commit 3dbcbaa5b4e2f99edac50eb192d32e9c4232bacb656f6059bf5082cac1b3ae0c Author: Adrian Schröter Date: Sat May 4 00:31:56 2024 +0200 Sync from SUSE:SLFO:Main sdl12_compat revision 10e1334fd183c0c857cddf4c34e3a201 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..30d2f2b --- /dev/null +++ b/baselibs.conf @@ -0,0 +1 @@ +libSDL-1_2-0 diff --git a/release-1.2.60.tar.gz b/release-1.2.60.tar.gz new file mode 100644 index 0000000..abb9077 --- /dev/null +++ b/release-1.2.60.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:029fa24fe9e0d6a15b94f4737a2d3ed3144c5ef920eb82b4c6b30248eb94518b +size 438381 diff --git a/sdl12_compat-rpmlintrc b/sdl12_compat-rpmlintrc new file mode 100644 index 0000000..55b244b --- /dev/null +++ b/sdl12_compat-rpmlintrc @@ -0,0 +1,11 @@ +# lto go home you're drunk +addFilter("lto-no-text-in-archive") + +# another false positive +# [ 40s] sdl12_compat-devel.x86_64: E: no-library-dependency-for /usr/lib64/libSDL-1.2.so +# [ 40s] The package misses dependency on a library package that provides the shared +# [ 40s] library. +addFilter("no-library-dependency-for") + +# only triggers on 15.3, hmm +addFilter("shlib-policy-name-error") diff --git a/sdl12_compat.changes b/sdl12_compat.changes new file mode 100644 index 0000000..ea9a2cc --- /dev/null +++ b/sdl12_compat.changes @@ -0,0 +1,57 @@ +------------------------------------------------------------------- +Wed Oct 26 16:54:07 UTC 2022 - Jan Engelhardt + +- Update to release 1.2.60 + * SDL_GetWMInfo() now works with SDL2 builds from the 2.0.xx + revisions. + * SDL_GetWMInfo() no longer asserts if used on Wayland. + * SDL_WM_SetIcon() no longer crashes on NULL icons, to match + SDL-1.2. + * Make SDL2's OpenGL 2D renderer work with apps that update + their screen surface from background threads + * SDL_ANYFORMAT is now supported + * SDL2 game controllers can optionally be used with the 1.2 + Joystick API. + * Check for specific X11 symbols in the process at startup and + force SDL2 to use X11 if so (fixes startup failures on + Wayland). +- Delete 0001-Use-SDL_PIXELFORMAT_RGB888-for-24-bit-surfaces.patch, + 0001-Set-pixels-in-SDL_CreateYUVOverlay-Fix-164.patch, + 0001-SDL_GetWMInfo-work-like-1.2-when-SDL_SetVideoMode-ha.patch + +------------------------------------------------------------------- +Mon Aug 8 14:18:26 UTC 2022 - Jan Engelhardt + +- Add 0001-Use-SDL_PIXELFORMAT_RGB888-for-24-bit-surfaces.patch + to rectify BGR order in older schismtracker. + +------------------------------------------------------------------- +Wed Jun 15 12:12:01 UTC 2022 - Jan Engelhardt + +- Require x11 and xorgproto just like SDL-devel. + +------------------------------------------------------------------- +Wed Jun 15 10:57:30 UTC 2022 - Dominique Leuenberger + +- Depend on the actual libSDL2 library which is being dlopen()'ed. +- Require pkgconfig(gl) and pkgconfig)glu) from the devel package, + as our headers include GL/gl.h and GL/glu.h (boo#1200562). + +------------------------------------------------------------------- +Tue May 17 07:44:55 UTC 2022 - Jan Engelhardt + +- Add baselibs.conf + +------------------------------------------------------------------- +Mon May 16 12:34:45 UTC 2022 - Jan Engelhardt + +- Add 0001-SDL_GetWMInfo-work-like-1.2-when-SDL_SetVideoMode-ha.patch + to unbreak use with schismtracker. +- Add 0001-Set-pixels-in-SDL_CreateYUVOverlay-Fix-164.patch + to unbreak use with MPlayer. +- Hot enable sdl12-compat to be the SDL1 replacement [boo#1198182] + +------------------------------------------------------------------- +Sat Mar 5 16:00:57 UTC 2022 - Jan Engelhardt + +- Initial package (v1.2.52) for build.opensuse.org diff --git a/sdl12_compat.spec b/sdl12_compat.spec new file mode 100644 index 0000000..7db410d --- /dev/null +++ b/sdl12_compat.spec @@ -0,0 +1,94 @@ +# +# spec file for package sdl12_compat +# +# Copyright (c) 2022 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: sdl12_compat +%define lname libSDL-1_2-0 +%global _lto_cflags %_lto_cflags -ffat-lto-objects +Version: 1.2.60 +Release: 0 +Summary: SDL-1.2 Compatibility Layer for Simple DirectMedia Layer 2.0 +License: MIT +Group: Development/Libraries/X11 +URL: https://github.com/libsdl-org/sdl12-compat +Source: https://github.com/libsdl-org/sdl12-compat/archive/refs/tags/release-%version.tar.gz +Source8: baselibs.conf +Source9: %name-rpmlintrc +BuildRequires: cmake +BuildRequires: pkg-config +BuildRequires: pkgconfig(sdl2) + +%description +This is the "Simple DirectMedia Layer" library built from sdl12_compat. +it provides a binary and source compatible API for programs written +against SDL 1.2, but it uses SDL 2.0 behind the scenes. + +%package -n %lname +Summary: SDL Graphics Routines for Primitives and Other Support Functions +Group: System/Libraries +Conflicts: libSDL-1_2-0 +%requires_eq %(rpm --qf "%%{name}" -qf $(readlink -f %{_libdir}/libSDL2.so)) + +%description -n %lname +This is the "Simple DirectMedia Layer" library built from sdl12_compat. +it provides a binary and source compatible API for programs written +against SDL 1.2, but it uses SDL 2.0 behind the scenes. + +%package devel +Summary: Libraries, includes and more to develop SDL-1.2 applications +Group: Development/Libraries/X11 +Requires: %lname = %version +Requires: pkgconfig(gl) +Requires: pkgconfig(glu) +Requires: pkgconfig(x11) +Requires: pkgconfig(xproto) +Conflicts: SDL-devel +Provides: SDL-devel = %version-%release +Provides: libSDL-devel = %version-%release + +%description devel +This package contains files needed for development with the SDL +library. + +%prep +%autosetup -p1 -n sdl12-compat-release-%version + +%build +%cmake +%cmake_build + +%install +%cmake_install +b="%buildroot" +ln -s sdl12_compat.pc "$b/%_libdir/pkgconfig/sdl.pc" +rm -v "$b/%_libdir"/*.a + +%post -n %lname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig + +%files -n %lname +%license LICENSE.txt +%_libdir/libSDL-1.2.so.* + +%files devel +%_bindir/sdl-config +%_includedir/SDL/ +%_datadir/aclocal/ +%_libdir/pkgconfig/*.pc +%_libdir/libSDL*so + +%changelog