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

Conflicts:
	extra/libdvdnav/PKGBUILD
	extra/libguess/PKGBUILD
	extra/libmowgli/PKGBUILD
	extra/xchm/PKGBUILD
	libre/linux-libre/PKGBUILD

1 files changed, 15 insertions, 10 deletions

diff --git a/extra/libdvdnav/PKGBUILD b/extra/libdvdnav/PKGBUILD
index ab1d622b7..cb1bc49a3 100644
--- a/extra/libdvdnav/PKGBUILD
+++ b/extra/libdvdnav/PKGBUILD
@@ -1,27 +1,32 @@
-# $Id: PKGBUILD 69820 2010-02-22 22:23:44Z giovanni $
+# $Id: PKGBUILD 144004 2011-12-01 16:22:55Z giovanni $
 # Maintainer: arjan <arjan@archlinux.org>
 # contributor Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=libdvdnav
 pkgver=4.1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="The library for xine-dvdnav plugin."
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.mplayerhq.hu/MPlayer/releases/dvdnav/"
-depends=('libdvdread>=4.1.3')
+depends=('libdvdread')
 options=(!libtool)
-source=(http://www.mplayerhq.hu/MPlayer/releases/dvdnav/${pkgname}-${pkgver}.tar.bz2
-        deadlock.patch)
+source=("http://www.mplayerhq.hu/MPlayer/releases/dvdnav-old/${pkgname}-${pkgver}.tar.bz2"
+        'deadlock.patch')
 md5sums=('d62383c45b28816771e283515f2c27fa'
          '864529165a1136ae4c1ccbc7b43cdb1a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   
-  patch -Np1 -i ${srcdir}/deadlock.patch || return 1
+  patch -Np1 -i ${srcdir}/deadlock.patch
 
-  ./autogen.sh --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./autogen.sh --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
 }