4 files changed, 24 insertions, 175 deletions
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"