3.2.10

Backports and update

.abf.yml

@@ -1,2 +1,2 @@
 sources:
-  SDL2-2.24.0.tar.gz: 04d7768f4418ba03537ef14a86a0c1c45582f5c3
+  SDL3-3.2.10.tar.gz: 4d6f91951f8dfa2e1fb35defc06e9e966675870a

.gitea/workflows/ci.yml

@@ -0,0 +1,17 @@
+version: '1'
+
+name: Run CI/CD...
+
+on: [push]
+
+jobs:
+  main:
+    runs-on: r11_builder
+    steps:
+      - name: Jobs
+        uses: ${{ github.server_url }}/Djam/r11_workflows@main
+        with:
+          CI_DEPLOY: ${{ secrets.CI_DEPLOY }}
+          PUBLICATOR: ${{ secrets.PUBLICATOR }}
+          REPO_DEPLOY: ${{ secrets.REPO_DEPLOY }}
+

.gitignore

@@ -0,0 +1,3 @@
+.*~
+*~
+.env

SDL2-2.0.16-soversion.patch

@@ -1,12 +0,0 @@
-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)

SDL3.spec

@@ -1,22 +1,21 @@
-%define oversion 0.2400.0
+%define oversion %(echo %{version} |cut -d. -f2- |sed "s/^/0./" |sed "s/\\./00./2")
 
-%define api 2.0
+%define api 3.0
 %define major 0
 %define libname %mklibname %{name}_ %{api} %{major}
 %define devname %mklibname %{name} -d
 
 Summary:	Simple DirectMedia Layer
-Name:		SDL2
+Name:		SDL3
-Version:	2.24.0
+Version:	3.2.10
 Release:	1
 License:	Zlib
 Group:		System/Libraries
-Url:		http://www.libsdl.org/
+URL:		https://www.libsdl.org
-Source0:	http://www.libsdl.org/release/%{name}-%{version}.tar.gz
+Source0:    https://github.com/libsdl-org/SDL/releases/download/release-%{version}/%{name}-%{version}.tar.gz
-Source1:	FindSDL2.cmake
 # Keep major stable, should be 0
-Patch1:		SDL2-2.0.16-soversion.patch
 BuildRequires:	cmake
+BuildRequires:  xz
 %ifarch %{x86_64} %{ix86} %{armx}
 BuildRequires:	nas-devel
 %endif
@@ -27,7 +26,6 @@ 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)
@@ -46,7 +44,8 @@ BuildRequires:	pkgconfig(xrandr)
 BuildRequires:	pkgconfig(xscrnsaver)
 BuildRequires:	pkgconfig(xxf86vm)
 BuildRequires:	pkgconfig(zlib)
-BuildRequires:	vulkan-devel
+BuildRequires:	pkgconfig(vulkan)
+BuildRequires:  pkgconfig(openssl3.3)
 
 %description
 This is the Simple DirectMedia Layer, a generic API that provides low level
@@ -64,10 +63,9 @@ This package contains the library needed to run programs dynamically
 linked with %{name}.
 
 %files -n %{libname}
-%doc README.md README-SDL.txt CREDITS.txt BUGS.txt WhatsNew.txt
+%doc README.md BUGS.txt WhatsNew.txt
-%license LICENSE.txt
+%doc LICENSE.txt
-%{_libdir}/lib%{name}-%{api}.so.%{major}
+%{_libdir}/lib%{name}.so.*
-%{_libdir}/lib%{name}-%{api}.so.%{oversion}
 
 #----------------------------------------------------------------------------
 
@@ -82,24 +80,36 @@ This package contains the headers that programmers will need to develop
 applications which will use %{name}.
 
 %files -n %{devname}
-%doc README.md README-SDL.txt CREDITS.txt BUGS.txt WhatsNew.txt
+%doc README.md BUGS.txt WhatsNew.txt
-%license LICENSE.txt
+%doc LICENSE.txt
-%{_bindir}/sdl2-config
-%{_datadir}/aclocal/sdl2.m4
-%{_datadir}/cmake/Modules/Find%{name}.cmake
 %{_includedir}/%{name}
 %{_libdir}/cmake/%{name}
 %{_libdir}/lib%{name}*.a
-%{_libdir}/pkgconfig/sdl2.pc
+%{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.so
 
 #----------------------------------------------------------------------------
 
 %prep
-%autosetup -p1
+%setup -q
+
+cat > sdl3.pc << EOF
+prefix=%{_prefix}
+exec_prefix=${prefix}
+libdir=%{_libdir}
+includedir=%{_includedir}
+
+Name: sdl3
+Description: %{summary}
+URL: %{url}
+Version: %{version}
+Libs: -lSDL3
+EOF
+
 
 %build
 %cmake \
+    -DCMAKE_BUILD_TYPE=Release \
 	-DESD:BOOL=OFF		\
 	-DESD_SHARED:BOOL=OFF	\
 	-DRPATH:BOOL=OFF	\
@@ -115,6 +125,11 @@ applications which will use %{name}.
 
 %install
 %make_install -C build
-install -m644 %{SOURCE1} -D %{buildroot}%{_datadir}/cmake/Modules/Find%{name}.cmake
 
 rm -rf %{buildroot}%{_datadir}/licenses
+
+
+# erase rpath in pkgconfig
+rm -f %{buildroot}%{_libdir}/pkgconfig/sdl3.pc
+
+install -Dm0644 sdl3.pc %{buildroot}%{_libdir}/pkgconfig/sdl3.pc