Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/happy/PKGBUILD
	community-staging/haskell-quickcheck/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	core/mlocate/PKGBUILD
	core/procps-ng/PKGBUILD
	core/sysvinit/PKGBUILD
	elementary/gtk-engine-equinox/PKGBUILD
	extra/audacious/PKGBUILD
	extra/libsigc++/PKGBUILD
	extra/postgresql-old-upgrade/PKGBUILD
	extra/qt/PKGBUILD
	extra/tftp-hpa/PKGBUILD
	extra/transmission/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/atk/PKGBUILD
	gnome-unstable/clutter/PKGBUILD
	gnome-unstable/evolution-data-server/PKGBUILD
	gnome-unstable/evolution/PKGBUILD
	gnome-unstable/gjs/PKGBUILD
	gnome-unstable/glib-networking/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/gnome-online-accounts/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gnome-themes-standard/PKGBUILD
	gnome-unstable/gobject-introspection/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/gtkhtml4/PKGBUILD
	gnome-unstable/gvfs/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/nautilus/PKGBUILD
	gnome-unstable/vala/PKGBUILD
	gnome-unstable/webkitgtk3/PKGBUILD
	libre/libretools/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-util-linux/PKGBUILD
	testing/mlocate/PKGBUILD
	testing/openmpi/PKGBUILD
	testing/run-parts/PKGBUILD
	testing/systemd/PKGBUILD
	testing/transmission/PKGBUILD
	testing/transmission/transmission-cli.install
	testing/transmission/transmission.systemd

2 files changed, 71 insertions, 3 deletions

diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD
index 839585e37..c14bdb53b 100644
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165847 2012-09-01 12:22:15Z heftig $
+# $Id: PKGBUILD 166672 2012-09-15 09:39:11Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
@@ -8,7 +8,7 @@
 
 pkgname=sdl-libre
 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' 'mips64el')
 url="http://www.libsdl.org"
@@ -18,16 +18,20 @@ conflicts=('sdl')
 replaces=('sdl')
 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
+        libsdl-1.2.15-resizing.patch
         libre.patch)
 md5sums=('9d96df8417572a2afb781a7c4c811a85'
          '04d8c179f125e04bcd4c9d60e013c2d7'
          'e5c16b7611f62c7cb25f0534eff68852'
          '687586a108b597a2a6b73070c1d37e51'
+         '3dd50347d8856160a9cbd7f80383a1f8'
          '5c665f72b8a2adc97a91f6db6f2da79a')
 
 build() {
@@ -35,8 +39,9 @@ build() {
   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 ../libre.patch
-  ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
+  ./configure --prefix=/usr --disable-nasm --enable-alsa \
               --with-x --disable-rpath --disable-static
   make
 }
diff --git a/libre/sdl-libre/libsdl-1.2.15-resizing.patch b/libre/sdl-libre/libsdl-1.2.15-resizing.patch
new file mode 100644
index 000000000..0655a13e1
--- /dev/null
+++ b/libre/sdl-libre/libsdl-1.2.15-resizing.patch
@@ -0,0 +1,63 @@
+Description: Revert change that breaks window corner resizing
+ http://bugzilla.libsdl.org/show_bug.cgi?id=1430
+Author: Andrew Caudwell <acaudwell@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.c	Mon Feb 20 23:51:08 2012 -0500
++++ b/src/video/x11/SDL_x11events.c	Mon 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;