On Sun, Jan 08, 2023 at 05:14:35PM -0500, Brad Smith wrote:
> Here are updates to SDL2 2.26.2 and some of the other SDL2 components.
>
> Could you check the joystick bits?
I checked and the gamepads still work as expected. Can run some SDL2
software.
sdl2-net and sdl2-ttf don't have a maintainer, but I think it makes
sense to commit the whole thing as all the ports relate to SDL2, but
would like to know that this survives a bulk build...
Could someone check? Otherwise any objections to bringing the sdl2*
ports up-to-date with this?
Attaching the diff.
Here are updates to SDL2 2.26.2 and some of the other SDL2 components.
Could you check the joystick bits?
Index: sdl2/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/sdl2/Makefile,v
retrieving revision 1.42
diff -u -p -u -p -r1.42 Makefile
--- sdl2/Makefile 7 Nov 2022 21:45:15 -0000 1.42
+++ sdl2/Makefile 8 Jan 2023 20:42:03 -0000
@@ -1,13 +1,12 @@
COMMENT= cross-platform multimedia library
-V= 2.24.1
-REVISION= 0
+V= 2.26.2
DISTNAME= SDL2-${V}
PKGNAME= sdl2-${V}
CATEGORIES= devel
MASTER_SITES= https://www.libsdl.org/release/
-SHARED_LIBS= SDL2 0.12 # 0.18
+SHARED_LIBS= SDL2 0.13 # 0.18
HOMEPAGE= https://www.libsdl.org/
Index: sdl2/distinfo
===================================================================
RCS file: /home/cvs/ports/devel/sdl2/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- sdl2/distinfo 18 Oct 2022 00:56:38 -0000 1.15
+++ sdl2/distinfo 8 Jan 2023 20:32:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (SDL2-2.24.1.tar.gz) = vBIViLEQUGVZjOOAeAJqQUwo6pXmbtKtq0xE2Aswnhs=
-SIZE (SDL2-2.24.1.tar.gz) = 7523849
+SHA256 (SDL2-2.26.2.tar.gz) = ldObw94Df736ciYjc3NAZI3k8YCmAbCvrSdkXRULmeA=
+SIZE (SDL2-2.26.2.tar.gz) = 8084120
Index: sdl2/patches/patch-Makefile_in
===================================================================
RCS file: /home/cvs/ports/devel/sdl2/patches/patch-Makefile_in,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 patch-Makefile_in
--- sdl2/patches/patch-Makefile_in 18 Oct 2022 00:56:38 -0000 1.13
+++ sdl2/patches/patch-Makefile_in 8 Jan 2023 20:36:31 -0000
@@ -1,7 +1,7 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -135,7 +135,7 @@ LT_AGE = @LT_AGE@
+@@ -136,7 +136,7 @@ LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
LT_RELEASE = @LT_RELEASE@
LT_REVISION = @LT_REVISION@
Index: sdl2/patches/patch-sdl2-config_cmake_in
===================================================================
RCS file: sdl2/patches/patch-sdl2-config_cmake_in
diff -N sdl2/patches/patch-sdl2-config_cmake_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sdl2/patches/patch-sdl2-config_cmake_in 18 Oct 2022 21:55:29 -0000
@@ -0,0 +1,12 @@
+Index: sdl2-config.cmake.in
+--- sdl2-config.cmake.in.orig
++++ sdl2-config.cmake.in
+@@ -124,7 +124,7 @@ if(WIN32)
+ unset(_sdl2_implib)
+ unset(_sdl2_dll)
+ else()
+- set(_sdl2_shared
"${SDL2_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2${CMAKE_SHARED_LIBRARY_SUFFIX}")
++ set(_sdl2_shared
"${SDL2_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2${CMAKE_SHARED_LIBRARY_SUFFIX}.${LIBSDL2_VERSION}")
+ if(EXISTS "${_sdl2_shared}")
+ if(NOT TARGET SDL2::SDL2)
+ add_library(SDL2::SDL2 SHARED IMPORTED)
Index: sdl2/patches/patch-src_SDL_c
===================================================================
RCS file: /home/cvs/ports/devel/sdl2/patches/patch-src_SDL_c,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-src_SDL_c
--- sdl2/patches/patch-src_SDL_c 18 Oct 2022 00:56:38 -0000 1.10
+++ sdl2/patches/patch-src_SDL_c 8 Jan 2023 20:36:29 -0000
@@ -4,7 +4,7 @@
Index: src/SDL.c
--- src/SDL.c.orig
+++ src/SDL.c
-@@ -301,9 +301,6 @@ SDL_InitSubSystem(Uint32 flags)
+@@ -303,9 +303,6 @@ SDL_InitSubSystem(Uint32 flags)
}
SDL_PrivateSubsystemRefCountIncr(SDL_INIT_GAMECONTROLLER);
flags_initialized |= SDL_INIT_GAMECONTROLLER;
@@ -14,12 +14,12 @@ Index: src/SDL.c
#endif
}
-@@ -533,6 +530,10 @@ SDL_GetRevisionNumber(void)
+@@ -558,6 +555,10 @@ SDL_GetRevisionNumber(void)
const char *
SDL_GetPlatform(void)
{
+ const char *platform;
-+ if (platform = SDL_getenv("SDL_PLATFORM")) {
++ if ((platform = SDL_getenv("SDL_PLATFORM"))) {
+ return platform;
+ }
#if __AIX__
Index: sdl2/patches/patch-src_joystick_SDL_gamecontrollerdb_h
===================================================================
RCS file:
/home/cvs/ports/devel/sdl2/patches/patch-src_joystick_SDL_gamecontrollerdb_h,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-src_joystick_SDL_gamecontrollerdb_h
--- sdl2/patches/patch-src_joystick_SDL_gamecontrollerdb_h 7 Nov 2022
21:45:15 -0000 1.6
+++ sdl2/patches/patch-src_joystick_SDL_gamecontrollerdb_h 8 Jan 2023
21:43:10 -0000
@@ -1,12 +1,9 @@
-- Enable controller detection by GUID on OpenBSD
-- Use both Linux and macOS GUIDs to match both XInput and DInput devices
-- Recognize raphnet USB adapter for SNES/NES-mini gamepads (from upstream,
- see https://github.com/libsdl-org/SDL/pull/6485)
+Use both Linux and macOS GUIDs to match both XInput and DInput devices.
Index: src/joystick/SDL_gamecontrollerdb.h
--- src/joystick/SDL_gamecontrollerdb.h.orig
+++ src/joystick/SDL_gamecontrollerdb.h
-@@ -357,7 +357,7 @@ static const char *s_ControllerMappings [] =
+@@ -360,7 +360,7 @@ static const char *s_ControllerMappings [] =
"030000004f04000003d0000000000000,run'n'drive,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b7,leftshoulder:a3,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:a4,rightstick:b11,righttrigger:b5,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
"03000000101c0000171c000000000000,uRage
Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,",
#endif
@@ -15,20 +12,12 @@ Index: src/joystick/SDL_gamecontrollerdb
"03000000c82d00000090000001000000,8BitDo FC30
Pro,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b3,y:b4,hint:SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1,",
"03000000c82d00000090000001000000,8BitDo FC30
Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,hint:!SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1,",
"03000000c82d00001038000000010000,8BitDo FC30
Pro,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,hint:SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1,",
-@@ -509,7 +509,7 @@ static const char *s_ControllerMappings [] =
+@@ -517,7 +517,7 @@ static const char *s_ControllerMappings [] =
"03000000830500006020000000010000,iBuffalo SNES
Controller,a:b1,b:b0,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b2,hint:!SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1,",
"03000000830500006020000000000000,iBuffalo USB 2-axis 8-button
Gamepad,a:b1,b:b0,back:b6,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b3,y:b2,",
#endif
--#ifdef SDL_JOYSTICK_LINUX
+-#if SDL_JOYSTICK_LINUX
+#if defined(SDL_JOYSTICK_LINUX) || defined(__OpenBSD__)
"xinput,*,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
"03000000c82d00000090000011010000,8BitDo FC30
Pro,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b3,y:b4,hint:SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1,",
"03000000c82d00000090000011010000,8BitDo FC30
Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,hint:!SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1,",
-@@ -846,6 +846,7 @@ static const char *s_ControllerMappings [] =
-
"050000006964726f69643a636f6e0000,idroid:con,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,",
-
"03000000b50700001503000010010000,impact,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,",
- "030000009b2800000300000001010000,raphnet.net 4nes4snes
v1.5,a:b0,b:b4,back:b2,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b1,y:b5,",
-+ "030000009b2800008000000020020000,raphnet technologies 1-player WUSBMote
v2.2,a:b1,b:b4,x:b0,y:b5,back:b2,start:b3,leftshoulder:b6,rightshoulder:b7,dpup:b12,dpdown:b13,dpleft:b14,dpright:b15,",
- #endif
- #if defined(__ANDROID__)
- "05000000c82d000006500000ffff3f00,8BitDo M30
Gamepad,a:b0,b:b1,back:b4,guide:b17,leftshoulder:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:a4,start:b6,x:b2,y:b3,hint:SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1,",
Index: sdl2/patches/patch-src_joystick_bsd_SDL_bsdjoystick_c
===================================================================
RCS file: sdl2/patches/patch-src_joystick_bsd_SDL_bsdjoystick_c
diff -N sdl2/patches/patch-src_joystick_bsd_SDL_bsdjoystick_c
--- sdl2/patches/patch-src_joystick_bsd_SDL_bsdjoystick_c 18 Oct 2022
00:56:38 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,130 +0,0 @@
-- Assign buttons correctly
-- Get GUID using USB_GET_DEVICEINFO
-- detect newer (XInput-style) gamecontroller if hitem.logical_maximum is > 255;
- if so invert y axes
-- Use ujoy(4) devices
-
-Index: src/joystick/bsd/SDL_bsdjoystick.c
---- src/joystick/bsd/SDL_bsdjoystick.c.orig
-+++ src/joystick/bsd/SDL_bsdjoystick.c
-@@ -83,6 +83,9 @@
-
- #ifdef __OpenBSD__
-
-+#define DEV_USB 3 /* needed to get GUID from
USB_GET_DEVICEINFO */
-+#define GUID_LEN 32 /* GUID string has length 32 */
-+
- #define HUG_DPAD_UP 0x90
- #define HUG_DPAD_DOWN 0x91
- #define HUG_DPAD_RIGHT 0x92
-@@ -192,6 +195,9 @@ struct joystick_hwdata
-
- static char *joynames[MAX_JOYS];
- static char *joydevnames[MAX_JOYS];
-+#ifdef __OpenBSD__
-+static char joyguids[MAX_JOYS][GUID_LEN];
-+#endif
-
- static int report_alloc(struct report *, struct report_desc *, int);
- static void report_free(struct report *);
-@@ -222,11 +228,14 @@ BSD_JoystickInit(void)
-
- SDL_memset(joynames, 0, sizeof(joynames));
- SDL_memset(joydevnames, 0, sizeof(joydevnames));
-+#ifdef __OpenBSD__
-+ SDL_memset(joyguids, 0, sizeof(char) * MAX_JOYS * GUID_LEN);
-+#endif
-
- for (i = 0; i < MAX_UHID_JOYS; i++) {
- SDL_Joystick nj;
-
-- SDL_snprintf(s, SDL_arraysize(s), "/dev/uhid%d", i);
-+ SDL_snprintf(s, SDL_arraysize(s), "/dev/ujoy/%d", i);
-
- joynames[numjoysticks] = SDL_strdup(s);
-
-@@ -362,6 +371,9 @@ BSD_JoystickOpen(SDL_Joystick *joy, int device_index)
- #endif
- int fd;
- int i;
-+#ifdef __OpenBSD__
-+ struct usb_device_info di;
-+#endif
-
- fd = open(path, O_RDONLY | O_CLOEXEC);
- if (fd == -1) {
-@@ -440,6 +452,17 @@ BSD_JoystickOpen(SDL_Joystick *joy, int device_index)
- }
- desc_failed:
- #endif
-+#if defined(__OpenBSD__)
-+ if (ioctl(fd, USB_GET_DEVICEINFO, &di) != -1) {
-+ SDL_snprintf(joyguids[numjoysticks],
-+ SDL_arraysize(joyguids[device_index]),
-+ "%02x%02x0000%02x%02x0000%02x%02x0000%02x%02x0000",
-+ DEV_USB & 0xFF, DEV_USB >> 8,
-+ di.udi_vendorNo & 0xFF, di.udi_vendorNo >> 8,
-+ di.udi_productNo & 0xFF, di.udi_productNo >> 8,
-+ di.udi_releaseNo & 0xFF, di.udi_releaseNo >> 8);
-+ }
-+#endif
- if (report_alloc(rep, hw->repdesc, REPORT_INPUT) < 0) {
- goto usberr;
- }
-@@ -550,6 +573,7 @@ BSD_JoystickUpdate(SDL_Joystick *joy)
- Sint32 v;
- #ifdef __OpenBSD__
- Sint32 dpad[4] = {0, 0, 0, 0};
-+ int actualbutton;
- #endif
-
- #if defined(__FREEBSD__) || SDL_HAVE_MACHINE_JOYSTICK_H ||
defined(__FreeBSD_kernel__) || defined(__DragonFly_)
-@@ -624,6 +648,18 @@ BSD_JoystickUpdate(SDL_Joystick *joy)
- naxe = joy->hwdata->axis_map[joyaxe];
- /* scaleaxe */
- v = (Sint32) hid_get_data(REP_BUF_DATA(rep),
&hitem);
-+#ifdef __OpenBSD__
-+ /* XInput controllermapping relies on inverted Y
axes.
-+ * These devices have a 16bit signed space, as
opposed
-+ * to older DInput devices (8bit unsigned), so
-+ * hitem.logical_maximum can be used to
differentiate them.
-+ */
-+ if ((joyaxe == JOYAXE_Y || joyaxe == JOYAXE_RY)
-+ && hitem.logical_maximum > 255) {
-+ if (v != 0)
-+ v = ~v;
-+ }
-+#endif
- v -= (hitem.logical_maximum +
- hitem.logical_minimum + 1) / 2;
- v *= 32768 /
-@@ -658,7 +694,12 @@ BSD_JoystickUpdate(SDL_Joystick *joy)
- }
- case HUP_BUTTON:
- v = (Sint32) hid_get_data(REP_BUF_DATA(rep), &hitem);
-+#ifdef __OpenBSD__
-+ actualbutton = HID_USAGE(hitem.usage) - 1; /* sdl
buttons are zero-based */
-+ SDL_PrivateJoystickButton(joy, actualbutton, v);
-+#else
- SDL_PrivateJoystickButton(joy, nbutton, v);
-+#endif
- nbutton++;
- break;
- default:
-@@ -703,11 +744,16 @@ static SDL_JoystickGUID
- BSD_JoystickGetDeviceGUID( int device_index )
- {
- SDL_JoystickGUID guid;
-+#ifdef __OpenBSD__
-+ guid = SDL_JoystickGetGUIDFromString(joyguids[device_index]);
-+ return guid;
-+#else
- /* the GUID is just the first 16 chars of the name for now */
- const char *name = BSD_JoystickGetDeviceName( device_index );
- SDL_zero( guid );
- SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
- return guid;
-+#endif
- }
-
- static int
Index: sdl2-image/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/sdl2-image/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- sdl2-image/Makefile 31 Mar 2022 16:10:30 -0000 1.15
+++ sdl2-image/Makefile 15 Oct 2022 10:35:29 -0000
@@ -1,11 +1,10 @@
-V = 2.0.5
+V = 2.6.2
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 # 0.4
HOMEPAGE = https://www.libsdl.org/projects/SDL_image/
@@ -14,25 +13,21 @@ 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 += SDL2 X11 Xcursor Xext Xfixes Xi Xrandr Xrender Xss
+WANTLIB += aom avif dav1d jpeg lzma m pthread samplerate sndio
+WANTLIB += 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 \
+LIB_DEPENDS = devel/sdl2 \
+ graphics/libavif \
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: /home/cvs/ports/devel/sdl2-image/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- sdl2-image/distinfo 12 Jul 2019 02:49:57 -0000 1.5
+++ sdl2-image/distinfo 14 Oct 2022 04:51:32 -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.2.tar.gz) = SDVftNjQC6xjnNHE9KdmHEr+8sISr2CzQOBrcFmBR3c=
+SIZE (SDL2_image-2.6.2.tar.gz) = 9814907
Index: sdl2-image/patches/patch-Makefile_in
===================================================================
RCS file: /home/cvs/ports/devel/sdl2-image/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -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 Oct 2022 04:54:16 -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: /home/cvs/ports/devel/sdl2-image/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- sdl2-image/pkg/PLIST 11 Mar 2022 18:53:25 -0000 1.4
+++ sdl2-image/pkg/PLIST 14 Oct 2022 04:55:39 -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: /home/cvs/ports/devel/sdl2-mixer/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- sdl2-mixer/Makefile 31 Mar 2022 16:10:30 -0000 1.14
+++ sdl2-mixer/Makefile 15 Oct 2022 07:53:12 -0000
@@ -1,11 +1,10 @@
-V = 2.0.4
+V = 2.6.2
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: /home/cvs/ports/devel/sdl2-mixer/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- sdl2-mixer/distinfo 20 Apr 2019 18:22:28 -0000 1.4
+++ sdl2-mixer/distinfo 14 Oct 2022 18:18:19 -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.2.tar.gz) = jN6oEDZt7Lo8M9MrgHG8zRwwmySZpUlG2StI5pIqo3E=
+SIZE (SDL2_mixer-2.6.2.tar.gz) = 9934376
Index: sdl2-mixer/patches/patch-Makefile_in
===================================================================
RCS file: /home/cvs/ports/devel/sdl2-mixer/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -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 Oct 2022 18:22:20 -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: /home/cvs/ports/devel/sdl2-mixer/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- sdl2-mixer/pkg/PLIST 11 Mar 2022 18:53:25 -0000 1.4
+++ sdl2-mixer/pkg/PLIST 14 Oct 2022 18:35:55 -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: /home/cvs/ports/devel/sdl2-net/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- sdl2-net/Makefile 31 Mar 2022 16:10:30 -0000 1.9
+++ sdl2-net/Makefile 14 Oct 2022 18:51:41 -0000
@@ -1,20 +1,18 @@
-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/
# 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: /home/cvs/ports/devel/sdl2-net/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- sdl2-net/distinfo 10 Jan 2016 08:10:42 -0000 1.2
+++ sdl2-net/distinfo 14 Oct 2022 18:38:35 -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: /home/cvs/ports/devel/sdl2-net/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -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 Oct 2022 18:40:44 -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: /home/cvs/ports/devel/sdl2-net/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- sdl2-net/pkg/PLIST 11 Mar 2022 18:53:25 -0000 1.3
+++ sdl2-net/pkg/PLIST 14 Oct 2022 18:48:50 -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: /home/cvs/ports/devel/sdl2-ttf/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- sdl2-ttf/Makefile 31 Mar 2022 16:10:30 -0000 1.11
+++ sdl2-ttf/Makefile 15 Oct 2022 10:44:08 -0000
@@ -1,19 +1,18 @@
-V = 2.0.15
+V = 2.20.1
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/
# 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 +20,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: /home/cvs/ports/devel/sdl2-ttf/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- sdl2-ttf/distinfo 1 Apr 2020 20:43:08 -0000 1.4
+++ sdl2-ttf/distinfo 14 Oct 2022 18:54:04 -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.1.tar.gz) = eM2tUfPMOtppMrG7bpFLM3mKuXCh6Bd2PyLdv9l9DFc=
+SIZE (SDL2_ttf-2.20.1.tar.gz) = 13160460
Index: sdl2-ttf/patches/patch-Makefile_in
===================================================================
RCS file: /home/cvs/ports/devel/sdl2-ttf/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -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 Oct 2022 18:54:39 -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: /home/cvs/ports/devel/sdl2-ttf/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- sdl2-ttf/pkg/PLIST 11 Mar 2022 18:53:25 -0000 1.5
+++ sdl2-ttf/pkg/PLIST 14 Oct 2022 19:01:50 -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}
