[arch-commits] Commit in sdl/trunk (PKGBUILD)

2020-05-19 Thread Evangelos Foutras via arch-commits 
Date: Tuesday, May 19, 2020 @ 09:34:35
  Author: foutrelis
Revision: 386561

upgpkg: sdl 1.2.15-14: reproducibility rebuild

Modified:
  sdl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-19 09:33:33 UTC (rev 386560)
+++ PKGBUILD2020-05-19 09:34:35 UTC (rev 386561)
@@ -4,7 +4,7 @@
 
 pkgname=sdl
 pkgver=1.2.15
-pkgrel=13
+pkgrel=14
 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;

[arch-commits] Commit in sdl/trunk (PKGBUILD)

2019-10-06 Thread Laurent Carlier via arch-commits 
Date: Sunday, October 6, 2019 @ 14:16:36
  Author: lcarlier
Revision: 363939

upgpkg: sdl 1.2.15-13

add missing package sourcecode signature

Modified:
  sdl/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-06 14:11:23 UTC (rev 363938)
+++ PKGBUILD2019-10-06 14:16:36 UTC (rev 363939)
@@ -4,7 +4,7 @@
 
 pkgname=sdl
 pkgver=1.2.15
-pkgrel=11
+pkgrel=13
 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;
@@ -14,7 +14,7 @@
 optdepends=('alsa-lib: ALSA audio driver'
 'libpulse: PulseAudio audio driver')
 options=('staticlibs')
