dvd bcond that actually works

diff --git a/kodi.spec b/kodi.spec
index 9cc3714b425d0625c37247abb88ad3ea9b5949c1..6cb0a1bdfebb80669347c5c35c4f34d67cc5f007 100644 (file)
--- 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 dfb46e3b5daa6e761a03119f8f77aee654820723..c5e75299735bf8b19c3df4ac1a414b823153fa15 100644 (file)
--- 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)