Tue Aug 14 00:02:20 UTC 2012

8 files changed, 63 insertions, 53 deletions

diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index cd50669e5..5d170a978 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,56 +1,63 @@
-# $Id: PKGBUILD 154018 2012-03-21 16:01:26Z schiv $
-# Maintainer: tobias <tobias@archlinux.org>
+# $Id: PKGBUILD 165179 2012-08-12 12:56:20Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: tobias <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 # ardour, liblrdf and raptor are heavily dependent on each other. Updating of
 # one package mostly will require an update of all the other packages. I vote
-# for fixed dependencies speaking in terms of versions
+# for fixed dependencies speaking in terms of versions -- tobias
+
+# SYSLIBS enabled, support still valid; see ardour 2.8.13 rel notes
 
 pkgname=ardour
-pkgver=2.8.12
-pkgrel=3
+pkgver=2.8.14
+pkgrel=1
 pkgdesc="A multichannel hard disk recorder and digital audio workstation"
 arch=('i686' 'x86_64')
 url="http://ardour.org/"
 license=('GPL')
-depends=('liblrdf>=0.4.0-8' 'liblo' 'libusb-compat'
-         'libgnomecanvas' 'aubio' 'slv2>=0.6.6-6')
+depends=('liblrdf' 'libusb-compat' 'liblo' 'soundtouch'
+         'aubio' 'lilv' 'suil' 'libgnomecanvasmm')
          # -libgnomecanvas(+libgnomecanvasmm)
-         # +soundtouch (these +/- changes are for SYSLIBS)
-         # liblrdf versioned for https://bugs.archlinux.org/task/25005
-         # slv2 versioned for https://bugs.archlinux.org/task/25060
+         # +soundtouch (these +/- changes are for SYSLIBS=1)
+         # cwiid removed for https://bugs.archlinux.org/task/28344
 makedepends=('scons' 'boost')
-changelog=${pkgname}.changelog
-source=(ftp://ftp.archlinux.org/other/ardour/${pkgname}-${pkgver}.tar.bz2
-        ${pkgname}.desktop)
-md5sums=('7c031892f53aeacf08a750fc320c79c5'
+changelog=$pkgname.changelog
+source=("ftp://ftp.archlinux.org/other/ardour/$pkgname-$pkgver.tar.bz2"
+        "$pkgname.desktop")
+md5sums=('c79219ba10735d0b061d53a84ae611a4'
          '8aeaf433ebf781733db48e5a16b0c4da')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
   sed -i '/-O3/d' SConstruct
 
-  scons ${MAKEFLAGS} ARCH="${CFLAGS} -O3" \
-                     PREFIX="/usr" \
-                     DIST_LIBDIR="lib" \
-                     FREEDESKTOP=0 \
-                     FREESOUND=1 \
-                     SYSLIBS=0 \
-                     DESTDIR="${pkgdir}"
+  # work around boost linking error (see ardour3 svn r13081)
+  # thanks to Harry Harren for the heads-up
+  CFLAGS+=" -DBOOST_SYSTEM_NO_DEPRECATED"
+  CXXFLAGS+=" -DBOOST_SYSTEM_NO_DEPRECATED"
+  export CFLAGS CXXFLAGS
+
+  scons $MAKEFLAGS ARCH="$CFLAGS -O3" \
+                   PREFIX="/usr" \
+                   DIST_LIBDIR="lib" \
+                   FREEDESKTOP=0 \
+                   FREESOUND=1 \
+                   SYSLIBS=1 \
+                   DESTDIR="$pkgdir"
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
-  scons DESTDIR="${pkgdir}" install
+  scons DESTDIR="$pkgdir" install
 
   # install some freedesktop.org compatibility
-  install -Dm644 "${srcdir}/${pkgname}.desktop" \
-    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 "$srcdir/$pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
 
-  # TODO: tell upstream to do this
+  # upstream will not do this
   # install templates
   cp -r templates "$pkgdir/usr/share/ardour2/"
 }
diff --git a/extra/ardour/ardour.changelog b/extra/ardour/ardour.changelog
index 47c111f01..242d5a78a 100644
--- a/extra/ardour/ardour.changelog
+++ b/extra/ardour/ardour.changelog
@@ -1,3 +1,9 @@
+11 Aug 2012 (GMT+8) Ray Rashif <schiv@archlinux.org>
+	* 2.8.14:
+	Upstream release
+	Dep on new (s)lv2 stack (lilv, suil et al replaces slv2)
+	SYSLIBS turned on by upstream decree; see 2.8.13 release notes
+
 15 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
 
 	* 2.8.11-5:
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 836f6d8cf..29898c04c 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 164181 2012-07-27 00:15:23Z bisson $
+# $Id: PKGBUILD 165171 2012-08-12 04:07:04Z bisson $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=audacious
-pkgver=3.3
+pkgver=3.3.1
 pkgrel=1
 pkgdesc='Lightweight, advanced audio player focused on audio quality'
 url='http://audacious-media-player.org/'
 license=('GPL3')
 arch=('i686' 'x86_64')
 depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins'
-         'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils')
+         'hicolor-icon-theme' 'desktop-file-utils')
 optdepends=('unzip: zipped skins support')
 source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('3c006676f1dbc2376c098855b93606da0f58f7ea')
