From 300bed8b2856a4738406a189b2c6672489b12560 Mon Sep 17 00:00:00 2001 From: guibuilder_pel7ppc64bebuilder0 Date: Sun, 8 Sep 2019 16:29:07 +0200 Subject: [PATCH] SDL2 package update Signed-off-by: guibuilder_pel7ppc64bebuilder0 --- SOURCES/SDL2-2.0.9-khrplatform.patch | 15 ++ SOURCES/SDL_config.h | 10 ++ SOURCES/multilib.patch | 49 +++--- SPECS/SDL2.spec | 224 ++++++++++++++++++++------- 4 files changed, 214 insertions(+), 84 deletions(-) create mode 100644 SOURCES/SDL2-2.0.9-khrplatform.patch diff --git a/SOURCES/SDL2-2.0.9-khrplatform.patch b/SOURCES/SDL2-2.0.9-khrplatform.patch new file mode 100644 index 0000000..b6c3927 --- /dev/null +++ b/SOURCES/SDL2-2.0.9-khrplatform.patch @@ -0,0 +1,15 @@ +diff -up SDL2-2.0.9/include/SDL_opengl_glext.h.khrplatform SDL2-2.0.9/include/SDL_opengl_glext.h +--- SDL2-2.0.9/include/SDL_opengl_glext.h.khrplatform 2019-02-15 20:22:39.173773779 -0500 ++++ SDL2-2.0.9/include/SDL_opengl_glext.h 2019-02-15 20:22:58.176399330 -0500 +@@ -469,8 +469,9 @@ GLAPI void APIENTRY glBlendEquation (GLe + typedef long GLsizeiptr; + typedef long GLintptr; + #else +-typedef ptrdiff_t GLsizeiptr; +-typedef ptrdiff_t GLintptr; ++#include ++typedef khronos_intptr_t GLintptr; ++typedef khronos_ssize_t GLsizeiptr; + #endif + #define GL_BUFFER_SIZE 0x8764 + #define GL_BUFFER_USAGE 0x8765 diff --git a/SOURCES/SDL_config.h b/SOURCES/SDL_config.h index 2537ad4..7862549 100644 --- a/SOURCES/SDL_config.h +++ b/SOURCES/SDL_config.h @@ -66,6 +66,16 @@ #include "SDL_config-sparc.h" #elif defined(__aarch64__) #include "SDL_config-aarch64.h" +#elif defined(__mips64) && defined(__MIPSEL__) +#include "SDL_config-mips64el.h" +#elif defined(__mips64) +#include "SDL_config-mips64.h" +#elif defined(__mips) && defined(__MIPSEL__) +#include "SDL_config-mipsel.h" +#elif defined(__mips) +#include "SDL_config-mips.h" +#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64 +#include "SDL_config-riscv64.h" #else #error "The SDL2-devel package is not usable with the architecture." #endif diff --git a/SOURCES/multilib.patch b/SOURCES/multilib.patch index 94715d2..955b398 100644 --- a/SOURCES/multilib.patch +++ b/SOURCES/multilib.patch @@ -1,24 +1,25 @@ -*** XSLT/xslt-config.in.orig 2006-06-06 17:32:23.000000000 +0200 ---- XSLT/xslt-config.in 2006-06-06 17:32:48.000000000 +0200 -*************** -*** 4,10 **** - exec_prefix=@exec_prefix@ - exec_prefix_set=no - includedir=@includedir@ -! libdir=@libdir@ - - usage() - { ---- 4,15 ---- - exec_prefix=@exec_prefix@ - exec_prefix_set=no - includedir=@includedir@ -! if [ "`ldd /bin/sh | grep lib64`" = "" ] -! then -! libdir=${exec_prefix}/lib -! else -! libdir=${exec_prefix}/lib64 -! fi - - usage() - { +diff -uNr SDL2-2.0.0.orig/sdl2-config.in SDL2-2.0.0/sdl2-config.in +--- SDL2-2.0.0.orig/sdl2-config.in 2013-08-12 06:57:54.000000000 +0400 ++++ SDL2-2.0.0/sdl2-config.in 2013-08-24 12:50:01.630268642 +0400 +@@ -3,7 +3,6 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + exec_prefix_set=no +-libdir=@libdir@ + + @ENABLE_STATIC_FALSE@usage="\ + @ENABLE_STATIC_FALSE@Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]" +@@ -45,11 +44,11 @@ + echo -I@includedir@/SDL2 @SDL_CFLAGS@ + ;; + @ENABLE_SHARED_TRUE@ --libs) +-@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ ++@ENABLE_SHARED_TRUE@ echo @SDL_RLD_FLAGS@ @SDL_LIBS@ + @ENABLE_SHARED_TRUE@ ;; + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) +-@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ ++@ENABLE_STATIC_TRUE@ echo @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ + @ENABLE_STATIC_TRUE@ ;; + *) + echo "${usage}" 1>&2 diff --git a/SPECS/SDL2.spec b/SPECS/SDL2.spec index 8f4ecb4..63328c2 100644 --- a/SPECS/SDL2.spec +++ b/SPECS/SDL2.spec @@ -1,22 +1,18 @@ -%if 0%{?epel} -%bcond_with wayland -%else -%bcond_without wayland -%endif - Name: SDL2 -Version: 2.0.3 -Release: 9%{?dist} -Summary: A cross-platform multimedia library -Group: System Environment/Libraries -URL: http://www.libsdl.org/ +Version: 2.0.10 +Release: 1%{?dist} +Summary: Cross-platform multimedia library + License: zlib and MIT +URL: http://www.libsdl.org/ Source0: http://www.libsdl.org/release/%{name}-%{version}.tar.gz Source1: SDL_config.h + Patch0: multilib.patch -# https://hg.libsdl.org/SDL/rev/7e843b8b8301 -Patch1: SDL2-2.0.3-oldgcc.patch +# ptrdiff_t is not the same as khronos defines on 32bit arches +Patch1: SDL2-2.0.9-khrplatform.patch +BuildRequires: gcc BuildRequires: alsa-lib-devel BuildRequires: audiofile-devel BuildRequires: mesa-libGL-devel @@ -28,50 +24,44 @@ BuildRequires: libX11-devel BuildRequires: libXi-devel BuildRequires: libXrandr-devel BuildRequires: libXrender-devel -BuildRequires: dbus-devel BuildRequires: libXScrnSaver-devel BuildRequires: libusb-devel -BuildRequires: pulseaudio-libs-devel BuildRequires: libXinerama-devel BuildRequires: libXcursor-devel BuildRequires: systemd-devel +# PulseAudio +BuildRequires: pkgconfig(libpulse-simple) +# Jack +BuildRequires: pkgconfig(jack) +# D-Bus +BuildRequires: pkgconfig(dbus-1) +# IBus +BuildRequires: pkgconfig(ibus-1.0) # Wayland -%if %{with wayland} -BuildRequires: libwayland-client-devel -#BuildRequires: libwayland-egl-devel -BuildRequires: libwayland-cursor-devel +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-egl) +BuildRequires: pkgconfig(wayland-cursor) +BuildRequires: pkgconfig(wayland-protocols) +BuildRequires: pkgconfig(wayland-scanner) +BuildRequires: pkgconfig(xkbcommon) +%ifarch x86_64 ppc64le +# Vulkan +BuildRequires: vulkan-devel %endif -BuildRequires: libxkbcommon-devel +# KMS +BuildRequires: mesa-libgbm-devel +BuildRequires: libdrm-devel %description Simple DirectMedia Layer (SDL) is a cross-platform multimedia library designed to provide fast access to the graphics frame buffer and audio device. %package devel -Summary: Files needed to develop Simple DirectMedia Layer applications -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: alsa-lib-devel -Requires: mesa-libGL-devel -Requires: mesa-libGLU-devel -Requires: mesa-libEGL-devel -Requires: mesa-libGLES-devel -Requires: libX11-devel -Requires: libXi-devel -Requires: libXext-devel -Requires: libXrandr-devel -Requires: libXrender-devel -Requires: libXScrnSaver-devel -Requires: libXinerama-devel -Requires: libXcursor-devel -Requires: systemd-devel -%if %{with wayland} -# Wayland -Requires: libwayland-client-devel -#Requires: libwayland-egl-devel -Requires: libwayland-cursor-devel -%endif -Requires: libxkbcommon-devel +Summary: Files needed to develop Simple DirectMedia Layer applications +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: mesa-libEGL-devel%{?_isa} +Requires: mesa-libGLES-devel%{?_isa} +Requires: libX11-devel%{?_isa} %description devel Simple DirectMedia Layer (SDL) is a cross-platform multimedia library designed @@ -79,26 +69,39 @@ to provide fast access to the graphics frame buffer and audio device. This package provides the libraries, include files, and other resources needed for developing SDL applications. +%package static +Summary: Static libraries for SDL2 + +%description static +Static libraries for SDL2. + %prep -%setup -q -#%patch0 -p1 -b .multilib -%patch1 -p1 -b .oldgcc +%autosetup -p1 # Compilation without ESD -sed -i -e 's/.*AM_PATH_ESD.*//' configure.in +sed -i -e 's/.*AM_PATH_ESD.*//' configure.ac sed -i -e 's/\r//g' TODO.txt README.txt WhatsNew.txt BUGS.txt COPYING.txt CREDITS.txt README-SDL.txt %build %configure \ --enable-sdl-dlopen \ + --enable-video-kmsdrm \ --disable-arts \ --disable-esd \ --disable-nas \ --enable-pulseaudio-shared \ + --enable-jack-shared \ --enable-alsa \ -%if %{with wayland} --enable-video-wayland \ +%ifarch x86_64 ppc64le ppc64 + --enable-video-vulkan \ +%endif + --enable-sse2=no \ + --enable-sse3=no \ + --disable-rpath \ +%ifarch ppc + --disable-altivec \ %endif - --disable-rpath + make %{?_smp_mflags} %install @@ -110,16 +113,16 @@ mv %{buildroot}%{_includedir}/SDL2/SDL_config.h %{buildroot}%{_includedir}/SDL2/ install -p -m 644 %{SOURCE1} %{buildroot}%{_includedir}/SDL2/SDL_config.h # remove libtool .la file -rm -f %{buildroot}%{_libdir}/*.la +rm -vf %{buildroot}%{_libdir}/*.la # remove static .a file -rm -f %{buildroot}%{_libdir}/*.a +# rm -f %{buildroot}%{_libdir}/*.a %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files -%doc BUGS.txt CREDITS.txt COPYING.txt README-SDL.txt +%license COPYING.txt +%doc BUGS.txt CREDITS.txt README-SDL.txt %{_libdir}/lib*.so.* %files devel @@ -127,18 +130,119 @@ rm -f %{buildroot}%{_libdir}/*.a %{_bindir}/*-config %{_libdir}/lib*.so %{_libdir}/pkgconfig/sdl2.pc +%{_libdir}/cmake/SDL2/ %{_includedir}/SDL2 %{_datadir}/aclocal/* +%files static +%license COPYING.txt +%{_libdir}/lib*.a + %changelog -* Wed Nov 18 2015 Ding-Yi Chen - 2.0.3-9 -- Use bcond instead +* Fri Jul 26 2019 Pete Walter - 2.0.10-1 +- Update to 2.0.10 + +* Wed Jul 24 2019 Fedora Release Engineering - 2.0.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 15 2019 Tom Callaway - 2.0.9-3 +- use khrplatform defines, not ptrdiff_t + +* Thu Jan 31 2019 Fedora Release Engineering - 2.0.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Nov 2 2018 Tom Callaway - 2.0.9-1 +- update to 2.0.9 + +* Thu Jul 12 2018 Fedora Release Engineering - 2.0.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon May 21 2018 Adam Jackson - 2.0.8-5 +- Backport a crash/hang fix from 2.0.9 (#1580541) + +* Wed Apr 11 2018 Tom Callaway - 2.0.8-4 +- enable video-kmsdrm + +* Fri Mar 30 2018 David Abdurachmanov - 2.0.8-3 +- Add riscv64 to SDL_config.h + +* Sun Mar 04 2018 Miro Hrončok - 2.0.8-2 +- Disable altivec on ppc64le (RHBZ #1551338) + +* Sun Mar 4 2018 Peter Robinson 2.0.8-1 +- Update to 2.0.8 + +* Wed Feb 07 2018 Fedora Release Engineering - 2.0.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 31 2018 Igor Gnatenko - 2.0.7-3 +- Switch to %%ldconfig_scriptlets + +* Sun Nov 05 2017 Igor Gnatenko - 2.0.7-2 +- Fix IBus + +* Tue Oct 24 2017 Igor Gnatenko - 2.0.7-1 +- Update to 2.0.7 + +* Thu Oct 19 2017 Igor Gnatenko - 2.0.6-4 +- Fully fix last overflow + +* Wed Oct 11 2017 Igor Gnatenko - 2.0.6-3 +- Fix potential overflow in surface allocation + +* Thu Oct 05 2017 Igor Gnatenko - 2.0.6-2 +- Fix invalid dbus arguments + +* Sat Sep 23 2017 Igor Gnatenko - 2.0.6-1 +- Update to 2.0.6 + +* Wed Aug 02 2017 Fedora Release Engineering - 2.0.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.0.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 2.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Jan 27 2017 Igor Gnatenko - 2.0.5-3 +- Fix NULL dereference (RHBZ #1416945) + +* Wed Oct 26 2016 Dan Horák - 2.0.5-2 +- fix FTBFS on ppc64/ppc64le + +* Thu Oct 20 2016 Igor Gnatenko - 2.0.5-1 +- Update to 2.0.5 (RHBZ #1387238) + +* Mon Sep 05 2016 Kalev Lember - 2.0.4-9 +- Backport Wayland fixes from upstream + +* Sun Aug 14 2016 Igor Gnatenko - 2.0.4-8 +- Fix whitespaces in CMake file (RHBZ #1366868) + +* Sun Jul 10 2016 Igor Gnatenko - 2.0.4-7 +- Remove useless Requirements from -devel subpkg + +* Sun Jul 10 2016 Igor Gnatenko - 2.0.4-6 +- Add ibus support + +* Sun Jul 10 2016 Joseph Mullally - 2.0.4-5 +- fix Wayland dynamic symbol loading (bz1354155) + +* Thu Feb 25 2016 Tom Callaway - 2.0.4-4 +- enable static subpackage (bz1253930) + +* Fri Feb 5 2016 Tom Callaway - 2.0.4-3 +- fix compile against latest wayland + +* Wed Feb 03 2016 Fedora Release Engineering - 2.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild -* Tue Aug 11 2015 Ding-Yi Chen - 2.0.3-8 -- Remove wayland support for Requires. +* Mon Jan 04 2016 Tom Callaway - 2.0.4-1 +- update to 2.0.4 -* Thu Aug 06 2015 Ding-Yi Chen - 2.0.3-7 -- Remove wayland support. +* Fri Sep 04 2015 Michal Toman - 2.0.3-7 +- Add support for MIPS architecture to SDL_config.h * Tue Jun 16 2015 Fedora Release Engineering - 2.0.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild