Hi,
Please find attached diffs for updating sdl2, sdl2-mixer, and sdl2-ttf
to their latest versions. API changes are minor. I've built and ran a
few consumers without issues. Here the release notes:
sdl2-2.30.0
-----------
In addition to lots of bug fixes, here are the major changes in this
release:
General:
* Added support for 2 bits-per-pixel indexed surface formats
* Added the function SDL_GameControllerGetSteamHandle() to get the Steam
API handle for a controller, if available
* Added the event SDL_CONTROLLERSTEAMHANDLEUPDATED which is sent when
the Steam API handle for a controller changes. This could also change
the name, VID, and PID of the controller.
* Added the environment variable SDL_LOGGING to control default log output
[rest is for macOS and Xbox, so omitted]
sdl2-mixer 2.8.0
----------------
In addition to lots of bug fixes, here are the major changes in this
release:
* Added support for loading wavpack sound files (https://www.wavpack.com/)
* Added support for loading classic console sound files using
Game_Music_Emu (https://github.com/libgme/game-music-emu)
* Use minimp3 instead of dr_mp3 as the default backend for MP3 music
* Use libxmp instead of modplug as the default backend for MOD music
* To use libmodplug instead, configure using --enable-music-mod-modplug
--disable-music-mod-xmp
* Added support for FLAC audio in Ogg containers
* Added Mix_PauseAudio() to pause and resume all audio playback
* Added Mix_GetNumTracks() and Mix_StartTrack() for managing tracks in
GME files
sdl2-ttf 2.22.0
---------------
In addition to bug fixes, here are the major changes in this release:
* Updated to FreeType version 2.13.2 and HarfBuzz version 8.1.1
ok? (planning to commit these updates soon if I don't hear anything...)
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/sdl2/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- Makefile 5 Nov 2023 13:56:52 -0000 1.54
+++ Makefile 18 Feb 2024 04:05:49 -0000
@@ -1,12 +1,12 @@
COMMENT= cross-platform multimedia library
-V= 2.28.5
+V= 2.30.0
DISTNAME= SDL2-${V}
PKGNAME= sdl2-${V}
CATEGORIES= devel
SITES= https://www.libsdl.org/release/
-SHARED_LIBS= SDL2 0.14 # 2.28.1
+SHARED_LIBS= SDL2 0.15 # 2.30.0
HOMEPAGE= https://www.libsdl.org/
@@ -17,12 +17,13 @@ DEBUG_PACKAGES= ${BUILD_PACKAGES}
# zlib
PERMIT_PACKAGE= Yes
-WANTLIB+= X11 Xcursor Xext Xfixes Xi Xrandr Xrender Xss m pthread
samplerate
-WANTLIB+= sndio usbhid xcb
+WANTLIB+= X11 Xcursor Xext Xfixes Xi Xrandr Xrender Xss iconv m pthread
+WANTLIB+= samplerate sndio usbhid xcb
# GL library is dlopen'd
WANTLIB+= GL
-LIB_DEPENDS= audio/libsamplerate
+LIB_DEPENDS= audio/libsamplerate \
+ converters/libiconv
USE_GMAKE= Yes
SEPARATE_BUILD= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/sdl2/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo 5 Nov 2023 13:56:52 -0000 1.22
+++ distinfo 18 Feb 2024 04:05:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (SDL2-2.28.5.tar.gz) = MyyzfQviDLlUFznGH3m65aR3Qn15roXjUgia/a9mZuQ=
-SIZE (SDL2-2.28.5.tar.gz) = 7345355
+SHA256 (SDL2-2.30.0.tar.gz) = NuLkFVfg+koVGTFcD1lYqHzLJ+JcUXdr628SOVJkR7A=
+SIZE (SDL2-2.30.0.tar.gz) = 7428037
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/sdl2/patches/patch-configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure
--- patches/patch-configure 2 Nov 2023 15:41:21 -0000 1.1
+++ patches/patch-configure 18 Feb 2024 04:05:49 -0000
@@ -2,7 +2,7 @@ prevent from using linux/input.h if pres
Index: configure
--- configure.orig
+++ configure
-@@ -26427,7 +26427,7 @@ main (void)
+@@ -26476,7 +26476,7 @@ main (void)
_ACEOF
if ac_fn_c_try_compile "$LINENO"
then :
Index: patches/patch-src_SDL_c
===================================================================
RCS file: /cvs/ports/devel/sdl2/patches/patch-src_SDL_c,v
retrieving revision 1.13
diff -u -p -r1.13 patch-src_SDL_c
--- patches/patch-src_SDL_c 19 Jul 2023 02:37:46 -0000 1.13
+++ patches/patch-src_SDL_c 18 Feb 2024 04:05:49 -0000
@@ -1,9 +1,9 @@
-- Allow custom SDL GetPlatform name with env var SDL_PLATFORM
+allow custom SDL GetPlatform name with env var SDL_PLATFORM
Index: src/SDL.c
--- src/SDL.c.orig
+++ src/SDL.c
-@@ -544,6 +544,10 @@ int SDL_GetRevisionNumber(void)
+@@ -566,6 +566,10 @@ int SDL_GetRevisionNumber(void)
/* Get the name of the platform */
const char *SDL_GetPlatform(void)
{
@@ -11,6 +11,6 @@ Index: src/SDL.c
+ if (platform = SDL_getenv("SDL_PLATFORM")) {
+ return platform;
+ }
- #if __AIX__
+ #if defined(__AIX__)
return "AIX";
- #elif __ANDROID__
+ #elif defined(__ANDROID__)
Index: patches/patch-src_joystick_bsd_SDL_bsdjoystick_c
===================================================================
RCS file:
/cvs/ports/devel/sdl2/patches/patch-src_joystick_bsd_SDL_bsdjoystick_c,v
retrieving revision 1.11
diff -u -p -r1.11 patch-src_joystick_bsd_SDL_bsdjoystick_c
--- patches/patch-src_joystick_bsd_SDL_bsdjoystick_c 28 Jul 2023 01:15:02
-0000 1.11
+++ patches/patch-src_joystick_bsd_SDL_bsdjoystick_c 18 Feb 2024 04:05:49
-0000
@@ -49,7 +49,7 @@ Index: src/joystick/bsd/SDL_bsdjoystick.
#endif
struct report
-@@ -711,6 +682,18 @@ static void BSD_JoystickUpdate(SDL_Joystick *joy)
+@@ -716,6 +687,18 @@ static void BSD_JoystickUpdate(SDL_Joystick *joy)
/* scaleaxe */
v = (Sint32)hid_get_data(REP_BUF_DATA(rep), &hitem);
v = (((SDL_JOYSTICK_AXIS_MAX - SDL_JOYSTICK_AXIS_MIN)
* (v - hitem.logical_minimum)) / (hitem.logical_maximum -
hitem.logical_minimum)) + SDL_JOYSTICK_AXIS_MIN;
@@ -68,7 +68,7 @@ Index: src/joystick/bsd/SDL_bsdjoystick.
SDL_PrivateJoystickAxis(joy, naxe, v);
} else if (usage == HUG_HAT_SWITCH) {
v = (Sint32)hid_get_data(REP_BUF_DATA(rep), &hitem);
-@@ -719,19 +702,29 @@ static void BSD_JoystickUpdate(SDL_Joystick *joy)
+@@ -724,19 +707,29 @@ static void BSD_JoystickUpdate(SDL_Joystick *joy)
hitem.logical_minimum);
}
#ifdef __OpenBSD__
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/sdl2-mixer/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 21 Sep 2023 09:50:05 -0000 1.16
+++ Makefile 18 Feb 2024 04:07:13 -0000
@@ -1,10 +1,10 @@
-V = 2.6.3
+V = 2.8.0
COMMENT = SDL2 multi-channel audio mixer library
DISTNAME = SDL2_mixer-${V}
PKGNAME = sdl2-mixer-${V}
CATEGORIES = devel audio
-SHARED_LIBS += SDL2_mixer 1.0 # 2.2
+SHARED_LIBS += SDL2_mixer 1.1 # 2.8.0
HOMEPAGE = https://www.libsdl.org/projects/SDL_mixer/
MAINTAINER = Thomas Frohwein <t...@openbsd.org>
@@ -13,13 +13,13 @@ MAINTAINER = Thomas Frohwein <thfr@openb
PERMIT_PACKAGE = Yes
WANTLIB += SDL2 X11 Xcursor Xext Xfixes Xi Xrandr Xrender Xss
-WANTLIB += c m modplug ogg opus opusfile pthread samplerate sndio
+WANTLIB += c iconv m ogg opus opusfile pthread samplerate sndio
WANTLIB += usbhid xcb
SITES = https://www.libsdl.org/projects/SDL_mixer/release/
-LIB_DEPENDS = audio/libmodplug \
- audio/opusfile \
+LIB_DEPENDS = audio/opusfile \
+ converters/libiconv \
devel/sdl2
CONFIGURE_STYLE = gnu
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/sdl2-mixer/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 29 May 2023 03:12:24 -0000 1.5
+++ distinfo 18 Feb 2024 04:07:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (SDL2_mixer-2.6.3.tar.gz) = emuoakeGSM5hfjpekncYG8Z/fOmHZgXupq/9Sg1u6o8=
-SIZE (SDL2_mixer-2.6.3.tar.gz) = 9935069
+SHA256 (SDL2_mixer-2.8.0.tar.gz) = HPs0yHsm29vHr9aMT1RcARarX5C7/sxa6+Kpy0uzFUk=
+SIZE (SDL2_mixer-2.8.0.tar.gz) = 10874471
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/sdl2-mixer/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 29 May 2023 03:12:25 -0000 1.4
+++ patches/patch-Makefile_in 18 Feb 2024 04:07:13 -0000
@@ -1,7 +1,7 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -78,7 +78,7 @@ LT_CURRENT = @LT_CURRENT@
+@@ -79,7 +79,7 @@ LT_CURRENT = @LT_CURRENT@
LT_RELEASE = @LT_RELEASE@
LT_REVISION = @LT_REVISION@
LT_EXTRA = @LT_EXTRA@
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/sdl2-ttf/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 11 Nov 2023 10:27:44 -0000 1.16
+++ Makefile 18 Feb 2024 04:09:15 -0000
@@ -1,8 +1,7 @@
-V = 2.20.2
+V = 2.22.0
COMMENT = SDL2 TrueType fonts library
DISTNAME = SDL2_ttf-${V}
PKGNAME = sdl2-ttf-${V}
-REVISION = 2
CATEGORIES = devel graphics fonts
SHARED_LIBS += SDL2_ttf 0.1 # 10.2
@@ -13,18 +12,20 @@ MAINTAINER = Thomas Frohwein <thfr@openb
# zlib
PERMIT_PACKAGE= Yes
-WANTLIB += SDL2 X11 Xcursor Xext Xfixes Xi Xrandr Xrender Xss
+WANTLIB += SDL2 X11 Xcursor Xext Xfixes Xi Xrandr Xrender Xss iconv
WANTLIB += m pthread samplerate sndio usbhid xcb
SITES = https://www.libsdl.org/projects/SDL_ttf/release/
COMPILER = base-clang ports-gcc
-LIB_DEPENDS = devel/sdl2
+LIB_DEPENDS = converters/libiconv \
+ devel/sdl2
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
pre-configure:
${SUBST_CMD} ${WRKSRC}/sdl2_ttf-config.cmake.in
+
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/sdl2-ttf/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 29 May 2023 03:12:25 -0000 1.5
+++ distinfo 18 Feb 2024 04:09:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (SDL2_ttf-2.20.2.tar.gz) = ncce2TSHUhsQeixKnKa/Q/ti9r3dXCawVea5FBiiIFM=
-SIZE (SDL2_ttf-2.20.2.tar.gz) = 13161592
+SHA256 (SDL2_ttf-2.22.0.tar.gz) = 1Iy9HOR1ueF4IGvzty1Wtm2E1E9krAWAMyg5YjTWdyM=
+SIZE (SDL2_ttf-2.22.0.tar.gz) = 14314901
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/sdl2-ttf/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 29 May 2023 03:12:25 -0000 1.4
+++ patches/patch-Makefile_in 18 Feb 2024 04:09:15 -0000
@@ -1,7 +1,7 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -815,7 +815,6 @@ HARFBUZZ_SOURCES = \
+@@ -835,7 +835,6 @@ HARFBUZZ_SOURCES = \
@USE_BUILTIN_HARFBUZZ_FALSE@LINKER = $(LINK)
libSDL2_ttf_la_LDFLAGS = \
-no-undefined \
Index: patches/patch-external_harfbuzz_src_hb-ft_cc
===================================================================
RCS file: patches/patch-external_harfbuzz_src_hb-ft_cc
diff -N patches/patch-external_harfbuzz_src_hb-ft_cc
--- patches/patch-external_harfbuzz_src_hb-ft_cc 11 Nov 2023 10:27:44
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-Fix build error with clang-16:
-error: cast from 'void (*)(FT_Face)' (aka 'void (*)(FT_FaceRec_ *)') to
'FT_Generic_Finalizer' (aka 'void (*)(void *)') converts to incompatible
function type [-Werror,-Wcast-function-type-strict]
-
-Subset of
https://github.com/harfbuzz/harfbuzz/commit/d88269c827895b38f99f7cf741fa60210d4d5169
-
-Index: external/harfbuzz/src/hb-ft.cc
---- external/harfbuzz/src/hb-ft.cc.orig
-+++ external/harfbuzz/src/hb-ft.cc
-@@ -729,8 +729,9 @@ hb_ft_face_create_referenced (FT_Face ft_face)
- }
-
- static void
--hb_ft_face_finalize (FT_Face ft_face)
-+hb_ft_face_finalize (void *arg)
- {
-+ FT_Face ft_face = (FT_Face) arg;
- hb_face_destroy ((hb_face_t *) ft_face->generic.data);
- }
-
-@@ -949,8 +950,9 @@ get_ft_library ()
- }
-
- static void
--_release_blob (FT_Face ft_face)
-+_release_blob (void *arg)
- {
-+ FT_Face ft_face = (FT_Face) arg;
- hb_blob_destroy ((hb_blob_t *) ft_face->generic.data);
- }
-
Index: patches/patch-sdl2_ttf-config_cmake_in
===================================================================
RCS file: /cvs/ports/devel/sdl2-ttf/patches/patch-sdl2_ttf-config_cmake_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-sdl2_ttf-config_cmake_in
--- patches/patch-sdl2_ttf-config_cmake_in 16 Sep 2023 17:47:12 -0000
1.1
+++ patches/patch-sdl2_ttf-config_cmake_in 18 Feb 2024 04:09:15 -0000
@@ -1,7 +1,7 @@
Index: sdl2_ttf-config.cmake.in
--- sdl2_ttf-config.cmake.in.orig
+++ sdl2_ttf-config.cmake.in
-@@ -55,7 +55,7 @@ if(NOT TARGET SDL2_ttf::SDL2_ttf)
+@@ -56,7 +56,7 @@ if(NOT TARGET SDL2_ttf::SDL2_ttf)
unset(_sdl2ttf_dll)
unset(_sdl2ttf_imp)
else()
