[packages/kodi] apply dvdread patch, bcond ffmpeg patch

glen glen at pld-linux.org
Mon Jan 19 21:01:00 CET 2015


commit 05c4c454fe638d8f170bba0208a34c9da938f359
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Jan 19 22:00:53 2015 +0200

    apply dvdread patch, bcond ffmpeg patch

 kodi.spec | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/kodi.spec b/kodi.spec
index ef638e0..d123056 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -53,7 +53,7 @@
 Summary:	Kodi is a free and open source media-player and entertainment hub
 Name:		kodi
 Version:	14.0
-Release:	0.2
+Release:	0.3
 License:	GPL v2+ and GPL v3+
 Group:		Applications/Multimedia
 Source0:	http://mirrors.kodi.tv/releases/source/%{version}-%{codename}.tar.gz
@@ -188,7 +188,8 @@ all common digital media files from local and network storage media.
 %prep
 %setup -q -n xbmc-%{version}-%{codename}
 %patch0 -p1
-%patch1 -p0
+%{?with_system_ffmpeg:%patch1 -p0}
+%{?with_system_dvdread:%patch2 -p1}
 
 rm -r lib/cximage-6.0/zlib
 #rm -r lib/libhdhomerun
@@ -200,13 +201,11 @@ rm -r lib/libmicrohttpd
 rm -r lib/libmodplug
 rm -r lib/librtmp
 rm -r lib/win32
+%{?with_system_dvdread:rm -r lib/libdvd/libdvdread}
 
 %if %{without system_ffmpeg}
 ln -s %{SOURCE1} tools/depends/target/ffmpeg/ffmpeg-2.4.4-%{codename}.tar.gz
 %endif
-%if %{with system_dvdread}
-#rm -r lib/libdvd/libdvdread
-%endif
 
 %build
 ./bootstrap
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list