[arch-commits] Commit in sdl/repos (3 files)

[Allan McRae]

    Date: Monday, October 20, 2008 @ 09:09:47
  Author: allan
Revision: 16060

Merged revisions 16058 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/sdl/trunk

........
  r16058 | allan | 2008-10-20 12:56:56 +0000 (Mon, 20 Oct 2008) | 2 lines
  
  upgpkg: sdl 1.2.13-3
      fix problem with esd linking (FS#11799)
........

Added:
  sdl/repos/extra-x86_64/sdl-1.2.13-dynaminc-esd.patch
    (from rev 16058, sdl/trunk/sdl-1.2.13-dynaminc-esd.patch)
Modified:
  sdl/repos/extra-x86_64/	(properties)
  sdl/repos/extra-x86_64/PKGBUILD

-------------------------------+
 PKGBUILD                      |   12 +++++++-----
 sdl-1.2.13-dynaminc-esd.patch |   12 ++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)


Property changes on: sdl/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /sdl/trunk:1-15787
   + /sdl/trunk:1-16059

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-20 12:58:43 UTC (rev 16059)
+++ extra-x86_64/PKGBUILD	2008-10-20 13:09:47 UTC (rev 16060)
@@ -4,7 +4,7 @@
 
 pkgname=sdl
 pkgver=1.2.13
-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,13 +12,15 @@
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
 makedepends=('alsa-lib' 'esd' 'mesa')
 options=('!libtool')
-source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz)
-md5sums=('c6660feea2a6834de10bc71b2f8e4d88')
+source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
+        sdl-1.2.13-dynaminc-esd.patch)
+md5sums=('c6660feea2a6834de10bc71b2f8e4d88'
+         '7c2f51f526f3b905b6170f39a7015eb9')
 
 build() {
   cd ${srcdir}/SDL-${pkgver}
-  ./configure --prefix=/usr --disable-nasm --enable-alsa \
-              --enable-esd --with-x --disable-rpath
+  patch -Np1 -i $srcdir/sdl-1.2.13-dynaminc-esd.patch
+  ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd --with-x --disable-rpath
   make || return 1
   make DESTDIR=${pkgdir} install
 }

Copied: sdl/repos/extra-x86_64/sdl-1.2.13-dynaminc-esd.patch (from rev 16058, sdl/trunk/sdl-1.2.13-dynaminc-esd.patch)
===================================================================
--- extra-x86_64/sdl-1.2.13-dynaminc-esd.patch	                        (rev 0)
+++ extra-x86_64/sdl-1.2.13-dynaminc-esd.patch	2008-10-20 13:09:47 UTC (rev 16060)
@@ -0,0 +1,12 @@
+diff -Naur SDL-1.2.13-old/configure SDL-1.2.13/configure
+--- SDL-1.2.13-old/configure	2007-12-31 15:09:39.000000000 +1000
++++ SDL-1.2.13/configure	2008-10-20 22:22:36.000000000 +1000
+@@ -25382,7 +25382,7 @@
+   enable_esd_shared=yes
+ fi
+ 
+-            esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([^ ]*\).*/\1\/libesd.so.*/'`
++            esd_lib_spec="/usr/lib/libesd.so.*"
+             esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
+             echo "-- $esd_lib_spec -> $esd_lib"
+