]> git.pld-linux.org Git - packages/kodi.git/commitdiff
build without dvd support if without system dvd
authorElan Ruusamäe <glen@pld-linux.org>
Mon, 2 Apr 2018 07:39:35 +0000 (10:39 +0300)
committerElan Ruusamäe <glen@pld-linux.org>
Mon, 2 Apr 2018 07:40:09 +0000 (10:40 +0300)
rpmfusion patch:
https://github.com/rpmfusion/kodi/blob/cc71d3dd5f52950f6237cd6196c90d5de4d5140b/kodi-17a2-libdvd.patch

kodi.spec
libdvd.patch [new file with mode: 0644]

index f13da61c68918adcb040050add7b72f768e28f2a..770e0f83249f0089fe5303813d4b5f0971848b02 100644 (file)
--- a/kodi.spec
+++ b/kodi.spec
@@ -50,7 +50,7 @@
 %bcond_with    wayland         # wayland
 # System libs:
 %bcond_without system_ffmpeg   # build with system ffmpeg
-%bcond_without system_dvdread  # build with system dvdread
+%bcond_with    system_dvdread  # build with system dvdread
 
 %define        codename Krypton
 Summary:       Kodi is a free and open source media-player and entertainment hub
@@ -67,6 +67,7 @@ Patch1:               disable-static.patch
 Patch2:                dvdread.patch
 Patch3:                ffmpeg3.patch
 Patch4:                gcc5.patch
+Patch5:                libdvd.patch
 URL:           http://kodi.tv/
 BuildRequires: Mesa-libEGL-devel
 BuildRequires: OpenGL-GLU-devel
@@ -196,9 +197,10 @@ all common digital media files from local and network storage media.
 %setup -q -n xbmc-%{version}-%{codename}
 #%patch0 -p1
 %patch1 -p1
-#%{?with_system_dvdread:%patch2 -p1}
+%{?with_system_dvdread:%patch2 -p1}
 #%patch3 -p1
 #%patch4 -p1
+%{!?with_system_dvdread:%patch5 -p1}
 
 #%{__rm} -r lib/cximage-6.0/zlib
 #%{__rm} -r lib/libhdhomerun
diff --git a/libdvd.patch b/libdvd.patch
new file mode 100644 (file)
index 0000000..7a9dc5e
--- /dev/null
@@ -0,0 +1,23 @@
+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:
+
This page took 0.324193 seconds and 4 git commands to generate.