On Thu, May 18, 2023 at 05:13:13AM +0200, Theo Buehler wrote:
> > It would be nice if this diff could go into a bulk build for testing;
> > even in the absence of this I think it's time to bring those ports up
> > to their upstream versions. Benefits include fixes for Opus memory leak
> > in sdl2-mixer, some CVEs for sdl2-ttf memory corruption etc.
>
> Three ports failed to package with llvm15: games/freeciv, games/wesnoth,
> and games/freedink/games. As pointed out by thfr, wesnoth needs a
> WANTLIB/LDEP change and freeciv looks similar. thfr has the full logs.
>
> I am not at all familiar with this part of the tree and I haven't looked
> at the diff beyond what was already discussed on the list. If you feel
> there's been enough testing of the important consumers, I'd say go ahead.
> I'm of course ok with you taking maintainer.
>
> games/freeciv:
> ===> Building package for freeciv-client-3.0.6p0
> Create /data/packages/amd64/all/freeciv-client-3.0.6p0.tgz
> Missing library for FLAC>=0.0
> Missing library for mikmod>=0.0
> Missing library for mpg123>=0.0
> Missing library for vorbis>=0.0
> Missing library for vorbisfile>=0.0
> *** Error 1 in games/freeciv (/usr/ports/infrastructure/mk/bsd.port.mk:3466
> 'port-wantlib-args': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CA...)
>
> games/wesnoth:
> ===> Building package for wesnoth-1.16.9
> Create /data/packages/amd64/all/wesnoth-1.16.9.tgz
> Missing library for vorbisfile>=0.0
> *** Error 1 in games/wesnoth (/usr/ports/infrastructure/mk/bsd.port.mk:3466
> 'port-wantlib-args': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CA...)
>
> games/freedink/game: (already fixed)
> gfx_fonts.cpp:296:9: error: cannot initialize a variable of type 'char *'
> with an rvalue of type 'co
> nst char *'
> char *familyname = TTF_FontFaceFamilyName(font);
> ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The update to SDL2_mixer exposed a missing dependency in wesnoth for libvorbis.
I also added in ICU as
wesnoth uses ICU.
freeciv does need a WANTLIB sync.
Index: freeciv/Makefile
===================================================================
RCS file: /home/cvs/ports/games/freeciv/Makefile,v
retrieving revision 1.131
diff -u -p -u -p -r1.131 Makefile
--- freeciv/Makefile 24 Apr 2023 11:40:39 -0000 1.131
+++ freeciv/Makefile 26 May 2023 23:48:19 -0000
@@ -7,7 +7,7 @@ REVISION-share= 0
VERSION= 3.0.6
DISTNAME= freeciv-${VERSION}
PKGNAME-main= freeciv-server-${VERSION}
-REVISION-main= 0
+REVISION-main= 1
CATEGORIES= games
@@ -26,11 +26,11 @@ cWANTLIB += pthread sqlite3 ssl z ${MODL
WANTLIB-main += readline ${cWANTLIB}
WANTLIB-client += ${cWANTLIB}
-WANTLIB-client += FLAC SDL2 SDL2_mixer X11 Xcursor Xext Xfixes Xi Xrandr
-WANTLIB-client += Xrender Xss atk-1.0 cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
+WANTLIB-client += SDL2 SDL2_mixer X11 Xcursor Xext Xfixes Xi Xrandr Xrender
+WANTLIB-client += Xss atk-1.0 cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
WANTLIB-client += gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-3 harfbuzz
-WANTLIB-client += mikmod modplug mpg123 ogg opus opusfile pango-1.0
pangocairo-1.0
-WANTLIB-client += samplerate sndio usbhid vorbis vorbisfile xcb
+WANTLIB-client += modplug ogg opus opusfile pango-1.0 pangocairo-1.0
+WANTLIB-client += samplerate sndio usbhid xcb
WANTLIB-share=
Index: wesnoth/Makefile
===================================================================
RCS file: /home/cvs/ports/games/wesnoth/Makefile,v
retrieving revision 1.105
diff -u -p -u -p -r1.105 Makefile
--- wesnoth/Makefile 3 May 2023 07:25:13 -0000 1.105
+++ wesnoth/Makefile 27 May 2023 00:29:04 -0000
@@ -4,7 +4,7 @@ BROKEN-hppa = missing atomic ops
COMMENT= fantasy turn-based strategy game
DISTNAME= wesnoth-1.16.9
-
+REVISION= 0
CATEGORIES= games x11
MAINTAINER= Kirill Bychkov <ki...@openbsd.org>
@@ -17,25 +17,27 @@ EXTRACT_SUFX= .tar.bz2
# GPLv2
PERMIT_PACKAGE= Yes
-WANTLIB += SDL2 SDL2_image SDL2_mixer
-WANTLIB += boost_atomic-mt boost_chrono-mt boost_context-mt
-WANTLIB += boost_coroutine-mt boost_filesystem-mt
-WANTLIB += boost_iostreams-mt boost_locale-mt
+WANTLIB += ${COMPILER_LIBCXX} SDL2 SDL2_image SDL2_mixer boost_atomic-mt
+WANTLIB += boost_chrono-mt boost_context-mt boost_coroutine-mt
+WANTLIB += boost_filesystem-mt boost_iostreams-mt boost_locale-mt
WANTLIB += boost_program_options-mt boost_random-mt boost_regex-mt
WANTLIB += boost_system-mt boost_thread-mt c cairo crypto dbus-1
-WANTLIB += fontconfig freetype glib-2.0 gobject-2.0
-WANTLIB += harfbuzz icudata icui18n icuuc intl m pango-1.0
-WANTLIB += pangocairo-1.0 ssl vorbisfile z ${COMPILER_LIBCXX}
+WANTLIB += fontconfig freetype glib-2.0 gobject-2.0 harfbuzz icudata
+WANTLIB += icui18n icuuc intl m pango-1.0 pangocairo-1.0 ssl vorbisfile
MODULES= devel/cmake
+
# c++17
COMPILER = base-clang ports-gcc
BUILD_DEPENDS= devel/gettext,-tools
-LIB_DEPENDS= devel/boost,-md \
+LIB_DEPENDS= audio/libvorbis \
+ devel/boost \
+ devel/boost,-md \
devel/sdl2-image \
devel/sdl2-mixer \
devel/pango \
+ textproc/icu4c \
x11/dbus
RUN_DEPENDS= devel/desktop-file-utils \
