Am Tue, 1 Aug 2023 17:58:57 -0400
schrieb George Koehler <kern...@gmail.com>:
> On Thu, 27 Jul 2023 21:48:07 +0100
> Stuart Henderson <s...@spacehopper.org> wrote:
>
> > > I have been experimenting with fixing WANTLIB in the last few
> > > days. For now I'm happy with a simple version bump and fixing
> > > MASTER_SITES.
> >
> > That would be
> >
> > WANTLIB += ${COMPILER_LIBCXX}
> > WANTLIB += c fluidsynth fontconfig freetype icudata icui18n icuuc
> > WANTLIB += lzma lzo2 m png z
> >
> > and it uses C++17 so the COMPILER line should be
> >
> > COMPILER
> > = base-clang ports-gcc
> >
>
> If I use this WANTLIB and keep the later WANTLIB += SDL2, then
> make port-lib-depends-check is happy. make package said, "LIB_DEPENDS
> audio/libsamplerate not needed for games/openttd ?"
>
> OpenTTD 13.4 came out on 29 Jul, so my amd64 now has Florian's diff
> from 27 Jul, plus 13.3 => 13.4, plus sthen's WANTLIB and COMPILER,
> minus audio/libsamplerate. Florian, is this well, or do you want to
> edit? Solene, when you commit, ok gkoehler@
I'd like to do a test on i386 first before committing it. There was a
problem with SDL in the past [1] which prevented it from being built.
At this point I have no usable i386 hardware at hand, so I will set up
a virtual machine for building openttd. However it is unlikely that I
will find the time before this weekend.
[1] https://marc.info/?l=openbsd-ports&m=167734207310983&w=2
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/openttd/Makefile,v
> retrieving revision 1.85
> diff -u -p -r1.85 Makefile
> --- Makefile 26 Apr 2023 08:34:13 -0000 1.85
> +++ Makefile 1 Aug 2023 21:48:23 -0000
> @@ -1,6 +1,6 @@
> COMMENT= open source clone of the game Transport Tycoon Deluxe
>
> -V = 13.1
> +V = 13.4
> DISTNAME = openttd-$V-source
> PKGNAME = openttd-$V
>
> @@ -14,13 +14,12 @@ HOMEPAGE= https://www.openttd.org/
> PERMIT_PACKAGE= Yes
>
> WANTLIB += ${COMPILER_LIBCXX}
> -WANTLIB += X11 Xcursor Xext Xfixes Xi Xrandr Xss c fluidsynth
> fontconfig -WANTLIB += freetype icudata icui18n icuuc lzma lzo2 m png
> pthread samplerate -WANTLIB += sndio usbhid z
> +WANTLIB += c fluidsynth fontconfig freetype icudata icui18n icuuc
> +WANTLIB += lzma lzo2 m png z
>
> -COMPILER = base-clang ports-gcc base-gcc
> +COMPILER = base-clang ports-gcc
>
> -MASTER_SITES =
> https://proxy.binaries.openttd.org/openttd-releases/$V/ +MASTER_SITES
> = https://cdn.openttd.org/openttd-releases/$V/
> EXTRACT_SUFX = .tar.xz
> DIST_SUBDIR = openttd
> @@ -29,7 +28,6 @@ MODULES = devel/cmake
>
> LIB_DEPENDS= archivers/lzo2 \
> audio/fluidsynth \
> - audio/libsamplerate \
> graphics/png \
> textproc/icu4c \
> archivers/xz
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/openttd/distinfo,v
> retrieving revision 1.44
> diff -u -p -r1.44 distinfo
> --- distinfo 26 Apr 2023 08:34:13 -0000 1.44
> +++ distinfo 1 Aug 2023 21:48:23 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (openttd/openttd-13.1-source.tar.xz) =
> Xt8i03A1I4KF72cql9WeZCgL66sj5YR4CDTM1r4KWLs= -SIZE
> (openttd/openttd-13.1-source.tar.xz) = 7407360 +SHA256
> (openttd/openttd-13.4-source.tar.xz) =
> Kh3roBv+WOIYiHn0UMP6TzgZJxq0m/NI3WZUXwQNFG8= +SIZE
> (openttd/openttd-13.4-source.tar.xz) = 7428012
--
greetings,
Florian Viehweger
