On Tue, 12 Apr 2022 15:07:10 +0200 Solene Rapenne <sol...@perso.pw> wrote:
> New minor update for openttd, and the assets are a bit lagging behind > so I updated them too. Something is wrong for openmsx and opensfx, the > zip file contains a single .tar file., opensfx licence changed so I > updated the licence of openbsd-data itself, maybe I should make it more > precise it's only for opensfx? I would use 2 comments, # opengfx, openmsx: GPLv2 only # opensfx: CC BY-SA 3.0, GPLv2+, CDDL 1.1 PERMIT_PACKAGE= Yes Or you might move the PERMIT_PACKAGE line to each Makefile, so each baseset has its own comment. If I pkg_add generaluser-gs-soundfont, the game switches from timidity to fluidsynth for music. (Our audio/fluidsynth/Makefile refers to this font.) I like this way, suggest to delete audio/timidity and add audio/generaluser-gs-soundfont in openttd's RUN_DEPENDS. I don't suggest any other changes. It might be possible to stop extracting the .tar files of opengfx and opensfx, because the game can read .tar; but it might be better to continue extracting them. (Music in tars might not work.) Also, the readmes want the data in baseset/, but we continue to put them in data/ or gm/, which does work. --George > works fine for me, tested on amd64 > > Index: Makefile > =================================================================== > RCS file: /home/reposync/ports/games/openttd/Makefile,v > retrieving revision 1.75 > diff -u -r1.75 Makefile > --- Makefile 11 Mar 2022 19:04:47 -0000 1.75 > +++ Makefile 12 Apr 2022 11:28:55 -0000 > @@ -1,6 +1,6 @@ > COMMENT= open source clone of the game Transport Tycoon Deluxe > > -V = 12.1 > +V = 12.2 > DISTNAME = openttd-$V-source > PKGNAME = openttd-$V > > Index: distinfo > =================================================================== > RCS file: /home/reposync/ports/games/openttd/distinfo,v > retrieving revision 1.41 > diff -u -r1.41 distinfo > --- distinfo 25 Nov 2021 17:19:32 -0000 1.41 > +++ distinfo 12 Apr 2022 11:30:16 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (openttd/openttd-12.1-source.tar.xz) = > JYv1uZgwEIkLoQUYtQa8SrgPfAjM7FlJfpulWkqj5+M= > -SIZE (openttd/openttd-12.1-source.tar.xz) = 7357316 > +SHA256 (openttd/openttd-12.2-source.tar.xz) = > gVCPDek6DCZLIW71agX4OB//e/+m0BASGiFJC02s6Vw= > +SIZE (openttd/openttd-12.2-source.tar.xz) = 7377496 > Index: Makefile.inc > =================================================================== > RCS file: /home/reposync/ports/games/openttd-data/Makefile.inc,v > retrieving revision 1.4 > diff -u -r1.4 Makefile.inc > --- Makefile.inc 11 Mar 2022 19:04:47 -0000 1.4 > +++ Makefile.inc 12 Apr 2022 12:38:52 -0000 > @@ -9,7 +9,7 @@ > > MAINTAINER ?= Anthony J. Bentley <anth...@anjbe.name> > > -# GPLv2 only > +# CC BY-SA 3.0, GPLv2+, CDDL 1.1 > PERMIT_PACKAGE= Yes > > MASTER_SITES ?= https://cdn.openttd.org/${OPENTTD_PROJECT}-releases/$V/ > Index: opengfx/Makefile > =================================================================== > RCS file: /home/reposync/ports/games/openttd-data/opengfx/Makefile,v > retrieving revision 1.5 > diff -u -r1.5 Makefile > --- opengfx/Makefile 11 Mar 2022 19:04:47 -0000 1.5 > +++ opengfx/Makefile 12 Apr 2022 12:31:31 -0000 > @@ -1,7 +1,7 @@ > COMMENT = graphics data for OpenTTD > > OPENTTD_PROJECT = opengfx > -V = 0.6.1 > +V = 7.1 > > post-extract: > cd ${WRKDIR} && ${TAR} xf opengfx-$V.tar > Index: opengfx/distinfo > =================================================================== > RCS file: /home/reposync/ports/games/openttd-data/opengfx/distinfo,v > retrieving revision 1.5 > diff -u -r1.5 distinfo > --- opengfx/distinfo 28 Oct 2021 09:58:45 -0000 1.5 > +++ opengfx/distinfo 12 Apr 2022 12:31:51 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (openttd/opengfx-0.6.1-all.zip) = > xpShEs1QjZyP2tG5K94F58SLFNZrrQw5meRDNnQ3434= > -SIZE (openttd/opengfx-0.6.1-all.zip) = 3550978 > +SHA256 (openttd/opengfx-7.1-all.zip) = > ko/PNO/QcZo1YMuraCHXHOaGtjFeiCU2D7qHp6lNeEY= > +SIZE (openttd/opengfx-7.1-all.zip) = 3547160 > Index: openmsx/Makefile > =================================================================== > RCS file: /home/reposync/ports/games/openttd-data/openmsx/Makefile,v > retrieving revision 1.2 > diff -u -r1.2 Makefile > --- openmsx/Makefile 11 Mar 2022 19:04:47 -0000 1.2 > +++ openmsx/Makefile 12 Apr 2022 12:56:31 -0000 > @@ -1,7 +1,10 @@ > COMMENT = music data for OpenTTD > > OPENTTD_PROJECT = openmsx > -V = 0.3.1 > +V = 0.4.2 > + > +post-extract: > + cd ${WRKDIR} && tar xf ${OPENTTD_PROJECT}-${V}.tar > > do-install: > ${INSTALL_DATA_DIR} ${PREFIX}/share/openttd/gm > Index: openmsx/distinfo > =================================================================== > RCS file: /home/reposync/ports/games/openttd-data/openmsx/distinfo,v > retrieving revision 1.2 > diff -u -r1.2 distinfo > --- openmsx/distinfo 2 Mar 2021 04:20:18 -0000 1.2 > +++ openmsx/distinfo 12 Apr 2022 12:38:08 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (openttd/openmsx-0.3.1-all.zip) = > kuKTronxOtZ59DGF6D+4H7jK1H/mP0rz09n5VRMEYPU= > -SIZE (openttd/openmsx-0.3.1-all.zip) = 136981 > +SHA256 (openttd/openmsx-0.4.2-all.zip) = > WkJ3ouYth/KVLqUCDcIPsvb/r9zPmRP781rUXuMOx2I= > +SIZE (openttd/openmsx-0.4.2-all.zip) = 140204 > Index: openmsx/pkg/PLIST > =================================================================== > RCS file: /home/reposync/ports/games/openttd-data/openmsx/pkg/PLIST,v > retrieving revision 1.2 > diff -u -r1.2 PLIST > --- openmsx/pkg/PLIST 11 Mar 2022 19:04:47 -0000 1.2 > +++ openmsx/pkg/PLIST 12 Apr 2022 12:55:40 -0000 > @@ -3,7 +3,6 @@ > share/openttd/gm/ > share/openttd/gm/5432gone_redfarn.mid > share/openttd/gm/be_sharp_bw_redfarn.mid > -share/openttd/gm/big_man_boogie_redfarn.mid > share/openttd/gm/boogi_marabi_redfarn.mid > share/openttd/gm/busy_schedule.mid > share/openttd/gm/careless_perc_redfarn.mid > @@ -13,6 +12,7 @@ > share/openttd/gm/coconut_run2.mid > share/openttd/gm/flying_scotsman.mid > share/openttd/gm/harp_harmony.mid > +share/openttd/gm/keep_on_rolling.mid > share/openttd/gm/linns_basket.mid > share/openttd/gm/midnight_snow_run.mid > share/openttd/gm/mighty_giant_run.mid > Index: opensfx/Makefile > =================================================================== > RCS file: /home/reposync/ports/games/openttd-data/opensfx/Makefile,v > retrieving revision 1.2 > diff -u -r1.2 Makefile > --- opensfx/Makefile 11 Mar 2022 19:04:47 -0000 1.2 > +++ opensfx/Makefile 12 Apr 2022 12:56:26 -0000 > @@ -1,7 +1,10 @@ > COMMENT = sound effects data for OpenTTD > > OPENTTD_PROJECT = opensfx > -V = 0.2.3 > +V = 1.0.3 > + > +post-extract: > + cd ${WRKDIR} && tar xf ${OPENTTD_PROJECT}-${V}.tar > > do-install: > ${INSTALL_DATA_DIR} ${PREFIX}/share/openttd/data > Index: opensfx/distinfo > =================================================================== > RCS file: /home/reposync/ports/games/openttd-data/opensfx/distinfo,v > retrieving revision 1.2 > diff -u -r1.2 distinfo > --- opensfx/distinfo 2 Mar 2021 04:20:18 -0000 1.2 > +++ opensfx/distinfo 12 Apr 2022 12:36:07 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (openttd/opensfx-0.2.3-all.zip) = > aDG2UbPci0lAJvcneYmh11eWG2fBe3XTwuCXRR91rwI= > -SIZE (openttd/opensfx-0.2.3-all.zip) = 11359588 > +SHA256 (openttd/opensfx-1.0.3-all.zip) = > 4KIYt92UOOcBUDsPhMJal8HBG3wvAlMj+xnW2xbvN1k= > +SIZE (openttd/opensfx-1.0.3-all.zip) = 11566000 > -- George Koehler <kern...@gmail.com>