-source=(https://www.libsdl.org/release/SDL-${pkgver}.tar.gz
+source=(https://www.libsdl.org/release/SDL-${pkgver}.tar.gz{,.sig}
 SDL-1.2.10-GrabNotViewable.patch
 SDL-1.2.15-SDL_EnableUNICODE_drops_keyboard_events.patch
 SDL-1.2.15-const_XData32.patch
@@ -39,6 +39,7 @@
SDL-1.2.15-CVE-2019-7638-CVE-2019-7636-Refuse-loading-BMP-image.patch
SDL-1.2.15-Reject-2-3-5-6-7-bpp-BMP-images.patch)
 sha256sums=('d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00'
+'SKIP'
 'ea2042b8a45a083b1447d5c56e52b23b79f2ddb0d717ec7b287b34ef71bd2d1a'
 '292046466d52a2ebe995a0121404864e4ee0de2b6024203acb95bbd600844da0'
 'bab60b515a74b71650ee71d5a0075c77046a7bad48b061673c3798dbdd35446d'
@@ -62,6 +63,7 @@
 '3624f0dbe8d9bd3d553a25806237edcae5fafe714e5c4da3c5e3b281a3fbc8ae'
 '7db8112826318de5705b54cf493060cec34e2822df2b1cd9f55891672beed64d'
 'da87eb71c7af042bc8379f9f7cd63e57d99429774bb43524dde103718b99c533')
+validpgpkeys=('1528635D8053A57F77D1E08630A59377A7763BE6') # Sam Lantinga 

 
 prepare() {
   cd SDL-$pkgver

[arch-commits] Commit in sdl/trunk (PKGBUILD)

2018-11-09 Thread Felix Yan via arch-commits 
Date: Friday, November 9, 2018 @ 23:10:37
  Author: felixonmars
Revision: 338752

PIE/BUILDINFO rebuild

Modified:
  sdl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-09 23:09:58 UTC (rev 338751)
+++ PKGBUILD2018-11-09 23:10:37 UTC (rev 338752)
@@ -4,7 +4,7 @@
 
 pkgname=sdl
 pkgver=1.2.15
-pkgrel=9
+pkgrel=10
 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;

[arch-commits] Commit in sdl/trunk (PKGBUILD)

2017-07-11 Thread Jan Steffens 
Date: Tuesday, July 11, 2017 @ 20:47:11
  Author: heftig
Revision: 300127

1.2.15-9

Modified:
  sdl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-11 20:45:39 UTC (rev 300126)
+++ PKGBUILD2017-07-11 20:47:11 UTC (rev 300127)
@@ -5,7 +5,7 @@
 
 pkgname=sdl
 pkgver=1.2.15
-pkgrel=8
+pkgrel=9
 pkgdesc="A library for portable low-level access to a video framebuffer, audio 
output, mouse, and keyboard"
 arch=('i686' 'x86_64')
 url="https://www.libsdl.org;

[arch-commits] Commit in sdl/trunk (PKGBUILD)

2017-03-30 Thread Jan Steffens 
Date: Thursday, March 30, 2017 @ 20:59:20
  Author: heftig
Revision: 291910

1.2.15-8

Modified:
  sdl/trunk/PKGBUILD

--+
 PKGBUILD |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-30 20:56:48 UTC (rev 291909)
+++ PKGBUILD2017-03-30 20:59:20 UTC (rev 291910)
@@ -5,10 +5,10 @@
 
 pkgname=sdl
 pkgver=1.2.15
-pkgrel=7
+pkgrel=8
 pkgdesc="A library for portable low-level access to a video framebuffer, audio 
output, mouse, and keyboard"
 arch=('i686' 'x86_64')
-url="http://www.libsdl.org;
+url="https://www.libsdl.org;
 license=('LGPL')
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
 makedepends=('alsa-lib' 'mesa' 'libpulse' 'glu')
@@ -15,7 +15,7 @@
 optdepends=('alsa-lib: ALSA audio driver'
 'libpulse: PulseAudio audio driver')
 options=('staticlibs')
-source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
+source=(https://www.libsdl.org/release/SDL-${pkgver}.tar.gz
 SDL-1.2.10-GrabNotViewable.patch
 SDL-1.2.15-SDL_EnableUNICODE_drops_keyboard_events.patch
 SDL-1.2.15-const_XData32.patch
@@ -26,17 +26,17 @@
 sdl-1.2.14-disable-mmx.patch
 libsdl-1.2.15-resizing.patch
 X11_KeyToUnicode.patch)
-md5sums=('9d96df8417572a2afb781a7c4c811a85'
- '37ad001a4d2ff924a5fab356b49f8a78'
- '8d5a61a0adf1a302695a30141f402712'
- 'd6a1bfa054507f281338626e5f12d74b'
- 'e382e5b7449e95969c5ba4084b0aab39'
- '1b0578c76453813eb4eaf0125ce242db'
- '321377e38e2db7f1baf43c392e165dd5'
- '04d8c179f125e04bcd4c9d60e013c2d7'
- 'e5c16b7611f62c7cb25f0534eff68852'
- '3dd50347d8856160a9cbd7f80383a1f8'
- 'edea272dff4698470877c016d818918d')
+sha256sums=('d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00'
+'ea2042b8a45a083b1447d5c56e52b23b79f2ddb0d717ec7b287b34ef71bd2d1a'
+'292046466d52a2ebe995a0121404864e4ee0de2b6024203acb95bbd600844da0'
+'bab60b515a74b71650ee71d5a0075c77046a7bad48b061673c3798dbdd35446d'
+'7586d6124d5452ad721ca6aa10eae09946d94854748e22f9c9c6fdca3d0aeb12'
+'3941c44a5580df95c6868936cfc57ba3e7b6952fb8a3eb14f963d54d9d8ca8a4'
+'d296af5bb0d9856d049b4e5adb9dd995d2a1e51d76a6adf63457e65101a50620'
+'8d178f13eb707e81f5f9d86bf7b609ae8f0bac937fb4a37ebcbf4bbc9b89e21b'
+'17bb880dd2cb4922d4e3771d146660b9da8be8f1629a5cdaae7523d4a9d2bd7c'
+'5160fb1c07b04480d98d45b89a0aa6e577f2ac4c3bace0c80b251e6aca1fb4a1'
+'b1ad9c60829b166e6b647006d6549ea657155e755cf574fcfc4b91b658654769')
 
 prepare() {
   cd SDL-$pkgver

[arch-commits] Commit in sdl/trunk (PKGBUILD X11_KeyToUnicode.patch)

2014-05-10 Thread Jan Steffens 
Date: Saturday, May 10, 2014 @ 23:41:06
  Author: heftig
Revision: 212210

FS#40292 missing symbol

Added:
  sdl/trunk/X11_KeyToUnicode.patch
Modified:
  sdl/trunk/PKGBUILD

+
 PKGBUILD   |9 +---
 X11_KeyToUnicode.patch |   52 +++
 2 files changed, 58 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-10 21:03:53 UTC (rev 212209)
+++ PKGBUILD2014-05-10 21:41:06 UTC (rev 212210)
@@ -5,7 +5,7 @@
 
 pkgname=sdl
 pkgver=1.2.15
-pkgrel=5
+pkgrel=6
 pkgdesc=A library for portable low-level access to a video framebuffer, audio 
output, mouse, and keyboard
 arch=('i686' 'x86_64')
 url=http://www.libsdl.org;
@@ -20,13 +20,15 @@
 sdl-1.2.14-disable-mmx.patch
 fix_joystick_misc_axes.diff
 libsdl-1.2.15-resizing.patch
-sdl_x11sym.patch)
+sdl_x11sym.patch
+X11_KeyToUnicode.patch)
 md5sums=('9d96df8417572a2afb781a7c4c811a85'
  '04d8c179f125e04bcd4c9d60e013c2d7'
  'e5c16b7611f62c7cb25f0534eff68852'
  '687586a108b597a2a6b73070c1d37e51'
  '3dd50347d8856160a9cbd7f80383a1f8'
- '148b285bccee9d21bb96db807363b962')
+ '148b285bccee9d21bb96db807363b962'
+ 'edea272dff4698470877c016d818918d')
 
 prepare() {
   cd SDL-$pkgver
@@ -35,6 +37,7 @@
   patch -Np1 -i ../fix_joystick_misc_axes.diff
   patch -Np1 -i ../libsdl-1.2.15-resizing.patch
   patch -Np0 -i ../sdl_x11sym.patch
+  patch -Np1 -i ../X11_KeyToUnicode.patch
 }
 
 build() {

Added: X11_KeyToUnicode.patch
===
--- X11_KeyToUnicode.patch  (rev 0)
+++ X11_KeyToUnicode.patch  2014-05-10 21:41:06 UTC (rev 212210)
@@ -0,0 +1,52 @@
+
+# HG changeset patch
+# User Sam Lantinga slou...@libsdl.org
+# Date 1327258041 18000
+# Node ID 900a0fae90ca65cff55a70a17b9ec39d2ddccbcf
+# Parent  5273dfd19a5e8c5736a0d417bd441f704c5355f8
+Fixed bug 1390 - X11_KeyToUnicode
+
+manuel.montezelo 2012-01-22 08:56:18 PST
+
+We had the following bug report at Debian:
+http://bugs.debian.org/376560
+
+Same one in Ubuntu:
+https://bugs.launchpad.net/ubuntu/+source/libsdl1.2/+bug/66217
+
+We've been including a patch since then (attached) to actually export the
+symbol, since 2006.  In the last release the function seems to be there, alive
+and kicking.
+
+It's affecting other people too:
+http://www.garagegames.com/community/forums/viewthread/52287
+
+diff -r 5273dfd19a5e -r 900a0fae90ca src/video/x11/SDL_x11events.c
+--- a/src/video/x11/SDL_x11events.cSat Jan 21 12:06:51 2012 -0500
 b/src/video/x11/SDL_x11events.cSun Jan 22 13:47:21 2012 -0500
+@@ -1246,8 +1246,11 @@
+  * sequences (dead accents, compose key sequences) will not work since the
+  * state has been irrevocably lost.
+  */
++extern DECLSPEC Uint16 SDLCALL X11_KeyToUnicode(SDLKey, SDLMod);
++
+ Uint16 X11_KeyToUnicode(SDLKey keysym, SDLMod modifiers)
+ {
++  static int warning = 0;
+   struct SDL_VideoDevice *this = current_video;
+   char keybuf[32];
+   int i;
+@@ -1255,6 +1258,12 @@
+   XKeyEvent xkey;
+   Uint16 unicode;
+ 
++  if ( warning ) {
++  warning = 0;
++  fprintf(stderr, WARNING: Application is using 
X11_KeyToUnicode().\n);
++  fprintf(stderr, This is not an official SDL function, please 
report this as a bug.\n);
++  }
++
+   if ( !this || !SDL_Display ) {
+   return 0;
+   }
+

[arch-commits] Commit in sdl/trunk (PKGBUILD)

2013-10-31 Thread Jan Steffens 
Date: Thursday, October 31, 2013 @ 14:07:39
  Author: heftig
Revision: 198628

bring back libSDLmain.a

Modified:
  sdl/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-31 09:58:50 UTC (rev 198627)
+++ PKGBUILD2013-10-31 13:07:39 UTC (rev 198628)
@@ -5,7 +5,7 @@
 
 pkgname=sdl
 pkgver=1.2.15
-pkgrel=4
+pkgrel=5
 pkgdesc=A library for portable low-level access to a video framebuffer, audio 
output, mouse, and keyboard
 arch=('i686' 'x86_64')
 url=http://www.libsdl.org;
@@ -14,6 +14,7 @@
 makedepends=('alsa-lib' 'mesa' 'libpulse' 'glu')
 optdepends=('alsa-lib: ALSA audio driver'
 'libpulse: PulseAudio audio driver')
+options=('staticlibs')
 source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
 sdl-1.2.14-fix-mouse-clicking.patch
 sdl-1.2.14-disable-mmx.patch

[arch-commits] Commit in sdl/trunk (PKGBUILD sdl_x11sym.patch)

2013-10-23 Thread Jan Steffens 
Date: Wednesday, October 23, 2013 @ 19:24:50
  Author: heftig
Revision: 197193

staticlibs

Added:
  sdl/trunk/sdl_x11sym.patch
Modified:
  sdl/trunk/PKGBUILD

--+
 PKGBUILD |   15 +++
 sdl_x11sym.patch |   12 
 2 files changed, 23 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-23 17:22:29 UTC (rev 197192)
+++ PKGBUILD2013-10-23 17:24:50 UTC (rev 197193)
@@ -5,7 +5,7 @@
 
 pkgname=sdl
 pkgver=1.2.15
-pkgrel=3
+pkgrel=4
 pkgdesc=A library for portable low-level access to a video framebuffer, audio 
output, mouse, and keyboard
 arch=('i686' 'x86_64')
 url=http://www.libsdl.org;
@@ -19,19 +19,26 @@
 sdl-1.2.14-fix-mouse-clicking.patch
 sdl-1.2.14-disable-mmx.patch
 fix_joystick_misc_axes.diff
-libsdl-1.2.15-resizing.patch)
+libsdl-1.2.15-resizing.patch
+sdl_x11sym.patch)
 md5sums=('9d96df8417572a2afb781a7c4c811a85'
  '04d8c179f125e04bcd4c9d60e013c2d7'
  'e5c16b7611f62c7cb25f0534eff68852'
  '687586a108b597a2a6b73070c1d37e51'
- '3dd50347d8856160a9cbd7f80383a1f8')
+ '3dd50347d8856160a9cbd7f80383a1f8'
+ '148b285bccee9d21bb96db807363b962')
 
