From ed3740b827d0173b48ddaf3af3b6695fa0d16f47 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 15:51:48 +0000 Subject: import SDL-1.2.15-14.el7 --- diff --git a/SOURCES/SDL-1.2.15-no-default-backing-store.patch b/SOURCES/SDL-1.2.15-no-default-backing-store.patch new file mode 100644 index 0000000..4d5209d --- /dev/null +++ b/SOURCES/SDL-1.2.15-no-default-backing-store.patch @@ -0,0 +1,24 @@ +Do not harness backing store by default + +xorg-server 1.15 enables backing store if composite extension is enabled +(default settings). Harnessing backing store through compositor leads to +tearing effect. + +This patch reverts default harnessing backing store to conditional use if +SDL_VIDEO_X11_BACKINGSTORE environment variable exists. + + + + +diff -up SDL-1.2.15/src/video/x11/SDL_x11video.c.jx SDL-1.2.15/src/video/x11/SDL_x11video.c +--- SDL-1.2.15/src/video/x11/SDL_x11video.c.jx 2012-01-19 01:30:06.000000000 -0500 ++++ SDL-1.2.15/src/video/x11/SDL_x11video.c 2014-03-04 14:39:34.691545549 -0500 +@@ -1088,7 +1088,7 @@ static int X11_CreateWindow(_THIS, SDL_S + } + } + +-#if 0 /* This is an experiment - are the graphics faster now? - nope. */ ++#if 1 /* This is an experiment - are the graphics faster now? - nope. */ + if ( SDL_getenv("SDL_VIDEO_X11_BACKINGSTORE") ) + #endif + /* Cache the window in the server, when possible */ diff --git a/SOURCES/SDL_config.h b/SOURCES/SDL_config.h index 109f879..1f75138 100644 --- a/SOURCES/SDL_config.h +++ b/SOURCES/SDL_config.h @@ -40,7 +40,11 @@ #elif defined(__ia64__) #include "SDL_config-ia64.h" #elif defined(__powerpc64__) +#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ #include "SDL_config-ppc64.h" +#else +#include "SDL_config-ppc64le.h" +#endif #elif defined(__powerpc__) #include "SDL_config-ppc.h" #elif defined(__s390x__) diff --git a/SPECS/SDL.spec b/SPECS/SDL.spec index 03203f3..aa8952b 100644 --- a/SPECS/SDL.spec +++ b/SPECS/SDL.spec @@ -1,6 +1,6 @@ Name: SDL Version: 1.2.15 -Release: 11%{?dist} +Release: 14%{?dist} Summary: A cross-platform multimedia library Group: System Environment/Libraries URL: http://www.libsdl.org/ @@ -22,6 +22,9 @@ Patch2: SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch Patch3: SDL-1.2.15-const_XData32.patch # sdl-config(1) manual from Debian, rh948864 Patch4: SDL-1.2.15-add_sdl_config_man.patch +# Do not use backing store by default, sdl2383, rh1073057, rh1245417 +# rejected by upstream +Patch5: SDL-1.2.15-no-default-backing-store.patch BuildRequires: alsa-lib-devel BuildRequires: audiofile-devel @@ -80,6 +83,7 @@ applications. %patch2 -p1 -b .gamma %patch3 -p1 -b .XData32 %patch4 -p1 -b .sdl_config_man +%patch5 -p1 -b .backing_store for F in CREDITS; do iconv -f iso8859-1 -t utf-8 < "$F" > "${F}.utf" touch --reference "$F" "${F}.utf" @@ -140,6 +144,15 @@ rm -f %{buildroot}%{_libdir}/*.la %{_libdir}/lib*.a %changelog +* Wed Jul 29 2015 Petr Pisar - 1.2.15-14 +- Do not harness backing store by default. Export SDL_VIDEO_X11_BACKINGSTORE + environment variable to enable it. +- Resolves: rhbz#1245417 + +* Tue Jun 10 2014 Petr Pisar - 1.2.15-13 +- Add support for ppc64le architecture (bug #1119370) +- bump version to match changelog + * Fri Jan 24 2014 Daniel Mach - 1.2.15-11 - Mass rebuild 2014-01-24