Merge pull request #1 from djam/SDL2:rosa2023.1

Backports and update
2025-02-23 14:42:58 +00:00 · 2024-09-16 12:52:35 +00:00 · 2024-09-16 12:52:35 +00:00 · 4a7a270a28
commit 4a7a270a28
parent 49bc905d29 66c0119445
7 changed files with 232 additions and 61 deletions
--- a/.abf.yml
+++ b/.abf.yml
@ -1,2 +1,2 @@
 sources:
-  SDL2-2.0.10.tar.gz: fb31312ea1d4b45db839796ae2336dfe3d5884e5
+  SDL2-2.30.6.tar.gz: 76d70f28a0c044111b461a189f02196814fd116e
--- a/FindSDL2.cmake
+++ b/FindSDL2.cmake
@ -0,0 +1,181 @@
+# Locate SDL2 library
+# This module defines
+# SDL2_LIBRARY, the name of the library to link against
+# SDL2_FOUND, if false, do not try to link to SDL2
+# SDL2_INCLUDE_DIR, where to find SDL.h
+#
+# This module responds to the the flag:
+# SDL2_BUILDING_LIBRARY
+# If this is defined, then no SDL2_main will be linked in because
+# only applications need main().
+# Otherwise, it is assumed you are building an application and this
+# module will attempt to locate and set the the proper link flags
+# as part of the returned SDL2_LIBRARY variable.
+#
+# Don't forget to include SDL2main.h and SDL2main.m your project for the
+# OS X framework based version. (Other versions link to -lSDL2main which
+# this module will try to find on your behalf.) Also for OS X, this
+# module will automatically add the -framework Cocoa on your behalf.
+#
+#
+# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
+# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
+# (SDL2.dll, libsdl2.so, SDL2.framework, etc).
+# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again.
+# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
+# as appropriate. These values are used to generate the final SDL2_LIBRARY
+# variable, but when these values are unset, SDL2_LIBRARY does not get created.
+#
+#
+# $SDL2DIR is an environment variable that would
+# correspond to the ./configure --prefix=$SDL2DIR
+# used in building SDL2.
+# l.e.galup  9-20-02
+#
+# Modified by Eric Wing.
+# Added code to assist with automated building by using environmental variables
+# and providing a more controlled/consistent search behavior.
+# Added new modifications to recognize OS X frameworks and
+# additional Unix paths (FreeBSD, etc).
+# Also corrected the header search path to follow "proper" SDL2 guidelines.
+# Added a search for SDL2main which is needed by some platforms.
+# Added a search for threads which is needed by some platforms.
+# Added needed compile switches for MinGW.
+#
+# On OSX, this will prefer the Framework version (if found) over others.
+# People will have to manually change the cache values of
+# SDL2_LIBRARY to override this selection or set the CMake environment
+# CMAKE_INCLUDE_PATH to modify the search paths.
+#
+# Note that the header path has changed from SDL2/SDL.h to just SDL.h
+# This needed to change because "proper" SDL2 convention
+# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
+# reasons because not all systems place things in SDL2/ (see FreeBSD).
+#
+# Ported by Johnny Patterson. This is a literal port for SDL2 of the FindSDL.cmake
+# module with the minor edit of changing "SDL" to "SDL2" where necessary. This
+# was not created for redistribution, and exists temporarily pending official
+# SDL2 CMake modules.
+
+#=============================================================================
+# Copyright 2003-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+FIND_PATH(SDL2_INCLUDE_DIR SDL.h
+  HINTS
+  $ENV{SDL2DIR}
+  PATH_SUFFIXES include/SDL2 include
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local/include/SDL2
+  /usr/include/SDL2
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+)
+#MESSAGE("SDL2_INCLUDE_DIR is ${SDL2_INCLUDE_DIR}")
+
+FIND_LIBRARY(SDL2_LIBRARY_TEMP
+  NAMES SDL2
+  HINTS
+  $ENV{SDL2DIR}
+  PATH_SUFFIXES lib64 lib
+  PATHS
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+)
+
+#MESSAGE("SDL2_LIBRARY_TEMP is ${SDL2_LIBRARY_TEMP}")
+
+IF(NOT SDL2_BUILDING_LIBRARY)
+  IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
+    # Non-OS X framework versions expect you to also dynamically link to
+    # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
+    # seem to provide SDL2main for compatibility even though they don't
+    # necessarily need it.
+    FIND_LIBRARY(SDL2MAIN_LIBRARY
+      NAMES SDL2main
+      HINTS
+      $ENV{SDL2DIR}
+      PATH_SUFFIXES lib64 lib
+      PATHS
+      /sw
+      /opt/local
+      /opt/csw
+      /opt
+    )
+  ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
+ENDIF(NOT SDL2_BUILDING_LIBRARY)
+
+# SDL2 may require threads on your system.
+# The Apple build may not need an explicit flag because one of the
+# frameworks may already provide it.
+# But for non-OSX systems, I will use the CMake Threads package.
+IF(NOT APPLE)
+  FIND_PACKAGE(Threads)
+ENDIF(NOT APPLE)
+
+# MinGW needs an additional library, mwindows
+# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows
+# (Actually on second look, I think it only needs one of the m* libraries.)
+IF(MINGW)
+  SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
+ENDIF(MINGW)
+
+SET(SDL2_FOUND "NO")
+IF(SDL2_LIBRARY_TEMP)
+  # For SDL2main
+  IF(NOT SDL2_BUILDING_LIBRARY)
+    IF(SDL2MAIN_LIBRARY)
+      SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP})
+    ENDIF(SDL2MAIN_LIBRARY)
+  ENDIF(NOT SDL2_BUILDING_LIBRARY)
+
+  # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
+  # CMake doesn't display the -framework Cocoa string in the UI even
+  # though it actually is there if I modify a pre-used variable.
+  # I think it has something to do with the CACHE STRING.
+  # So I use a temporary variable until the end so I can set the
+  # "real" variable in one-shot.
+  IF(APPLE)
+    SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
+  ENDIF(APPLE)
+
+  # For threads, as mentioned Apple doesn't need this.
+  # In fact, there seems to be a problem if I used the Threads package
+  # and try using this line, so I'm just skipping it entirely for OS X.
+  IF(NOT APPLE)
+    SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
+  ENDIF(NOT APPLE)
+
+  # For MinGW library
+  IF(MINGW)
+    SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
+  ENDIF(MINGW)
+
+  # Set the final string here so the GUI reflects the final state.
+  SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
+  # Set the temp variable to INTERNAL so it is not seen in the CMake GUI
+  SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
+
+  SET(SDL2_FOUND "YES")
+ENDIF(SDL2_LIBRARY_TEMP)
+
+INCLUDE(FindPackageHandleStandardArgs)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
+                                  REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)
+
--- a/SDL2-2.0.10-cmake-libdir.patch
+++ b/SDL2-2.0.10-cmake-libdir.patch
@ -1,12 +0,0 @@
-diff -urN SDL2-2.0.10/CMakeLists.txt SDL2-2.0.10-patched/CMakeLists.txt
--- SDL2-2.0.10/CMakeLists.txt	2019-07-25 14:32:36.000000000 +1000
-+++ SDL2-2.0.10-patched/CMakeLists.txt	2019-08-30 21:49:54.390555194 +1000
-@@ -1885,7 +1885,7 @@
- if (WINDOWS)
-   set(PKG_PREFIX "cmake")
- else ()
-  set(PKG_PREFIX "lib/cmake/SDL2")
-+  set(PKG_PREFIX "lib${LIB_SUFFIX}/cmake/SDL2")
- endif ()
- 
- include(CMakePackageConfigHelpers)
--- a/SDL2-2.0.16-soversion.patch
+++ b/SDL2-2.0.16-soversion.patch
@ -0,0 +1,12 @@
+diff -urN SDL2-2.0.16/CMakeLists.txt SDL2-2.0.16-patched/CMakeLists.txt
+--- SDL2-2.0.16/CMakeLists.txt	2021-08-11 10:17:18.363243527 +1000
+++ SDL2-2.0.16-patched/CMakeLists.txt	2021-08-11 10:18:52.446580179 +1000
+@@ -2564,7 +2564,7 @@
+   elseif(UNIX AND NOT ANDROID)
+     set_target_properties(SDL2 PROPERTIES
+       VERSION ${LT_VERSION}
+-      SOVERSION ${LT_MAJOR}
+      SOVERSION 0
+       OUTPUT_NAME "SDL2-${LT_RELEASE}")
+   else()
+     if(WINDOWS OR CYGWIN)
--- a/SDL2-2.0.3-cmake.patch
+++ b/SDL2-2.0.3-cmake.patch
@ -1,13 +0,0 @@
-diff -urN SDL2-2.0.3/CMakeLists.txt SDL2-2.0.3-patched/CMakeLists.txt
--- SDL2-2.0.3/CMakeLists.txt	2014-03-16 13:31:41.000000000 +1100
-+++ SDL2-2.0.3-patched/CMakeLists.txt	2014-06-08 21:15:39.121190857 +1100
-@@ -148,9 +148,6 @@
-   set(CMAKE_C_FLAGS "$ENV{CFLAGS}")
-   list(APPEND EXTRA_CFLAGS "$ENV{CFLAGS}")
- endif()
-if(NOT ("$ENV{CFLAGS}" STREQUAL "")) # Hackish, but does the trick on Win32
-  list(APPEND EXTRA_LDFLAGS "$ENV{LDFLAGS}")
-endif()
- 
- if(MSVC)
-   option(FORCE_STATIC_VCRT "Force /MT for static VC runtimes" OFF)
--- a/SDL2-2.0.7-soversion.patch
+++ b/SDL2-2.0.7-soversion.patch
@ -1,12 +0,0 @@
-diff -urN SDL2-2.0.7/CMakeLists.txt SDL2-2.0.7-patched/CMakeLists.txt
--- SDL2-2.0.7/CMakeLists.txt	2017-10-24 05:27:45.000000000 +1000
-+++ SDL2-2.0.7-patched/CMakeLists.txt	2017-11-17 11:57:50.811762729 +1000
-@@ -1699,7 +1699,7 @@
-   elseif(UNIX AND NOT ANDROID)
-     set_target_properties(SDL2 PROPERTIES
-       VERSION ${LT_VERSION}
-      SOVERSION ${LT_REVISION}
-+      SOVERSION 0
-       OUTPUT_NAME "SDL2-${LT_RELEASE}")
-   else()
-     set_target_properties(SDL2 PROPERTIES
--- a/SDL2.spec
+++ b/SDL2.spec
@ -1,4 +1,4 @@
-%define oversion 0.10.0
+%define oversion %(echo %{version} |cut -d. -f2- |sed "s/^/0./" |sed "s/\\./00./2")

 %define api 2.0
 %define major 0
@ -7,24 +7,28 @@

 Summary:	Simple DirectMedia Layer
 Name:		SDL2
-Version:	2.0.10
+Version:	2.30.6
 Release:	1
 License:	Zlib
 Group:		System/Libraries
-Url:		http://www.libsdl.org/
+Url:		http://www.libsdl.org
 Source0:	http://www.libsdl.org/release/%{name}-%{version}.tar.gz
-Patch0:		SDL2-2.0.3-cmake.patch
-Patch1:		SDL2-2.0.7-soversion.patch
-Patch2:		SDL2-2.0.10-cmake-libdir.patch
+# Keep major stable, should be 0
+Patch1:		SDL2-2.0.16-soversion.patch
 BuildRequires:	cmake
-BuildRequires:	wayland-doc
+%ifarch %{x86_64} %{ix86} %{armx}
 BuildRequires:	nas-devel
+%endif
 BuildRequires:	pkgconfig(alsa)
 BuildRequires:	pkgconfig(dbus-1)
 BuildRequires:	pkgconfig(egl)
 BuildRequires:	pkgconfig(gl)
 BuildRequires:	pkgconfig(glu)
+BuildRequires:	pkgconfig(jack)
 BuildRequires:	pkgconfig(libpulse)
+BuildRequires:	pkgconfig(libpipewire-0.3)
+BuildRequires:	pkgconfig(samplerate)
+BuildRequires:	pkgconfig(sndio)
 BuildRequires:	pkgconfig(libusb)
 BuildRequires:	pkgconfig(udev)
 BuildRequires:	pkgconfig(wayland-client)
@ -41,6 +45,7 @@ BuildRequires:	pkgconfig(xrandr)
 BuildRequires:	pkgconfig(xscrnsaver)
 BuildRequires:	pkgconfig(xxf86vm)
 BuildRequires:	pkgconfig(zlib)
+BuildRequires:	vulkan-devel

 %description
 This is the Simple DirectMedia Layer, a generic API that provides low level
@ -58,9 +63,10 @@ This package contains the library needed to run programs dynamically
 linked with %{name}.

 %files -n %{libname}
-%doc README.txt README-SDL.txt CREDITS.txt COPYING.txt BUGS.txt WhatsNew.txt
-%{_libdir}/libSDL2-%{api}.so.%{major}
-%{_libdir}/libSDL2-%{api}.so.%{oversion}
+%doc README.md README-SDL.txt CREDITS.txt BUGS.txt WhatsNew.txt
+%license LICENSE.txt
+%{_libdir}/lib%{name}-%{api}.so.%{major}
+%{_libdir}/lib%{name}-%{api}.so.%{oversion}

 #----------------------------------------------------------------------------

@ -75,28 +81,37 @@ This package contains the headers that programmers will need to develop
 applications which will use %{name}.

 %files -n %{devname}
-%doc README.txt README-SDL.txt CREDITS.txt COPYING.txt BUGS.txt WhatsNew.txt
+%doc README.md README-SDL.txt CREDITS.txt BUGS.txt WhatsNew.txt
+%license LICENSE.txt
 %{_bindir}/sdl2-config
-%{_libdir}/cmake/SDL2/
+%{_datadir}/aclocal/sdl2.m4
+%{_includedir}/%{name}
+%{_libdir}/cmake/%{name}
+%{_libdir}/lib%{name}*.a
 %{_libdir}/pkgconfig/sdl2.pc
 %{_libdir}/*.so
-%{_libdir}/libSDL2main.a
-%dir %{_includedir}/SDL2
-%{_includedir}/SDL2/*.h
-%{_datadir}/aclocal/sdl2.m4

 #----------------------------------------------------------------------------

 %prep
-%setup -q
-%apply_patches
+%autosetup -p1

 %build
-%global optflags %{optflags} -mstackrealign
 %cmake \
-	-DRPATH:BOOL=OFF \
-	-DSDL_STATIC:BOOL=OFF
-%make -s
+	-DESD:BOOL=OFF		\
+	-DESD_SHARED:BOOL=OFF	\
+	-DRPATH:BOOL=OFF	\
+	-DSDL_STATIC:BOOL=OFF	\
+%ifnarch %{ix86} %{x86_64}
+	-DSSEMATH:BOOL=OFF	\
+%endif
+%ifarch znver1
+	-DSSEMATH:BOOL=ON	\
+%endif
+	-DVIDEO_VULKAN:BOOL=ON
+%make_build

 %install
-%makeinstall_std -C build
+%make_install -C build
+
+rm -rf %{buildroot}%{_datadir}/licenses