-build() {
+prepare() {
   cd SDL-$pkgver
   patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch
   patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch
   patch -Np1 -i ../fix_joystick_misc_axes.diff
   patch -Np1 -i ../libsdl-1.2.15-resizing.patch
+  patch -Np0 -i ../sdl_x11sym.patch
+}
+
+build() {
+  cd SDL-$pkgver
   ./configure --prefix=/usr --disable-nasm --enable-alsa \
   --with-x --disable-rpath --disable-static
   make

Added: sdl_x11sym.patch
===
--- sdl_x11sym.patch(rev 0)
+++ sdl_x11sym.patch2013-10-23 17:24:50 UTC (rev 197193)
@@ -0,0 +1,12 @@
+--- src/video/x11/SDL_x11sym.h-orig2013-07-16 23:56:46.718523385 -0600
 src/video/x11/SDL_x11sym.h 2013-07-16 23:58:27.025186485 -0600
+@@ -165,7 +165,8 @@
+  */
+ #ifdef LONG64
+ SDL_X11_MODULE(IO_32BIT)
+-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned 
len),(dpy,data,len),return)
++
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned 
len),(dpy,data,len),return)
+ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long 
len),(dpy,data,len),)
+ #endif
+

[arch-commits] Commit in sdl/trunk (PKGBUILD)

