Date: Saturday, September 1, 2012 @ 08:23:59
Author: heftig
Revision: 165848
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
sdl/repos/extra-i686/PKGBUILD
(from rev 165847, sdl/trunk/PKGBUILD)
sdl/repos/extra-i686/fix_joystick_misc_axes.diff
(from rev 165847, sdl/trunk/fix_joystick_misc_axes.diff)
sdl/repos/extra-i686/sdl-1.2.14-disable-mmx.patch
(from rev 165847, sdl/trunk/sdl-1.2.14-disable-mmx.patch)
sdl/repos/extra-i686/sdl-1.2.14-fix-mouse-clicking.patch
(from rev 165847, sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch)
sdl/repos/extra-x86_64/PKGBUILD
(from rev 165847, sdl/trunk/PKGBUILD)
sdl/repos/extra-x86_64/fix_joystick_misc_axes.diff
(from rev 165847, sdl/trunk/fix_joystick_misc_axes.diff)
sdl/repos/extra-x86_64/sdl-1.2.14-disable-mmx.patch
(from rev 165847, sdl/trunk/sdl-1.2.14-disable-mmx.patch)
sdl/repos/extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch
(from rev 165847, sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch)
Deleted:
sdl/repos/extra-i686/PKGBUILD
sdl/repos/extra-i686/sdl-1.2.14-disable-mmx.patch
sdl/repos/extra-i686/sdl-1.2.14-fix-mouse-clicking.patch
sdl/repos/extra-x86_64/PKGBUILD
sdl/repos/extra-x86_64/sdl-1.2.14-disable-mmx.patch
sdl/repos/extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch
--------------------------------------------------+
extra-i686/PKGBUILD | 73 ++++++++++-----------
extra-i686/fix_joystick_misc_axes.diff | 13 +++
extra-i686/sdl-1.2.14-disable-mmx.patch | 26 +++----
extra-i686/sdl-1.2.14-fix-mouse-clicking.patch | 46 ++++++-------
extra-x86_64/PKGBUILD | 73 ++++++++++-----------
extra-x86_64/fix_joystick_misc_axes.diff | 13 +++
extra-x86_64/sdl-1.2.14-disable-mmx.patch | 26 +++----
extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch | 46 ++++++-------
8 files changed, 174 insertions(+), 142 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-09-01 12:22:15 UTC (rev 165847)
+++ extra-i686/PKGBUILD 2012-09-01 12:23:59 UTC (rev 165848)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
-# Contributor: Allan McRae <[email protected]>
-# Contributor: dorphell <[email protected]>
-
-pkgname=sdl
-pkgver=1.2.15
-pkgrel=1
-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')
-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)
-md5sums=('9d96df8417572a2afb781a7c4c811a85'
- '04d8c179f125e04bcd4c9d60e013c2d7'
- 'e5c16b7611f62c7cb25f0534eff68852')
-
-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
- ./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
-}
Copied: sdl/repos/extra-i686/PKGBUILD (from rev 165847, sdl/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-09-01 12:23:59 UTC (rev 165848)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Contributor: Allan McRae <[email protected]>
+# Contributor: dorphell <[email protected]>
+
+pkgname=sdl
+pkgver=1.2.15
+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";
+license=('LGPL')
+depends=('glibc' 'libxext' 'libxrender' 'libx11')
+makedepends=('alsa-lib' 'mesa' 'libpulse')
+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)
+md5sums=('9d96df8417572a2afb781a7c4c811a85'
+ '04d8c179f125e04bcd4c9d60e013c2d7'
+ 'e5c16b7611f62c7cb25f0534eff68852'
+ '687586a108b597a2a6b73070c1d37e51')
+
+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
+ ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
+ --with-x --disable-rpath --disable-static
+ make
+}
+
+package() {
+ cd SDL-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Copied: sdl/repos/extra-i686/fix_joystick_misc_axes.diff (from rev 165847,
sdl/trunk/fix_joystick_misc_axes.diff)
===================================================================
--- extra-i686/fix_joystick_misc_axes.diff (rev 0)
+++ extra-i686/fix_joystick_misc_axes.diff 2012-09-01 12:23:59 UTC (rev
165848)
@@ -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; i<ABS_MISC; ++i ) {
++ for ( i=0; i<ABS_MAX; ++i ) {
+ /* Skip hats */
+ if ( i == ABS_HAT0X ) {
+ i = ABS_HAT3Y;
Deleted: extra-i686/sdl-1.2.14-disable-mmx.patch
===================================================================
--- extra-i686/sdl-1.2.14-disable-mmx.patch 2012-09-01 12:22:15 UTC (rev
165847)
+++ extra-i686/sdl-1.2.14-disable-mmx.patch 2012-09-01 12:23:59 UTC (rev
165848)
@@ -1,13 +0,0 @@
-# and another one from FS#26020
-
---- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700
-+++ b/src/video/SDL_yuv_sw.c 2011-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,
Copied: sdl/repos/extra-i686/sdl-1.2.14-disable-mmx.patch (from rev 165847,
sdl/trunk/sdl-1.2.14-disable-mmx.patch)
===================================================================
--- extra-i686/sdl-1.2.14-disable-mmx.patch (rev 0)
+++ extra-i686/sdl-1.2.14-disable-mmx.patch 2012-09-01 12:23:59 UTC (rev
165848)
@@ -0,0 +1,13 @@
+# and another one from FS#26020
+
+--- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700
++++ b/src/video/SDL_yuv_sw.c 2011-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,
Deleted: extra-i686/sdl-1.2.14-fix-mouse-clicking.patch
===================================================================
--- extra-i686/sdl-1.2.14-fix-mouse-clicking.patch 2012-09-01 12:22:15 UTC
(rev 165847)
+++ extra-i686/sdl-1.2.14-fix-mouse-clicking.patch 2012-09-01 12:23:59 UTC
(rev 165848)
@@ -1,23 +0,0 @@
---- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08
11:57:05.003169834 -0700
-+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340
-0700
-@@ -423,12 +423,15 @@
- 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/extra-i686/sdl-1.2.14-fix-mouse-clicking.patch (from rev
165847, sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch)
===================================================================
--- extra-i686/sdl-1.2.14-fix-mouse-clicking.patch
(rev 0)
+++ extra-i686/sdl-1.2.14-fix-mouse-clicking.patch 2012-09-01 12:23:59 UTC
(rev 165848)
@@ -0,0 +1,23 @@
+--- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08
11:57:05.003169834 -0700
++++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340
-0700
+@@ -423,12 +423,15 @@
+ 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: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-09-01 12:22:15 UTC (rev 165847)
+++ extra-x86_64/PKGBUILD 2012-09-01 12:23:59 UTC (rev 165848)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
-# Contributor: Allan McRae <[email protected]>
-# Contributor: dorphell <[email protected]>
-
-pkgname=sdl
-pkgver=1.2.15
-pkgrel=1
-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')
-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)
-md5sums=('9d96df8417572a2afb781a7c4c811a85'
- '04d8c179f125e04bcd4c9d60e013c2d7'
- 'e5c16b7611f62c7cb25f0534eff68852')
-
-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
- ./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
-}
Copied: sdl/repos/extra-x86_64/PKGBUILD (from rev 165847, sdl/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-09-01 12:23:59 UTC (rev 165848)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Contributor: Allan McRae <[email protected]>
+# Contributor: dorphell <[email protected]>
+
+pkgname=sdl
+pkgver=1.2.15
+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";
+license=('LGPL')
+depends=('glibc' 'libxext' 'libxrender' 'libx11')
+makedepends=('alsa-lib' 'mesa' 'libpulse')
+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)
+md5sums=('9d96df8417572a2afb781a7c4c811a85'
+ '04d8c179f125e04bcd4c9d60e013c2d7'
+ 'e5c16b7611f62c7cb25f0534eff68852'
+ '687586a108b597a2a6b73070c1d37e51')
+
+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
+ ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
+ --with-x --disable-rpath --disable-static
+ make
+}
+
+package() {
+ cd SDL-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Copied: sdl/repos/extra-x86_64/fix_joystick_misc_axes.diff (from rev 165847,
sdl/trunk/fix_joystick_misc_axes.diff)
===================================================================
--- extra-x86_64/fix_joystick_misc_axes.diff (rev 0)
+++ extra-x86_64/fix_joystick_misc_axes.diff 2012-09-01 12:23:59 UTC (rev
165848)
@@ -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; i<ABS_MISC; ++i ) {
++ for ( i=0; i<ABS_MAX; ++i ) {
+ /* Skip hats */
+ if ( i == ABS_HAT0X ) {
+ i = ABS_HAT3Y;
Deleted: extra-x86_64/sdl-1.2.14-disable-mmx.patch
===================================================================
--- extra-x86_64/sdl-1.2.14-disable-mmx.patch 2012-09-01 12:22:15 UTC (rev
165847)
+++ extra-x86_64/sdl-1.2.14-disable-mmx.patch 2012-09-01 12:23:59 UTC (rev
165848)
@@ -1,13 +0,0 @@
-# and another one from FS#26020
-
---- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700
-+++ b/src/video/SDL_yuv_sw.c 2011-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,
Copied: sdl/repos/extra-x86_64/sdl-1.2.14-disable-mmx.patch (from rev 165847,
sdl/trunk/sdl-1.2.14-disable-mmx.patch)
===================================================================
--- extra-x86_64/sdl-1.2.14-disable-mmx.patch (rev 0)
+++ extra-x86_64/sdl-1.2.14-disable-mmx.patch 2012-09-01 12:23:59 UTC (rev
165848)
@@ -0,0 +1,13 @@
+# and another one from FS#26020
+
+--- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700
++++ b/src/video/SDL_yuv_sw.c 2011-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,
Deleted: extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch
===================================================================
--- extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch 2012-09-01 12:22:15 UTC
(rev 165847)
+++ extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch 2012-09-01 12:23:59 UTC
(rev 165848)
@@ -1,23 +0,0 @@
---- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08
11:57:05.003169834 -0700
-+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340
-0700
-@@ -423,12 +423,15 @@
- 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/extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch (from rev
165847, sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch)
===================================================================
--- extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch
(rev 0)
+++ extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch 2012-09-01 12:23:59 UTC
(rev 165848)
@@ -0,0 +1,23 @@
+--- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08
11:57:05.003169834 -0700
++++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340
-0700
+@@ -423,12 +423,15 @@
+ 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;
+
