Compare commits
No commits in common. "c8" and "c9s" have entirely different histories.
|
|
@ -1 +1 @@
|
|||
fb31312ea1d4b45db839796ae2336dfe3d5884e5 SOURCES/SDL2-2.0.10.tar.gz
|
||||
788380a96075119a2ab1e5b53f2fee74fa957fa2 SDL2-2.26.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1 +1,17 @@
|
|||
SOURCES/SDL2-2.0.10.tar.gz
|
||||
/SDL2-2.0.0.tar.gz
|
||||
/SDL2-2.0.1.tar.gz
|
||||
/SDL2-2.0.2.tar.gz
|
||||
/SDL2-2.0.3.tar.gz
|
||||
/SDL2-2.0.4.tar.gz
|
||||
/SDL2-2.0.5.tar.gz
|
||||
/SDL2-2.0.6.tar.gz
|
||||
/SDL2-2.0.7.tar.gz
|
||||
/SDL2-2.0.8.tar.gz
|
||||
/SDL2-2.0.9.tar.gz
|
||||
/SDL2-2.0.10.tar.gz
|
||||
/SDL2-2.0.12.tar.gz
|
||||
/SDL2-2.0.14.tar.gz
|
||||
/SDL2-2.0.16.tar.gz
|
||||
/SDL2-2.0.18.tar.gz
|
||||
/SDL2-2.0.20.tar.gz
|
||||
/SDL2-2.26.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,81 @@
|
|||
From 68d8a2c6b4f732920df40bd79dc3c18b71a4a349 Mon Sep 17 00:00:00 2001
|
||||
From: Neal Gompa <ngompa@fedoraproject.org>
|
||||
Date: Fri, 29 Apr 2022 23:39:39 -0400
|
||||
Subject: [PATCH] Revert "Revert "video: Prefer Wayland over X11""
|
||||
|
||||
For Fedora/RHEL, we want to continue using Wayland by default.
|
||||
|
||||
The majority of issues around Wayland by default seem to center
|
||||
around cases that are issues for the Steam Runtime's bundled
|
||||
copy of SDL and proprietary games that depend on that runtime.
|
||||
|
||||
These issues do not apply to us.
|
||||
|
||||
This reverts commit 254fcc90eb22bb159ab365ad956222a9c5632841.
|
||||
---
|
||||
src/video/SDL_video.c | 24 ++++++++++++------------
|
||||
1 file changed, 12 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
|
||||
index 2b896c44b..6f31f4c9e 100644
|
||||
--- a/src/video/SDL_video.c
|
||||
+++ b/src/video/SDL_video.c
|
||||
@@ -61,12 +61,12 @@ static VideoBootStrap *bootstrap[] = {
|
||||
#if SDL_VIDEO_DRIVER_COCOA
|
||||
&COCOA_bootstrap,
|
||||
#endif
|
||||
-#if SDL_VIDEO_DRIVER_X11
|
||||
- &X11_bootstrap,
|
||||
-#endif
|
||||
#if SDL_VIDEO_DRIVER_WAYLAND
|
||||
&Wayland_bootstrap,
|
||||
#endif
|
||||
+#if SDL_VIDEO_DRIVER_X11
|
||||
+ &X11_bootstrap,
|
||||
+#endif
|
||||
#if SDL_VIDEO_DRIVER_VIVANTE
|
||||
&VIVANTE_bootstrap,
|
||||
#endif
|
||||
@@ -4275,12 +4275,12 @@ SDL_IsScreenKeyboardShown(SDL_Window *window)
|
||||
#if SDL_VIDEO_DRIVER_UIKIT
|
||||
#include "uikit/SDL_uikitmessagebox.h"
|
||||
#endif
|
||||
-#if SDL_VIDEO_DRIVER_X11
|
||||
-#include "x11/SDL_x11messagebox.h"
|
||||
-#endif
|
||||
#if SDL_VIDEO_DRIVER_WAYLAND
|
||||
#include "wayland/SDL_waylandmessagebox.h"
|
||||
#endif
|
||||
+#if SDL_VIDEO_DRIVER_X11
|
||||
+#include "x11/SDL_x11messagebox.h"
|
||||
+#endif
|
||||
#if SDL_VIDEO_DRIVER_HAIKU
|
||||
#include "haiku/SDL_bmessagebox.h"
|
||||
#endif
|
||||
@@ -4388,17 +4388,17 @@ SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
|
||||
retval = 0;
|
||||
}
|
||||
#endif
|
||||
-#if SDL_VIDEO_DRIVER_X11
|
||||
+#if SDL_VIDEO_DRIVER_WAYLAND
|
||||
if (retval == -1 &&
|
||||
- SDL_MessageboxValidForDriver(messageboxdata, SDL_SYSWM_X11) &&
|
||||
- X11_ShowMessageBox(messageboxdata, buttonid) == 0) {
|
||||
+ SDL_MessageboxValidForDriver(messageboxdata, SDL_SYSWM_WAYLAND) &&
|
||||
+ Wayland_ShowMessageBox(messageboxdata, buttonid) == 0) {
|
||||
retval = 0;
|
||||
}
|
||||
#endif
|
||||
-#if SDL_VIDEO_DRIVER_WAYLAND
|
||||
+#if SDL_VIDEO_DRIVER_X11
|
||||
if (retval == -1 &&
|
||||
- SDL_MessageboxValidForDriver(messageboxdata, SDL_SYSWM_WAYLAND) &&
|
||||
- Wayland_ShowMessageBox(messageboxdata, buttonid) == 0) {
|
||||
+ SDL_MessageboxValidForDriver(messageboxdata, SDL_SYSWM_X11) &&
|
||||
+ X11_ShowMessageBox(messageboxdata, buttonid) == 0) {
|
||||
retval = 0;
|
||||
}
|
||||
#endif
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
|
@ -1,23 +1,32 @@
|
|||
Name: SDL2
|
||||
Version: 2.0.10
|
||||
Release: 2%{?dist}
|
||||
Summary: Cross-platform multimedia library
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global enable_jack 1
|
||||
# For the generated library symbol suffix
|
||||
%if 0%{?__isa_bits} == 32
|
||||
%global libsymbolsuffix %{nil}
|
||||
%else
|
||||
%global libsymbolsuffix ()(%{__isa_bits}bit)
|
||||
%endif
|
||||
|
||||
# For declaring rich dependency on libdecor
|
||||
%global libdecor_majver 0
|
||||
|
||||
Name: SDL2
|
||||
Version: 2.26.0
|
||||
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
|
||||
Source2: SDL_revision.h
|
||||
|
||||
Patch0: multilib.patch
|
||||
# ptrdiff_t is not the same as khronos defines on 32bit arches
|
||||
Patch1: SDL2-2.0.9-khrplatform.patch
|
||||
Patch2: CVE-2019-13616-validate_image_size_when_loading_BMP_files.patch
|
||||
# Prefer Wayland by default
|
||||
Patch1: SDL2-2.0.22-prefer-wayland.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: git-core
|
||||
BuildRequires: cmake
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: mesa-libGL-devel
|
||||
BuildRequires: mesa-libGLU-devel
|
||||
|
|
@ -29,21 +38,22 @@ BuildRequires: libXi-devel
|
|||
BuildRequires: libXrandr-devel
|
||||
BuildRequires: libXrender-devel
|
||||
BuildRequires: libXScrnSaver-devel
|
||||
BuildRequires: libusb-devel
|
||||
BuildRequires: libXinerama-devel
|
||||
BuildRequires: libXcursor-devel
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: pkgconfig(libusb-1.0)
|
||||
# PulseAudio
|
||||
BuildRequires: pkgconfig(libpulse-simple)
|
||||
# Jack
|
||||
%if 0%{?enable_jack}
|
||||
BuildRequires: pkgconfig(jack)
|
||||
%endif
|
||||
# PipeWire
|
||||
BuildRequires: pkgconfig(libpipewire-0.3)
|
||||
# D-Bus
|
||||
BuildRequires: pkgconfig(dbus-1)
|
||||
# IBus
|
||||
BuildRequires: pkgconfig(ibus-1.0)
|
||||
# Wayland
|
||||
BuildRequires: pkgconfig(libdecor-%{libdecor_majver})
|
||||
BuildRequires: pkgconfig(wayland-client)
|
||||
BuildRequires: pkgconfig(wayland-egl)
|
||||
BuildRequires: pkgconfig(wayland-cursor)
|
||||
|
|
@ -51,13 +61,14 @@ BuildRequires: pkgconfig(wayland-protocols)
|
|||
BuildRequires: pkgconfig(wayland-scanner)
|
||||
BuildRequires: pkgconfig(xkbcommon)
|
||||
# Vulkan
|
||||
%ifnarch s390 s390x aarch64 ppc64le
|
||||
BuildRequires: vulkan-devel
|
||||
%endif
|
||||
# KMS
|
||||
BuildRequires: mesa-libgbm-devel
|
||||
BuildRequires: libdrm-devel
|
||||
|
||||
# Ensure libdecor is pulled in when libwayland-client is (rhbz#1992804)
|
||||
Requires: (libdecor-%{libdecor_majver}.so.%{libdecor_majver}%{libsymbolsuffix} if libwayland-client)
|
||||
|
||||
%description
|
||||
Simple DirectMedia Layer (SDL) is a cross-platform multimedia library designed
|
||||
to provide fast access to the graphics frame buffer and audio device.
|
||||
|
|
@ -68,6 +79,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||
Requires: mesa-libEGL-devel%{?_isa}
|
||||
Requires: mesa-libGLES-devel%{?_isa}
|
||||
Requires: libX11-devel%{?_isa}
|
||||
# Conflict with versions before libSDLmain moved here
|
||||
Conflicts: %{name}-static < 2.0.18-2
|
||||
|
||||
%description devel
|
||||
Simple DirectMedia Layer (SDL) is a cross-platform multimedia library designed
|
||||
|
|
@ -77,98 +90,195 @@ developing SDL applications.
|
|||
|
||||
%package static
|
||||
Summary: Static libraries for SDL2
|
||||
# Needed to keep CMake happy
|
||||
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
||||
# Conflict with versions before libSDLmain moved to -devel
|
||||
Conflicts: %{name}-devel < 2.0.18-2
|
||||
|
||||
%description static
|
||||
Static libraries for SDL2.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
# Compilation without ESD
|
||||
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
|
||||
%autosetup -S git
|
||||
sed -i -e 's/\r//g' TODO.txt README.md WhatsNew.txt BUGS.txt LICENSE.txt CREDITS.txt README-SDL.txt
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--enable-sdl-dlopen \
|
||||
--enable-video-kmsdrm \
|
||||
--disable-arts \
|
||||
--disable-esd \
|
||||
--disable-nas \
|
||||
--enable-pulseaudio-shared \
|
||||
%if 0%{?enable_jack}
|
||||
--enable-jack-shared \
|
||||
%else
|
||||
--disable-jack \
|
||||
%endif
|
||||
--enable-alsa \
|
||||
--enable-video-wayland \
|
||||
%ifnarch s390 s390x aarch64 ppc64le
|
||||
--enable-video-vulkan \
|
||||
%endif
|
||||
--enable-sse2=no \
|
||||
--enable-sse3=no \
|
||||
--disable-rpath \
|
||||
# Deal with new CMake policy around whitespace in LDFLAGS...
|
||||
export LDFLAGS="%{shrink:%{build_ldflags}}"
|
||||
|
||||
%cmake \
|
||||
-DSDL_DLOPEN=ON \
|
||||
-DSDL_VIDEO_KMSDRM=ON \
|
||||
-DSDL_ARTS=OFF \
|
||||
-DSDL_ESD=OFF \
|
||||
-DSDL_NAS=OFF \
|
||||
-DSDL_PULSEAUDIO_SHARED=ON \
|
||||
-DSDL_JACK_SHARED=ON \
|
||||
-DSDL_PIPEWIRE_SHARED=ON \
|
||||
-DSDL_ALSA=ON \
|
||||
-DSDL_VIDEO_WAYLAND=ON \
|
||||
-DSDL_LIBDECOR_SHARED=ON \
|
||||
-DSDL_VIDEO_VULKAN=ON \
|
||||
-DSDL_SSE3=OFF \
|
||||
-DSDL_RPATH=OFF \
|
||||
-DSDL_STATIC=ON \
|
||||
-DSDL_STATIC_PIC=ON \
|
||||
%ifarch ppc64le
|
||||
--disable-altivec \
|
||||
-DSDL_ALTIVEC=OFF \
|
||||
%endif
|
||||
|
||||
make %{?_smp_mflags}
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
%cmake_install
|
||||
|
||||
# Rename SDL_config.h to SDL_config-<arch>.h to avoid file conflicts on
|
||||
# multilib systems and install SDL_config.h wrapper
|
||||
mv %{buildroot}%{_includedir}/SDL2/SDL_config.h %{buildroot}%{_includedir}/SDL2/SDL_config-%{_arch}.h
|
||||
install -p -m 644 %{SOURCE1} %{buildroot}%{_includedir}/SDL2/SDL_config.h
|
||||
|
||||
# remove libtool .la file
|
||||
rm -vf %{buildroot}%{_libdir}/*.la
|
||||
# remove static .a file
|
||||
# rm -f %{buildroot}%{_libdir}/*.a
|
||||
|
||||
%ldconfig_scriptlets
|
||||
# Rename SDL_revision.h to SDL_revision-<arch>.h to avoid file conflicts on
|
||||
# multilib systems and install SDL_revision.h wrapper
|
||||
# TODO: Figure out how in the hell the SDL_REVISION changes between architectures on the same SRPM.
|
||||
mv %{buildroot}%{_includedir}/SDL2/SDL_revision.h %{buildroot}%{_includedir}/SDL2/SDL_revision-%{_arch}.h
|
||||
install -p -m 644 %{SOURCE2} %{buildroot}%{_includedir}/SDL2/SDL_revision.h
|
||||
|
||||
%files
|
||||
%license COPYING.txt
|
||||
%license LICENSE.txt
|
||||
%doc BUGS.txt CREDITS.txt README-SDL.txt
|
||||
%{_libdir}/lib*.so.*
|
||||
%{_libdir}/libSDL2-2.0.so.0*
|
||||
|
||||
%files devel
|
||||
%doc README.txt TODO.txt WhatsNew.txt
|
||||
%doc README.md TODO.txt WhatsNew.txt
|
||||
%{_bindir}/*-config
|
||||
%{_libdir}/lib*.so
|
||||
%{_libdir}/libSDL2main.a
|
||||
%{_libdir}/pkgconfig/sdl2.pc
|
||||
%{_libdir}/cmake/SDL2/
|
||||
%dir %{_libdir}/cmake/SDL2
|
||||
%{_libdir}/cmake/SDL2/SDL2Config*.cmake
|
||||
%{_libdir}/cmake/SDL2/SDL2Targets*.cmake
|
||||
%{_libdir}/cmake/SDL2/SDL2mainTargets*.cmake
|
||||
%{_includedir}/SDL2
|
||||
%{_datadir}/aclocal/*
|
||||
%{_libdir}/libSDL2_test.a
|
||||
%{_libdir}/cmake/SDL2/SDL2testTargets*.cmake
|
||||
|
||||
%files static
|
||||
%license COPYING.txt
|
||||
%{_libdir}/lib*.a
|
||||
%license LICENSE.txt
|
||||
%{_libdir}/libSDL2.a
|
||||
%{_libdir}/cmake/SDL2/SDL2staticTargets*.cmake
|
||||
|
||||
%changelog
|
||||
* Fri Nov 22 2019 Wim Taymans <wtaymans@redhat.com> - 2.0.10-2
|
||||
- Fix CVE-2019-13616 SDL: heap-based buffer overflow in SDL blit
|
||||
functions in video/SDL_blit*.c
|
||||
- Resolves: rhbz#1756279
|
||||
* Mon Aug 21 2022 Neal Gompa <ngompa@centosproject.org> - 2.26.0-1
|
||||
- Update to 2.26.0
|
||||
Resolves: rhbz#2051959
|
||||
- Drop backported patches included in this release
|
||||
|
||||
* Tue Nov 12 2019 Wim Taymans <wtaymans@redhat.com> - 2.0.10-1
|
||||
* Tue Feb 08 2022 Neal Gompa <ngompa@centosproject.org> - 2.0.20-2
|
||||
- Backport Wayland fixes with Wayland-by-default from upstream
|
||||
Resolves: rhbz#2051963
|
||||
|
||||
* Tue Jan 11 2022 Neal Gompa <ngompa@centosproject.org> - 2.0.20-1
|
||||
- Update to 2.0.20
|
||||
Resolves: rhbz#2039137
|
||||
- Drop backported patches included in this release
|
||||
|
||||
* Fri Jan 07 2022 Neal Gompa <ngompa@centosproject.org> - 2.0.18-2
|
||||
- Move libSDL2main to -devel and refresh split CMake target patch
|
||||
Resolves: rhbz#2038390
|
||||
|
||||
* Tue Jan 04 2022 Neal Gompa <ngompa@centosproject.org> - 2.0.18-1
|
||||
- Update to 2.0.18
|
||||
Resolves: rhbz#2028076
|
||||
- Fix multilib conflict with SDL_revision.h (rhbz#2008838)
|
||||
- Backport fix for building against wayland-1.20+
|
||||
- Add patch to split SDL2 CMake targets for static libraries (rhbz#1965359)
|
||||
|
||||
* Wed Dec 01 2021 Neal Gompa <ngompa@centosproject.org> - 2.0.16-5
|
||||
- Re-enable libdecor support now that it's available in RHEL 9
|
||||
Resolves: rhbz#2003471
|
||||
|
||||
* Thu Aug 26 2021 Wim Taymans <wtaymans@redhat.com> - 2.0.16-4
|
||||
- Build with SDL_STATIC_PIC and SDL_STATIC to actually make the
|
||||
static version of SDL2
|
||||
|
||||
* Thu Aug 26 2021 Wim Taymans <wtaymans@redhat.com> - 2.0.16-3
|
||||
- Build with SDL_STATIC_PIC instead of SDL_STATIC
|
||||
|
||||
* Thu Aug 26 2021 Wim Taymans <wtaymans@redhat.com> - 2.0.16-2
|
||||
- Disable libdecor until it is added to centos/RHEL9
|
||||
|
||||
* Thu Aug 26 2021 Neal Gompa <ngompa@fedoraproject.org> - 2.0.16-1
|
||||
- Update to 2.0.16
|
||||
|
||||
* Thu Aug 26 2021 Tom Callaway <spot@fedoraproject.org> - 2.0.14-7
|
||||
- add -static Requires to -devel to make CMake stop failing on missing files (bz1965359)
|
||||
|
||||
* Thu Aug 26 2021 Neal Gompa <ngompa13@gmail.com> - 2.0.14-6
|
||||
- Switch to CMake to build SDL2
|
||||
- Build JACK support unconditionally since PipeWire-JACK exists in RHEL 9
|
||||
|
||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.14-5
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.14-4
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Mon Feb 22 2021 Hans de Goede <hdegoede@redhat.com> - 2.0.14-3
|
||||
- SDL2 no longer uses audiofile, drop the audiofile-devel BuildRequires
|
||||
|
||||
* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.14-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Thu Jan 21 2021 Pete Walter <pwalter@fedoraproject.org> - 2.0.14-1
|
||||
- Update to 2.0.14
|
||||
- Rebase multilib.patch
|
||||
- Don't use globs in the form of libFOO.so.* for listing files
|
||||
|
||||
* Tue Jan 12 2021 Wim Taymans <wtaymans@redhat.com> - 2.0.12-5
|
||||
- Disable JACK on rhel >= 8
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.12-4
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.12-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 2.0.12-2
|
||||
- Use make macros
|
||||
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
|
||||
|
||||
* Wed Mar 11 2020 Pete Walter <pwalter@fedoraproject.org> - 2.0.12-1
|
||||
- Update to 2.0.12
|
||||
|
||||
* Tue Feb 11 2020 Tom Callaway <spot@fedoraproject.org> - 2.0.10-3
|
||||
- apply upstream fix for FTBFS
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.10-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Jul 26 2019 Pete Walter <pwalter@fedoraproject.org> - 2.0.10-1
|
||||
- Update to 2.0.10
|
||||
- Resolves: rhbz#1751780
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.9-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Feb 15 2019 Tom Callaway <spot@fedoraproject.org> - 2.0.9-3
|
||||
- use khrplatform defines, not ptrdiff_t
|
||||
|
||||
* Tue Aug 14 2018 Wim Taymans <wtaymans@redhat.com> - 2.0.8-7
|
||||
- Disable jack
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.9-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Aug 11 2018 Wim Taymans <wtaymans@redhat.com> - 2.0.8-6
|
||||
- Disable vulkan on s390, s390x, aarch64 and ppc64le
|
||||
- Resolves: rhbz#1610034
|
||||
* Fri Nov 2 2018 Tom Callaway <spot@fedoraproject.org> - 2.0.9-1
|
||||
- update to 2.0.9
|
||||
|
||||
* Tue Jul 17 2018 Wim Taymans <wtaymans@redhat.com> - 2.0.8-5
|
||||
- Disable obsolete audiofile-devel BR (#1588283)
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Mon May 21 2018 Adam Jackson <ajax@redhat.com> - 2.0.8-5
|
||||
- Backport a crash/hang fix from 2.0.9 (#1580541)
|
||||
|
||||
* Wed Apr 11 2018 Tom Callaway <spot@fedoraproject.org> - 2.0.8-4
|
||||
- enable video-kmsdrm
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
/*
|
||||
Simple DirectMedia Layer
|
||||
Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
arising from the use of this software.
|
||||
|
||||
Permission is granted to anyone to use this software for any purpose,
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely, subject to the following restrictions:
|
||||
|
||||
1. The origin of this software must not be misrepresented; you must not
|
||||
claim that you wrote the original software. If you use this software
|
||||
in a product, an acknowledgment in the product documentation would be
|
||||
appreciated but is not required.
|
||||
2. Altered source versions must be plainly marked as such, and must not be
|
||||
misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
*/
|
||||
|
||||
/*
|
||||
* This SDL_revision.h is a wrapper include file for the original SDL_revision.h,
|
||||
* which has been renamed to SDL_revision-<arch>.h. There are conflicts for the
|
||||
* original SDL_revision.h on multilib systems, which result from REVISION
|
||||
* inconsistency between architecture builds, though, I'm not sure why.
|
||||
* Computers are weird.
|
||||
*
|
||||
* Copyright (C) 2021 Tom Callaway <spotrh@gmail.com>
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file SDL_revision.h
|
||||
*/
|
||||
|
||||
#ifdef SDL_revision_wrapper_h
|
||||
#error "SDL_revision_wrapper_h should not be defined!"
|
||||
#endif
|
||||
#define SDL_revision_wrapper_h
|
||||
|
||||
#if defined(__i386__)
|
||||
#include "SDL_revision-i386.h"
|
||||
#elif defined(__ia64__)
|
||||
#include "SDL_revision-ia64.h"
|
||||
#elif defined(__powerpc64__)
|
||||
# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
||||
#include "SDL_revision-ppc64.h"
|
||||
# else
|
||||
#include "SDL_revision-ppc64le.h"
|
||||
# endif
|
||||
#elif defined(__powerpc__)
|
||||
#include "SDL_revision-ppc.h"
|
||||
#elif defined(__s390x__)
|
||||
#include "SDL_revision-s390x.h"
|
||||
#elif defined(__s390__)
|
||||
#include "SDL_revision-s390.h"
|
||||
#elif defined(__x86_64__)
|
||||
#include "SDL_revision-x86_64.h"
|
||||
#elif defined(__arm__)
|
||||
#include "SDL_revision-arm.h"
|
||||
#elif defined(__alpha__)
|
||||
#include "SDL_revision-alpha.h"
|
||||
#elif defined(__sparc__) && defined (__arch64__)
|
||||
#include "SDL_revision-sparc64.h"
|
||||
#elif defined(__sparc__)
|
||||
#include "SDL_revision-sparc.h"
|
||||
#elif defined(__aarch64__)
|
||||
#include "SDL_revision-aarch64.h"
|
||||
#elif defined(__mips64) && defined(__MIPSEL__)
|
||||
#include "SDL_revision-mips64el.h"
|
||||
#elif defined(__mips64)
|
||||
#include "SDL_revision-mips64.h"
|
||||
#elif defined(__mips) && defined(__MIPSEL__)
|
||||
#include "SDL_revision-mipsel.h"
|
||||
#elif defined(__mips)
|
||||
#include "SDL_revision-mips.h"
|
||||
#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64
|
||||
#include "SDL_revision-riscv64.h"
|
||||
#else
|
||||
#error "The SDL2-devel package is not usable with the architecture."
|
||||
#endif
|
||||
|
||||
#undef SDL_revision_wrapper_h
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
From 85138c1ec673e05263ae666baf61f79384daf7e0 Mon Sep 17 00:00:00 2001
|
||||
From: Sam Lantinga <slouken@libsdl.org>
|
||||
Date: Tue, 30 Jul 2019 11:00:00 -0700
|
||||
Subject: Fixed bug 4538 - validate image size when loading BMP files
|
||||
|
||||
|
||||
diff --git a/src/video/SDL_bmp.c b/src/video/SDL_bmp.c
|
||||
index 0b68918cc..a06b0c94c 100644
|
||||
--- a/src/video/SDL_bmp.c
|
||||
+++ b/src/video/SDL_bmp.c
|
||||
@@ -226,6 +226,11 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
|
||||
SDL_RWseek(src, (biSize - headerSize), RW_SEEK_CUR);
|
||||
}
|
||||
}
|
||||
+ if (biWidth <= 0 || biHeight == 0) {
|
||||
+ SDL_SetError("BMP file with bad dimensions (%dx%d)", biWidth, biHeight);
|
||||
+ was_error = SDL_TRUE;
|
||||
+ goto done;
|
||||
+ }
|
||||
if (biHeight < 0) {
|
||||
topDown = SDL_TRUE;
|
||||
biHeight = -biHeight;
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
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 <KHR/khrplatform.h>
|
||||
+typedef khronos_intptr_t GLintptr;
|
||||
+typedef khronos_ssize_t GLsizeiptr;
|
||||
#endif
|
||||
#define GL_BUFFER_SIZE 0x8764
|
||||
#define GL_BUFFER_USAGE 0x8765
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||
|
|
@ -1,15 +1,16 @@
|
|||
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@
|
||||
diff --git a/sdl2-config.in b/sdl2-config.in
|
||||
index f6eca7668..93460f7ae 100644
|
||||
--- a/sdl2-config.in
|
||||
+++ b/sdl2-config.in
|
||||
@@ -7,7 +7,6 @@ bindir=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)")
|
||||
prefix=$(cd -P -- "$bindir/@bin_prefix_relpath@" && printf '%s\n' "$(pwd -P)")
|
||||
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 @@
|
||||
@@ -49,12 +48,11 @@ while test $# -gt 0; do
|
||||
echo -I@includedir@/SDL2 @SDL_CFLAGS@
|
||||
;;
|
||||
@ENABLE_SHARED_TRUE@ --libs)
|
||||
|
|
@ -18,8 +19,9 @@ diff -uNr SDL2-2.0.0.orig/sdl2-config.in SDL2-2.0.0/sdl2-config.in
|
|||
@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@ sdl_static_libs=$(echo "@SDL_LIBS@ @SDL_STATIC_LIBS@" | sed -E "s#-lSDL2[ $]#$libdir/libSDL2.a #g")
|
||||
-@ENABLE_STATIC_TRUE@ echo -L@libdir@ $sdl_static_libs
|
||||
+@ENABLE_STATIC_TRUE@ echo @SDL_LIBS@ @SDL_STATIC_LIBS@
|
||||
@ENABLE_STATIC_TRUE@ ;;
|
||||
*)
|
||||
echo "${usage}" 1>&2
|
||||
Loading…
Reference in New Issue