multimedia/xbmc: Removed (replaced by kodi).

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

13 files changed, 0 insertions, 844 deletions

diff --git a/multimedia/xbmc/README b/multimedia/xbmc/README
deleted file mode 100644
index b5c86c5d2e..0000000000
--- a/multimedia/xbmc/README
+++ /dev/null
@@ -1,28 +0,0 @@
-XBMC is an award winning media center application for Linux, Mac OS X,
-Windows and XBox. The ultimate hub for all your media, XBMC is easy to
-use, looks slick, and has a large helpful community.  XBMC supports
-viewing and playing a vast library of audio, video and image formats.
-XBMC has a sophisticated library management system that allows you to
-organize all your media to give you quick and immediate access.
-
-Optional dependencies: libcec, pulseaudio, libbluray, libnfs, libva,
-libdvdcss, lirc, cwiid, pybluez, id3lib, libvdpau, rtmpdump, afpfs-ng,
-libmicrohttpd, avahi, lame, ffmpeg
-
-Optional: libcrystalhd and libshairport (not available at slackbuilds.org)
-
-Below are some paramaters that can be passed to the slackbuild to turn
-on some optional components.
-
-FFMPEG=yes|no (Default is no), requires ffmpeg
-WII=yes|no (Default is no), requires cwiid and pybluez
-WEBSERVER=yes|no (Default is no), requires libmicrohttpd
-PULSE=yes|no (Default is no), requires pulseaudio
-
-Note: The use of external ffmpeg is discouraged by the XBMC developers.
-
-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 to building this package or it will fail to build.
diff --git a/multimedia/xbmc/doinst.sh b/multimedia/xbmc/doinst.sh
deleted file mode 100644
index 3e5691a052..0000000000
--- a/multimedia/xbmc/doinst.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
diff --git a/multimedia/xbmc/patches/0001-Revert-drop-support-for-external-ffmpeg.patch b/multimedia/xbmc/patches/0001-Revert-drop-support-for-external-ffmpeg.patch
deleted file mode 100644
index d0920b3bd6..0000000000
--- a/multimedia/xbmc/patches/0001-Revert-drop-support-for-external-ffmpeg.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From e55766aa8da7265bea129c70cfd445ad66191fd0 Mon Sep 17 00:00:00 2001
-From: Michael Cronenworth <mike@cchtml.com>
-Date: Sun, 16 Mar 2014 17:14:03 -0500
-Subject: [PATCH 1/2] Revert "drop support for external ffmpeg"
-
-This reverts commit e211654714b2266b80ba65361bda8f715d47933a.
-
-Conflicts:
-	configure.in
----
- configure.in | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index f9f5693..c389b76 100644
---- a/configure.in
-+++ b/configure.in
-@@ -191,6 +191,9 @@ libcec_disabled="== libcec disabled. CEC adapter support will not be available.
- # External library message strings
- external_libraries_enabled="== Use of all supported external libraries enabled. =="
- external_libraries_disabled="== Use of all supported external libraries disabled. =="
-+external_ffmpeg_enabled="== Use of external ffmpeg enabled. =="
-+external_ffmpeg_disabled="== Use of external ffmpeg disabled. =="
-+ffmpeg_vdpau_not_supported="== External ffmpeg doesn't support VDPAU. VDPAU support disabled. =="
- dashes="------------------------"
- final_message="\n  XBMC Configuration:"
- final_message="\n$dashes$final_message\n$dashes"
-@@ -569,6 +572,12 @@ AC_ARG_ENABLE([external-libraries],
-   [use_external_libraries=$enableval],
-   [use_external_libraries=no])
- 
-+AC_ARG_ENABLE([external-ffmpeg],
-+  [AS_HELP_STRING([--enable-external-ffmpeg],
-+  [enable use of external ffmpeg libraries (default is no) 'Linux only'])],
-+  [use_external_ffmpeg=$enableval],
-+  [use_external_ffmpeg=$use_external_libraries])
-+
- AC_ARG_ENABLE([libav-compat],
-   [AS_HELP_STRING([--enable-libav-compat],
-   [build a wrapper around libav to provide the functions needed by XBMC. This is
-@@ -600,9 +609,6 @@ PKG_PROG_PKG_CONFIG
- MAKE="${MAKE:-make}"
- OBJDUMP="${OBJDUMP:-objdump}"
- 
--use_external_ffmpeg=no
--use_static_ffmpeg=no
--
- # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os
- # there is no autoconf variable which will give
- # the correct output format when doing cross compilation
--- 
-1.8.5.3
-
diff --git a/multimedia/xbmc/patches/0002-Revert-linux-link-ffmpeg-statically.patch b/multimedia/xbmc/patches/0002-Revert-linux-link-ffmpeg-statically.patch
deleted file mode 100644
index a3f8a2cea2..0000000000
--- a/multimedia/xbmc/patches/0002-Revert-linux-link-ffmpeg-statically.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-From 6df5c168c9de11fa6fdec250ba2b1c732ff3e9a2 Mon Sep 17 00:00:00 2001
-From: Michael Cronenworth <mike@cchtml.com>
-Date: Sun, 16 Mar 2014 17:23:51 -0500
-Subject: [PATCH 2/2] Revert "linux: link ffmpeg statically"
-
-This reverts commit 974a3c0e97b817ca358a959a026db95330673642.
-
-Conflicts:
-	Makefile.in
-	configure.in
----
- Makefile.in         | 14 ---------------
- configure.in        | 13 +------------
- lib/DllAvCodec.h    |  4 ++--
- lib/DllAvFilter.h   |  2 +-
- lib/DllAvFormat.h   |  8 ++++----
- lib/DllAvUtil.h     |  4 ++--
- lib/DllPostProc.h   |  2 +-
- lib/DllSwResample.h |  4 ++--
- lib/DllSwScale.h    |  4 ++--
- lib/Makefile.in     | 14 --------------
- 10 files changed, 15 insertions(+), 54 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 6f689cf..bfadbe6 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -472,20 +472,6 @@ ifeq ($(findstring freebsd,@ARCH@),freebsd)
- DYNOBJSXBMC+= xbmc/freebsd/freebsd.a
- endif
- 
--ifeq (@USE_STATIC_FFMPEG@,1)
--FFMPEGOBJS = lib/ffmpeg/libavcodec/libavcodec.a \
--             lib/ffmpeg/libavfilter/libavfilter.a \
--             lib/ffmpeg/libswresample/libswresample.a \
--             lib/ffmpeg/libavformat/libavformat.a \
--             lib/ffmpeg/libavutil/libavutil.a \
--             lib/ffmpeg/libpostproc/libpostproc.a \
--             lib/ffmpeg/libswscale/libswscale.a
--DYNOBJSXBMC+= $(FFMPEGOBJS)
--LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@ @HOGWEED_ALL_LIBS@
--
--$(FFMPEGOBJS): dvdpcodecs
--endif
--
- ifneq (@USE_LIBXBMC@,1)
- MAINOBJS+=xbmc/main/main.a
- else
-diff --git a/configure.in b/configure.in
-index c389b76..0c6fc47 100644
---- a/configure.in
-+++ b/configure.in
-@@ -874,15 +874,6 @@ elif test "$use_arch" = "arm"; then
-     fi
-   fi
- fi
--if test "$use_static_ffmpeg" = "yes"; then
--  USE_STATIC_FFMPEG=1
--  AC_DEFINE([USE_STATIC_FFMPEG], [1], [link ffmpeg statically])
--  # 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
-@@ -2627,7 +2618,6 @@ AC_SUBST(DISABLE_FISHBMC)
- AC_SUBST(DISABLE_PROJECTM)
- AC_SUBST(USE_SKIN_TOUCHED)
- AC_SUBST(USE_EXTERNAL_FFMPEG)
--AC_SUBST(USE_STATIC_FFMPEG)
- AC_SUBST(USE_LIBAV_HACKS)
- AC_SUBST(PYTHON_VERSION)
- AC_SUBST(OUTPUT_FILES)
-@@ -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
- # our own pushd/popd functions
-@@ -2832,7 +2819,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [
-       --disable-ffserver \
-       --disable-ffmpeg \
-       --disable-crystalhd \
--      `if test "$use_static_ffmpeg" = "yes"; then echo --enable-static --disable-shared; else echo --disable-static --enable-shared; fi` \
-+      --enable-shared \
-       --disable-doc \
-       --enable-postproc \
-       --enable-gpl \
-diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h
-index af13a15..5cef736 100644
---- a/lib/DllAvCodec.h
-+++ b/lib/DllAvCodec.h
-@@ -94,7 +94,7 @@ public:
-   virtual AVDictionary* av_frame_get_metadata(const AVFrame* frame)=0;
- };
- 
--#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) || (defined USE_STATIC_FFMPEG)
-+#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN)
- 
- // Use direct layer
- class DllAvCodec : public DllDynamic, DllAvCodecInterface
-@@ -166,7 +166,7 @@ public:
-   // DLL faking.
-   virtual bool ResolveExports() { return true; }
-   virtual bool Load() {
--#if !defined(TARGET_DARWIN) && !defined(USE_STATIC_FFMPEG)
-+#if !defined(TARGET_DARWIN)
-     CLog::Log(LOGDEBUG, "DllAvCodec: Using libavcodec system library");
- #endif
-     return true;
-diff --git a/lib/DllAvFilter.h b/lib/DllAvFilter.h
-index 05e5c6f..2200bfa 100644
---- a/lib/DllAvFilter.h
-+++ b/lib/DllAvFilter.h
-@@ -104,7 +104,7 @@ public:
- #endif
- };
- 
--#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) || (defined USE_STATIC_FFMPEG)
-+#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN)
- // Use direct mapping
- class DllAvFilter : public DllDynamic, DllAvFilterInterface
- {
-diff --git a/lib/DllAvFormat.h b/lib/DllAvFormat.h
-index fc7e166..0016c0b 100644
---- a/lib/DllAvFormat.h
-+++ b/lib/DllAvFormat.h
-@@ -41,7 +41,7 @@ extern "C" {
-   void xbmc_read_frame_flush(AVFormatContext *s);
- #else
-   #include "libavformat/avformat.h"
--  #if defined(TARGET_DARWIN) || defined(USE_STATIC_FFMPEG)
-+  #if defined(TARGET_DARWIN)
-     void ff_read_frame_flush(AVFormatContext *s);    // internal replacement 
-     #define xbmc_read_frame_flush ff_read_frame_flush
-   #endif
-@@ -73,7 +73,7 @@ public:
-   virtual int av_read_play(AVFormatContext *s)=0;
-   virtual int av_read_pause(AVFormatContext *s)=0;
-   virtual int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp, int flags)=0;
--#if (!defined USE_EXTERNAL_FFMPEG) && (!defined TARGET_DARWIN) && (!defined USE_STATIC_FFMPEG)
-+#if (!defined USE_EXTERNAL_FFMPEG) && (!defined TARGET_DARWIN)
-   virtual int avformat_find_stream_info_dont_call(AVFormatContext *ic, AVDictionary **options)=0;
- #endif
-   virtual int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputFormat *fmt, AVDictionary **options)=0;
-@@ -108,7 +108,7 @@ public:
- #endif
- };
- 
--#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) || (defined USE_STATIC_FFMPEG)
-+#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) 
- 
- // Use direct mapping
- class DllAvFormat : public DllDynamic, DllAvFormatInterface
-@@ -170,7 +170,7 @@ public:
-   // DLL faking.
-   virtual bool ResolveExports() { return true; }
-   virtual bool Load() {
--#if !defined(TARGET_DARWIN) && !defined(USE_STATIC_FFMPEG)
-+#if !defined(TARGET_DARWIN)
-     CLog::Log(LOGDEBUG, "DllAvFormat: Using libavformat system library");
- #endif
-     CSingleLock lock(DllAvCodec::m_critSection);
-diff --git a/lib/DllAvUtil.h b/lib/DllAvUtil.h
-index 0fcdf10..ce5889b 100644
---- a/lib/DllAvUtil.h
-+++ b/lib/DllAvUtil.h
-@@ -116,7 +116,7 @@ public:
- #endif
- };
- 
--#if defined (USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) || (defined USE_STATIC_FFMPEG)
-+#if defined (USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN)
- // Use direct layer
- class DllAvUtilBase : public DllDynamic, DllAvUtilInterface
- {
-@@ -174,7 +174,7 @@ public:
-    // DLL faking.
-    virtual bool ResolveExports() { return true; }
-    virtual bool Load() {
--#if !defined(TARGET_DARWIN) && !defined(USE_STATIC_FFMPEG)
-+#if !defined(TARGET_DARWIN)
-      CLog::Log(LOGDEBUG, "DllAvUtilBase: Using libavutil system library");
- #endif
-      return true;
-diff --git a/lib/DllPostProc.h b/lib/DllPostProc.h
-index e9542eb..0265651 100644
---- a/lib/DllPostProc.h
-+++ b/lib/DllPostProc.h
-@@ -78,7 +78,7 @@ public:
-   virtual void pp_free_context(pp_context *ppContext)=0;
- };
- 
--#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) || (defined USE_STATIC_FFMPEG)
-+#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) 
- 
- // We call directly.
- class DllPostProc : public DllDynamic, DllPostProcInterface
-diff --git a/lib/DllSwResample.h b/lib/DllSwResample.h
-index cd1452b..854d250 100644
---- a/lib/DllSwResample.h
-+++ b/lib/DllSwResample.h
-@@ -60,7 +60,7 @@ public:
-   virtual int swr_set_compensation(struct SwrContext *s, int sample_delta, int compensation_distance) = 0;
- };
- 
--#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) || (defined USE_STATIC_FFMPEG)
-+#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) 
- 
- // Use direct mapping
- class DllSwResample : public DllDynamic, DllSwResampleInterface
-@@ -71,7 +71,7 @@ public:
-   // DLL faking.
-   virtual bool ResolveExports() { return true; }
-   virtual bool Load() {
--#if !defined(TARGET_DARWIN) && !defined(USE_STATIC_FFMPEG)
-+#if !defined(TARGET_DARWIN)
-     CLog::Log(LOGDEBUG, "DllAvFormat: Using libswresample system library");
- #endif
-     return true;
-diff --git a/lib/DllSwScale.h b/lib/DllSwScale.h
-index 97e3b40..36bb616 100644
---- a/lib/DllSwScale.h
-+++ b/lib/DllSwScale.h
-@@ -87,7 +87,7 @@ public:
-    virtual void sws_freeContext(struct SwsContext *context)=0;
- };
- 
--#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) || (defined USE_STATIC_FFMPEG)
-+#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) 
- 
- // We call into this library directly.
- class DllSwScale : public DllDynamic, public DllSwScaleInterface
-@@ -111,7 +111,7 @@ public:
-   // DLL faking.
-   virtual bool ResolveExports() { return true; }
-   virtual bool Load() {
--#if !defined(TARGET_DARWIN) && !defined(USE_STATIC_FFMPEG)
-+#if !defined(TARGET_DARWIN)
-     CLog::Log(LOGDEBUG, "DllSwScale: Using libswscale system library");
- #endif
-     return true;
-diff --git a/lib/Makefile.in b/lib/Makefile.in
-index ca18a4a..906219c 100644
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -27,7 +27,6 @@ endif
- 
- LIBS=
- ifneq (@USE_EXTERNAL_FFMPEG@,1)
--ifneq (@USE_STATIC_FFMPEG@,1)
-   LIBS+=$(AVUTIL_SO) \
- 	$(AVCODEC_SO) \
- 	$(AVFORMAT_SO) \
-@@ -36,12 +35,10 @@ ifneq (@USE_STATIC_FFMPEG@,1)
- 	$(SWSCALE_SO) \
- 	$(SWRESAMPLE_SO)
- endif
--endif
- 
- .PHONY: $(DIRS) codecs
- 
- ifneq ($(findstring osx,$(ARCH)), osx)
--ifneq (@USE_STATIC_FFMPEG@,1)
- 
- codecs: $(addprefix $(SYSDIR)/, $(LIBS));
- 
-@@ -74,17 +71,6 @@ ffmpeg/libswscale/libswscale.so   : ffmpeg;
- ffmpeg/libpostproc/libpostproc.so : ffmpeg;
- ffmpeg/libswresample/libswresample.so : ffmpeg;
- endif
--endif
--
--ifeq (@USE_STATIC_FFMPEG@,1)
--ffmpeg/libavutil/libavutil.a     : ffmpeg;
--ffmpeg/libavcodec/libavcodec.a   : ffmpeg;
--ffmpeg/libavformat/libavformat.a : ffmpeg;
--ffmpeg/libavfilter/libavfilter.a : ffmpeg;
--ffmpeg/libswscale/libswscale.a   : ffmpeg;
--ffmpeg/libpostproc/libpostproc.a : ffmpeg;
--ffmpeg/libswresample/libswresample.a : ffmpeg;
--endif
- 
- ffmpeg:
- 	$(MAKE) -C $@
--- 
-1.8.5.3
diff --git a/multimedia/xbmc/patches/0003-makefile-include.patch b/multimedia/xbmc/patches/0003-makefile-include.patch
deleted file mode 100644
index d3687e640a..0000000000
--- a/multimedia/xbmc/patches/0003-makefile-include.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/Makefile.include.in	2014-03-16 15:34:08.479015885 -0500
-+++ b/Makefile.include.in	2014-03-16 18:58:00.770693019 -0500
-@@ -58,6 +58,11 @@
- 	@SDL_DEFINES@ \
- 	@DEFS@ \
- 
-+ifeq (@USE_EXTERNAL_FFMPEG@,1)
-+	DEFINES+=-DUSE_EXTERNAL_FFMPEG \
-+
-+endif
-+
- ifeq ($(findstring osx,$(ARCH)), osx)
- 	INCLUDES+=-I@abs_top_srcdir@/xbmc/osx
- endif
diff --git a/multimedia/xbmc/patches/libnfs-header-changes.patch b/multimedia/xbmc/patches/libnfs-header-changes.patch
deleted file mode 100644
index ef3d45e2c6..0000000000
--- a/multimedia/xbmc/patches/libnfs-header-changes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/xbmc/filesystem/NFSDirectory.cpp b/xbmc/filesystem/NFSDirectory.cpp
-index 85084a5..8efa7bf 100644
---- a/xbmc/filesystem/NFSDirectory.cpp
-+++ b/xbmc/filesystem/NFSDirectory.cpp
-@@ -37,6 +37,7 @@
- using namespace XFILE;
- using namespace std;
- #include <limits.h>
-+#include <nfsc/libnfs-zdr.h>
- #include <nfsc/libnfs-raw-mount.h>
- #include <nfsc/libnfs-raw-nfs.h>
- 
-diff --git a/xbmc/filesystem/NFSFile.cpp b/xbmc/filesystem/NFSFile.cpp
-index 479f3fe..2aeea32 100644
---- a/xbmc/filesystem/NFSFile.cpp
-+++ b/xbmc/filesystem/NFSFile.cpp
-@@ -32,6 +32,7 @@
- #include "network/DNSNameCache.h"
- #include "threads/SystemClock.h"
- 
-+#include <nfsc/libnfs-zdr.h>
- #include <nfsc/libnfs-raw-mount.h>
- 
- #ifdef TARGET_WINDOWS
diff --git a/multimedia/xbmc/patches/sse2.patch b/multimedia/xbmc/patches/sse2.patch
deleted file mode 100644
index d9b730ed2f..0000000000
--- a/multimedia/xbmc/patches/sse2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur Git-xbmc.orig/lib/libsquish/config Git-xbmc/lib/libsquish/config
---- Git-xbmc.orig/lib/libsquish/config	2012-11-18 14:14:35.000000000 +0000
-+++ Git-xbmc/lib/libsquish/config	2012-12-07 02:54:22.864062271 +0000
-@@ -4,7 +4,7 @@
- USE_ALTIVEC ?= 0
- 
- # define to 1 to use SSE2 instructions
--USE_SSE ?= 0
-+USE_SSE ?= 1
- 
- # default flags
- CXXFLAGS ?= -O2
diff --git a/multimedia/xbmc/patches/xbmc-13.0-dvdread.patch b/multimedia/xbmc/patches/xbmc-13.0-dvdread.patch
deleted file mode 100644
index d694a95cae..0000000000
--- a/multimedia/xbmc/patches/xbmc-13.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.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
-
diff --git a/multimedia/xbmc/patches/xbmc-Gotham-rtmpdump-build.patch b/multimedia/xbmc/patches/xbmc-Gotham-rtmpdump-build.patch
deleted file mode 100644
index b745a55754..0000000000
--- a/multimedia/xbmc/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/xbmc/patches/xbmc-Gotham-samba-4.0.patch b/multimedia/xbmc/patches/xbmc-Gotham-samba-4.0.patch
deleted file mode 100644
index 6306472009..0000000000
--- a/multimedia/xbmc/patches/xbmc-Gotham-samba-4.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur xbmc-Gotham_alpha9.orig/xbmc/filesystem/SMBDirectory.cpp xbmc-Gotham_alpha9/xbmc/filesystem/SMBDirectory.cpp
---- xbmc-Gotham_alpha9.orig/xbmc/filesystem/SMBDirectory.cpp	2013-10-31 16:48:45.000000000 +0000
-+++ xbmc-Gotham_alpha9/xbmc/filesystem/SMBDirectory.cpp	2013-11-28 06:04:24.156764793 +0000
-@@ -43,7 +43,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/XBMC/Mounts/"
-diff -Naur xbmc-Gotham_alpha9.orig/xbmc/filesystem/SmbFile.cpp xbmc-Gotham_alpha9/xbmc/filesystem/SmbFile.cpp
---- xbmc-Gotham_alpha9.orig/xbmc/filesystem/SmbFile.cpp	2013-10-31 16:48:45.000000000 +0000
-+++ xbmc-Gotham_alpha9/xbmc/filesystem/SmbFile.cpp	2013-11-28 06:05:11.648764834 +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/xbmc/slack-desc b/multimedia/xbmc/slack-desc
deleted file mode 100644
index 0b0528594f..0000000000
--- a/multimedia/xbmc/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-    |-----handy-ruler------------------------------------------------------|
-xbmc: XBMC (Multi-platform Media Center)
-xbmc:
-xbmc: XBMC is an award winning media center application for Linux, Mac OS X,
-xbmc: Windows and XBox. The ultimate hub for all your media, XBMC is easy to
-xbmc: use, looks slick, and has a large helpful community.  XBMC supports
-xbmc: viewing and playing a vast library of audio, video and image formats.
-xbmc: XBMC has a sophisticated library management system that allows you to
-xbmc: organize all your media to give you quick and immediate access.
-xbmc:
-xbmc: Homepage: http://xbmc.org/
-xbmc:
diff --git a/multimedia/xbmc/xbmc.SlackBuild b/multimedia/xbmc/xbmc.SlackBuild
deleted file mode 100644
index 09ea4fb6f7..0000000000
--- a/multimedia/xbmc/xbmc.SlackBuild
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for XBMC
-
-# Copyright 2009-2014 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 ''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=xbmc
-VERSION=${VERSION:-13.1}
-BUILD=${BUILD:-3}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION-Gotham
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-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 . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Fix for sse2 cpu's.
-if grep 'sse2' /proc/cpuinfo 2>&1 > /dev/null; then
-  patch -p1 < $CWD/patches/sse2.patch
-fi
-
-# No need to show Git: "Version" in a release build.
-sed -i '/GetXbmcGitRevision/,/else/d' $PRGNAM/GUIInfoManager.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-Gotham-samba-4.0.patch
-
-# Use installed libdvdread.
-patch -p1 < $CWD/patches/xbmc-13.0-dvdread.patch
-
-# Header fix against libnfs 1.9.4+.
-patch -p1 < $CWD/patches/libnfs-header-changes.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"
-
-if [ "${FFMPEG:-no}" == "yes" ]; then
-  OPT_DEPS="--enable-external-ffmpeg"
-  # Renable external ffmpeg. Patches from fedora.
-  patch -p1 < $CWD/patches/0001-Revert-drop-support-for-external-ffmpeg.patch
-  patch -p1 < $CWD/patches/0002-Revert-linux-link-ffmpeg-statically.patch
-  patch -p1 < $CWD/patches/0003-makefile-include.patch
-else
-  OPT_DEPS=""
-fi
-
-# Build webserver. Requires libmicrohttpd.
-if [ "${WEBSERVER:-no}" == "yes" ]; then
-  OPT_DEPS="$OPT_DEPS --enable-webserver"
-else
-  OPT_DEPS="$OPT_DEPS --disable-webserver"
-fi
-
-# Use pulseaudio.
-if [ "${PULSE:-no}" == "yes" ]; then
-  OPT_DEPS="$OPT_DEPS --enable-pulse"
-fi
-
-# Build the pvr addons.
-cd $PRGNAM-pvr-addons-13.0-Gotham
-  ./bootstrap
-  CFLAGS="$SLKCFLAGS $AFPFS_NGFLAGS -DGL_GLEXT_PROTOTYPES" \
-  CXXFLAGS="$SLKCFLAGS $AFPFS_NGFLAGS -DGL_GLEXT_PROTOTYPES" \
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib${LIBDIRSUFFIX}/xbmc/addons \
-    --enable-release \
-    --enable-addons-with-dependencies=yes \
-    --docdir=/usr/doc/$PRGNAM-$VERSION \
-    --build=$ARCH-slackware-linux
-
-    make
-cd ..
-
-./bootstrap
-
-CFLAGS="$SLKCFLAGS $AFPFS_NGFLAGS" \
-CXXFLAGS="$SLKCFLAGS $AFPFS_NGFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-static=no \
-  --enable-neon \
-  --disable-debug \
-  --enable-gl \
-  --enable-mid \
-  --enable-goom \
-  --enable-ffmpeg-libvorbis \
-  --enable-alsa \
-  --disable-asap-codec \
-  --enable-texturepacker \
-  $OPT_DEPS \
-  --enable-external-libraries \
-  --build=$ARCH-slackware-linux
-
-make VERBOSE=1
-
-# Wii controller usage. Default is no.
-if ! [ "${WII:-no}" = "no" ]; then
-  make eventclients DESTDIR=$PKG WII_EXTRA_OPTS="-DCWIID_OLD"
-  find $PKG/usr/lib${LIBDIRSUFFIX}/python* -iname "*\.py" -exec chmod 0644 '{}' \;
-fi
-
-make install DESTDIR=$PKG
-
-install -m 0755 tools/TexturePacker/TexturePacker $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
-
-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
-
-# Install manpages.
-mkdir -p $PKG/usr/man/man1
-for i in diskmounter.1 runXBMC.1 xbmc.bin.1 xbmc.1 xbmc-standalone.1 xbmc-send.1 \
-  setAlsaVolumes.1 installXBMC.1
-do
-  install -m 0644 docs/manpages/$i $PKG/usr/man/man1/$i
-done
-
-if ! [ "${WII:-no}" = "no" ]; then
-  for i in xbmc-j2meremote.1 xbmc-ps3remote.1 xbmc-wiiremote.1; do
-    install -m 0644 docs/manpages/$i $PKG/usr/man/man1/$i
-  done
-fi
-gzip -9 $PKG/usr/man/man?/*.?
-
-cp -a \
-  tools/EventClients/README.txt $PRGNAM-pvr-addons-13.0-Gotham/COPYING \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-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
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/xbmc/xbmc.info b/multimedia/xbmc/xbmc.info
deleted file mode 100644
index 3d8e99cbc0..0000000000
--- a/multimedia/xbmc/xbmc.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="xbmc"
-VERSION="13.1"
-HOMEPAGE="http://xbmc.org/"
-DOWNLOAD="http://mirrors.kodi.tv/releases/source/old/xbmc-13.1.tar.gz \
-          https://github.com/opdenkamp/xbmc-pvr-addons/archive/13.0-Gotham.tar.gz"
-MD5SUM="1359859ad5fc13402e1cdca3641b19bd \
-        63f5863393ca869eb6f357a62de76378"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="jdk libass libmpeg2 libmodplug yajl tinyxml"
-MAINTAINER="Larry Hajali"
-EMAIL="larryhaja[at]gmail[dot]com"