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

[Andrea Scarpino]

    Date: Saturday, October 3, 2009 @ 10:55:08
  Author: andrea
Revision: 53850

Merged revisions 53849 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/audacious/trunk

........
  r53849 | andrea | 2009-10-03 16:54:33 +0200 (Sat, 03 Oct 2009) | 2 lines
  
  upgpkg: audacious 2.1-2
      FS#15559
........

Modified:
  audacious/repos/extra-i686/	(properties)
  audacious/repos/extra-i686/PKGBUILD
Deleted:
  audacious/repos/extra-i686/ChangeLog

-----------+
 ChangeLog |   31 -------------------------------
 PKGBUILD  |   24 ++++++++++++++++--------
 2 files changed, 16 insertions(+), 39 deletions(-)


Property changes on: audacious/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /audacious/trunk:1-45594
   + /audacious/trunk:1-53849

Deleted: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-10-03 14:54:33 UTC (rev 53849)
+++ extra-i686/ChangeLog	2009-10-03 14:55:08 UTC (rev 53850)
@@ -1,31 +0,0 @@
-2009-07-12  Eric Belanger  <eric at archlinux.org>
-
-	* audacious-2.1.0-1
-	New upstream release.
-	Added audacious-plugins depends (close FS#14655)
-
-2008-08-16  Alexander Fehr  <pizzapunk gmail com>
-
-  * audacious-1.5.1-1:
-  New upstream release.
-  New maintainer.
-  Added dependencies on libxml2 and desktop-file-utils.
-  Removed dependency on libglade.
-  Made dependency on unzip optional.
-  Removed conflicts audacious-player.
-  Removed !libtool option.
-  Enabled SSE2 for x86_64.
-  Cleaned up install file.
-  Added update-desktop-database to install file.
-
-2008-03-15  Travis Willard  <travis at archlinux.org>
-
-  * audacious-1.5.0-1:
-  New upstream release.
-  Renamed audacious-player to audacious - been a long time coming.
-
-2008-02-16  Travis Willard  <travis at archlinux.org>
-
-  * audacious-1.4.6-1:
-  New upstream release.
-  Added ChangeLog.

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-03 14:54:33 UTC (rev 53849)
+++ extra-i686/PKGBUILD	2009-10-03 14:55:08 UTC (rev 53850)
@@ -1,29 +1,37 @@
 # $Id$
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly at gmail.com>
 
 pkgname=audacious
 pkgver=2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Media player based on BMP"
 arch=('i686' 'x86_64')
 url="http://audacious-media-player.org/"
 license=('GPL3')
-depends=('gtk2' 'libmcs' 'dbus-glib' 'libsamplerate' 'libxml2' 'desktop-file-utils' 'audacious-plugins')
+depends=('gtk2' 'libmcs' 'dbus-glib' 'libsamplerate' 'libxml2' 'desktop-file-utils'
+	'audacious-plugins')
 optdepends=('unzip: Zipped skins support')
 provides=('audacious-player')
 replaces=('audacious-player')
 install=audacious.install
-source=(http://distfiles.atheme.org/audacious-$pkgver.tgz)
-md5sums=('03ab6a062e5909214841f90f767f1147')
+source=(http://distfiles.atheme.org/$pkgname-$pkgver.tgz
+	'remove_libudet.patch')
+md5sums=('03ab6a062e5909214841f90f767f1147'
+         'd194f9f187c415b60165dd584ae3bad1')
 
 build() {
-  cd "$srcdir/audacious-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
+  patch -Np1 -i ${srcdir}/remove_libudet.patch || return 1
+
   if [[ $CARCH == "i686" ]]; then
-    ./configure --prefix=/usr --enable-samplerate --disable-sse2 || return 1
+    ./configure --prefix=/usr \
+      --enable-samplerate \
+      --disable-sse2 || return 1
   elif [[ $CARCH == "x86_64" ]]; then
-    ./configure --prefix=/usr --enable-samplerate || return 1
+    ./configure --prefix=/usr \
+      --enable-samplerate || return 1
   fi
 
   make || return 1