Merge pull request #1173 from lrusak/kodi-libdvd-url

kodi: build libdvd* in the kodi depends

config/functions

@@ -145,6 +145,14 @@ get_build_dir() {
   fi
 }
 
+get_pkg_version() {
+  if [ ! -z $1 ] ; then
+    cd $ROOT
+    . config/options $1
+    echo "$PKG_VERSION"
+  fi
+}
+
 tolower(){
   echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
 }

packages/mediacenter/kodi/package.mk

@@ -97,7 +97,8 @@ else
 fi
 
 if [ "$KODI_DVDCSS_SUPPORT" = yes ]; then
-  KODI_DVDCSS="-DENABLE_DVDCSS=ON"
+  KODI_DVDCSS="-DENABLE_DVDCSS=ON \
+               -DLIBDVDCSS_URL=$ROOT/$SOURCES/libdvdcss/libdvdcss-$(get_pkg_version libdvdcss).tar.gz"
 else
   KODI_DVDCSS="-DENABLE_DVDCSS=OFF"
 fi
@@ -201,6 +202,10 @@ if [ ! "$KODIPLAYER_DRIVER" = default ]; then
   fi
 fi
 
+KODI_LIBDVD="$KODI_DVDCSS \
+             -DLIBDVDNAV_URL=$ROOT/$SOURCES/libdvdnav/libdvdnav-$(get_pkg_version libdvdnav).tar.gz \
+             -DLIBDVDREAD_URL=$ROOT/$SOURCES/libdvdread/libdvdread-$(get_pkg_version libdvdread).tar.gz"
+
 PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$ROOT/$TOOLCHAIN \
                        -DWITH_TEXTUREPACKER=$ROOT/$TOOLCHAIN/bin/TexturePacker \
                        -DDEPENDS_PATH=$ROOT/$PKG_BUILD/depends \
@@ -229,7 +234,7 @@ PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$ROOT/$TOOLCHAIN \
                        $KODI_XORG \
                        $KODI_SAMBA \
                        $KODI_NFS \
-                       $KODI_DVDCSS \
+                       $KODI_LIBDVD \
                        $KODI_AVAHI \
                        $KODI_UPNP \
                        $KODI_MYSQL \

packages/multimedia/libdvdcss/package.mk

@@ -29,6 +29,16 @@ PKG_SHORTDESC="libdvdcss: a simple library designed for accessing DVDs as a bloc
 PKG_LONGDESC="libdvdcss is a simple library designed for accessing DVDs as a block device without having to bother about the decryption."
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --with-pic"
+configure_target() {
+  :
+}
+
+make_target() {
+  :
+}
+
+makeinstall_target() {
+  :
+}

packages/multimedia/libdvdnav/package.mk

@@ -29,14 +29,16 @@ PKG_SHORTDESC="libdvdnav: a library that allows easy use of sophisticated DVD na
 PKG_LONGDESC="libdvdnav is a library that allows easy use of sophisticated DVD navigation features such as DVD menus, multiangle playback and even interactive DVD games."
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --with-pic"
+configure_target() {
-
+  :
-pre_configure_target() {
-  export CFLAGS="$CFLAGS -D_XBMC -DHAVE_DVDCSS_DVDCSS_H"
 }
 
-post_makeinstall_target() {
+make_target() {
-  ln -sf dvdnav.pc $SYSROOT_PREFIX/usr/lib/pkgconfig/libdvdnav.pc
+  :
+}
+
+makeinstall_target() {
+  :
 }

packages/multimedia/libdvdread/package.mk

@@ -29,14 +29,16 @@ PKG_SHORTDESC="libdvdread: a library which provides a simple foundation for read
 PKG_LONGDESC="libdvdread is a library which provides a simple foundation for reading DVDs."
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --with-libdvdcss --with-pic"
+configure_target() {
-
+  :
-pre_configure_target() {
-  export CFLAGS="$CFLAGS -D_XBMC -DHAVE_DVDCSS_DVDCSS_H"
 }
 
-post_makeinstall_target() {
+make_target() {
-  ln -sf dvdread.pc $SYSROOT_PREFIX/usr/lib/pkgconfig/libdvdread.pc
+  :
+}
+
+makeinstall_target() {
+  :
 }