2013-08-23 Thread Jan Steffens 
Date: Friday, August 23, 2013 @ 19:21:22
  Author: heftig
Revision: 193559

Add glu dep FS#36599

Modified:
  sdl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-23 17:13:25 UTC (rev 193558)
+++ PKGBUILD2013-08-23 17:21:22 UTC (rev 193559)
@@ -11,7 +11,7 @@
 url=http://www.libsdl.org;
 license=('LGPL')
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
-makedepends=('alsa-lib' 'mesa' 'libpulse')
+makedepends=('alsa-lib' 'mesa' 'libpulse' 'glu')
 optdepends=('alsa-lib: ALSA audio driver'
 'libpulse: PulseAudio audio driver')
 options=('!libtool')

[arch-commits] Commit in sdl/trunk (PKGBUILD libsdl-1.2.15-resizing.patch)

2012-09-15 Thread Jan Steffens 
Date: Saturday, September 15, 2012 @ 05:39:11
  Author: heftig
Revision: 166672

FS#30650 FS#31513

Added:
  sdl/trunk/libsdl-1.2.15-resizing.patch
Modified:
  sdl/trunk/PKGBUILD

--+
 PKGBUILD |   11 +--
 libsdl-1.2.15-resizing.patch |   63 +
 2 files changed, 71 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-09-15 09:38:19 UTC (rev 166671)
+++ PKGBUILD2012-09-15 09:39:11 UTC (rev 166672)
@@ -5,28 +5,33 @@
 
 pkgname=sdl
 pkgver=1.2.15
-pkgrel=2
+pkgrel=3
 pkgdesc=A library for portable low-level access to a video framebuffer, audio 
output, mouse, and keyboard
 arch=('i686' 'x86_64')
 url=http://www.libsdl.org;
 license=('LGPL')
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
 makedepends=('alsa-lib' 'mesa' 'libpulse')
+optdepends=('alsa-lib: ALSA audio driver'
+'libpulse: PulseAudio audio driver')
 options=('!libtool')
 source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
 sdl-1.2.14-fix-mouse-clicking.patch
 sdl-1.2.14-disable-mmx.patch
