[arch-commits] Commit in sdl/repos/community-x86_64 (10 files)
Jan Steffens
heftig at gemini.archlinux.org
Sat Dec 25 00:56:22 UTC 2021
Date: Saturday, December 25, 2021 @ 00:56:22
Author: heftig
Revision: 1083524
archrelease: copy trunk to community-x86_64
Added:
sdl/repos/community-x86_64/0001-SDL-1.2.15-no-default-backing-store.patch
(from rev 1083523, sdl/trunk/0001-SDL-1.2.15-no-default-backing-store.patch)
sdl/repos/community-x86_64/0002-x11-Bypass-SetGammaRamp-when-changing-gamma.patch
(from rev 1083523, sdl/trunk/0002-x11-Bypass-SetGammaRamp-when-changing-gamma.patch)
sdl/repos/community-x86_64/0003-sdl-1.2.14-fix-mouse-clicking.patch
(from rev 1083523, sdl/trunk/0003-sdl-1.2.14-fix-mouse-clicking.patch)
sdl/repos/community-x86_64/0004-sdl-1.2.14-disable-mmx.patch
(from rev 1083523, sdl/trunk/0004-sdl-1.2.14-disable-mmx.patch)
sdl/repos/community-x86_64/PKGBUILD
(from rev 1083523, sdl/trunk/PKGBUILD)
Deleted:
sdl/repos/community-x86_64/0001-SDL-1.2.15-no-default-backing-store.patch
sdl/repos/community-x86_64/0002-x11-Bypass-SetGammaRamp-when-changing-gamma.patch
sdl/repos/community-x86_64/0003-sdl-1.2.14-fix-mouse-clicking.patch
sdl/repos/community-x86_64/0004-sdl-1.2.14-disable-mmx.patch
sdl/repos/community-x86_64/PKGBUILD
--------------------------------------------------------+
0001-SDL-1.2.15-no-default-backing-store.patch | 66 ++++----
0002-x11-Bypass-SetGammaRamp-when-changing-gamma.patch | 82 +++++-----
0003-sdl-1.2.14-fix-mouse-clicking.patch | 68 ++++----
0004-sdl-1.2.14-disable-mmx.patch | 46 ++---
PKGBUILD | 120 +++++++--------
5 files changed, 192 insertions(+), 190 deletions(-)
Deleted: 0001-SDL-1.2.15-no-default-backing-store.patch
===================================================================
--- 0001-SDL-1.2.15-no-default-backing-store.patch 2021-12-25 00:48:20 UTC (rev 1083523)
+++ 0001-SDL-1.2.15-no-default-backing-store.patch 2021-12-25 00:56:22 UTC (rev 1083524)
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 31 Aug 2021 22:40:44 +0000
-Subject: [PATCH] SDL-1.2.15-no-default-backing-store
-
-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.
-
-<https://bugzilla.libsdl.org/show_bug.cgi?id=2383>
-<https://bugzilla.redhat.com/show_bug.cgi?id=1073057>
----
- src/video/x11/SDL_x11video.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/video/x11/SDL_x11video.c b/src/video/x11/SDL_x11video.c
-index bbf0d5d0..c365e7a2 100644
---- a/src/video/x11/SDL_x11video.c
-+++ b/src/video/x11/SDL_x11video.c
-@@ -1093,7 +1093,7 @@ static int X11_CreateWindow(_THIS, SDL_Surface *screen,
- }
- }
-
--#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 */
Copied: sdl/repos/community-x86_64/0001-SDL-1.2.15-no-default-backing-store.patch (from rev 1083523, sdl/trunk/0001-SDL-1.2.15-no-default-backing-store.patch)
===================================================================
--- 0001-SDL-1.2.15-no-default-backing-store.patch (rev 0)
+++ 0001-SDL-1.2.15-no-default-backing-store.patch 2021-12-25 00:56:22 UTC (rev 1083524)
@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 31 Aug 2021 22:40:44 +0000
+Subject: [PATCH] SDL-1.2.15-no-default-backing-store
+
+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.
+
+<https://bugzilla.libsdl.org/show_bug.cgi?id=2383>
+<https://bugzilla.redhat.com/show_bug.cgi?id=1073057>
+---
+ src/video/x11/SDL_x11video.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/video/x11/SDL_x11video.c b/src/video/x11/SDL_x11video.c
+index bbf0d5d0ffc9..c365e7a2ab72 100644
+--- a/src/video/x11/SDL_x11video.c
++++ b/src/video/x11/SDL_x11video.c
+@@ -1093,7 +1093,7 @@ static int X11_CreateWindow(_THIS, SDL_Surface *screen,
+ }
+ }
+
+-#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 */
Deleted: 0002-x11-Bypass-SetGammaRamp-when-changing-gamma.patch
===================================================================
--- 0002-x11-Bypass-SetGammaRamp-when-changing-gamma.patch 2021-12-25 00:48:20 UTC (rev 1083523)
+++ 0002-x11-Bypass-SetGammaRamp-when-changing-gamma.patch 2021-12-25 00:56:22 UTC (rev 1083524)
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar at atlas.cz>
-Date: Tue, 1 Jan 2013 21:25:15 +0100
-Subject: [PATCH] x11: Bypass SetGammaRamp when changing gamma
-
-Recent Xorg has broken dynamic colors setting, so calling SDL_SetGamme()
-does not have any effect here. Recent means xorg-server >= 1.7, since 2010.
-See <https://bugs.freedesktop.org/show_bug.cgi?id=27222>.
----
- src/video/SDL_gamma.c | 15 ++-------------
- 1 file changed, 2 insertions(+), 13 deletions(-)
-
-diff --git a/src/video/SDL_gamma.c b/src/video/SDL_gamma.c
-index 4fd03701..464ab882 100644
---- a/src/video/SDL_gamma.c
-+++ b/src/video/SDL_gamma.c
-@@ -92,22 +92,11 @@ static void CalculateGammaFromRamp(float *gamma, Uint16 *ramp)
-
- int SDL_SetGamma(float red, float green, float blue)
- {
-- int succeeded;
-+ int succeeded = -1;
- SDL_VideoDevice *video = current_video;
- SDL_VideoDevice *this = current_video;
-
-- succeeded = -1;
-- /* Prefer using SetGammaRamp(), as it's more flexible */
-- {
-- Uint16 ramp[3][256];
--
-- CalculateGammaRamp(red, ramp[0]);
-- CalculateGammaRamp(green, ramp[1]);
-- CalculateGammaRamp(blue, ramp[2]);
-- succeeded = SDL_SetGammaRamp(ramp[0], ramp[1], ramp[2]);
-- }
-- if ( (succeeded < 0) && video->SetGamma ) {
-- SDL_ClearError();
-+ if ( video->SetGamma ) {
- succeeded = video->SetGamma(this, red, green, blue);
- }
- return succeeded;
Copied: sdl/repos/community-x86_64/0002-x11-Bypass-SetGammaRamp-when-changing-gamma.patch (from rev 1083523, sdl/trunk/0002-x11-Bypass-SetGammaRamp-when-changing-gamma.patch)
===================================================================
--- 0002-x11-Bypass-SetGammaRamp-when-changing-gamma.patch (rev 0)
+++ 0002-x11-Bypass-SetGammaRamp-when-changing-gamma.patch 2021-12-25 00:56:22 UTC (rev 1083524)
@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar at atlas.cz>
+Date: Tue, 1 Jan 2013 21:25:15 +0100
+Subject: [PATCH] x11: Bypass SetGammaRamp when changing gamma
+
+Recent Xorg has broken dynamic colors setting, so calling SDL_SetGamme()
+does not have any effect here. Recent means xorg-server >= 1.7, since 2010.
+See <https://bugs.freedesktop.org/show_bug.cgi?id=27222>.
+---
+ src/video/SDL_gamma.c | 15 ++-------------
+ 1 file changed, 2 insertions(+), 13 deletions(-)
+
+diff --git a/src/video/SDL_gamma.c b/src/video/SDL_gamma.c
+index 4fd037019f3a..464ab8827d62 100644
+--- a/src/video/SDL_gamma.c
++++ b/src/video/SDL_gamma.c
+@@ -92,22 +92,11 @@ static void CalculateGammaFromRamp(float *gamma, Uint16 *ramp)
+
+ int SDL_SetGamma(float red, float green, float blue)
+ {
+- int succeeded;
++ int succeeded = -1;
+ SDL_VideoDevice *video = current_video;
+ SDL_VideoDevice *this = current_video;
+
+- succeeded = -1;
+- /* Prefer using SetGammaRamp(), as it's more flexible */
+- {
+- Uint16 ramp[3][256];
+-
+- CalculateGammaRamp(red, ramp[0]);
+- CalculateGammaRamp(green, ramp[1]);
+- CalculateGammaRamp(blue, ramp[2]);
+- succeeded = SDL_SetGammaRamp(ramp[0], ramp[1], ramp[2]);
+- }
+- if ( (succeeded < 0) && video->SetGamma ) {
+- SDL_ClearError();
++ if ( video->SetGamma ) {
+ succeeded = video->SetGamma(this, red, green, blue);
+ }
+ return succeeded;
Deleted: 0003-sdl-1.2.14-fix-mouse-clicking.patch
===================================================================
--- 0003-sdl-1.2.14-fix-mouse-clicking.patch 2021-12-25 00:48:20 UTC (rev 1083523)
+++ 0003-sdl-1.2.14-fix-mouse-clicking.patch 2021-12-25 00:56:22 UTC (rev 1083524)
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 31 Aug 2021 22:41:53 +0000
-Subject: [PATCH] sdl-1.2.14-fix-mouse-clicking
-
----
- src/video/x11/SDL_x11events.c | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c
-index be19a69a..9f13b464 100644
---- a/src/video/x11/SDL_x11events.c
-+++ b/src/video/x11/SDL_x11events.c
-@@ -451,12 +451,15 @@ printf("Mode: NotifyGrab\n");
- if ( xevent.xcrossing.mode == NotifyUngrab )
- printf("Mode: NotifyUngrab\n");
- #endif
-- if ( this->input_grab == SDL_GRAB_OFF ) {
-- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-+ if ( (xevent.xcrossing.mode != NotifyGrab) &&
-+ (xevent.xcrossing.mode != NotifyUngrab) ) {
-+ if ( this->input_grab == SDL_GRAB_OFF ) {
-+ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-+ }
-+ posted = SDL_PrivateMouseMotion(0, 0,
-+ xevent.xcrossing.x,
-+ xevent.xcrossing.y);
- }
-- posted = SDL_PrivateMouseMotion(0, 0,
-- xevent.xcrossing.x,
-- xevent.xcrossing.y);
- }
- break;
-
Copied: sdl/repos/community-x86_64/0003-sdl-1.2.14-fix-mouse-clicking.patch (from rev 1083523, sdl/trunk/0003-sdl-1.2.14-fix-mouse-clicking.patch)
===================================================================
--- 0003-sdl-1.2.14-fix-mouse-clicking.patch (rev 0)
+++ 0003-sdl-1.2.14-fix-mouse-clicking.patch 2021-12-25 00:56:22 UTC (rev 1083524)
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 31 Aug 2021 22:41:53 +0000
+Subject: [PATCH] sdl-1.2.14-fix-mouse-clicking
+
+---
+ src/video/x11/SDL_x11events.c | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c
+index be19a69a8b81..9f13b4640c3e 100644
+--- a/src/video/x11/SDL_x11events.c
++++ b/src/video/x11/SDL_x11events.c
+@@ -451,12 +451,15 @@ printf("Mode: NotifyGrab\n");
+ if ( xevent.xcrossing.mode == NotifyUngrab )
+ printf("Mode: NotifyUngrab\n");
+ #endif
+- if ( this->input_grab == SDL_GRAB_OFF ) {
+- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
++ if ( (xevent.xcrossing.mode != NotifyGrab) &&
++ (xevent.xcrossing.mode != NotifyUngrab) ) {
++ if ( this->input_grab == SDL_GRAB_OFF ) {
++ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
++ }
++ posted = SDL_PrivateMouseMotion(0, 0,
++ xevent.xcrossing.x,
++ xevent.xcrossing.y);
+ }
+- posted = SDL_PrivateMouseMotion(0, 0,
+- xevent.xcrossing.x,
+- xevent.xcrossing.y);
+ }
+ break;
+
Deleted: 0004-sdl-1.2.14-disable-mmx.patch
===================================================================
--- 0004-sdl-1.2.14-disable-mmx.patch 2021-12-25 00:48:20 UTC (rev 1083523)
+++ 0004-sdl-1.2.14-disable-mmx.patch 2021-12-25 00:56:22 UTC (rev 1083524)
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 31 Aug 2021 22:42:24 +0000
-Subject: [PATCH] sdl-1.2.14-disable-mmx
-
-and another one from FS#26020
----
- src/video/SDL_yuv_sw.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/video/SDL_yuv_sw.c b/src/video/SDL_yuv_sw.c
-index c555ce06..86f436b1 100644
---- a/src/video/SDL_yuv_sw.c
-+++ b/src/video/SDL_yuv_sw.c
-@@ -89,6 +89,8 @@
- #include "SDL_yuvfuncs.h"
- #include "SDL_yuv_sw_c.h"
-
-+#undef __OPTIMIZE__
-+
- /* The functions used to manipulate software video overlays */
- static struct private_yuvhwfuncs sw_yuvfuncs = {
- SDL_LockYUV_SW,
Copied: sdl/repos/community-x86_64/0004-sdl-1.2.14-disable-mmx.patch (from rev 1083523, sdl/trunk/0004-sdl-1.2.14-disable-mmx.patch)
===================================================================
--- 0004-sdl-1.2.14-disable-mmx.patch (rev 0)
+++ 0004-sdl-1.2.14-disable-mmx.patch 2021-12-25 00:56:22 UTC (rev 1083524)
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 31 Aug 2021 22:42:24 +0000
+Subject: [PATCH] sdl-1.2.14-disable-mmx
+
+and another one from FS#26020
+---
+ src/video/SDL_yuv_sw.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/video/SDL_yuv_sw.c b/src/video/SDL_yuv_sw.c
+index c555ce06c261..86f436b1b371 100644
+--- a/src/video/SDL_yuv_sw.c
++++ b/src/video/SDL_yuv_sw.c
+@@ -89,6 +89,8 @@
+ #include "SDL_yuvfuncs.h"
+ #include "SDL_yuv_sw_c.h"
+
++#undef __OPTIMIZE__
++
+ /* The functions used to manipulate software video overlays */
+ static struct private_yuvhwfuncs sw_yuvfuncs = {
+ SDL_LockYUV_SW,
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-25 00:48:20 UTC (rev 1083523)
+++ PKGBUILD 2021-12-25 00:56:22 UTC (rev 1083524)
@@ -1,59 +0,0 @@
-# Contributor: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=sdl
-pkgver=1.2.15+387+gfbfcca32
-pkgrel=1
-pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
-arch=('x86_64')
-url="https://www.libsdl.org"
-license=('LGPL')
-depends=('glibc' 'libxext' 'libxrender' 'libx11')
-makedepends=('alsa-lib' 'mesa' 'libpulse' 'glu' 'git')
-optdepends=('alsa-lib: ALSA audio driver'
- 'libpulse: PulseAudio audio driver')
-options=('staticlibs')
-_commit=fbfcca3277a5f13dd78f7d44ffe2dc65d4e2d048 # main
-source=("git+https://github.com/libsdl-org/SDL-1.2#commit=$_commit"
- 0001-SDL-1.2.15-no-default-backing-store.patch
- 0002-x11-Bypass-SetGammaRamp-when-changing-gamma.patch
- 0003-sdl-1.2.14-fix-mouse-clicking.patch
- 0004-sdl-1.2.14-disable-mmx.patch)
-sha256sums=('SKIP'
- 'b242b28ab9b2d823d96f0939c6fb2fbaabb110b9e61be754f6cf502a34d57a2f'
- '0a5d00c1f75158b1838706a0733a51c8c1014983528bafb4a477327f7595e135'
- '70e339886440f94f03a320c4b8605a2704f3e3117aa9e998f32b0cebc3e4bc59'
- 'a99bb91981e091bb01bbedf5138008ef16155c9a6b24349a771555c9bb57fdcd')
-validpgpkeys=('1528635D8053A57F77D1E08630A59377A7763BE6') # Sam Lantinga <slouken at libsdl.org>
-
-pkgver() {
- cd SDL-1.2
- git describe --tags | sed 's/^release-//;s/-/+/g'
-}
-
-prepare() {
- cd SDL-1.2
-
- git apply -3 ../0001-SDL-1.2.15-no-default-backing-store.patch
-
- # https://bugs.freedesktop.org/show_bug.cgi?id=27222
- git apply -3 ../0002-x11-Bypass-SetGammaRamp-when-changing-gamma.patch
-
- git apply -3 ../0003-sdl-1.2.14-fix-mouse-clicking.patch
- git apply -3 ../0004-sdl-1.2.14-disable-mmx.patch
-
- ./autogen.sh
-}
-
-build() {
- cd SDL-1.2
- ./configure --prefix=/usr --disable-nasm --enable-alsa \
- --with-x --disable-rpath --disable-static
- make
-}
-
-package() {
- cd SDL-1.2
- make DESTDIR="$pkgdir" install
-}
Copied: sdl/repos/community-x86_64/PKGBUILD (from rev 1083523, sdl/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-25 00:56:22 UTC (rev 1083524)
@@ -0,0 +1,61 @@
+# Contributor: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=sdl
+pkgver=1.2.15+r406+gf1caf909
+pkgrel=1
+epoch=1
+pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
+arch=('x86_64')
+url="https://www.libsdl.org"
+license=('LGPL')
+depends=('glibc' 'libxext' 'libxrender' 'libx11')
+makedepends=('alsa-lib' 'mesa' 'libpulse' 'glu' 'git')
+optdepends=('alsa-lib: ALSA audio driver'
+ 'libpulse: PulseAudio audio driver')
+options=('staticlibs')
+_commit=f1caf90987baf134acdfa6fc29d0b684b00c4989 # main
+source=("git+https://github.com/libsdl-org/SDL-1.2#commit=$_commit"
+ 0001-SDL-1.2.15-no-default-backing-store.patch
+ 0002-x11-Bypass-SetGammaRamp-when-changing-gamma.patch
+ 0003-sdl-1.2.14-fix-mouse-clicking.patch
+ 0004-sdl-1.2.14-disable-mmx.patch)
+sha256sums=('SKIP'
+ '658a3467f285201431a274339bd5b35a15c6b12156d8b19b21d66546ab8512bc'
+ '786c55a1e2c3bd5d68d5649d6f4325ec22109ea3453e73d8d173966798a36538'
+ 'c2be5af8e1fe36d3771972de4575d30b48372bb94f53433a3ae8cff030d1724d'
+ '62275b1b2f8e79d5f12126a79994733dcd13d62954391fcdf93c76f35fde55a0')
+validpgpkeys=('1528635D8053A57F77D1E08630A59377A7763BE6') # Sam Lantinga <slouken at libsdl.org>
+
+pkgver() {
+ cd SDL-1.2
+ git describe --tags | sed 's/^release-//;s/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd SDL-1.2
+
+ git apply -3 ../0001-SDL-1.2.15-no-default-backing-store.patch
+
+ # https://bugs.freedesktop.org/show_bug.cgi?id=27222
+ git apply -3 ../0002-x11-Bypass-SetGammaRamp-when-changing-gamma.patch
+
+ git apply -3 ../0003-sdl-1.2.14-fix-mouse-clicking.patch
+ git apply -3 ../0004-sdl-1.2.14-disable-mmx.patch
+
+ ./autogen.sh
+}
+
+build() {
+ cd SDL-1.2
+ CFLAGS+=' -ffat-lto-objects'
+ ./configure --prefix=/usr --disable-nasm --enable-alsa \
+ --with-x --disable-rpath --disable-static
+ make
+}
+
+package() {
+ cd SDL-1.2
+ make DESTDIR="$pkgdir" install
+}
More information about the arch-commits
mailing list