[arch-commits] Commit in sdl_mixer/repos (extra-x86_64 extra-x86_64/PKGBUILD)

Allan McRae allan at archlinux.org
Sun Oct 19 01:01:51 UTC 2008


    Date: Saturday, October 18, 2008 @ 21:01:48
  Author: allan
Revision: 15781

Fix SVN conflict

Modified:
  sdl_mixer/repos/extra-x86_64/	(properties)
  sdl_mixer/repos/extra-x86_64/PKGBUILD

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


Property changes on: sdl_mixer/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /sdl_mixer/trunk:1
   + /sdl_mixer/trunk:1-15780

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-19 00:58:44 UTC (rev 15780)
+++ extra-x86_64/PKGBUILD	2008-10-19 01:01:48 UTC (rev 15781)
@@ -1,25 +1,25 @@
 # $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 # Contributor: Lukas Sabota <punkrockguy318 at cocmast.net> (Timidity Patch)
 
 pkgname=sdl_mixer
 pkgver=1.2.8
-pkgrel=2
+pkgrel=3
 pkgdesc="A simple multi-channel audio mixer"
 arch=('i686' 'x86_64')
 url="http://www.libsdl.org/projects/SDL_mixer/"
 license=('LGPL' 'GPL')
-depends=('sdl>=1.2.12' 'libvorbis' 'libmikmod')
+depends=('sdl>=1.2.12' 'libvorbis' 'libmikmod' 'smpeg')
 options=('!libtool')
 source=(http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${pkgver}.tar.gz)
 md5sums=('0b5b91015d0f3bd9597e094ba67c4d65')
 
 build() {
-  cd ${startdir}/src/SDL_mixer-${pkgver}
+  cd ${srcdir}/SDL_mixer-${pkgver}
   sed -i 's|/usr/local/lib/timidity|/usr/lib/timidity|' timidity/config.h || return 1
   sed -i 's|/etc/timidity/timidity.cfg|/etc/timidity++/timidity.cfg|' timidity/config.h || return 1
-  ./configure --prefix=/usr --enable-music-ogg 
+  ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${pkgdir} install
 }




More information about the arch-commits mailing list