1 files changed, 8 insertions, 6 deletions
diff --git a/multimedia/xbmc/xbmc.SlackBuild b/multimedia/xbmc/xbmc.SlackBuild
index 958faa0834..b099eb4cb1 100644
--- a/multimedia/xbmc/xbmc.SlackBuild
+++ b/multimedia/xbmc/xbmc.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xbmc
-VERSION=${VERSION:-13.0_r2}
+VERSION=${VERSION:-13.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,8 +40,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DIRNAME=$(tar -tf $CWD/$PRGNAM-$VERSION.tar.gz | head -1)
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -61,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $DIRNAME
+rm -rf $PRGNAM-$VERSION-Gotham
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $DIRNAME
+cd $PRGNAM-$VERSION-Gotham
 tar xvf $CWD/$PRGNAM-pvr-addons-13.0-Gotham.tar.gz || tar xvf $CWD/13.0-Gotham.tar.gz
 chown -R root:root .
 find -L . \
@@ -88,6 +86,9 @@ patch -p1 < $CWD/patches/xbmc-Gotham-rtmpdump-build.patch
 # Patch for Samba 4.0.
 patch -p1 < $CWD/patches/xbmc-Gotham-samba-4.0.patch
 
+# Use installed libdvdread.
+patch -p1 < $CWD/patches/xbmc-13.0-dvdread.patch
+
 # Hack for using afpfs-ng.
 cat lib/afpfs-ng/fix_afpfs-ng_includes.patch | head -1336 | tail -1172 | patch -p1
 AFPFS_NGFLAGS="-I$PWD/include"
@@ -152,7 +153,7 @@ CXXFLAGS="$SLKCFLAGS $AFPFS_NGFLAGS" \
   --enable-external-libraries \
   --build=$ARCH-slackware-linux
 
-make
+make VERBOSE=1
 
 # Wii controller usage. Default is no.
 if ! [ "${WII:-no}" = "no" ]; then
@@ -190,6 +191,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 # Final clean up.
 rm -f $PKG/usr/share/xbmc/{README.linux,LICENSE.GPL,*.txt}
 find $PKG \( -name "Makefile*" -o -name "*cmake*" -o -name "*\.in" \) -exec rm -f '{}' \;
+chmod 0644 $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc