Compare commits
1 Commits
Author | SHA256 | Date | |
---|---|---|---|
|
cb409b63d0 |
48
0001-cmake-install-sdl2-config-.cmake-files.patch
Normal file
48
0001-cmake-install-sdl2-config-.cmake-files.patch
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
From 95ac51c0df4abad48127c1c7288d24b6588b8489 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Anonymous Maarten <anonymous.maarten@gmail.com>
|
||||||
|
Date: Wed, 12 Mar 2025 14:31:06 +0100
|
||||||
|
Subject: [PATCH] cmake: install sdl2-config*.cmake files
|
||||||
|
|
||||||
|
SDL2, built with autotools, installs these.
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 2 ++
|
||||||
|
cmake/sdl2-config-version.cmake | 3 +++
|
||||||
|
cmake/sdl2-config.cmake | 3 +++
|
||||||
|
3 files changed, 8 insertions(+)
|
||||||
|
create mode 100644 cmake/sdl2-config-version.cmake
|
||||||
|
create mode 100644 cmake/sdl2-config.cmake
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 7e6119f..9ae4072 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -539,6 +539,8 @@ if(SDL2COMPAT_INSTALL)
|
||||||
|
)
|
||||||
|
install(
|
||||||
|
FILES
|
||||||
|
+ cmake/sdl2-config.cmake
|
||||||
|
+ cmake/sdl2-config-version.cmake
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}/SDL2Config.cmake
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}/SDL2ConfigVersion.cmake
|
||||||
|
DESTINATION "${SDL2COMPAT_INSTALL_CMAKEDIR}"
|
||||||
|
diff --git a/cmake/sdl2-config-version.cmake b/cmake/sdl2-config-version.cmake
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..3795a7d
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/cmake/sdl2-config-version.cmake
|
||||||
|
@@ -0,0 +1,3 @@
|
||||||
|
+# Compatibility for SDL2 built with autotools
|
||||||
|
+
|
||||||
|
+include("${CMAKE_CURRENT_LIST_DIR}/SDL2ConfigVersion.cmake")
|
||||||
|
diff --git a/cmake/sdl2-config.cmake b/cmake/sdl2-config.cmake
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..56d0ad0
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/cmake/sdl2-config.cmake
|
||||||
|
@@ -0,0 +1,3 @@
|
||||||
|
+# Compatibility for SDL2 built with autotools
|
||||||
|
+
|
||||||
|
+include("${CMAKE_CURRENT_LIST_DIR}/SDL2Config.cmake")
|
||||||
|
--
|
||||||
|
2.48.1
|
||||||
|
|
@@ -1,4 +1 @@
|
|||||||
libSDL2-2_0-0
|
libSDL2-2_0-0
|
||||||
sdl2-compat-devel
|
|
||||||
conflicts "SDL2-devel-<targettype>"
|
|
||||||
provides "SDL2-devel-<targettype> = <version>-<release>"
|
|
||||||
|
BIN
sdl2-compat-2.32.52.tar.gz
Normal file
BIN
sdl2-compat-2.32.52.tar.gz
Normal file
Binary file not shown.
BIN
sdl2-compat-2.32.52.tar.gz.sig
Normal file
BIN
sdl2-compat-2.32.52.tar.gz.sig
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1 +0,0 @@
|
|||||||
addFilter("shlib-fixed-dependency")
|
|
@@ -1,38 +1,7 @@
|
|||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jul 25 08:12:54 UTC 2025 - Lubos Kocman <lubos.kocman@suse.com>
|
Fri Mar 21 08:46:06 UTC 2025 - Fabian Vogt <fvogt@suse.com>
|
||||||
|
|
||||||
- Change license to Zlib
|
- Also provide libSDL2-devel
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon May 5 03:28:40 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
|
||||||
|
|
||||||
- Update to release 2.32.56
|
|
||||||
* Fixed rendering in Mesen2
|
|
||||||
* Fixed brightness in ioquake3
|
|
||||||
* Fixed a hang at launch in the xemu emulator
|
|
||||||
* Fixed crackling and sped up audio in OpenRCT2
|
|
||||||
* Fixed fullscreen window positioning on Wayland with multiple
|
|
||||||
displays
|
|
||||||
* Key events are now sent for dead keys on X11
|
|
||||||
* Fixed mouse wheel integer scrolling values
|
|
||||||
* Fixed a double-free when working with RLE surfaces
|
|
||||||
* Fixed a memory leak in SDL_LockTextureToSurface()
|
|
||||||
* Fixed sending SDL3 controller events to SDL2 applications
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Mar 31 23:26:16 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
|
||||||
|
|
||||||
- Update to release 2.32.54
|
|
||||||
* Fixed crash during controller hotplug in RetroArch
|
|
||||||
* Improved accuracy of SDL_GetRenderDriverInfo()
|
|
||||||
* Fixed SDL_SetWindowInputFocus() return value
|
|
||||||
- Delete 0001-cmake-install-sdl2-config-.cmake-files.patch
|
|
||||||
(merged)
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Sun Mar 30 02:13:56 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
|
||||||
|
|
||||||
- Add workarounds for Leap 15's not-so-capable pkg-config.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Mar 12 16:14:12 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
Wed Mar 12 16:14:12 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
@@ -1,28 +0,0 @@
|
|||||||
pub 1024D/A7763BE6 2001-01-05
|
|
||||||
uid Sam Lantinga <slouken@libsdl.org>
|
|
||||||
sub 1024g/06F8768C 2001-01-05
|
|
||||||
|
|
||||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
|
||||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
|
||||||
|
|
||||||
mQGiBDpWOb0RBADQwd3d9mzt6KzqlsgXf9mikBuMbpKzYs1SBKYpdzUs9sRY0CnH
|
|
||||||
vCQTrL5sI57yKLnqEl6SbIiE75ZwrSWwvUDFFTh35Jew5nPZwv64en2kw2y4qrnJ
|
|
||||||
kBZCHDSU4KgfUZtoJ25Tmeru5MLNbXxCOoMszO5L5OchwMrGMtmFLRA/bwCgy5Th
|
|
||||||
d1/vJo+bej9tbgv++SJ05o0D/3MPK7EBoxWkQ0I+ScqOsvSMRQXWc/hXy4lyIp8e
|
|
||||||
xJByBApkv0LiiT3KlPpq/K2gTlDlCZ/JTt6Rv8Ug0g47R3a0aoz9kfc15UjHdiap
|
|
||||||
UOfF9MWmmbw59Lyx6+y2e0/C5xWzNOR1G4G5y4RZL/GXrp67xz/0fEhI85R+eASq
|
|
||||||
AEfSBAC5ZxwnBwyl+h+PXeJYKrPQjSUlgtSAkKp7PNBywwlue1LcSb7j4cc+cmgH
|
|
||||||
QMVuM883LPE59btNzFTAZjlzzIMiaXf5h9EkDARTGQ1wFiO3V5vIbVLh4kAoNfpT
|
|
||||||
egy7bYn3UrlbKg3V2DbCdEXm1zQufZzK7T0yenA5Ps8xXX7mNrQhU2FtIExhbnRp
|
|
||||||
bmdhIDxzbG91a2VuQGxpYnNkbC5vcmc+iF8EExECABcFAjpWOb0FCwcKAwQDFQMC
|
|
||||||
AxYCAQIXgAASCRAwpZN3p3Y75gdlR1BHAAEB31EAnjxYj6c496zRYru3fzUiPgl9
|
|
||||||
JjFZAKCOkxoODf9qHbcdmFi1Mq0dTMP3OLkBDQQ6VjnDEAQA++MHQHlE0CPyEEX8
|
|
||||||
urvzDmsnX9/lGpZeZ1/ECm4QT/04QVdRJReaz1/8ha/JJ3J/jw+Ti3aHxvyLsXR/
|
|
||||||
dH61wKnqbQ+3UFI0di6Z+a2idPLkUeqnAFWUSLsjSzmYPeTE76Tw9BsBMcfmyYWe
|
|
||||||
jPZRNz4zNCNR21PNdSRSCq9/3NMAAwYD/1j+HquGLdhhd4jpKZtepybOxArNpZWE
|
|
||||||
t7DruzN6OdiwognWNrgx59iW2EJeCYgGuI1+3Ega0EjQ9ybPCmfR6SdE0ro2CmYR
|
|
||||||
JsYoJaHn0l6IArmF0E97jstIVVy3nNI729CFEPIvOHM8+0Hdd6gpNSQtbEFItt5l
|
|
||||||
XBwc8gr/AtqXiE4EGBECAAYFAjpWOcMAEgkQMKWTd6d2O+YHZUdQRwABAcZlAJ9z
|
|
||||||
Xumd1FC6YnvEST9eUQbeitjFhQCfYSvy7PxXgSfXedKsZmHWdka01zY=
|
|
||||||
=62+H
|
|
||||||
-----END PGP PUBLIC KEY BLOCK-----
|
|
@@ -19,21 +19,20 @@
|
|||||||
%define lname libSDL2-2_0-0
|
%define lname libSDL2-2_0-0
|
||||||
%global _lto_cflags %_lto_cflags -ffat-lto-objects
|
%global _lto_cflags %_lto_cflags -ffat-lto-objects
|
||||||
Name: sdl2-compat
|
Name: sdl2-compat
|
||||||
Version: 2.32.56
|
Version: 2.32.52
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: SDL-2.0 Compatibility Layer for Simple DirectMedia Layer 3.0
|
Summary: SDL-2.0 Compatibility Layer for Simple DirectMedia Layer 3.0
|
||||||
License: Zlib
|
License: MIT
|
||||||
Group: Development/Libraries/X11
|
Group: Development/Libraries/X11
|
||||||
URL: https://github.com/libsdl-org/sdl2-compat
|
URL: https://github.com/libsdl-org/sdl2-compat
|
||||||
Source: https://github.com/libsdl-org/sdl2-compat/releases/download/release-%version/sdl2-compat-%version.tar.gz
|
Source: https://github.com/libsdl-org/sdl2-compat/releases/download/release-%version/sdl2-compat-%version.tar.gz
|
||||||
Source2: https://github.com/libsdl-org/sdl2-compat/releases/download/release-%version/sdl2-compat-%version.tar.gz.sig
|
Source2: https://github.com/libsdl-org/sdl2-compat/releases/download/release-%version/sdl2-compat-%version.tar.gz.sig
|
||||||
Source3: %name.keyring
|
|
||||||
Source8: baselibs.conf
|
Source8: baselibs.conf
|
||||||
Source9: %name-rpmlintrc
|
|
||||||
Patch1: sdl2-symvers.patch
|
Patch1: sdl2-symvers.patch
|
||||||
|
Patch2: 0001-cmake-install-sdl2-config-.cmake-files.patch
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: pkg-config
|
BuildRequires: pkg-config
|
||||||
BuildRequires: pkgconfig(sdl3) >= 3.2.12
|
BuildRequires: pkgconfig(sdl3) >= 3.2.4
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This is the "Simple DirectMedia Layer" library built from sdl2-compat.
|
This is the "Simple DirectMedia Layer" library built from sdl2-compat.
|
||||||
@@ -43,9 +42,7 @@ against SDL 2.0, but it uses SDL 3.0 behind the scenes.
|
|||||||
%package -n %lname
|
%package -n %lname
|
||||||
Summary: SDL-2.0 Compatibility Layer for Simple DirectMedia Layer 3.0
|
Summary: SDL-2.0 Compatibility Layer for Simple DirectMedia Layer 3.0
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Requires: libSDL3-0 >= 3.2.10
|
%requires_eq %(rpm --qf "%%{name}" -qf $(readlink -f %_libdir/libSDL3.so))
|
||||||
# "sdl2-compat 2.32.54: SDL3 library is too old (have 3.2.8, but
|
|
||||||
# need at least 3.2.10). Segmentation fault (core dumped)"
|
|
||||||
|
|
||||||
%description -n %lname
|
%description -n %lname
|
||||||
This is the "Simple DirectMedia Layer" library built from sdl2-compat.
|
This is the "Simple DirectMedia Layer" library built from sdl2-compat.
|
||||||
@@ -58,9 +55,7 @@ Group: Development/Libraries/X11
|
|||||||
Requires: %lname = %version
|
Requires: %lname = %version
|
||||||
Conflicts: SDL2-devel
|
Conflicts: SDL2-devel
|
||||||
Provides: SDL2-devel = %version-%release
|
Provides: SDL2-devel = %version-%release
|
||||||
# You should not add pkgconfig(x11) to sdl-devel; as far as SDL is concerned, it is optional.
|
Provides: libSDL2-devel = %version-%release
|
||||||
# (Think outputting to Wayland, KMSDRM, or null.)
|
|
||||||
# https://github.com/libsdl-org/sdl2-compat/issues/405
|
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
This package contains files needed for development with the SDL2
|
This package contains files needed for development with the SDL2
|
||||||
@@ -74,14 +69,9 @@ library.
|
|||||||
%cmake_build
|
%cmake_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
b="%buildroot"
|
|
||||||
%cmake_install
|
%cmake_install
|
||||||
rm -Rf "$b/%_datadir/licenses" # using %%license instead
|
rm -Rf "%buildroot/%_datadir/licenses" # using %%license instead
|
||||||
cd "$b/%_libdir/cmake/SDL2/"
|
cd "%buildroot/%_libdir/cmake/SDL2/"
|
||||||
%if 0%{?suse_version} < 1600
|
|
||||||
# pkgconfig 0.x does not know "Provides" lines; work around it.
|
|
||||||
ln -s sdl2-compat.pc "$b/%_libdir/pkgconfig/sdl2.pc"
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%ldconfig_scriptlets -n %lname
|
%ldconfig_scriptlets -n %lname
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user