On Thu, Mar 19, 2020 at 06:44:05PM -0400, Brad Smith wrote: > Here are updates to SDL2 2.0.12, SDL2_gfx 1.0.4 and SDL2_ttf 2.0.15.
Here is an updated diff. Reverts a commit in the new release for the time being which broke building with CMake based ports using SDL2. Index: sdl2/Makefile =================================================================== RCS file: /home/cvs/ports/devel/sdl2/Makefile,v retrieving revision 1.29 diff -u -p -u -p -r1.29 Makefile --- sdl2/Makefile 10 Nov 2019 21:35:39 -0000 1.29 +++ sdl2/Makefile 19 Mar 2020 22:11:03 -0000 @@ -2,14 +2,13 @@ COMMENT= cross-platform multimedia library -V= 2.0.10 +V= 2.0.12 DISTNAME= SDL2-${V} PKGNAME= sdl2-${V} CATEGORIES= devel MASTER_SITES= https://www.libsdl.org/release/ -REVISION= 0 -SHARED_LIBS= SDL2 0.7 # 0.10 +SHARED_LIBS= SDL2 0.8 # 0.12 HOMEPAGE= https://www.libsdl.org/ Index: sdl2/distinfo =================================================================== RCS file: /home/cvs/ports/devel/sdl2/distinfo,v retrieving revision 1.9 diff -u -p -u -p -r1.9 distinfo --- sdl2/distinfo 22 Sep 2019 15:46:25 -0000 1.9 +++ sdl2/distinfo 19 Mar 2020 21:30:30 -0000 @@ -1,2 +1,2 @@ -SHA256 (SDL2-2.0.10.tar.gz) = tGVsE6Hw0AI64vSpzwjskv/7Rk4PJCODN3hBWbi5HVc= -SIZE (SDL2-2.0.10.tar.gz) = 5550762 +SHA256 (SDL2-2.0.12.tar.gz) = NJJo9pXALvvJuRSKcLheWM77v3BKvT6RvmVNt/HiyGM= +SIZE (SDL2-2.0.12.tar.gz) = 5720162 Index: sdl2/patches/patch-Makefile_in =================================================================== RCS file: /home/cvs/ports/devel/sdl2/patches/patch-Makefile_in,v retrieving revision 1.7 diff -u -p -u -p -r1.7 patch-Makefile_in --- sdl2/patches/patch-Makefile_in 22 Sep 2019 15:46:26 -0000 1.7 +++ sdl2/patches/patch-Makefile_in 19 Mar 2020 21:33:26 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2019/0 Index: Makefile.in --- Makefile.in.orig +++ Makefile.in -@@ -125,7 +125,7 @@ LT_AGE = @LT_AGE@ +@@ -126,7 +126,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ LT_REVISION = @LT_REVISION@ Index: sdl2/patches/patch-include_SDL_endian_h =================================================================== RCS file: sdl2/patches/patch-include_SDL_endian_h diff -N sdl2/patches/patch-include_SDL_endian_h --- sdl2/patches/patch-include_SDL_endian_h 14 May 2017 06:40:35 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -$OpenBSD: patch-include_SDL_endian_h,v 1.1 2017/05/14 06:40:35 jsg Exp $ - -<endian.h> is simpler and more reliable. - -Index: include/SDL_endian.h ---- include/SDL_endian.h.orig -+++ include/SDL_endian.h -@@ -42,7 +42,10 @@ - #ifdef __linux__ - #include <endian.h> - #define SDL_BYTEORDER __BYTE_ORDER --#else /* __linux__ */ -+#elif defined(__OpenBSD__) -+#include <endian.h> -+#define SDL_BYTEORDER BYTE_ORDER -+#else - #if defined(__hppa__) || \ - defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \ - (defined(__MIPS__) && defined(__MISPEB__)) || \ 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 26 Mar 2020 00:46:58 -0000 @@ -0,0 +1,37 @@ +$OpenBSD$ + +Index: sdl2-config.cmake.in +--- sdl2-config.cmake.in.orig ++++ sdl2-config.cmake.in +@@ -9,31 +9,3 @@ set(SDL2_LIBDIR "@libdir@") + set(SDL2_INCLUDE_DIRS "@includedir@/SDL2") + set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@") + string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES) +- +-if(NOT TARGET SDL2::SDL2) +- # Remove -lSDL2 as that is handled by CMake, note the space at the end so it does not replace e.g. -lSDL2main +- # This may require "libdir" beeing set (from above) +- string(REPLACE "-lSDL2 " "" SDL2_EXTRA_LINK_FLAGS "@SDL_RLD_FLAGS@ @SDL_LIBS@ ") +- string(STRIP "${SDL2_EXTRA_LINK_FLAGS}" SDL2_EXTRA_LINK_FLAGS) +- string(REPLACE "-lSDL2 " "" SDL2_EXTRA_LINK_FLAGS_STATIC "@SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ ") +- string(STRIP "${SDL2_EXTRA_LINK_FLAGS_STATIC}" SDL2_EXTRA_LINK_FLAGS_STATIC) +- +- add_library(SDL2::SDL2 SHARED IMPORTED) +- set_target_properties(SDL2::SDL2 PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" +- IMPORTED_LINK_INTERFACE_LANGUAGES "C" +- IMPORTED_LOCATION "@libdir@/libSDL2.so" +- INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS}") +- +- add_library(SDL2::SDL2-static STATIC IMPORTED) +- set_target_properties(SDL2::SDL2-static PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" +- IMPORTED_LINK_INTERFACE_LANGUAGES "C" +- IMPORTED_LOCATION "@libdir@/libSDL2.a" +- INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS_STATIC}") +- +- add_library(SDL2::SDL2main STATIC IMPORTED) +- set_target_properties(SDL2::SDL2main PROPERTIES +- IMPORTED_LINK_INTERFACE_LANGUAGES "C" +- IMPORTED_LOCATION "@libdir@/libSDL2main.a") +-endif() Index: sdl2/patches/patch-sdl2-config_in =================================================================== RCS file: /home/cvs/ports/devel/sdl2/patches/patch-sdl2-config_in,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-sdl2-config_in --- sdl2/patches/patch-sdl2-config_in 30 Oct 2013 18:11:11 -0000 1.1.1.1 +++ sdl2/patches/patch-sdl2-config_in 19 Mar 2020 21:35:40 -0000 @@ -1,6 +1,8 @@ $OpenBSD: patch-sdl2-config_in,v 1.1.1.1 2013/10/30 18:11:11 bcallah Exp $ ---- sdl2-config.in.orig Sat Aug 10 15:37:09 2013 -+++ sdl2-config.in Sat Aug 10 15:38:41 2013 + +Index: sdl2-config.in +--- sdl2-config.in.orig ++++ sdl2-config.in @@ -42,10 +42,10 @@ while test $# -gt 0; do echo @SDL_VERSION@ ;; Index: sdl2/patches/patch-sdl2_pc_in =================================================================== RCS file: /home/cvs/ports/devel/sdl2/patches/patch-sdl2_pc_in,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-sdl2_pc_in --- sdl2/patches/patch-sdl2_pc_in 30 Oct 2013 18:11:11 -0000 1.1.1.1 +++ sdl2/patches/patch-sdl2_pc_in 19 Mar 2020 21:35:38 -0000 @@ -1,6 +1,8 @@ $OpenBSD: patch-sdl2_pc_in,v 1.1.1.1 2013/10/30 18:11:11 bcallah Exp $ ---- sdl2.pc.in.orig Sat Aug 10 15:39:01 2013 -+++ sdl2.pc.in Sat Aug 10 15:40:09 2013 + +Index: sdl2.pc.in +--- sdl2.pc.in.orig ++++ sdl2.pc.in @@ -10,6 +10,5 @@ Description: Simple DirectMedia Layer is a cross-platf Version: @SDL_VERSION@ Requires: Index: sdl2/patches/patch-src_SDL_c =================================================================== RCS file: /home/cvs/ports/devel/sdl2/patches/patch-src_SDL_c,v retrieving revision 1.3 diff -u -p -u -p -r1.3 patch-src_SDL_c --- sdl2/patches/patch-src_SDL_c 22 Sep 2019 15:46:26 -0000 1.3 +++ sdl2/patches/patch-src_SDL_c 19 Mar 2020 21:34:23 -0000 @@ -1,13 +1,13 @@ $OpenBSD: patch-src_SDL_c,v 1.3 2019/09/22 15:46:26 thfr Exp $ -disable breaking if no haptic feedback support which disallows gamecontroller API +Disable breaking if no haptic feedback support which disallows gamecontroller API pretend to be Linux in SDL_GetPlatform to allow compatibility with FNA games -until OpenBSD support has been rolled out (estimated end of 2018) +until OpenBSD support has been rolled out (estimated end of 2018). Index: src/SDL.c --- src/SDL.c.orig +++ src/SDL.c -@@ -227,8 +227,6 @@ SDL_InitSubSystem(Uint32 flags) +@@ -263,8 +263,6 @@ SDL_InitSubSystem(Uint32 flags) } } SDL_PrivateSubsystemRefCountIncr(SDL_INIT_HAPTIC); @@ -16,7 +16,7 @@ Index: src/SDL.c #endif } -@@ -453,7 +451,7 @@ SDL_GetPlatform() +@@ -489,7 +487,7 @@ SDL_GetPlatform() #elif __NETBSD__ return "NetBSD"; #elif __OPENBSD__ Index: sdl2/patches/patch-src_joystick_SDL_gamecontroller_c =================================================================== RCS file: /home/cvs/ports/devel/sdl2/patches/patch-src_joystick_SDL_gamecontroller_c,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-src_joystick_SDL_gamecontroller_c --- sdl2/patches/patch-src_joystick_SDL_gamecontroller_c 22 Sep 2019 15:46:26 -0000 1.4 +++ sdl2/patches/patch-src_joystick_SDL_gamecontroller_c 26 Mar 2020 02:33:02 -0000 @@ -11,16 +11,25 @@ many controllers use this mapping Index: src/joystick/SDL_gamecontroller.c --- src/joystick/SDL_gamecontroller.c.orig +++ src/joystick/SDL_gamecontroller.c -@@ -735,7 +735,7 @@ static char *SDL_PrivateGetControllerGUIDFromMappingSt +@@ -731,7 +731,7 @@ static char *SDL_PrivateGetControllerGUIDFromMappingSt + pchGUID[pFirstComma - pMapping] = '\0'; + + /* Convert old style GUIDs to the new style in 2.0.5 */ +-#if __WIN32__ ++#if defined(__WIN32__) + if (SDL_strlen(pchGUID) == 32 && + SDL_memcmp(&pchGUID[20], "504944564944", 12) == 0) { + SDL_memcpy(&pchGUID[20], "000000000000", 12); +@@ -739,7 +739,7 @@ static char *SDL_PrivateGetControllerGUIDFromMappingSt SDL_memcpy(&pchGUID[8], &pchGUID[0], 4); SDL_memcpy(&pchGUID[0], "03000000", 8); } -#elif __MACOSX__ -+#else if(__MACOSX__) || (__OpenBSD__) ++#elif defined(__MACOSX__) || defined(__OpenBSD__) if (SDL_strlen(pchGUID) == 32 && SDL_memcmp(&pchGUID[4], "000000000000", 12) == 0 && SDL_memcmp(&pchGUID[20], "000000000000", 12) == 0) { -@@ -1022,17 +1022,21 @@ static ControllerMapping_t *SDL_PrivateGetControllerMa +@@ -1026,17 +1026,21 @@ static ControllerMapping_t *SDL_PrivateGetControllerMa ControllerMapping_t *mapping; mapping = SDL_PrivateGetControllerMappingForGUID(&guid, SDL_FALSE); Index: sdl2/patches/patch-src_video_SDL_egl_c =================================================================== RCS file: /home/cvs/ports/devel/sdl2/patches/patch-src_video_SDL_egl_c,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-src_video_SDL_egl_c --- sdl2/patches/patch-src_video_SDL_egl_c 22 Sep 2019 15:46:26 -0000 1.4 +++ sdl2/patches/patch-src_video_SDL_egl_c 19 Mar 2020 21:34:35 -0000 @@ -1,4 +1,5 @@ $OpenBSD: patch-src_video_SDL_egl_c,v 1.4 2019/09/22 15:46:26 thfr Exp $ + Index: src/video/SDL_egl.c --- src/video/SDL_egl.c.orig +++ src/video/SDL_egl.c Index: sdl2/patches/patch-src_video_x11_SDL_x11opengl_c =================================================================== RCS file: /home/cvs/ports/devel/sdl2/patches/patch-src_video_x11_SDL_x11opengl_c,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-src_video_x11_SDL_x11opengl_c --- sdl2/patches/patch-src_video_x11_SDL_x11opengl_c 7 Jan 2018 22:56:46 -0000 1.2 +++ sdl2/patches/patch-src_video_x11_SDL_x11opengl_c 19 Mar 2020 21:35:38 -0000 @@ -1,6 +1,8 @@ $OpenBSD: patch-src_video_x11_SDL_x11opengl_c,v 1.2 2018/01/07 22:56:46 awolk Exp $ ---- src/video/x11/SDL_x11opengl.c.orig Fri Sep 20 16:47:56 2013 -+++ src/video/x11/SDL_x11opengl.c Fri Sep 20 16:48:19 2013 + +Index: src/video/x11/SDL_x11opengl.c +--- src/video/x11/SDL_x11opengl.c.orig ++++ src/video/x11/SDL_x11opengl.c @@ -32,7 +32,7 @@ #include "SDL_loadso.h" #include "SDL_x11opengles.h" Index: sdl2/pkg/PLIST =================================================================== RCS file: /home/cvs/ports/devel/sdl2/pkg/PLIST,v retrieving revision 1.8 diff -u -p -u -p -r1.8 PLIST --- sdl2/pkg/PLIST 10 Nov 2019 21:35:39 -0000 1.8 +++ sdl2/pkg/PLIST 19 Mar 2020 22:05:37 -0000 @@ -26,6 +26,7 @@ include/SDL2/SDL_loadso.h include/SDL2/SDL_log.h include/SDL2/SDL_main.h include/SDL2/SDL_messagebox.h +include/SDL2/SDL_metal.h include/SDL2/SDL_mouse.h include/SDL2/SDL_mutex.h include/SDL2/SDL_name.h @@ -76,6 +77,7 @@ include/SDL2/begin_code.h include/SDL2/close_code.h lib/cmake/ lib/cmake/SDL2/ +lib/cmake/SDL2/sdl2-config-version.cmake lib/cmake/SDL2/sdl2-config.cmake @static-lib lib/libSDL2.a lib/libSDL2.la Index: sdl2-gfx/Makefile =================================================================== RCS file: /home/cvs/ports/devel/sdl2-gfx/Makefile,v retrieving revision 1.8 diff -u -p -u -p -r1.8 Makefile --- sdl2-gfx/Makefile 12 Jul 2019 20:46:01 -0000 1.8 +++ sdl2-gfx/Makefile 19 Mar 2020 22:29:56 -0000 @@ -1,14 +1,13 @@ # $OpenBSD: Makefile,v 1.8 2019/07/12 20:46:01 sthen Exp $ -V = 1.0.1 +V = 1.0.4 COMMENT = primitives drawing/other support functions for SDL2 DISTNAME = SDL2_gfx-${V} PKGNAME = sdl2-gfx-${V} CATEGORIES = devel graphics x11 -REVISION = 0 -SHARED_LIBS += SDL2_gfx 0.0 # 0.1 -SHARED_LIBS += SDL2_gfx-1.0 0.0 # 0.1 +SHARED_LIBS += SDL2_gfx 1.0 # 0.1 +SHARED_LIBS += SDL2_gfx-1.0 1.0 # 0.1 HOMEPAGE = http://www.ferzkopp.net/joomla/content/view/19/14/ Index: sdl2-gfx/distinfo =================================================================== RCS file: /home/cvs/ports/devel/sdl2-gfx/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- sdl2-gfx/distinfo 21 Dec 2015 13:38:01 -0000 1.2 +++ sdl2-gfx/distinfo 19 Mar 2020 22:20:00 -0000 @@ -1,2 +1,2 @@ -SHA256 (SDL2_gfx-1.0.1.tar.gz) = 1pvLzrgRtOVxL7rT7ec3FmMn9EtyfxOIwyWB276MWZo= -SIZE (SDL2_gfx-1.0.1.tar.gz) = 1078780 +SHA256 (SDL2_gfx-1.0.4.tar.gz) = Y+DgGt3tyd8vhbk6JI8G6KBK/6AUqDXC6jS/405XYmI= +SIZE (SDL2_gfx-1.0.4.tar.gz) = 1230588 Index: sdl2-gfx/patches/patch-Makefile_in =================================================================== RCS file: /home/cvs/ports/devel/sdl2-gfx/patches/patch-Makefile_in,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-Makefile_in --- sdl2-gfx/patches/patch-Makefile_in 21 Dec 2015 13:38:01 -0000 1.2 +++ sdl2-gfx/patches/patch-Makefile_in 19 Mar 2020 22:25:35 -0000 @@ -3,8 +3,9 @@ $OpenBSD: patch-Makefile_in,v 1.2 2015/1 We don't need a version number in the library name itself, on top of the SO number. ---- Makefile.in.orig Mon Jun 9 17:51:08 2014 -+++ Makefile.in Mon Dec 21 14:35:19 2015 +Index: Makefile.in +--- Makefile.in.orig ++++ Makefile.in @@ -306,7 +306,6 @@ EXTRA_DIST = \ libSDL2_gfx_la_LDFLAGS = \ Index: sdl2-gfx/pkg/PLIST =================================================================== RCS file: /home/cvs/ports/devel/sdl2-gfx/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -p -r1.3 PLIST --- sdl2-gfx/pkg/PLIST 21 Dec 2015 21:36:29 -0000 1.3 +++ sdl2-gfx/pkg/PLIST 19 Mar 2020 22:31:51 -0000 @@ -1,11 +1,10 @@ @comment $OpenBSD: PLIST,v 1.3 2015/12/21 21:36:29 ajacoutot Exp $ -include/SDL2/ include/SDL2/SDL2_framerate.h include/SDL2/SDL2_gfxPrimitives.h include/SDL2/SDL2_imageFilter.h include/SDL2/SDL2_rotozoom.h @lib lib/libSDL2_gfx-1.0.so.${LIBSDL2_gfx-1.0_VERSION} -lib/libSDL2_gfx.a +@static-lib lib/libSDL2_gfx.a lib/libSDL2_gfx.la @lib lib/libSDL2_gfx.so.${LIBSDL2_gfx_VERSION} lib/pkgconfig/SDL2_gfx.pc Index: sdl2-ttf/Makefile =================================================================== RCS file: /home/cvs/ports/devel/sdl2-ttf/Makefile,v retrieving revision 1.8 diff -u -p -u -p -r1.8 Makefile --- sdl2-ttf/Makefile 12 Jul 2019 21:02:19 -0000 1.8 +++ sdl2-ttf/Makefile 19 Mar 2020 22:19:38 -0000 @@ -1,11 +1,10 @@ # $OpenBSD: Makefile,v 1.8 2019/07/12 21:02:19 sthen Exp $ -V = 2.0.14 +V = 2.0.15 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 Index: sdl2-ttf/distinfo =================================================================== RCS file: /home/cvs/ports/devel/sdl2-ttf/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- sdl2-ttf/distinfo 27 Aug 2016 16:07:07 -0000 1.3 +++ sdl2-ttf/distinfo 19 Mar 2020 22:17:21 -0000 @@ -1,2 +1,2 @@ -SHA256 (SDL2_ttf-2.0.14.tar.gz) = NNteILz2TnBx/priWsqn1yvcTxGrPOWazHaKti/jknY= -SIZE (SDL2_ttf-2.0.14.tar.gz) = 4147462 +SHA256 (SDL2_ttf-2.0.15.tar.gz) = qezrGtiMHxVFzXvSjny8CywUGR1AI49TGhWwGxsizTM= +SIZE (SDL2_ttf-2.0.15.tar.gz) = 4479718 Index: sdl2-ttf/patches/patch-Makefile_in =================================================================== RCS file: /home/cvs/ports/devel/sdl2-ttf/patches/patch-Makefile_in,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-Makefile_in --- sdl2-ttf/patches/patch-Makefile_in 5 Nov 2013 17:30:07 -0000 1.1.1.1 +++ sdl2-ttf/patches/patch-Makefile_in 19 Mar 2020 22:17:45 -0000 @@ -1,7 +1,9 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2013/11/05 17:30:07 bcallah Exp $ ---- Makefile.in.orig Sat Oct 12 16:35:50 2013 -+++ Makefile.in Sat Oct 12 16:36:06 2013 -@@ -368,12 +368,10 @@ EXTRA_DIST = \ + +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 \ Index: sdl2-ttf/pkg/PLIST =================================================================== RCS file: /home/cvs/ports/devel/sdl2-ttf/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -p -r1.3 PLIST --- sdl2-ttf/pkg/PLIST 27 Aug 2016 16:07:07 -0000 1.3 +++ sdl2-ttf/pkg/PLIST 19 Mar 2020 22:18:25 -0000 @@ -1,6 +1,6 @@ @comment $OpenBSD: PLIST,v 1.3 2016/08/27 16:07:07 ajacoutot Exp $ include/SDL2/SDL_ttf.h -lib/libSDL2_ttf.a +@static-lib lib/libSDL2_ttf.a lib/libSDL2_ttf.la @lib lib/libSDL2_ttf.so.${LIBSDL2_ttf_VERSION} lib/pkgconfig/SDL2_ttf.pc