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
No comments:
Post a Comment