3 files changed, 35 insertions, 10 deletions
diff --git a/libraries/libbluray/README b/libraries/libbluray/README
index 1eae7883dd4eb..ecb1b4ab79faf 100644
--- a/libraries/libbluray/README
+++ b/libraries/libbluray/README
@@ -13,3 +13,5 @@ slackbuild as:
 
 Most commercial Blu-Ray are protected by AACS or BD+ technologies and this
 library is not enough to playback those discs.
+
+Note: The xine plugin has been disabled because it requires xine-lib > 1.2.0.
diff --git a/libraries/libbluray/libbluray.SlackBuild b/libraries/libbluray/libbluray.SlackBuild
index a5d94dd4431e2..a12bfc0ea2447 100644
--- a/libraries/libbluray/libbluray.SlackBuild
+++ b/libraries/libbluray/libbluray.SlackBuild
@@ -2,10 +2,28 @@
 
 # Slackware build script for libbluray
 
-# Written by Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2011-2013 Larry Hajali <larryhaja[at]gmail[dot]com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libbluray
-VERSION=${VERSION:-0.2.3}
+VERSION=${VERSION:-0.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,6 +75,9 @@ sed -i -e '/pkg-config libbluray/d' -e 's|0644|0755|' player_wrappers/xine/Makef
 # If you want bdjava enabled then set BDAJVA=yes to the slackbuild.
 if [ "${BDJAVA:-no}" == 'yes' ]; then
   OPT_ARGS="--enable-bdjava"
+  sed -i \
+    "s|/usr/lib/libbluray|/usr/lib${LIBDIRSUFFIX}/libbluray|" \
+    src/libbluray/bdj/bdj.c
 else
   OPT_ARGS="--disable-bdjava"
 fi
@@ -65,19 +86,21 @@ CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --enable-debug=no \
   --enable-static=no \
+  --enable-doxygen-man \
   $OPT_ARGS \
   --build=$ARCH-slackware-linux
 
 CFLAGS="$SLKCFLAGS" make
 make install DESTDIR=$PKG
 
+### The xine bluray plugin only works with xine-lib > 1.2.
+### Disabling for now.
 # Install the xine bluray plugin
-CFLAGS="$SLKCFLAGS -I$PKG/usr/include" \
-LDFLAGS="-L$PKG/usr/lib$LIBDIRSUFFIX" \
-LIBS_BD="-lbluray" \
-make -C player_wrappers/xine DESTDIR=$PKG install
+#CFLAGS="$SLKCFLAGS -I$PKG/usr/include" \
+#LDFLAGS="-L$PKG/usr/lib$LIBDIRSUFFIX" \
+#LIBS_BD="-lbluray" \
+#make -C player_wrappers/xine DESTDIR=$PKG install
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/libraries/libbluray/libbluray.info b/libraries/libbluray/libbluray.info
index 75d98b979c7be..5ba7522962399 100644
--- a/libraries/libbluray/libbluray.info
+++ b/libraries/libbluray/libbluray.info
@@ -1,8 +1,8 @@
 PRGNAM="libbluray"
-VERSION="0.2.3"
+VERSION="0.4.0"
 HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
-DOWNLOAD="ftp://ftp.videolan.org/pub/videolan/libbluray/0.2.3/libbluray-0.2.3.tar.bz2"
-MD5SUM="684e420d2ebafa13786ae84364543cf9"
+DOWNLOAD="ftp://ftp.videolan.org/pub/videolan/libbluray/0.4.0/libbluray-0.4.0.tar.bz2"
+MD5SUM="c7a1cc71cb9747f93122ec650d4ae933"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""