-fix_joystick_misc_axes.diff)
+fix_joystick_misc_axes.diff
+libsdl-1.2.15-resizing.patch)
 md5sums=('9d96df8417572a2afb781a7c4c811a85'
  '04d8c179f125e04bcd4c9d60e013c2d7'
  'e5c16b7611f62c7cb25f0534eff68852'
- '687586a108b597a2a6b73070c1d37e51')
+ '687586a108b597a2a6b73070c1d37e51'
+ '3dd50347d8856160a9cbd7f80383a1f8')
 
 build() {
   cd SDL-$pkgver
   patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch
   patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch
   patch -Np1 -i ../fix_joystick_misc_axes.diff
+  patch -Np1 -i ../libsdl-1.2.15-resizing.patch
   ./configure --prefix=/usr --disable-nasm --enable-alsa \
   --with-x --disable-rpath --disable-static
   make

Added: libsdl-1.2.15-resizing.patch
===
--- libsdl-1.2.15-resizing.patch(rev 0)
+++ libsdl-1.2.15-resizing.patch2012-09-15 09:39:11 UTC (rev 166672)
@@ -0,0 +1,63 @@
+Description: Revert change that breaks window corner resizing
+ http://bugzilla.libsdl.org/show_bug.cgi?id=1430
+Author: Andrew Caudwell acaudw...@gmail.com
+Last-Update: 2012-04-10
+Bug-Debian: http://bugs.debian.org/665779
+
+diff -r c787fb1b5699 src/video/x11/SDL_x11events.c
+--- a/src/video/x11/SDL_x11events.cMon Feb 20 23:51:08 2012 -0500
 b/src/video/x11/SDL_x11events.cMon Mar 26 12:26:52 2012 +1300
+@@ -57,12 +57,6 @@
+ static SDLKey MISC_keymap[256];
+ SDLKey X11_TranslateKeycode(Display *display, KeyCode kc);
+ 
+-/*
+- Pending resize target for ConfigureNotify (so outdated events don't
+- cause inappropriate resize events)
+-*/
+-int X11_PendingConfigureNotifyWidth = -1;
+-int X11_PendingConfigureNotifyHeight = -1;
+ 
+ #ifdef X_HAVE_UTF8_STRING
+ Uint32 Utf8ToUcs4(const Uint8 *utf8)
+@@ -825,16 +819,6 @@
+ #ifdef DEBUG_XEVENTS
+ printf(ConfigureNotify! (resize: %dx%d)\n, xevent.xconfigure.width, 
xevent.xconfigure.height);
+ #endif
+-  if ((X11_PendingConfigureNotifyWidth != -1) 
+-  (X11_PendingConfigureNotifyHeight != -1)) {
+-  if ((xevent.xconfigure.width != 
X11_PendingConfigureNotifyWidth) 
+-  (xevent.xconfigure.height != 
X11_PendingConfigureNotifyHeight)) {
+-  /* Event is from before the resize, so ignore. */
+-  break;
+-  }
+-  X11_PendingConfigureNotifyWidth = -1;
+-  X11_PendingConfigureNotifyHeight = -1;
+-  }
+   if ( SDL_VideoSurface ) {
+   if ((xevent.xconfigure.width != SDL_VideoSurface-w) ||
+   (xevent.xconfigure.height != SDL_VideoSurface-h)) {
+diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h
+--- a/src/video/x11/SDL_x11events_c.h  Mon Feb 20 23:51:08 2012 -0500
 b/src/video/x11/SDL_x11events_c.h  Mon Mar 26 12:26:52 2012 +1300
+@@ -27,8 +27,3 @@
+ extern void X11_InitOSKeymap(_THIS);
+ extern void X11_PumpEvents(_THIS);
+ extern void X11_SetKeyboardState(Display *display, const char *key_vec);
+-
+-/* Variables to be exported */
+-extern int X11_PendingConfigureNotifyWidth;
+-extern int X11_PendingConfigureNotifyHeight;
+-
+diff -r c787fb1b5699 src/video/x11/SDL_x11video.c
+--- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500
 b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300
+@@ -1182,8 +1182,6 @@
+   current = NULL;
+   goto done;
+   }
+-  X11_PendingConfigureNotifyWidth = width;
+-  X11_PendingConfigureNotifyHeight = height;
+   } else {
+   if (X11_CreateWindow(this,current,width,height,bpp,flags)  0) {
+   current = NULL;

[arch-commits] Commit in sdl/trunk (PKGBUILD)

2012-09-03 Thread Jan Steffens 
Date: Monday, September 3, 2012 @ 12:40:05
  Author: heftig
Revision: 165907

esd is unavailable, option has no effect

Modified:
  sdl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-09-03 14:09:08 UTC (rev 165906)
+++ PKGBUILD2012-09-03 16:40:05 UTC (rev 165907)
@@ -27,7 +27,7 @@
   patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch
   patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch
   patch -Np1 -i ../fix_joystick_misc_axes.diff
-  ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
+  ./configure --prefix=/usr --disable-nasm --enable-alsa \
   --with-x --disable-rpath --disable-static
   make
 }

[arch-commits] Commit in sdl/trunk (PKGBUILD fix_joystick_misc_axes.diff)

2012-09-01 Thread Jan Steffens 
Date: Saturday, September 1, 2012 @ 08:22:15
  Author: heftig
Revision: 165847

Add patch to fix FS#31331

Added:
  sdl/trunk/fix_joystick_misc_axes.diff
Modified:
  sdl/trunk/PKGBUILD

-+
 PKGBUILD|   19 +++
 fix_joystick_misc_axes.diff |   13 +
 2 files changed, 24 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-09-01 09:41:45 UTC (rev 165846)
+++ PKGBUILD2012-09-01 12:22:15 UTC (rev 165847)
@@ -5,7 +5,7 @@
 
 pkgname=sdl
 pkgver=1.2.15
-pkgrel=1
+pkgrel=2
 pkgdesc=A library for portable low-level access to a video framebuffer, audio 
output, mouse, and keyboard
 arch=('i686' 'x86_64')
 url=http://www.libsdl.org;
@@ -15,21 +15,24 @@
 options=('!libtool')
 source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
 sdl-1.2.14-fix-mouse-clicking.patch
-sdl-1.2.14-disable-mmx.patch)
+sdl-1.2.14-disable-mmx.patch
+fix_joystick_misc_axes.diff)
 md5sums=('9d96df8417572a2afb781a7c4c811a85'
  '04d8c179f125e04bcd4c9d60e013c2d7'
- 'e5c16b7611f62c7cb25f0534eff68852')
+ 'e5c16b7611f62c7cb25f0534eff68852'
+ '687586a108b597a2a6b73070c1d37e51')
 
 build() {
-  cd ${srcdir}/SDL-${pkgver}
-  patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch
-  patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch
+  cd SDL-$pkgver
+  patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch
+  patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch
+  patch -Np1 -i ../fix_joystick_misc_axes.diff
   ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
   --with-x --disable-rpath --disable-static
   make
 }
 
 package() {
-  cd ${srcdir}/SDL-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd SDL-$pkgver
+  make DESTDIR=$pkgdir install
 }

Added: fix_joystick_misc_axes.diff
===
--- fix_joystick_misc_axes.diff (rev 0)
+++ fix_joystick_misc_axes.diff 2012-09-01 12:22:15 UTC (rev 165847)
@@ -0,0 +1,13 @@
+diff --git a/src/joystick/linux/SDL_sysjoystick.c 
b/src/joystick/linux/SDL_sysjoystick.c
+index ee43974..80e46e4 100644
+--- a/src/joystick/linux/SDL_sysjoystick.c
 b/src/joystick/linux/SDL_sysjoystick.c
+@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, 
int fd)
+   ++joystick-nbuttons;
+   }
+   }
+-  for ( i=0; iABS_MISC; ++i ) {
++  for ( i=0; iABS_MAX; ++i ) {
+   /* Skip hats */
+   if ( i == ABS_HAT0X ) {
+   i = ABS_HAT3Y;

[arch-commits] Commit in sdl/trunk (PKGBUILD)

2011-12-19 Thread Jan Steffens 
Date: Monday, December 19, 2011 @ 08:35:59
  Author: heftig
Revision: 145193

Add patch to fix FS#27469

Modified:
  sdl/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-19 12:38:49 UTC (rev 145192)
+++ PKGBUILD2011-12-19 13:35:59 UTC (rev 145193)
@@ -5,7 +5,7 @@
 
 pkgname=sdl
 pkgver=1.2.14
-pkgrel=9
+pkgrel=10
 pkgdesc=A library for portable low-level access to a video framebuffer, audio 
output, mouse, and keyboard
 arch=('i686' 'x86_64')
 url=http://www.libsdl.org;
@@ -17,12 +17,14 @@
 sdl-1.2.14-joystick-crash.diff
 sdl-1.2.14-fix-mouse-clicking.patch
 sdl-1.2.14-fix-disappearing-cursor.patch
-sdl-1.2.14-disable-mmx.patch)
+sdl-1.2.14-disable-mmx.patch
+fs27469.patch)
 md5sums=('e52086d1b508fa0b76c52ee30b55bec4'
  '9d8890b3817736a5d365f7497f096634'
  '04d8c179f125e04bcd4c9d60e013c2d7'
  'a6cf3e71b653aa97d0d8ae6c0a789807'
- '9ffecb9932a132ee5cefb4112e950761')
+ '9ffecb9932a132ee5cefb4112e950761'
+ '89091617e27fcad64451bc0b28e48501')
 
 build() {
   cd ${srcdir}/SDL-${pkgver}
@@ -30,6 +32,7 @@
   patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch
   patch -Np1 -i $srcdir/sdl-1.2.14-fix-disappearing-cursor.patch
   patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch
+  patch -Np1 -i $srcdir/fs27469.patch
   ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
   --with-x --disable-rpath
   make

[arch-commits] Commit in sdl/trunk (PKGBUILD sdl-1.2.14-disable-mmx.patch)

2011-09-21 Thread Jan Steffens 
Date: Wednesday, September 21, 2011 @ 08:30:37
  Author: heftig
Revision: 138375

upgpkg: sdl 1.2.14-9

add one more anti-mmx patch

Modified:
  sdl/trunk/PKGBUILD
  sdl/trunk/sdl-1.2.14-disable-mmx.patch

--+
 PKGBUILD |4 ++--
 sdl-1.2.14-disable-mmx.patch |   14 ++
 2 files changed, 16 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-21 12:26:12 UTC (rev 138374)
+++ PKGBUILD2011-09-21 12:30:37 UTC (rev 138375)
@@ -5,7 +5,7 @@
 
 pkgname=sdl
 pkgver=1.2.14
-pkgrel=8
+pkgrel=9
 pkgdesc=A library for portable low-level access to a video framebuffer, audio 
output, mouse, and keyboard
 arch=('i686' 'x86_64')
 url=http://www.libsdl.org;
@@ -22,7 +22,7 @@
  '9d8890b3817736a5d365f7497f096634'
  '04d8c179f125e04bcd4c9d60e013c2d7'
  'a6cf3e71b653aa97d0d8ae6c0a789807'
- 'e5e89389a55cd7a2fee44cb53af8dd6e')
+ '9ffecb9932a132ee5cefb4112e950761')
 
 build() {
   cd ${srcdir}/SDL-${pkgver}

Modified: sdl-1.2.14-disable-mmx.patch
===
--- sdl-1.2.14-disable-mmx.patch2011-09-21 12:26:12 UTC (rev 138374)
+++ sdl-1.2.14-disable-mmx.patch2011-09-21 12:30:37 UTC (rev 138375)
@@ -57,3 +57,17 @@
  #  elif defined(_MSC_VER)  defined(_M_IX86)
  #if (_MSC_VER = 1200)  
  #  include malloc.h   
+
+# and another one from FS#26020
+
+--- a/src/video/SDL_yuv_sw.c2009-10-13 06:07:15.0 +0700
 b/src/video/SDL_yuv_sw.c2011-09-20 19:26:30.247742620 +0700
+@@ -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,

[arch-commits] Commit in sdl/trunk (PKGBUILD sdl-1.2.14-disable-mmx.patch)

2011-09-16 Thread Jan Steffens 
Date: Friday, September 16, 2011 @ 04:52:29
  Author: heftig
Revision: 138093

upgpkg: sdl 1.2.14-8
Fix FS#26020

Added:
  sdl/trunk/sdl-1.2.14-disable-mmx.patch
Modified:
  sdl/trunk/PKGBUILD

--+
 PKGBUILD |   12 +---
 sdl-1.2.14-disable-mmx.patch |   59 +
 2 files changed, 67 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-16 08:47:11 UTC (rev 138092)
+++ PKGBUILD2011-09-16 08:52:29 UTC (rev 138093)
@@ -1,10 +1,11 @@
 # $Id$
-# Maintainer: Allan McRae al...@archlinux.org
+# Maintainer: Jan heftig Steffens jan.steff...@gmail.com
+# Contributor: Allan McRae al...@archlinux.org
 # Contributor: dorphell dorph...@archlinux.org
 
 pkgname=sdl
 pkgver=1.2.14
-pkgrel=7
+pkgrel=8
 pkgdesc=A library for portable low-level access to a video framebuffer, audio 
output, mouse, and keyboard
 arch=('i686' 'x86_64')
 url=http://www.libsdl.org;
@@ -15,17 +16,20 @@
 source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
 sdl-1.2.14-joystick-crash.diff
 sdl-1.2.14-fix-mouse-clicking.patch
-sdl-1.2.14-fix-disappearing-cursor.patch)
+sdl-1.2.14-fix-disappearing-cursor.patch
+sdl-1.2.14-disable-mmx.patch)
 md5sums=('e52086d1b508fa0b76c52ee30b55bec4'
  '9d8890b3817736a5d365f7497f096634'
  '04d8c179f125e04bcd4c9d60e013c2d7'
- 'a6cf3e71b653aa97d0d8ae6c0a789807')
+ 'a6cf3e71b653aa97d0d8ae6c0a789807'
+ 'e5e89389a55cd7a2fee44cb53af8dd6e')
 
 build() {
   cd ${srcdir}/SDL-${pkgver}
   patch -Np1 -i $srcdir/sdl-1.2.14-joystick-crash.diff
   patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch
   patch -Np1 -i $srcdir/sdl-1.2.14-fix-disappearing-cursor.patch
+  patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch
   ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
   --with-x --disable-rpath
   make

Added: sdl-1.2.14-disable-mmx.patch
===
--- sdl-1.2.14-disable-mmx.patch(rev 0)
+++ sdl-1.2.14-disable-mmx.patch2011-09-16 08:52:29 UTC (rev 138093)
@@ -0,0 +1,59 @@
+2 changesets to fix FS#26020
+
+# HG changeset patch
+# User Ryan C. Gordon iccu...@icculus.org
+# Date 1315711279 14400
+# Node ID 739ad55fe50d77a2ce84d6e3d59e97c550719d0d
+# Parent  32558685a9042e79cb773c37c09349b0a5ff5d72
+Disabled MMX blitters on GCC. They break the build on tons of machines now.
+
+diff -r 32558685a904 -r 739ad55fe50d src/video/SDL_RLEaccel.c
+--- a/src/video/SDL_RLEaccel.c  Sat Sep 10 19:37:20 2011 -0400
 b/src/video/SDL_RLEaccel.c  Sat Sep 10 23:21:19 2011 -0400
+@@ -91,7 +91,8 @@
+ #include SDL_blit.h
+ #include SDL_RLEaccel_c.h
+ 
+-#if defined(__GNUC__)  (defined(__i386__) || defined(__x86_64__))  
SDL_ASSEMBLY_ROUTINES
++/* Force MMX to 0; this blows up on almost every major compiler now. --ryan. 
*/
++#if 0  defined(__GNUC__)  (defined(__i386__) || defined(__x86_64__))  
SDL_ASSEMBLY_ROUTINES
+ #define MMX_ASMBLIT
+ #endif
+ 
+diff -r 32558685a904 -r 739ad55fe50d src/video/SDL_blit_A.c
+--- a/src/video/SDL_blit_A.cSat Sep 10 19:37:20 2011 -0400
 b/src/video/SDL_blit_A.cSat Sep 10 23:21:19 2011 -0400
+@@ -32,7 +32,8 @@
+ 
+ #if SDL_ASSEMBLY_ROUTINES
+ #  if defined(__GNUC__)  (defined(__i386__) || defined(__x86_64__))
+-#define MMX_ASMBLIT 1
++ /* forced MMX to 0...it breaks on most compilers now.  --ryan. */
++#define MMX_ASMBLIT 0
+ #define GCC_ASMBLIT 1
+ #  elif defined(_MSC_VER)  defined(_M_IX86)
+ #if (_MSC_VER = 1200)  
+
+# HG changeset patch
+# User Ryan C. Gordon iccu...@icculus.org
+# Date 1315939378 14400
+# Node ID 867c4c3604b79a810cf8ff16590001d9ef9c2824
+# Parent  614c2583703af89b3197f4fef73174ddc903eccf
+Turned off the rest of the MMX code in SDL_blit_A.c.
+
+It also seems to blow up everywhere.
+
+Fixes Bugzilla #1278.
+
+diff -r 614c2583703a -r 867c4c3604b7 src/video/SDL_blit_A.c
+--- a/src/video/SDL_blit_A.cMon Sep 12 00:29:18 2011 -0400
 b/src/video/SDL_blit_A.cTue Sep 13 14:42:58 2011 -0400
+@@ -34,7 +34,7 @@
+ #  if defined(__GNUC__)  (defined(__i386__) || defined(__x86_64__))
+  /* forced MMX to 0...it breaks on most compilers now.  --ryan. */
+ #define MMX_ASMBLIT 0
+-#define GCC_ASMBLIT 1
++#define GCC_ASMBLIT 0
+ #  elif defined(_MSC_VER)  defined(_M_IX86)
+ #if (_MSC_VER = 1200)  
+ #  include malloc.h

[arch-commits] Commit in sdl/trunk (PKGBUILD)

2011-08-12 Thread Ionut Biru 
Date: Friday, August 12, 2011 @ 10:45:48
  Author: ibiru
Revision: 135310

drop esound

Modified:
  sdl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-12 14:40:13 UTC (rev 135309)
+++ PKGBUILD2011-08-12 14:45:48 UTC (rev 135310)
@@ -4,13 +4,13 @@
 
 pkgname=sdl
 pkgver=1.2.14
-pkgrel=6
+pkgrel=7
 pkgdesc=A library for portable low-level access to a video framebuffer, audio 
output, mouse, and keyboard
 arch=('i686' 'x86_64')
 url=http://www.libsdl.org;
 license=('LGPL')
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
-makedepends=('alsa-lib' 'esound' 'mesa' 'libpulse')
+makedepends=('alsa-lib' 'mesa' 'libpulse')
 options=('!libtool')
 source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
 sdl-1.2.14-joystick-crash.diff

[arch-commits] Commit in sdl/trunk (PKGBUILD)

2010-05-24 Thread Allan McRae 
Date: Monday, May 24, 2010 @ 09:28:48
  Author: allan
Revision: 80971

upgpkg: sdl 1.2.14-3
revert patch, breaks stuff (FS#19569)

Modified:
  sdl/trunk/PKGBUILD

--+
 PKGBUILD |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-24 08:47:25 UTC (rev 80970)
+++ PKGBUILD2010-05-24 13:28:48 UTC (rev 80971)
@@ -4,7 +4,7 @@
 
 pkgname=sdl
 pkgver=1.2.14
-pkgrel=2
+pkgrel=3
 pkgdesc=A library for portable low-level access to a video framebuffer, audio 
output, mouse, and keyboard
 arch=('i686' 'x86_64')
 url=http://www.libsdl.org;
@@ -12,14 +12,11 @@
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
 makedepends=('alsa-lib' 'esound' 'mesa')
 options=('!libtool')
-source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
-sdl-1.2.14-fix-mouse-clicking.patch)
-md5sums=('e52086d1b508fa0b76c52ee30b55bec4'
- '04d8c179f125e04bcd4c9d60e013c2d7')
+source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz)
+md5sums=('e52086d1b508fa0b76c52ee30b55bec4')
 
 build() {
   cd ${srcdir}/SDL-${pkgver}
-  patch -Np1 -i ${srcdir}/sdl-1.2.14-fix-mouse-clicking.patch
   ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
   --with-x --disable-rpath
   make || return 1

[arch-commits] Commit in sdl/trunk (PKGBUILD)

2010-05-22 Thread Allan McRae 
Date: Saturday, May 22, 2010 @ 08:17:13
  Author: allan
Revision: 80801

upgpkg: sdl 1.2.14-2
fix muse clicking issue in wesnoth

Modified:
  sdl/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-22 11:25:32 UTC (rev 80800)
+++ PKGBUILD2010-05-22 12:17:13 UTC (rev 80801)
@@ -4,7 +4,7 @@
 
 pkgname=sdl
 pkgver=1.2.14
-pkgrel=1
+pkgrel=2
 pkgdesc=A library for portable low-level access to a video framebuffer, audio 
output, mouse, and keyboard
 arch=('i686' 'x86_64')
 url=http://www.libsdl.org;
@@ -12,13 +12,20 @@
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
 makedepends=('alsa-lib' 'esound' 'mesa')
 options=('!libtool')
-source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz)
-md5sums=('e52086d1b508fa0b76c52ee30b55bec4')
+source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
+sdl-1.2.14-fix-mouse-clicking.patch)
+md5sums=('e52086d1b508fa0b76c52ee30b55bec4'
+ '04d8c179f125e04bcd4c9d60e013c2d7')
 
 build() {
   cd ${srcdir}/SDL-${pkgver}
+  patch -Np1 -i ${srcdir}/sdl-1.2.14-fix-mouse-clicking.patch
   ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
   --with-x --disable-rpath
   make || return 1
+}
+
+package() {
+  cd ${srcdir}/SDL-${pkgver}
   make DESTDIR=${pkgdir} install
 }