[packages/kodi/dev-18-leia] dvd bcond that actually works

glen glen at pld-linux.org
Mon Jul 23 13:54:39 CEST 2018


commit ea5464ac7080b17fc0badabab6b7908d6dae2997
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Mon Jul 23 13:36:11 2018 +0300

    dvd bcond that actually works

 kodi.spec    | 1 +
 libdvd.patch | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/kodi.spec b/kodi.spec
index 9cc3714..6cb0a1b 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -218,6 +218,7 @@ cd build
 # https://trac.kodi.tv/ticket/16861
 %define	specflags -I/usr/include/freetype2
 %cmake \
+	-DENABLE_INTERNAL_LIBDVD=OFF \
 	-DENABLE_INTERNAL_CROSSGUID=OFF \
 	-DENABLE_DVDCSS=%{__true_false dvdcss} \
 	..
diff --git a/libdvd.patch b/libdvd.patch
index dfb46e3..c5e7529 100644
--- a/libdvd.patch
+++ b/libdvd.patch
@@ -2,7 +2,7 @@
 +++ 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)
++if(NOT ENABLE_INTERNAL_LIBDVD 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/ea5464ac7080b17fc0badabab6b7908d6dae2997



More information about the pld-cvs-commit mailing list