+sha1sums=('6ccd6856df853d939ea41402be4bfc76a5423a8f')
 
 provides=('audacious-player')
 replaces=('audacious-player')
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 6c7780b1d..7702bec15 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165095 2012-08-10 13:32:19Z andyrtr $
+# $Id: PKGBUILD 165181 2012-08-12 16:18:01Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.6.1
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -25,7 +25,7 @@ md5sums=('87ade07e3d1efd03c9c3add949cf9c00'
          '9b8467a1e51d360096b70e2c3c081e6c'
          '3733c23e77eb503bd94cc368e02830dc'
          '90c30380d4c8cd48a908cfdadae1ea24'
-         'a81573a429b98e16670d7fea47e528c4'
+         '7d2347b6d444e223f6b7dc6e706b9ffe'
          '9657daa21760bb0b5fa3d8b51d5e01a1'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17'
diff --git a/extra/cups/cups-systemd-socket.patch b/extra/cups/cups-systemd-socket.patch
index f699b9eda..0eb5f4af1 100644
--- a/extra/cups/cups-systemd-socket.patch
+++ b/extra/cups/cups-systemd-socket.patch
@@ -103,7 +103,7 @@ diff -up cups-1.5.0/data/cups.path.in.systemd-socket cups-1.5.0/data/cups.path.i
 diff -up cups-1.5.0/data/cups.service.in.systemd-socket cups-1.5.0/data/cups.service.in
 --- cups-1.5.0/data/cups.service.in.systemd-socket	2011-10-18 15:32:40.846670473 +0100
 +++ cups-1.5.0/data/cups.service.in	2011-10-18 15:32:40.846670473 +0100
-@@ -0,0 +1,9 @@
+@@ -0,0 +1,10 @@
 +[Unit]
 +Description=CUPS Printing Service
 +
@@ -117,7 +117,7 @@ diff -up cups-1.5.0/data/cups.service.in.systemd-socket cups-1.5.0/data/cups.ser
 diff -up cups-1.5.0/data/cups.socket.in.systemd-socket cups-1.5.0/data/cups.socket.in
 --- cups-1.5.0/data/cups.socket.in.systemd-socket	2011-10-18 15:32:40.847670454 +0100
 +++ cups-1.5.0/data/cups.socket.in	2011-10-18 15:32:40.847670454 +0100
-@@ -0,0 +1,10 @@
+@@ -0,0 +1,11 @@
 +[Unit]
 +Description=CUPS Printing Service Sockets
 +
diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD
index b469acf89..1d9921140 100644
--- a/extra/epiphany/PKGBUILD
+++ b/extra/epiphany/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 159282 2012-05-20 21:18:36Z heftig $
+# $Id: PKGBUILD 165192 2012-08-12 19:49:26Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=epiphany
-pkgver=3.4.2
+pkgver=3.4.3
 pkgrel=1
 install=epiphany.install
 pkgdesc="A GNOME web browser based on the WebKit rendering engine."
@@ -15,10 +15,10 @@ options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('fb5b0d48c4d8725031d023fd6a054c10cb9f166cd430db7fc2383d8d2af5d615')
+sha256sums=('3233fb9e9e8a056c3ef494e85cf5e27068abf51df5fc7f5203ab7afda480f395')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
       --disable-scrollkeeper \
@@ -27,6 +27,6 @@ build() {
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD
index 6e974845c..14bb27853 100644
--- a/extra/libgee/PKGBUILD
+++ b/extra/libgee/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 147137 2012-01-22 20:17:23Z ibiru $
+# $Id: PKGBUILD 165194 2012-08-12 19:52:12Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libgee
-pkgver=0.6.4
+pkgver=0.6.5
 pkgrel=1
 pkgdesc="GObject collection library"
 url="http://live.gnome.org/Libgee"
@@ -13,15 +13,15 @@ depends=('glib2')
 makedepends=('gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/libgee/0.6/$pkgname-$pkgver.tar.xz)
-sha256sums=('55f39f3b28e676f6cbd9377d83edd031084436a4da41280a9503c94faffb1665')
+sha256sums=('99b78db2492c533e386a07bce9aab1de4bdf23284b1a485b893683de388fff48')
 
 build() {
-    cd "$srcdir/$pkgname-$pkgver"
+    cd $pkgname-$pkgver
     ./configure --prefix=/usr --disable-static
     make
 }
 
 package() {
-    cd "$srcdir/$pkgname-$pkgver"
+    cd $pkgname-$pkgver
     make DESTDIR="$pkgdir" install
 }
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index 88636b960..9cf7151b3 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163157 2012-07-08 09:32:05Z ibiru $
+# $Id: PKGBUILD 165175 2012-08-12 04:32:32Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,8 +6,8 @@
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=mpd
-pkgver=0.17
-pkgrel=2
+pkgver=0.17.1
+pkgrel=1
 pkgdesc='Flexible, powerful, server-side application for playing music'
 url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki'
 license=('GPL')
@@ -19,7 +19,7 @@ makedepends=('doxygen')
 source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
         'tmpfiles.d'
         'rc.d') 
-sha1sums=('36201f32ca5729b62b0e6cbddb19ade20ee3f7d7'
+sha1sums=('11da36217d57d08010f309977a4a77cce6240f77'
           'f4d5922abb69abb739542d8e93f4dfd748acdad7'
           '3470d489565f0ed479f1665dd2876f66acb5a585')
 
@@ -35,11 +35,8 @@ build() {
 		--enable-lastfm \
 		--enable-jack \
 		--enable-pulse \
-		--enable-documentation \
-		--disable-libwrap \
 		--disable-cue \
 		--disable-sidplay \
-		--disable-documentation \
 		--with-systemdsystemunitdir=/usr/lib/systemd/system
 
 	make