From 900271e7a79fc73d9388e8a482fd40ac4451d612 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 2 Apr 2018 10:39:35 +0300 Subject: [PATCH] build without dvd support if without system dvd rpmfusion patch: https://github.com/rpmfusion/kodi/blob/cc71d3dd5f52950f6237cd6196c90d5de4d5140b/kodi-17a2-libdvd.patch --- kodi.spec | 6 ++++-- libdvd.patch | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 libdvd.patch diff --git a/kodi.spec b/kodi.spec index f13da61..770e0f8 100644 --- 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 index 0000000..7a9dc5e --- /dev/null +++ b/libdvd.patch @@ -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: + + -- 2.44.0