From cc0b9d97635118ca2737f2313812894b81ba0e2c Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Wed, 11 Aug 2021 00:02:26 +0200 Subject: [PATCH] up to 2.0.16 - cflags patch does not seem to be necessary since 2.0.4 --- SDL2-cflags.patch | 12 ------------ SDL2.spec | 14 ++++++++------ 2 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 SDL2-cflags.patch diff --git a/SDL2-cflags.patch b/SDL2-cflags.patch deleted file mode 100644 index 856d894..0000000 --- a/SDL2-cflags.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- SDL2-2.0.3/configure.ac.orig 2014-03-16 03:31:42.000000000 +0100 -+++ SDL2-2.0.3/configure.ac 2014-05-18 08:29:43.394208085 +0200 -@@ -1762,6 +1766,9 @@ - SOURCES="$SOURCES $srcdir/src/video/directfb/*.c" - EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS" - -+ # Needed so SDL applications can include SDL_syswm.h -+ SDL_CFLAGS="$SDL_CFLAGS $DIRECTFB_CFLAGS" -+ - AC_MSG_CHECKING(for directfb dynamic loading support) - directfb_shared=no - directfb_lib=[`find_lib "libdirectfb.so.*" "$DIRECTFB_LIBS"`] diff --git a/SDL2.spec b/SDL2.spec index 9c74933..5209a75 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -60,17 +60,19 @@ Summary: SDL (Simple DirectMedia Layer) - Game/Multimedia Library Summary(pl.UTF-8): SDL (Simple DirectMedia Layer) - Biblioteka do gier/multimediów Summary(zh_CN.UTF-8): SDL (Simple DirectMedia Layer) Generic APIs - 游戏/多媒体库 Name: SDL2 -Version: 2.0.14 +Version: 2.0.16 Release: 1 License: Zlib (BSD-like) Group: Libraries Source0: http://www.libsdl.org/release/%{name}-%{version}.tar.gz -# Source0-md5: 76ed4e6da9c07bd168b2acd9bfefab1b +# Source0-md5: 98b8a1535a757ea1d03ae44e2fb20247 Patch0: %{name}-config.patch -Patch1: %{name}-cflags.patch URL: http://www.libsdl.org/ %{?with_kms:BuildRequires: Mesa-libgbm-devel >= 11.1.0} %{?with_directfb:BuildRequires: DirectFB-devel >= 1.0.0} +%if %{with opengl} || %{with gles} +BuildRequires: EGL-devel +%endif %{?with_directfb:BuildRequires: FusionSound-devel >= 1.1.1} %{?with_opengl:BuildRequires: OpenGL-GLX-devel} %{?with_gles:BuildRequires: OpenGLES-devel} @@ -90,11 +92,12 @@ BuildRequires: libsamplerate-devel BuildRequires: libtool >= 2:2.0 %{?with_nas:BuildRequires: nas-devel} BuildRequires: perl-modules +BuildRequires: pipewire-devel >= 0.3.20 BuildRequires: pkgconfig >= 1:0.7 BuildRequires: pulseaudio-devel >= 0.9 BuildRequires: udev-devel # wayland-client, wayland-cursor -%{?with_wayland:BuildRequires: wayland-devel} +%{?with_wayland:BuildRequires: wayland-devel >= 1.15} %{?with_wayland:BuildRequires: wayland-egl-devel} BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libXScrnSaver-devel @@ -211,7 +214,6 @@ SDL - przykładowe programy. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %{__libtoolize} @@ -264,7 +266,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) # non-Linux READMEs packaged for portability information -%doc BUGS.txt COPYING.txt CREDITS.txt README*.txt TODO.txt WhatsNew.txt +%doc BUGS.txt CREDITS.txt LICENSE.txt README*.txt TODO.txt WhatsNew.txt %attr(755,root,root) %{_libdir}/libSDL2-2.0.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libSDL2-2.0.so.0 -- 2.44.0