Hi,
This is a bulk diff to bring these 4 sdl2-related ports up-to-date. I
have been running with them for over a month and built multiple ports.
No issues observed.
There is some reduction in dependencies - the explanation is that for
example sdl2-image started including stb_image as the default backend
for JPG and PNG in 2.6.0. Similar for sdl2-mixer with stb_vorbis etc.
(see release note links at the bottom)
The patches are based on a diff sent to my by Brad and the input from
tb@ on sdl2-image.
I would like to take maintainer for sdl2-{net,ttf} while here (I
already am for the other 2 ports).
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.
Release note links:
https://github.com/libsdl-org/SDL_image/releases
https://github.com/libsdl-org/SDL_mixer/releases
https://github.com/libsdl-org/SDL_net/releases
https://github.com/libsdl-org/SDL_ttf/releases
ok?
Index: sdl2-image/Makefile
===================================================================
RCS file: /cvs/ports/devel/sdl2-image/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- sdl2-image/Makefile 31 Mar 2022 16:10:30 -0000 1.15
+++ sdl2-image/Makefile 14 May 2023 20:48:40 -0000
@@ -1,11 +1,10 @@
-V = 2.0.5
+V = 2.6.3
COMMENT = SDL2 image library
DISTNAME = SDL2_image-${V}
PKGNAME = sdl2-image-${V}
CATEGORIES = devel graphics
-REVISION = 0
-SHARED_LIBS += SDL2_image 0.1 # 0.4
+SHARED_LIBS += SDL2_image 1.0 # 2.6.3
HOMEPAGE = https://www.libsdl.org/projects/SDL_image/
@@ -14,25 +13,27 @@ MAINTAINER = Thomas Frohwein <thfr@openb
# zlib
PERMIT_PACKAGE = Yes
-WANTLIB += SDL2 jpeg m png pthread samplerate sndio tiff usbhid webp z
-WANTLIB += X11 Xcursor Xext Xfixes Xi Xinerama Xrandr Xrender Xss Xxf86vm
-WANTLIB += lzma xcb zstd
+WANTLIB += ${COMPILER_LIBCXX} SDL2 X11 Xcursor Xext Xfixes Xi Xrandr Xrender
+WANTLIB += Xss aom avif brotlicommon brotlidec brotlienc dav1d hwy jpeg jxl
+WANTLIB += lcms2 lzma m pthread samplerate sndio tiff usbhid webp xcb z zstd
MASTER_SITES = https://www.libsdl.org/projects/SDL_image/release/
-LIB_DEPENDS = devel/sdl2>=2.0.8 \
- graphics/jpeg \
+COMPILER = base-clang ports-gcc
+
+LIB_DEPENDS = archivers/brotli \
+ devel/highway \
+ devel/sdl2 \
+ graphics/lcms2 \
+ graphics/libavif \
+ graphics/libjxl \
graphics/libwebp \
- graphics/png \
graphics/tiff
CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS += --disable-jpg-shared \
- --disable-png-shared \
+CONFIGURE_ARGS += --disable-avif-shared \
--disable-tif-shared \
--disable-webp-shared
-CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- OBJC="${CC}"
+CONFIGURE_ENV += OBJC="${CC}"
.include <bsd.port.mk>
Index: sdl2-image/distinfo
===================================================================
RCS file: /cvs/ports/devel/sdl2-image/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- sdl2-image/distinfo 12 Jul 2019 02:49:57 -0000 1.5
+++ sdl2-image/distinfo 14 May 2023 20:48:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (SDL2_image-2.0.5.tar.gz) = vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA=
-SIZE (SDL2_image-2.0.5.tar.gz) = 11736518
+SHA256 (SDL2_image-2.6.3.tar.gz) = kxyb5b8dfI+um33BV4KLfu6HTiPH8ktEun7/a0g2MSw=
+SIZE (SDL2_image-2.6.3.tar.gz) = 9816720
Index: sdl2-image/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/sdl2-image/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- sdl2-image/patches/patch-Makefile_in 11 Mar 2022 18:53:25 -0000
1.4
+++ sdl2-image/patches/patch-Makefile_in 14 May 2023 20:48:40 -0000
@@ -1,16 +1,11 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -463,12 +463,10 @@ EXTRA_DIST = \
+@@ -571,7 +571,6 @@ EXTRA_DIST = \
- @USE_VERSION_RC_FALSE@libSDL2_image_la_LDFLAGS = \
- @USE_VERSION_RC_FALSE@ -no-undefined \
--@USE_VERSION_RC_FALSE@ -release $(LT_RELEASE) \
- @USE_VERSION_RC_FALSE@ -version-info
$(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ libSDL2_image_la_LDFLAGS = \
+ -no-undefined \
+- -release $(LT_RELEASE) \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LT_EXTRA)
- @USE_VERSION_RC_TRUE@libSDL2_image_la_LDFLAGS = \
- @USE_VERSION_RC_TRUE@ -no-undefined \
--@USE_VERSION_RC_TRUE@ -release $(LT_RELEASE) \
- @USE_VERSION_RC_TRUE@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-Wl,version.o
-
- @USE_VERSION_RC_FALSE@libSDL2_image_la_LIBADD = $(IMG_LIBS)
+ libSDL2_image_la_LIBADD = $(IMG_LIBS)
Index: sdl2-image/patches/patch-SDL2_image_pc_in
===================================================================
RCS file: sdl2-image/patches/patch-SDL2_image_pc_in
diff -N sdl2-image/patches/patch-SDL2_image_pc_in
--- sdl2-image/patches/patch-SDL2_image_pc_in 11 Mar 2022 18:53:25 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
---- SDL2_image.pc.in.orig Sat Aug 10 13:38:36 2013
-+++ SDL2_image.pc.in Fri Nov 15 18:57:27 2013
-@@ -8,5 +8,6 @@ Description: image loading library for Simple DirectMe
- Version: @VERSION@
- Requires: sdl2 >= @SDL_VERSION@
- Libs: -L${libdir} -lSDL2_image
-+Libs.private: @IMG_LIBS@
- Cflags: -I${includedir}/SDL2
-
Index: sdl2-image/patches/patch-configure
===================================================================
RCS file: sdl2-image/patches/patch-configure
diff -N sdl2-image/patches/patch-configure
--- sdl2-image/patches/patch-configure 11 Mar 2022 18:53:25 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-Index: configure
---- configure.orig
-+++ configure
-@@ -13124,7 +13124,7 @@ if ${ac_cv_lib_tiff_TIFFClientOpen+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltiff -lz $LIBS"
-+LIBS="-ltiff -ljpeg -lz $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -13463,7 +13463,7 @@ _ACEOF
- # Disable dynamic jpeg since we're linking it explicitly
- jpg_lib=''
- fi
-- IMG_LIBS="-ltiff -lz $IMG_LIBS"
-+ IMG_LIBS="-ltiff -ljpeg -lz $IMG_LIBS"
- fi
- fi
- if test x$enable_jpg = xyes -a x$have_jpg_hdr = xyes -a x$have_jpg_lib =
xyes; then
Index: sdl2-image/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/sdl2-image/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- sdl2-image/pkg/PLIST 11 Mar 2022 18:53:25 -0000 1.4
+++ sdl2-image/pkg/PLIST 14 May 2023 20:48:40 -0000
@@ -1,5 +1,8 @@
include/SDL2/SDL_image.h
-lib/libSDL2_image.a
+lib/cmake/SDL2_image/
+lib/cmake/SDL2_image/sdl2_image-config-version.cmake
+lib/cmake/SDL2_image/sdl2_image-config.cmake
+@static-lib lib/libSDL2_image.a
lib/libSDL2_image.la
@lib lib/libSDL2_image.so.${LIBSDL2_image_VERSION}
lib/pkgconfig/SDL2_image.pc
Index: sdl2-mixer/Makefile
===================================================================
RCS file: /cvs/ports/devel/sdl2-mixer/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- sdl2-mixer/Makefile 31 Mar 2022 16:10:30 -0000 1.14
+++ sdl2-mixer/Makefile 14 May 2023 20:48:40 -0000
@@ -1,11 +1,10 @@
-V = 2.0.4
+V = 2.6.3
COMMENT = SDL2 multi-channel audio mixer library
DISTNAME = SDL2_mixer-${V}
PKGNAME = sdl2-mixer-${V}
CATEGORIES = devel audio
-REVISION = 0
-SHARED_LIBS += SDL2_mixer 0.1 # 2.2
+SHARED_LIBS += SDL2_mixer 1.0 # 2.2
HOMEPAGE = https://www.libsdl.org/projects/SDL_mixer/
MAINTAINER = Thomas Frohwein <[email protected]>
@@ -13,37 +12,24 @@ MAINTAINER = Thomas Frohwein <thfr@openb
# zlib
PERMIT_PACKAGE = Yes
-WANTLIB += FLAC SDL2 c m mikmod modplug ogg opus opusfile pthread sndio usbhid
-WANTLIB += vorbis vorbisfile samplerate mpg123
-WANTLIB += X11 Xcursor Xext Xfixes Xi Xinerama Xrandr Xrender Xss Xxf86vm xcb
+WANTLIB += SDL2 X11 Xcursor Xext Xfixes Xi Xrandr Xrender Xss
+WANTLIB += c m modplug ogg opus opusfile pthread samplerate sndio
+WANTLIB += usbhid xcb
MASTER_SITES = https://www.libsdl.org/projects/SDL_mixer/release/
-LIB_DEPENDS = audio/flac \
- audio/libmikmod \
- audio/libmodplug \
- audio/libogg \
- audio/libvorbis \
- audio/mpg123 \
+LIB_DEPENDS = audio/libmodplug \
audio/opusfile \
devel/sdl2
CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS += --disable-music-flac-shared \
- --disable-music-midi-fluidsynth \
+CONFIGURE_ARGS += --disable-music-midi-fluidsynth \
--disable-music-mod-modplug-shared \
- --disable-music-ogg-shared \
- --enable-music-mod-mikmod \
- --disable-music-mod-mikmod-shared
-CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include
-I${LOCALBASE}/include/libmodplug" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ --disable-music-opus-shared
USE_GMAKE = Yes
NO_TEST = Yes
-
-pre-build:
- ${SUBST_CMD} ${WRKSRC}/timidity/options.h
post-install:
${INSTALL_PROGRAM} ${WRKBUILD}/build/.libs/playmus
${PREFIX}/bin/play2mus
Index: sdl2-mixer/distinfo
===================================================================
RCS file: /cvs/ports/devel/sdl2-mixer/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- sdl2-mixer/distinfo 20 Apr 2019 18:22:28 -0000 1.4
+++ sdl2-mixer/distinfo 14 May 2023 20:48:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (SDL2_mixer-2.0.4.tar.gz) = tM9aOCwGHNdQgc8kbCqi+d+NsEvdqNzca2zKVb7eJBk=
-SIZE (SDL2_mixer-2.0.4.tar.gz) = 11125077
+SHA256 (SDL2_mixer-2.6.3.tar.gz) = emuoakeGSM5hfjpekncYG8Z/fOmHZgXupq/9Sg1u6o8=
+SIZE (SDL2_mixer-2.6.3.tar.gz) = 9935069
Index: sdl2-mixer/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/sdl2-mixer/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- sdl2-mixer/patches/patch-Makefile_in 11 Mar 2022 18:53:25 -0000
1.3
+++ sdl2-mixer/patches/patch-Makefile_in 14 May 2023 20:48:40 -0000
@@ -1,12 +1,12 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -44,7 +44,7 @@ LT_AGE = @LT_AGE@
- LT_CURRENT = @LT_CURRENT@
+@@ -78,7 +78,7 @@ LT_CURRENT = @LT_CURRENT@
LT_RELEASE = @LT_RELEASE@
LT_REVISION = @LT_REVISION@
--LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE)
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+LT_LDFLAGS = -no-undefined -rpath $(libdir) -version-info
$(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ LT_EXTRA = @LT_EXTRA@
+-LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE)
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LT_EXTRA)
++LT_LDFLAGS = -no-undefined -rpath $(libdir) -version-info
$(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LT_EXTRA)
- all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET)
$(objects)/playwave$(EXE) $(objects)/playmus$(EXE)
+ all: $(srcdir)/configure Makefile $(objects)/$(TARGET)
$(objects)/playwave$(EXE) $(objects)/playmus$(EXE)
Index: sdl2-mixer/patches/patch-SDL2_mixer_pc_in
===================================================================
RCS file: sdl2-mixer/patches/patch-SDL2_mixer_pc_in
diff -N sdl2-mixer/patches/patch-SDL2_mixer_pc_in
--- sdl2-mixer/patches/patch-SDL2_mixer_pc_in 11 Mar 2022 18:53:25 -0000
1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
---- SDL2_mixer.pc.in.orig Sat Aug 10 13:39:54 2013
-+++ SDL2_mixer.pc.in Fri Nov 15 19:01:58 2013
-@@ -8,5 +8,6 @@ Description: mixer library for Simple DirectMedia Laye
- Version: @VERSION@
- Requires: sdl2 >= @SDL_VERSION@
- Libs: -L${libdir} -lSDL2_mixer
-+Libs.private: -lmikmod -lvorbisfile -lvorbis -lFLAC -logg -lsmpeg2 -lm
- Cflags: -I${includedir}/SDL2
-
Index: sdl2-mixer/patches/patch-configure
===================================================================
RCS file: sdl2-mixer/patches/patch-configure
diff -N sdl2-mixer/patches/patch-configure
--- sdl2-mixer/patches/patch-configure 11 Mar 2022 18:53:25 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-Index: configure
---- configure.orig
-+++ configure
-@@ -12353,7 +12353,7 @@ if ${ac_cv_lib_vorbisfile_ov_open_callbacks+:} false;
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lvorbisfile -lvorbis -logg -lm $LIBS"
-+LIBS="-lvorbisfile -lvorbis -logg $LIBM $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -12443,7 +12443,7 @@ fi
-
- if test x$have_flac_export = xyes; then
- LIBS_SAVED="$LIBS"
-- LIBS="-lFLAC"
-+ LIBS="-lFLAC -logg $LIBM"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libflac so-name
version >= $libflac_ver" >&5
- $as_echo_n "checking for libflac so-name version >= $libflac_ver... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -12489,7 +12489,7 @@ if ${ac_cv_lib_FLAC_FLAC__stream_decoder_new+:} false;
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lFLAC $LIBS"
-+LIBS="-lFLAC -logg $LIBM $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
Index: sdl2-mixer/patches/patch-timidity_options_h
===================================================================
RCS file: sdl2-mixer/patches/patch-timidity_options_h
diff -N sdl2-mixer/patches/patch-timidity_options_h
--- sdl2-mixer/patches/patch-timidity_options_h 11 Mar 2022 18:53:25 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-Index: timidity/options.h
---- timidity/options.h.orig
-+++ timidity/options.h
-@@ -78,10 +78,7 @@
- #if defined(__WIN32__) || defined(__OS2__)
- #define DEFAULT_PATH "C:\\TIMIDITY"
- #else
--#define DEFAULT_PATH "/etc/timidity"
--#define DEFAULT_PATH1 "/usr/share/timidity"
--#define DEFAULT_PATH2 "/usr/local/share/timidity"
--#define DEFAULT_PATH3 "/usr/local/lib/timidity"
-+#define DEFAULT_PATH "${SYSCONFDIR}"
- #endif
-
- /* These affect general volume */
Index: sdl2-mixer/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/sdl2-mixer/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- sdl2-mixer/pkg/PLIST 11 Mar 2022 18:53:25 -0000 1.4
+++ sdl2-mixer/pkg/PLIST 14 May 2023 20:48:40 -0000
@@ -1,7 +1,10 @@
@bin bin/play2mus
@bin bin/play2wave
include/SDL2/SDL_mixer.h
-lib/libSDL2_mixer.a
+lib/cmake/SDL2_mixer/
+lib/cmake/SDL2_mixer/sdl2_mixer-config-version.cmake
+lib/cmake/SDL2_mixer/sdl2_mixer-config.cmake
+@static-lib lib/libSDL2_mixer.a
lib/libSDL2_mixer.la
@lib lib/libSDL2_mixer.so.${LIBSDL2_mixer_VERSION}
lib/pkgconfig/SDL2_mixer.pc
Index: sdl2-net/Makefile
===================================================================
RCS file: /cvs/ports/devel/sdl2-net/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- sdl2-net/Makefile 31 Mar 2022 16:10:30 -0000 1.9
+++ sdl2-net/Makefile 14 May 2023 20:48:40 -0000
@@ -1,20 +1,19 @@
-V = 2.0.1
+V = 2.2.0
COMMENT = SDL2 cross-platform networking library
DISTNAME = SDL2_net-${V}
PKGNAME = sdl2-net-${V}
CATEGORIES = devel net
-REVISION = 1
-SHARED_LIBS += SDL2_net 0.0 # 0.0
+SHARED_LIBS += SDL2_net 1.0 # 0.0
HOMEPAGE = https://www.libsdl.org/projects/SDL_net/
+MAINTAINER = Thomas Frohwein <[email protected]>
# zlib
PERMIT_PACKAGE = Yes
-WANTLIB += SDL2 m pthread sndio usbhid
-WANTLIB += X11 Xcursor Xext Xfixes Xi Xinerama Xrandr Xrender Xss Xxf86vm
-WANTLIB += samplerate xcb
+WANTLIB += SDL2 X11 Xcursor Xext Xfixes Xi Xrandr Xrender Xss
+WANTLIB += m pthread samplerate sndio usbhid xcb
MASTER_SITES = https://www.libsdl.org/projects/SDL_net/release/
Index: sdl2-net/distinfo
===================================================================
RCS file: /cvs/ports/devel/sdl2-net/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- sdl2-net/distinfo 10 Jan 2016 08:10:42 -0000 1.2
+++ sdl2-net/distinfo 14 May 2023 20:48:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (SDL2_net-2.0.1.tar.gz) = Fc6Kfloj2v6Bd8jfbmx5tnSaA//x6BlnQtNXFldgnSE=
-SIZE (SDL2_net-2.0.1.tar.gz) = 347436
+SHA256 (SDL2_net-2.2.0.tar.gz) = TkqJGYgxYnGXT/TpWF7R73KaEj0iwIvUcxKRedyFf+s=
+SIZE (SDL2_net-2.2.0.tar.gz) = 8707169
Index: sdl2-net/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/sdl2-net/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- sdl2-net/patches/patch-Makefile_in 11 Mar 2022 18:53:25 -0000 1.3
+++ sdl2-net/patches/patch-Makefile_in 14 May 2023 20:48:40 -0000
@@ -1,15 +1,11 @@
---- Makefile.in.orig Sun Jan 3 02:57:09 2016
-+++ Makefile.in Thu Jan 7 01:01:14 2016
-@@ -398,12 +398,10 @@ EXTRA_DIST = \
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
+@@ -436,7 +436,6 @@ EXTRA_DIST = \
- @USE_VERSION_RC_FALSE@libSDL2_net_la_LDFLAGS = \
- @USE_VERSION_RC_FALSE@ -no-undefined \
--@USE_VERSION_RC_FALSE@ -release $(LT_RELEASE) \
- @USE_VERSION_RC_FALSE@ -version-info
$(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ libSDL2_net_la_LDFLAGS = \
+ -no-undefined \
+- -release $(LT_RELEASE) \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LT_EXTRA)
- @USE_VERSION_RC_TRUE@libSDL2_net_la_LDFLAGS = \
- @USE_VERSION_RC_TRUE@ -no-undefined \
--@USE_VERSION_RC_TRUE@ -release $(LT_RELEASE) \
- @USE_VERSION_RC_TRUE@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-Wl,version.o
-
- @USE_VERSION_RC_FALSE@libSDL2_net_la_LIBADD = @INETLIB@
+ libSDL2_net_la_LIBADD = @INETLIB@
Index: sdl2-net/patches/patch-SDL_net_h
===================================================================
RCS file: sdl2-net/patches/patch-SDL_net_h
diff -N sdl2-net/patches/patch-SDL_net_h
--- sdl2-net/patches/patch-SDL_net_h 11 Mar 2022 18:53:25 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- SDL_net.h.orig Sat Oct 12 17:26:39 2013
-+++ SDL_net.h Sat Oct 12 17:28:26 2013
-@@ -365,7 +365,7 @@ extern DECLSPEC const char * SDLCALL SDLNet_GetError(v
- /***********************************************************************/
-
- /* Warning, some systems have data access alignment restrictions */
--#if defined(sparc) || defined(mips) || defined(__arm__)
-+#if defined(__STRICT_ALIGNMENT)
- #define SDL_DATA_ALIGNED 1
- #endif
- #ifndef SDL_DATA_ALIGNED
Index: sdl2-net/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/sdl2-net/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- sdl2-net/pkg/PLIST 11 Mar 2022 18:53:25 -0000 1.3
+++ sdl2-net/pkg/PLIST 14 May 2023 20:48:40 -0000
@@ -1,6 +1,8 @@
-include/SDL2/
include/SDL2/SDL_net.h
-lib/libSDL2_net.a
+lib/cmake/SDL2_net/
+lib/cmake/SDL2_net/sdl2_net-config-version.cmake
+lib/cmake/SDL2_net/sdl2_net-config.cmake
+@static-lib lib/libSDL2_net.a
lib/libSDL2_net.la
@lib lib/libSDL2_net.so.${LIBSDL2_net_VERSION}
lib/pkgconfig/SDL2_net.pc
Index: sdl2-ttf/Makefile
===================================================================
RCS file: /cvs/ports/devel/sdl2-ttf/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- sdl2-ttf/Makefile 31 Mar 2022 16:10:30 -0000 1.11
+++ sdl2-ttf/Makefile 14 May 2023 20:48:40 -0000
@@ -1,19 +1,19 @@
-V = 2.0.15
+V = 2.20.2
COMMENT = SDL2 TrueType fonts library
DISTNAME = SDL2_ttf-${V}
PKGNAME = sdl2-ttf-${V}
CATEGORIES = devel graphics fonts
-REVISION = 0
-SHARED_LIBS += SDL2_ttf 0.0 # 10.2
+SHARED_LIBS += SDL2_ttf 0.1 # 10.2
HOMEPAGE = https://www.libsdl.org/projects/SDL_ttf/
+MAINTAINER = Thomas Frohwein <[email protected]>
# zlib
PERMIT_PACKAGE= Yes
-WANTLIB += SDL2 freetype m pthread sndio usbhid z samplerate xcb
-WANTLIB += X11 Xcursor Xext Xfixes Xi Xinerama Xrandr Xrender Xss Xxf86vm
+WANTLIB += SDL2 X11 Xcursor Xext Xfixes Xi Xrandr Xrender Xss
+WANTLIB += m pthread samplerate sndio usbhid xcb
MASTER_SITES = https://www.libsdl.org/projects/SDL_ttf/release/
@@ -21,7 +21,5 @@ LIB_DEPENDS = devel/sdl2
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
-CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
Index: sdl2-ttf/distinfo
===================================================================
RCS file: /cvs/ports/devel/sdl2-ttf/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- sdl2-ttf/distinfo 1 Apr 2020 20:43:08 -0000 1.4
+++ sdl2-ttf/distinfo 14 May 2023 20:48:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (SDL2_ttf-2.0.15.tar.gz) = qezrGtiMHxVFzXvSjny8CywUGR1AI49TGhWwGxsizTM=
-SIZE (SDL2_ttf-2.0.15.tar.gz) = 4479718
+SHA256 (SDL2_ttf-2.20.2.tar.gz) = ncce2TSHUhsQeixKnKa/Q/ti9r3dXCawVea5FBiiIFM=
+SIZE (SDL2_ttf-2.20.2.tar.gz) = 13161592
Index: sdl2-ttf/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/sdl2-ttf/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- sdl2-ttf/patches/patch-Makefile_in 11 Mar 2022 18:53:25 -0000 1.3
+++ sdl2-ttf/patches/patch-Makefile_in 14 May 2023 20:48:40 -0000
@@ -1,16 +1,11 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -413,12 +413,10 @@ EXTRA_DIST = \
-
- @USE_VERSION_RC_FALSE@libSDL2_ttf_la_LDFLAGS = \
- @USE_VERSION_RC_FALSE@ -no-undefined \
--@USE_VERSION_RC_FALSE@ -release $(LT_RELEASE) \
- @USE_VERSION_RC_FALSE@ -version-info
$(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
- @USE_VERSION_RC_TRUE@libSDL2_ttf_la_LDFLAGS = \
- @USE_VERSION_RC_TRUE@ -no-undefined \
--@USE_VERSION_RC_TRUE@ -release $(LT_RELEASE) \
- @USE_VERSION_RC_TRUE@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-Wl,version.o
+@@ -815,7 +815,6 @@ HARFBUZZ_SOURCES = \
+ @USE_BUILTIN_HARFBUZZ_FALSE@LINKER = $(LINK)
+ libSDL2_ttf_la_LDFLAGS = \
+ -no-undefined \
+- -release $(LT_RELEASE) \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LT_EXTRA)
@USE_VERSION_RC_TRUE@libSDL2_ttf_la_DEPENDENCIES = version.o
Index: sdl2-ttf/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/sdl2-ttf/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- sdl2-ttf/pkg/PLIST 11 Mar 2022 18:53:25 -0000 1.5
+++ sdl2-ttf/pkg/PLIST 14 May 2023 20:48:40 -0000
@@ -1,4 +1,7 @@
include/SDL2/SDL_ttf.h
+lib/cmake/SDL2_ttf/
+lib/cmake/SDL2_ttf/sdl2_ttf-config-version.cmake
+lib/cmake/SDL2_ttf/sdl2_ttf-config.cmake
@static-lib lib/libSDL2_ttf.a
lib/libSDL2_ttf.la
@lib lib/libSDL2_ttf.so.${LIBSDL2_ttf_VERSION}
