Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/apcupsd/PKGBUILD
	community/bmp-musepack/PKGBUILD
	community/bmp-wma/PKGBUILD
	community/bonnie++/PKGBUILD
	community/cantata/PKGBUILD
	community/checkinstall/PKGBUILD
	community/chrootuid/PKGBUILD
	community/compiz-bcop/PKGBUILD
	community/compiz-fusion-plugins-extra/PKGBUILD
	community/compiz-fusion-plugins-main/PKGBUILD
	community/compiz/PKGBUILD
	community/compizconfig-backend-gconf/PKGBUILD
	community/compizconfig-python/PKGBUILD
	community/ekg2/PKGBUILD
	community/emerald/PKGBUILD
	community/fbgetty/PKGBUILD
	community/flumotion/PKGBUILD
	community/leafnode/PKGBUILD
	community/libcompizconfig/PKGBUILD
	community/libdnet/PKGBUILD
	community/libee/PKGBUILD
	community/libtxc_dxtn/PKGBUILD
	community/linux-tools/PKGBUILD
	community/openntpd/PKGBUILD
	community/osiris/PKGBUILD
	community/perl-package-stash-xs/PKGBUILD
	community/perl-params-util/PKGBUILD
	community/procstatd/PKGBUILD
	community/scponly/PKGBUILD
	community/sniffit/PKGBUILD
	community/synergy/PKGBUILD
	community/turbojpeg/PKGBUILD
	community/unbound/PKGBUILD
	community/uucp/PKGBUILD
	core/gawk/PKGBUILD
	core/ifenslave/PKGBUILD
	core/jfsutils/PKGBUILD
	core/openldap/PKGBUILD
	core/rfkill/PKGBUILD
	core/systemd/PKGBUILD
	core/wireless_tools/PKGBUILD
	core/xinetd/PKGBUILD
	extra/avahi/PKGBUILD
	extra/calligra/PKGBUILD
	extra/clutter-gst/PKGBUILD
	extra/flac/PKGBUILD
	extra/hddtemp/PKGBUILD
	extra/libbluray/PKGBUILD
	extra/libdmx/PKGBUILD
	extra/libfs/PKGBUILD
	extra/libjpeg-turbo/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libxau/PKGBUILD
	extra/libxfixes/PKGBUILD
	extra/licq/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/perl-guard/PKGBUILD
	extra/perl-template-toolkit/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pigeonhole/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/python/PKGBUILD
	extra/samba/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vde2/PKGBUILD
	extra/vim/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-dict/PKGBUILD
	libre/libquicktime-libre/PKGBUILD
	libre/xscreensaver-libre/PKGBUILD

1 files changed, 4 insertions, 20 deletions

diff --git a/extra/libbluray/PKGBUILD b/extra/libbluray/PKGBUILD
index ba2ee7b36..1f4d9c706 100644
--- a/extra/libbluray/PKGBUILD
+++ b/extra/libbluray/PKGBUILD
@@ -1,46 +1,30 @@
-# $Id: PKGBUILD 167258 2012-09-29 12:58:04Z ibiru $
+# $Id: PKGBUILD 186521 2013-05-28 10:28:20Z ioni $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrew Cook <ariscop@gmail.com>
 
 pkgname=libbluray
-pkgver=0.2.3
+pkgver=0.3.0
 pkgrel=1
 pkgdesc="Library to access Blu-Ray disks for video playback"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/developers/libbluray.html"
 license=('LGPL2.1')
-depends=('libxml2')
-if [ "$CARCH" != "mips64el" ]; then
-makedepends=('apache-ant' 'jdk7-openjdk')
-optdepends=('java-environment: Blu-ray Disc Java support library')
-fi
+depends=('libxml2' 'freetype2')
 options=(!libtool)
 source=(ftp://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-sha512sums=('b84fd172523facb207134bb1fee09c7f65914d22f6120fbfd6f312f0435229f3b110e8cc8ea121159929cda3760cfac4b52f84de39d0fb976f8c88d1f7e6d278')
+sha512sums=('96eedf23ff756e97fa64d9624a49608daccbac169714b9b231a284ed4eb63c77ee2ecbdfc42c311781571146cfa0fe340854ac831d3fe1312131e1742a4a7b02')
 
 build() {
   cd "$pkgname-$pkgver"
 
-if [ "$CARCH" != "mips64el" ]; then
-  . /etc/profile.d/jdk.sh
   ./configure --prefix=/usr \
-    --enable-bdjava \
-    --with-jdk=${JAVA_HOME} \
     --disable-static
-else
-  ./configure --prefix=/usr \
-    --disable-static
-fi
   make
 }
 
 package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
-  #install bdj
-if [ "$CARCH" != "mips64el" ]; then
-  install -Dm644 src/.libs/libbluray.jar "$pkgdir/usr/share/java/libbluray.jar"
-fi
 }
 
 # vim:set ts=2 sw=2 et: