From 9076b4bbce102a80a9840cb418920826d70acd7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Fri, 18 Nov 2016 14:01:23 +0100 Subject: [PATCH 1/5] config/functions: add get_pkg_version helper function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- config/functions | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/functions b/config/functions index e52cbec6ec..1f75d05eeb 100644 --- a/config/functions +++ b/config/functions @@ -139,6 +139,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 } From 5d83d3a36a3315c14e08df58e0618587b2f5a565 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 14 Jan 2017 00:35:04 -0800 Subject: [PATCH 2/5] libdvdread: only download the package, don't build it --- packages/multimedia/libdvdread/package.mk | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/multimedia/libdvdread/package.mk b/packages/multimedia/libdvdread/package.mk index f5b6d8fbeb..9a7e954114 100644 --- a/packages/multimedia/libdvdread/package.mk +++ b/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" - -pre_configure_target() { - export CFLAGS="$CFLAGS -D_XBMC -DHAVE_DVDCSS_DVDCSS_H" +configure_target() { + : } -post_makeinstall_target() { - ln -sf dvdread.pc $SYSROOT_PREFIX/usr/lib/pkgconfig/libdvdread.pc +make_target() { + : +} + +makeinstall_target() { + : } From c5373505dc7d7fa209c9184ec2419415298b6c74 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 14 Jan 2017 00:35:20 -0800 Subject: [PATCH 3/5] libdvdnav: only download the package, don't build it --- packages/multimedia/libdvdnav/package.mk | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/multimedia/libdvdnav/package.mk b/packages/multimedia/libdvdnav/package.mk index a4d3b9b652..a7b85d1ed5 100644 --- a/packages/multimedia/libdvdnav/package.mk +++ b/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" - -pre_configure_target() { - export CFLAGS="$CFLAGS -D_XBMC -DHAVE_DVDCSS_DVDCSS_H" +configure_target() { + : } -post_makeinstall_target() { - ln -sf dvdnav.pc $SYSROOT_PREFIX/usr/lib/pkgconfig/libdvdnav.pc +make_target() { + : +} + +makeinstall_target() { + : } From e778ad5060964d1f35693e6af4e487d159c40c35 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 14 Jan 2017 00:35:31 -0800 Subject: [PATCH 4/5] libdvdcss: only download the package, don't build it --- packages/multimedia/libdvdcss/package.mk | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/multimedia/libdvdcss/package.mk b/packages/multimedia/libdvdcss/package.mk index 46d8e96816..5bff216741 100644 --- a/packages/multimedia/libdvdcss/package.mk +++ b/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() { + : +} From 13c92f83eb733472b61394196f4b44f2d00aac6e Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 14 Jan 2017 00:36:23 -0800 Subject: [PATCH 5/5] kodi: specify libdvdread, libdvdnav, and libdvdcss url --- packages/mediacenter/kodi/package.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index f75dc3e738..47b58c5cf8 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/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 \