mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-18 22:06:04 +01:00
multimedia/xbmc: Updated for version 13.1.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
parent
0ffb5b137f
commit
8ae8d5c3b8
5 changed files with 156 additions and 15 deletions
|
@ -25,4 +25,4 @@ PVR information: http://wiki.xbmc.org/index.php?title=PVR
|
|||
|
||||
NOTE:
|
||||
Please remove or rename /etc/oss.conf if it exists on your system
|
||||
prior building this package or it will fail to build.
|
||||
prior to building this package or it will fail to build.
|
||||
|
|
|
@ -38,7 +38,7 @@ index 6f689cf..bfadbe6 100644
|
|||
- lib/ffmpeg/libpostproc/libpostproc.a \
|
||||
- lib/ffmpeg/libswscale/libswscale.a
|
||||
-DYNOBJSXBMC+= $(FFMPEGOBJS)
|
||||
-LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@
|
||||
-LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@ @HOGWEED_ALL_LIBS@
|
||||
-
|
||||
-$(FFMPEGOBJS): dvdpcodecs
|
||||
-endif
|
||||
|
@ -50,7 +50,7 @@ diff --git a/configure.in b/configure.in
|
|||
index c389b76..0c6fc47 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -874,14 +874,6 @@ elif test "$use_arch" = "arm"; then
|
||||
@@ -874,15 +874,6 @@ elif test "$use_arch" = "arm"; then
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
@ -60,12 +60,13 @@ index c389b76..0c6fc47 100644
|
|||
- # ffmpeg may depend on gnutls and vorbisenc, we add those libs at the end of linker
|
||||
- # command in order to resolve any missing symbols
|
||||
- GNUTLS_ALL_LIBS=`${PKG_CONFIG} --static --libs-only-l --silence-errors gnutls`
|
||||
- HOGWEED_ALL_LIBS=`${PKG_CONFIG} --static --libs-only-l --silence-errors hogweed nettle`
|
||||
- VORBISENC_ALL_LIBS=`${PKG_CONFIG} --static --libs-only-l --silence-errors vorbisenc`
|
||||
-fi
|
||||
|
||||
# Checks for library functions.
|
||||
AC_FUNC_ALLOCA
|
||||
@@ -2619,7 +2618,6 @@ AC_SUBST(DISABLE_FISHBMC)
|
||||
@@ -2627,7 +2618,6 @@ AC_SUBST(DISABLE_FISHBMC)
|
||||
AC_SUBST(DISABLE_PROJECTM)
|
||||
AC_SUBST(USE_SKIN_TOUCHED)
|
||||
AC_SUBST(USE_EXTERNAL_FFMPEG)
|
||||
|
@ -73,11 +74,12 @@ index c389b76..0c6fc47 100644
|
|||
AC_SUBST(USE_LIBAV_HACKS)
|
||||
AC_SUBST(PYTHON_VERSION)
|
||||
AC_SUBST(OUTPUT_FILES)
|
||||
@@ -2666,8 +2663,6 @@ AC_SUBST(USE_ANDROID)
|
||||
@@ -2673,9 +2663,6 @@ AC_SUBST(USE_ANDROID)
|
||||
AC_SUBST(GTEST_CONFIGURED)
|
||||
AC_SUBST(USE_DOXYGEN)
|
||||
AC_SUBST(USE_PVR_ADDONS)
|
||||
-AC_SUBST(GNUTLS_ALL_LIBS)
|
||||
-AC_SUBST(HOGWEED_ALL_LIBS)
|
||||
-AC_SUBST(VORBISENC_ALL_LIBS)
|
||||
|
||||
# pushd and popd are not available in other shells besides bash, so implement
|
||||
|
@ -290,4 +292,3 @@ index ca18a4a..906219c 100644
|
|||
$(MAKE) -C $@
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
|
|
138
multimedia/xbmc/patches/xbmc-13.0-dvdread.patch
Normal file
138
multimedia/xbmc/patches/xbmc-13.0-dvdread.patch
Normal file
|
@ -0,0 +1,138 @@
|
|||
From 7bc0877dc9715e891159392abf669f970722dece Mon Sep 17 00:00:00 2001
|
||||
From: Ken Dreyer <ktdreyer@ktdreyer.com>
|
||||
Date: Mon, 6 May 2013 17:07:40 -0600
|
||||
Subject: [PATCH 1/3] Fedora: use external dvdread
|
||||
|
||||
Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
|
||||
(cherry picked from commit 9f9845af842a376d5bdf70742785e7727695fd03)
|
||||
---
|
||||
bootstrap.mk | 5 -----
|
||||
configure.in | 19 -------------------
|
||||
lib/libdvd/Makefile.in | 20 +++++++-------------
|
||||
3 files changed, 7 insertions(+), 37 deletions(-)
|
||||
|
||||
diff --git a/bootstrap.mk b/bootstrap.mk
|
||||
index 8bc4795..1fc31a4 100644
|
||||
--- a/bootstrap.mk
|
||||
+++ b/bootstrap.mk
|
||||
@@ -8,7 +8,6 @@ ifneq ($(wildcard lib/libdvd/libdvdcss/configure.ac),)
|
||||
BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac
|
||||
DVD_CSS=lib/libdvd/libdvdcss/configure
|
||||
endif
|
||||
-BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdread/configure.ac
|
||||
BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdnav/configure.ac
|
||||
|
||||
ifneq ($(wildcard pvr-addons/Makefile.am),)
|
||||
@@ -18,10 +17,6 @@ endif
|
||||
BOOTSTRAP_TARGETS=$(basename $(BOOTSTRAP_SUBDIRS))
|
||||
all: $(BOOTSTRAP_TARGETS)
|
||||
|
||||
-#preserve order for libdvd. dvdcss (if present) -> dvdread -> dvdnav.
|
||||
-lib/libdvd/libdvdread/configure: $(DVD_CSS)
|
||||
-lib/libdvd/libdvdnav/configure: lib/libdvd/libdvdread/configure
|
||||
-
|
||||
%: %.ac
|
||||
autoreconf -vif $(@D)
|
||||
-@rm -rf $(@D)/autom4te.cache
|
||||
diff --git a/configure.in b/configure.in
|
||||
index beb8aac..343292e 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -2860,27 +2860,9 @@
|
||||
--with-pic
|
||||
], [$SKIP_CONFIG_DVDCSS])
|
||||
|
||||
-XB_CONFIG_MODULE([lib/libdvd/libdvdread], [
|
||||
- ./configure2 \
|
||||
- --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src $DROID_DVDLIB_SEEK64" \
|
||||
- --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
|
||||
- --host=$host_alias \
|
||||
- --build=$build_alias \
|
||||
- --target=$target_alias \
|
||||
- --enable-static \
|
||||
- --disable-shared \
|
||||
- --disable-strip \
|
||||
- --disable-opts \
|
||||
- --cc="$CC" &&
|
||||
- mkdir -p `pwd`/../includes/dvdread
|
||||
- cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
|
||||
- cp `pwd`/../libdvdread/src/dvdread/*.h `pwd`/../includes/dvdread
|
||||
-], [0])
|
||||
-
|
||||
XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [
|
||||
./configure2 \
|
||||
--extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \
|
||||
- --extra-ldflags="-L`pwd`/../libdvdread/obj" \
|
||||
--with-dvdread-config="`pwd`/../dvdread-config" \
|
||||
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
|
||||
--host=$host_alias \
|
||||
diff --git a/lib/libdvd/Makefile.in b/lib/libdvd/Makefile.in
|
||||
index 69d2286..1f5eebb 100644
|
||||
--- a/lib/libdvd/Makefile.in
|
||||
+++ b/lib/libdvd/Makefile.in
|
||||
@@ -5,8 +5,7 @@ CXX=@CXX@
|
||||
|
||||
SYSDIR=@abs_top_srcdir@/system/players/dvdplayer
|
||||
SOS= libdvdnav-$(ARCH).so
|
||||
-DIRS= libdvdread \
|
||||
- libdvdnav
|
||||
+DIRS= libdvdnav
|
||||
|
||||
WRAPPER=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
|
||||
WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias
|
||||
@@ -14,7 +13,7 @@ WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_al
|
||||
ifeq ($(findstring osx,$(ARCH)),osx)
|
||||
LDFLAGS +=-bundle -undefined dynamic_lookup -read_only_relocs suppress
|
||||
else
|
||||
-LDFLAGS += -shared -fPIC -rdynamic
|
||||
+LDFLAGS += -shared -fPIC -rdynamic -ldvdread
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH), powerpc-osx)
|
||||
@@ -35,8 +34,7 @@ SLIB=$(addprefix $(SYSDIR)/, $(SOS))
|
||||
|
||||
DISTCLEAN_FILES=includes/dvdread/*.h \
|
||||
includes/dvdcss/*.h \
|
||||
- libdvdnav/config.h \
|
||||
- libdvdread/config.h
|
||||
+ libdvdnav/config.h
|
||||
|
||||
.PHONY: $(DIRS) compile
|
||||
|
||||
@@ -48,9 +46,9 @@ $(SYSDIR)/libdvdcss-$(ARCH).so: $($(WRAPPER)) libdvdcss/src/.libs/libdvdcss.a
|
||||
$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
|
||||
$(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O)
|
||||
|
||||
-$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
|
||||
+$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
|
||||
$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
|
||||
- $(WRAPPER) $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o $(BUNDLE1_O)
|
||||
+ $(WRAPPER) $(DVDCSS_O) libdvdnav/obj/*.o $(BUNDLE1_O)
|
||||
|
||||
else
|
||||
|
||||
@@ -59,8 +57,8 @@ $(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
|
||||
libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \
|
||||
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
|
||||
|
||||
-$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
|
||||
- $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o -lm \
|
||||
+$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
|
||||
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o -lm \
|
||||
-Wl,--unresolved-symbols=ignore-all \
|
||||
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
|
||||
|
||||
@@ -70,10 +68,6 @@ libdvdcss/src/.libs/libdvdcss.a: libdvdcss;
|
||||
libdvdcss: compile
|
||||
$(MAKE) -C $@
|
||||
|
||||
-libdvdread/obj/libdvdread.a: libdvdread;
|
||||
-libdvdread: compile
|
||||
- $(MAKE) -C $@
|
||||
-
|
||||
libdvdnav/obj/libdvdnav.a: libdvdnav;
|
||||
libdvdnav: compile
|
||||
$(MAKE) -C $@
|
||||
--
|
||||
1.8.5.3
|
||||
|
|
@ -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
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
PRGNAM="xbmc"
|
||||
VERSION="13.0_r2"
|
||||
VERSION="13.1"
|
||||
HOMEPAGE="http://xbmc.org/"
|
||||
DOWNLOAD="http://mirrors.xbmc.org/releases/source/xbmc-13.0_r2.tar.gz \
|
||||
DOWNLOAD="http://mirrors.xbmc.org/releases/source/xbmc-13.1.tar.gz \
|
||||
https://github.com/opdenkamp/xbmc-pvr-addons/archive/13.0-Gotham.tar.gz"
|
||||
MD5SUM="8f34b930be1dbeced07b43e316a9fcce \
|
||||
MD5SUM="1359859ad5fc13402e1cdca3641b19bd \
|
||||
63f5863393ca869eb6f357a62de76378"
|
||||
DOWNLOAD_x86_64=""
|
||||
MD5SUM_x86_64=""
|
||||
|
|
Loading…
Reference in a new issue