diff options
| -rw-r--r-- | multimedia/kodi/README | 8 | ||||
| -rw-r--r-- | multimedia/kodi/kodi.SlackBuild | 23 | ||||
| -rw-r--r-- | multimedia/kodi/kodi.info | 12 | ||||
| -rw-r--r-- | multimedia/kodi/patches/xbmc-15.0-dvdread.patch | 138 | ||||
| -rw-r--r-- | multimedia/kodi/patches/xbmc-Gotham-rtmpdump-build.patch | 13 | ||||
| -rw-r--r-- | multimedia/kodi/patches/xbmc-Helix-samba-4.0.patch | 24 | ||||
| -rw-r--r-- | multimedia/kodi/patches/xbmc-Krypton-samba-4.0.patch | 24 |
7 files changed, 42 insertions, 200 deletions
diff --git a/multimedia/kodi/README b/multimedia/kodi/README index ca03ccfcc0..d13c4486ee 100644 --- a/multimedia/kodi/README +++ b/multimedia/kodi/README @@ -6,7 +6,7 @@ Kodi has a sophisticated library management system that allows you to organize all your media to give you quick and immediate access. Optional dependencies: libcec, libbluray, libnfs, lirc, cwiid, pybluez, -rtmpdump, avahi, SDL2, shairplay and openjdk +avahi, shairplay and openjdk Optional: libcrystalhd (not available at slackbuilds.org) @@ -22,5 +22,7 @@ Kodi can be compiled with openjdk instead of jdk. Please remove or rename /etc/oss.conf if it exists on your system prior to building this package or it will fail to build. -ffmpeg on SBo is too old to build with kodi. Use ffmepg that is built -by default with kodi. +Using the system ffmpeg in the Kodi slackbuild is currently not +supported. The option to build Kodi with system ffmpeg is still +available in the slackbuild but it won't be supported by the +maintainer. diff --git a/multimedia/kodi/kodi.SlackBuild b/multimedia/kodi/kodi.SlackBuild index 4f0d65e10e..7f4db7862c 100644 --- a/multimedia/kodi/kodi.SlackBuild +++ b/multimedia/kodi/kodi.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for kodi -# Copyright 2009-2016 Larry Hajali <larryhaja[at]gmail[dot]com> +# Copyright 2009-2017 Larry Hajali <larryhaja[at]gmail[dot]com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,9 +24,9 @@ PRGNAM=kodi SRCNAM=xbmc -CODNAM=Jarvis -VERSION=${VERSION:-16.1} -FFMPEGVER=${FFMPEGVER:-2.8.6} +CODNAM=Krypton +VERSION=${VERSION:-17.1} +FFMPEGVER=${FFMPEGVER:-3.1.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -66,7 +66,7 @@ rm -rf $SRCNAM-$VERSION-$CODNAM tar xvf $CWD/$SRCNAM-$VERSION-$CODNAM.tar.gz cd $SRCNAM-$VERSION-$CODNAM # Don't have the Makefile download ffmpeg during install. -ln -s $CWD/FFmpeg-${FFMPEGVER}-${CODNAM}-16.0.tar.gz tools/depends/target/ffmpeg/ffmpeg-${FFMPEGVER}-${CODNAM}-16.0.tar.gz +ln -s $CWD/FFmpeg-${FFMPEGVER}-${CODNAM}.tar.gz tools/depends/target/ffmpeg/ffmpeg-${FFMPEGVER}-${CODNAM}-17.0.tar.gz chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -77,16 +77,8 @@ find -L . \ # No need to show Git: "Version" in a release build. sed -i '/Git:/s|.*| return GetVersionShort();|' $SRCNAM/utils/SystemInfo.cpp -# Patch for building against rtmpdump. Only needed if xbmc fails to build -# w/rtmpdump. See the following link for a rather obtuse explanation. -# http://slaxbmc.blogspot.com/2011/03/23-install-xbmc-from-source.html -patch -p1 < $CWD/patches/xbmc-Gotham-rtmpdump-build.patch - # Patch for Samba 4.0. -patch -p1 < $CWD/patches/xbmc-Helix-samba-4.0.patch - -# Use installed libdvdread. -patch -p1 < $CWD/patches/xbmc-15.0-dvdread.patch +patch -p1 < $CWD/patches/xbmc-Krypton-samba-4.0.patch # Fix static linking for Texturepacker. Thanks to Gentoo. # Issue: http://forum.kodi.tv/showthread.php?tid=220407 @@ -124,7 +116,6 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-gl \ --enable-mid \ --enable-alsa \ - --disable-asap-codec \ --enable-texturepacker \ --enable-pulse \ $OPT_DEPS \ @@ -155,7 +146,7 @@ for i in $PRGNAM.bin.1 $PRGNAM.1 $PRGNAM-standalone.1; do done if ! [ "${WII:-no}" = "no" ]; then - for i in $PRGNAM-j2meremote.1 $PRGNAM-ps3remote.1 $PRGNAM-send.1 $PRGNAM-wiiremote.1; do + for i in $PRGNAM-ps3remote.1 $PRGNAM-send.1 $PRGNAM-wiiremote.1; do install -m 0644 docs/manpages/$i $PKG/usr/man/man1/$i done fi diff --git a/multimedia/kodi/kodi.info b/multimedia/kodi/kodi.info index 74c8158ded..a71e538938 100644 --- a/multimedia/kodi/kodi.info +++ b/multimedia/kodi/kodi.info @@ -1,12 +1,12 @@ PRGNAM="kodi" -VERSION="16.1" +VERSION="17.1" HOMEPAGE="https://kodi.tv/" -DOWNLOAD="https://github.com/xbmc/xbmc/archive/16.1-Jarvis/xbmc-16.1-Jarvis.tar.gz \ - https://github.com/xbmc/FFmpeg/archive/2.8.6-Jarvis-16.0/FFmpeg-2.8.6-Jarvis-16.0.tar.gz" -MD5SUM="79358ad5f77f42c5498a9412d5a78dd5 \ - 91292b7dc99b9d055e4ad7b9644c9738" +DOWNLOAD="https://github.com/xbmc/xbmc/archive/17.1-Krypton/xbmc-17.1-Krypton.tar.gz \ + https://github.com/xbmc/FFmpeg/archive/3.1.6-Krypton/FFmpeg-3.1.6-Krypton.tar.gz" +MD5SUM="5e1fe4f85373aaaafba81185401ca14f \ + bf8b1689603ae4322b95f4095ad9bd62" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk libass libmpeg2 dcadec crossguid yajl tinyxml libmicrohttpd" +REQUIRES="jdk libass crossguid yajl tinyxml libmicrohttpd" MAINTAINER="Larry Hajali" EMAIL="larryhaja[at]gmail[dot]com" diff --git a/multimedia/kodi/patches/xbmc-15.0-dvdread.patch b/multimedia/kodi/patches/xbmc-15.0-dvdread.patch deleted file mode 100644 index 1387245c77..0000000000 --- a/multimedia/kodi/patches/xbmc-15.0-dvdread.patch +++ /dev/null @@ -1,138 +0,0 @@ -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.ac -+++ b/configure.ac -@@ -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 - diff --git a/multimedia/kodi/patches/xbmc-Gotham-rtmpdump-build.patch b/multimedia/kodi/patches/xbmc-Gotham-rtmpdump-build.patch deleted file mode 100644 index b745a55754..0000000000 --- a/multimedia/kodi/patches/xbmc-Gotham-rtmpdump-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur xbmc-Gotham_alpha9.orig/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp xbmc-Gotham_alpha9/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp ---- xbmc-Gotham_alpha9.orig/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp 2013-10-31 16:48:45.000000000 +0000 -+++ xbmc-Gotham_alpha9/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp 2013-11-28 05:47:36.418763917 +0000 -@@ -21,9 +21,7 @@ - #if (defined HAVE_CONFIG_H) && (!defined TARGET_WINDOWS) - #include "config.h" - #endif --#ifdef TARGET_WINDOWS - #include "system.h" // just for HAS_LIBRTMP --#endif - - #ifdef HAS_LIBRTMP - #include "settings/AdvancedSettings.h" diff --git a/multimedia/kodi/patches/xbmc-Helix-samba-4.0.patch b/multimedia/kodi/patches/xbmc-Helix-samba-4.0.patch deleted file mode 100644 index bb570ad9f0..0000000000 --- a/multimedia/kodi/patches/xbmc-Helix-samba-4.0.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur xbmc-14.0-Helix.orig/xbmc/filesystem/SMBDirectory.cpp xbmc-14.0-Helix/xbmc/filesystem/SMBDirectory.cpp ---- xbmc-14.0-Helix.orig/xbmc/filesystem/SMBDirectory.cpp 2014-12-22 23:11:35.000000000 +0000 -+++ xbmc-14.0-Helix/xbmc/filesystem/SMBDirectory.cpp 2014-12-24 03:32:09.227643266 +0000 -@@ -42,7 +42,7 @@ - #include "threads/SingleLock.h" - #include "PasswordManager.h" - --#include <libsmbclient.h> -+#include <samba-4.0/libsmbclient.h> - - #if defined(TARGET_DARWIN) - #define XBMC_SMB_MOUNT_PATH "Library/Application Support/Kodi/Mounts/" -diff -Naur xbmc-14.0-Helix.orig/xbmc/filesystem/SMBFile.cpp xbmc-14.0-Helix/xbmc/filesystem/SMBFile.cpp ---- xbmc-14.0-Helix.orig/xbmc/filesystem/SMBFile.cpp 2014-12-22 23:11:35.000000000 +0000 -+++ xbmc-14.0-Helix/xbmc/filesystem/SMBFile.cpp 2014-12-24 03:32:52.697913705 +0000 -@@ -26,7 +26,7 @@ - #include "SMBFile.h" - #include "PasswordManager.h" - #include "SMBDirectory.h" --#include <libsmbclient.h> -+#include <samba-4.0/libsmbclient.h> - #include "settings/AdvancedSettings.h" - #include "settings/Settings.h" - #include "threads/SingleLock.h" diff --git a/multimedia/kodi/patches/xbmc-Krypton-samba-4.0.patch b/multimedia/kodi/patches/xbmc-Krypton-samba-4.0.patch new file mode 100644 index 0000000000..b0cdb70181 --- /dev/null +++ b/multimedia/kodi/patches/xbmc-Krypton-samba-4.0.patch @@ -0,0 +1,24 @@ +diff -Naur xbmc-17.1-Krypton.orig/xbmc/filesystem/SMBDirectory.cpp xbmc-17.1-Krypton/xbmc/filesystem/SMBDirectory.cpp +--- xbmc-17.1-Krypton.orig/xbmc/filesystem/SMBDirectory.cpp 2017-03-20 16:17:49.000000000 +0000 ++++ xbmc-17.1-Krypton/xbmc/filesystem/SMBDirectory.cpp 2017-03-20 23:01:52.444160749 +0000 +@@ -45,7 +45,7 @@ + #include "linux/XTimeUtils.h" + #endif + +-#include <libsmbclient.h> ++#include <samba-4.0/libsmbclient.h> + + struct CachedDirEntry + { +diff -Naur xbmc-17.1-Krypton.orig/xbmc/filesystem/SMBFile.cpp xbmc-17.1-Krypton/xbmc/filesystem/SMBFile.cpp +--- xbmc-17.1-Krypton.orig/xbmc/filesystem/SMBFile.cpp 2017-03-20 16:17:49.000000000 +0000 ++++ xbmc-17.1-Krypton/xbmc/filesystem/SMBFile.cpp 2017-03-20 23:00:17.355154034 +0000 +@@ -26,7 +26,7 @@ + #include "SMBFile.h" + #include "PasswordManager.h" + #include "SMBDirectory.h" +-#include <libsmbclient.h> ++#include <samba-4.0/libsmbclient.h> + #include "settings/AdvancedSettings.h" + #include "settings/Settings.h" + #include "threads/SingleLock.h" |