[packages/kodi/dev-18-leia] build without internal dvd libs

[glen]

commit b8db91445a3cd49c56477da0843823a5f48efaad
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Mon Jul 23 08:59:24 2018 +0300

    build without internal dvd libs

 kodi.spec    |  5 +++--
 libdvd.patch | 31 ++++++++-----------------------
 2 files changed, 11 insertions(+), 25 deletions(-)
---
diff --git a/kodi.spec b/kodi.spec
index 8c97c03..9cc3714 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -105,6 +105,7 @@ BuildRequires:	libcap-devel
 BuildRequires:	libcdio-devel
 %{?with_libcec:BuildRequires:	libcec-devel >= 3.0.0}
 BuildRequires:	libdrm-devel
+BuildRequires:	libdvdcss-devel >= 1.4.1
 %{?with_system_dvdread:BuildRequires:	libdvdread-devel}
 BuildRequires:	libgcrypt-devel
 BuildRequires:	libjpeg-devel
@@ -195,7 +196,7 @@ all common digital media files from local and network storage media.
 %{?with_system_dvdread:%patch2 -p1}
 #%patch3 -p1
 #%patch4 -p1
-#%{!?with_system_dvdread:%patch5 -p1}
+%patch5 -p1
 
 #%{__rm} -r lib/cximage-6.0/zlib
 #%{__rm} -r lib/libhdhomerun
@@ -218,6 +219,7 @@ cd build
 %define	specflags -I/usr/include/freetype2
 %cmake \
 	-DENABLE_INTERNAL_CROSSGUID=OFF \
+	-DENABLE_DVDCSS=%{__true_false dvdcss} \
 	..
 %if 0
 %configure \
@@ -233,7 +235,6 @@ cd build
 	%{__enable_disable asap_codec asap-codec} \
 	%{__enable_disable avahi} \
 	%{__enable_disable dbus} \
-	%{__enable_disable dvdcss} \
 	%{__enable_disable gles} \
 	%{__enable_disable gl} \
 	%{__enable_disable gtest} \
diff --git a/libdvd.patch b/libdvd.patch
index 7a9dc5e..dfb46e3 100644
--- a/libdvd.patch
+++ b/libdvd.patch
@@ -1,23 +1,8 @@
-https://github.com/rpmfusion/kodi/blob/cc71d3dd5f52950f6237cd6196c90d5de4d5140b/kodi-17a2-libdvd.patch
-
---- a/Makefile.in	2016-06-30 14:18:13.000000000 -0500
-+++ b/Makefile.in	2016-07-30 12:23:17.468082870 -0500
-@@ -10,8 +10,7 @@
- 	tools/EventClients
- 
- DVDPCODECS_DIRS= \
--	lib \
--	lib/libdvd
-+	lib
- 
- VideoPlayer_ARCHIVES=xbmc/cores/VideoPlayer/VideoPlayer.a \
-                    xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecs.a \
-@@ -343,7 +342,6 @@
- 	$(MAKE) -C lib/addons/library.xbmc.pvr
- 	$(MAKE) -C lib/addons/library.kodi.inputstream
- dvdpcodecs: dllloader
--	$(MAKE) -C lib/libdvd
- 
- dvdpextcodecs:
- 
-
+--- xbmc-18.0a2-Leia/cmake/modules/FindLibDvd.cmake	2018-06-21 14:07:40.000000000 +0300
++++ xbmc-18.0a2-Leia/cmake/modules/FindLibDvd.cmake	2018-07-23 08:07:01.660838388 +0300
+@@ -1,4 +1,4 @@
+-if(KODI_DEPENDSBUILD)
++if(BUILD_INTERNAL_DVD OR KODI_DEPENDSBUILD)
+   set(_dvdlibs dvdread dvdnav)
+   set(_handlevars LIBDVD_INCLUDE_DIRS DVDREAD_LIBRARY DVDNAV_LIBRARY)
+   if(ENABLE_DVDCSS)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kodi.git/commitdiff/b8db91445a3cd49c56477da0843823a5f48efaad