diff --git a/config/functions b/config/functions index 670185beed..e52cbec6ec 100644 --- a/config/functions +++ b/config/functions @@ -34,6 +34,7 @@ setup_toolchain() { echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)" >> $CMAKE_CONF echo "SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)" >> $CMAKE_CONF echo "SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)" >> $CMAKE_CONF + echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)" >> $CMAKE_CONF fi export HOST_CC="$ROOT/$TOOLCHAIN/bin/host-gcc" export HOST_CXX="$ROOT/$TOOLCHAIN/bin/host-g++" @@ -82,6 +83,7 @@ setup_toolchain() { echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)" >> $CMAKE_CONF echo "SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)" >> $CMAKE_CONF echo "SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)" >> $CMAKE_CONF + echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)" >> $CMAKE_CONF fi export HOST_CC="$CC" export HOST_CXX="$CXX" diff --git a/packages/addons/addon-depends/moonlight-embedded/package.mk b/packages/addons/addon-depends/moonlight-embedded/package.mk index 2ef3e07e52..81cecb6c15 100644 --- a/packages/addons/addon-depends/moonlight-embedded/package.mk +++ b/packages/addons/addon-depends/moonlight-embedded/package.mk @@ -43,9 +43,7 @@ elif [ "$DISPLAYSERVER" = "x11" ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvdpau SDL2 ffmpeg libxcb" fi -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - $FREESCALE_V4L_INCLUDE" +PKG_CMAKE_OPTS_TARGET="$FREESCALE_V4L_INCLUDE" pre_build_target() { cp -a $(get_build_dir moonlight-common-c)/* $ROOT/$PKG_BUILD/third_party/moonlight-common-c diff --git a/packages/devel/libcec/package.mk b/packages/devel/libcec/package.mk index 30d445da89..71871a3f05 100644 --- a/packages/devel/libcec/package.mk +++ b/packages/devel/libcec/package.mk @@ -32,10 +32,8 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=1 \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DCMAKE_INSTALL_LIBDIR_NOARCH=/usr/lib \ - -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" + -DCMAKE_INSTALL_LIBDIR:STRING=lib \ + -DCMAKE_INSTALL_LIBDIR_NOARCH:STRING=lib" if [ "$KODIPLAYER_DRIVER" = "bcm2835-firmware" ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-firmware" diff --git a/packages/graphics/libprojectM/package.mk b/packages/graphics/libprojectM/package.mk index 58f528061a..446506e7ce 100644 --- a/packages/graphics/libprojectM/package.mk +++ b/packages/graphics/libprojectM/package.mk @@ -31,5 +31,4 @@ PKG_LONGDESC="libprojectM:" PKG_IS_ADDON="no" PKG_AUTORECONF="no" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DBUILD_PROJECTM_STATIC=1" \ No newline at end of file +PKG_CMAKE_OPTS_TARGET="-DBUILD_PROJECTM_STATIC=1" \ No newline at end of file diff --git a/packages/graphics/vsxu/package.mk b/packages/graphics/vsxu/package.mk index 8f52567aa0..b9ac28b7db 100644 --- a/packages/graphics/vsxu/package.mk +++ b/packages/graphics/vsxu/package.mk @@ -34,11 +34,7 @@ PKG_AUTORECONF="no" export LDFLAGS="$LDFLAGS -lX11" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DCMAKE_INSTALL_LIBDIR_NOARCH=/usr/lib \ - -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DBUILD_SHARED_LIBS=0 \ +PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=0 \ -DVSXU_STATIC=1 \ -DCMAKE_POSITION_INDEPENDENT_CODE=1 \ -DCMAKE_CXX_FLAGS=-I$SYSROOT_PREFIX/usr/include/freetype2" diff --git a/packages/mediacenter/kodi-binary-addons/adsp.basic/package.mk b/packages/mediacenter/kodi-binary-addons/adsp.basic/package.mk index cce93bf116..7ab6e27d19 100644 --- a/packages/mediacenter/kodi-binary-addons/adsp.basic/package.mk +++ b/packages/mediacenter/kodi-binary-addons/adsp.basic/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.adsp" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/adsp.biquad.filters/package.mk b/packages/mediacenter/kodi-binary-addons/adsp.biquad.filters/package.mk index 95dadbac61..e1d97b9e14 100644 --- a/packages/mediacenter/kodi-binary-addons/adsp.biquad.filters/package.mk +++ b/packages/mediacenter/kodi-binary-addons/adsp.biquad.filters/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.adsp" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/adsp.freesurround/package.mk b/packages/mediacenter/kodi-binary-addons/adsp.freesurround/package.mk index f09af1b525..48ee0e8d9c 100644 --- a/packages/mediacenter/kodi-binary-addons/adsp.freesurround/package.mk +++ b/packages/mediacenter/kodi-binary-addons/adsp.freesurround/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.adsp" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.2sf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.2sf/package.mk index 27923159f3..47f4dc392c 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.2sf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.2sf/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.asap/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.asap/package.mk index d198a7ba18..616ba7a83c 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.asap/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.asap/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.dumb/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.dumb/package.mk index 9a9d587cc4..8074445da3 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.dumb/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.dumb/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.fluidsynth/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.fluidsynth/package.mk index b42c583cf7..4d02a784cd 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.fluidsynth/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.fluidsynth/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.gme/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.gme/package.mk index d359b36e18..04244f531b 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.gme/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.gme/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.gsf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.gsf/package.mk index 15a983e5a8..dace1966bf 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.gsf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.gsf/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.modplug/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.modplug/package.mk index 98628db730..35206f72db 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.modplug/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.modplug/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.ncsf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.ncsf/package.mk index b8af5f5fbf..2f0ba69823 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.ncsf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.ncsf/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.nosefart/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.nosefart/package.mk index b421bdb7fa..80de3a9b4e 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.nosefart/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.nosefart/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.openmpt/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.openmpt/package.mk index f27164e265..7f19e4f1c9 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.openmpt/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.openmpt/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.organya/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.organya/package.mk index 8cb82aed5f..9ea08bab97 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.organya/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.organya/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.qsf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.qsf/package.mk index 439a9191df..5dd2e9b149 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.qsf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.qsf/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.sidplay/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.sidplay/package.mk index 1700c9b1c5..6b298cf46c 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.sidplay/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.sidplay/package.mk @@ -32,9 +32,7 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DSIDPLAY2_LIBRARIES=$SYSROOT_PREFIX/usr/lib" +PKG_CMAKE_OPTS_TARGET="-DSIDPLAY2_LIBRARIES=$SYSROOT_PREFIX/usr/lib" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.snesapu/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.snesapu/package.mk index 6af74d0f44..cefd08c857 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.snesapu/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.snesapu/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.ssf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.ssf/package.mk index 3a9ac021bb..1590f8be8a 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.ssf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.ssf/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.stsound/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.stsound/package.mk index 8a4aab0fa9..2769b23fb8 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.stsound/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.stsound/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk index b592e2006e..9a01d165de 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.upse/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.upse/package.mk index e44f4e4998..e491ad0470 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.upse/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.upse/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk index 11a5405f7a..efc327d564 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk @@ -33,9 +33,6 @@ PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" PKG_ADDON_PROJECTS="Generic Nvidia_Legacy RPi2 imx6 WeTek_Play" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.vgmstream/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.vgmstream/package.mk index 7c5db536c1..bdeb72b3d1 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.vgmstream/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.vgmstream/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.wsr/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.wsr/package.mk index c2bb4c39d5..2600c3af6a 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.wsr/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.wsr/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audioencoder.flac/package.mk b/packages/mediacenter/kodi-binary-addons/audioencoder.flac/package.mk index 2ddb52295d..90f6196a11 100644 --- a/packages/mediacenter/kodi-binary-addons/audioencoder.flac/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audioencoder.flac/package.mk @@ -32,9 +32,7 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.audioencoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DFLAC_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ +PKG_CMAKE_OPTS_TARGET="-DFLAC_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ -DOGG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include" addon() { diff --git a/packages/mediacenter/kodi-binary-addons/audioencoder.lame/package.mk b/packages/mediacenter/kodi-binary-addons/audioencoder.lame/package.mk index fb218756b0..42fd1b4332 100644 --- a/packages/mediacenter/kodi-binary-addons/audioencoder.lame/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audioencoder.lame/package.mk @@ -32,9 +32,7 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.audioencoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DLAME_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include" +PKG_CMAKE_OPTS_TARGET="-DLAME_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/audioencoder.vorbis/package.mk b/packages/mediacenter/kodi-binary-addons/audioencoder.vorbis/package.mk index 66ea494804..d7574d3715 100644 --- a/packages/mediacenter/kodi-binary-addons/audioencoder.vorbis/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audioencoder.vorbis/package.mk @@ -32,9 +32,7 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.audioencoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DOGG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ +PKG_CMAKE_OPTS_TARGET="-DOGG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ -DVORBIS_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ -DVORBISENC_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include" diff --git a/packages/mediacenter/kodi-binary-addons/audioencoder.wav/package.mk b/packages/mediacenter/kodi-binary-addons/audioencoder.wav/package.mk index a93ae1eefd..b91e98992e 100644 --- a/packages/mediacenter/kodi-binary-addons/audioencoder.wav/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audioencoder.wav/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.audioencoder" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk index da9f56bc80..9ffd7e59ec 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk +++ b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk @@ -28,22 +28,16 @@ PKG_LONGDESC="inputstream.adaptive" PKG_IS_ADDON="yes" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - - post_makeinstall_target() { mkdir -p wv && cd wv cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ -DDECRYPTERPATH=special://home/cdm \ $ROOT/$PKG_BUILD/wvdecrypter make cp -P $ROOT/$PKG_BUILD/.$TARGET_NAME/wv/libssd_wv.so $INSTALL/usr/lib - } +} addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.rtmp/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.rtmp/package.mk index e4df27eeae..80f66fdcfa 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.rtmp/package.mk +++ b/packages/mediacenter/kodi-binary-addons/inputstream.rtmp/package.mk @@ -28,9 +28,6 @@ PKG_LONGDESC="inputstream.rtmp" PKG_IS_ADDON="yes" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk b/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk index b947a64e2d..ba2858027d 100644 --- a/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk +++ b/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.peripheral" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk index a2e8c3983e..9e6749dfaf 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk @@ -36,9 +36,6 @@ pre_configure_target() { CXXFLAGS="$CXXFLAGS -Wno-narrowing" } -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk index f37c190645..3c096df36c 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk index 6712d9124b..23333c65c1 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk index 4e9e6c14b8..91ceabcb6b 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk index 31032bc526..752fdfc711 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk index cde8f7ad08..48cd121700 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk @@ -32,9 +32,7 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - -DHDHOMERUN_LIBRARIES=$SYSROOT_PREFIX/usr/lib/libhdhomerun.so \ +PKG_CMAKE_OPTS_TARGET="-DHDHOMERUN_LIBRARIES=$SYSROOT_PREFIX/usr/lib/libhdhomerun.so \ -DHDHOMERUN_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include/hdhomerun" addon() { diff --git a/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk index 957c006255..ddccae3a78 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk index f854533fe9..923348981d 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk index 4cba2ade33..b6ea3083e8 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk @@ -36,9 +36,6 @@ pre_configure_target() { CXXFLAGS="$CXXFLAGS -Wno-narrowing" } -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk index 8dfd551efa..39d69a4af1 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk index 365b00ade0..12ebe25833 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk @@ -36,9 +36,6 @@ pre_configure_target() { CXXFLAGS="$CXXFLAGS -Wno-narrowing" } -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk index af6dff9764..7b6bcea204 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/pvr.octonet/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.octonet/package.mk index 0fd5a8be53..8e3e3a47aa 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.octonet/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.octonet/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk index e5678631cc..5cd16be1e7 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk index ebc9facab5..fb8ac1e844 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk index 6e9d117bcf..4325cbe4bf 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk index 713869f28a..8fc707ae95 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk index 7173337e54..0aa4c7f425 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk index 12f0196c6e..c7b52f09e6 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.asteroids/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.asteroids/package.mk index 9a97aab03e..8c0d680cc2 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.asteroids/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.asteroids/package.mk @@ -36,9 +36,6 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk index 6301827afd..4ad9fb1922 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk @@ -36,9 +36,6 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.biogenesis/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.biogenesis/package.mk index 0d2ce2e9c5..982dc17f95 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.biogenesis/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.biogenesis/package.mk @@ -36,9 +36,6 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.cpblobs/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.cpblobs/package.mk index 11fea20175..d7a7876c96 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.cpblobs/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.cpblobs/package.mk @@ -36,9 +36,6 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.greynetic/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.greynetic/package.mk index 32c5527b45..f139599e97 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.greynetic/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.greynetic/package.mk @@ -36,9 +36,6 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.matrixtrails/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.matrixtrails/package.mk index ca834d21d6..17e8a83c77 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.matrixtrails/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.matrixtrails/package.mk @@ -36,9 +36,6 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.pingpong/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.pingpong/package.mk index b89313fe3d..72b2a30a66 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.pingpong/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.pingpong/package.mk @@ -36,9 +36,6 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.pyro/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.pyro/package.mk index 75b2180995..f6b6af28ed 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.pyro/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.pyro/package.mk @@ -36,9 +36,6 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk index 7e18c4a597..b5a1b7e94c 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk @@ -42,9 +42,6 @@ if [ "$OPENGLES_SUPPORT" = yes ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGLES" fi -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - pre_configure_target() { if [ "$KODIPLAYER_DRIVER" = bcm2835-firmware ]; then BCM2835_INCLUDES="-I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \ diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.stars/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.stars/package.mk index f89a7e3509..d2f146b7ab 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.stars/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.stars/package.mk @@ -36,9 +36,6 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/package.mk b/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/package.mk index a3f277c8d0..dacdfebba6 100644 --- a/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/package.mk @@ -36,9 +36,6 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { for _ADDON in $PKG_BUILD/.install_pkg/usr/share/kodi/addons/* ; do _ADDON_ID=$(basename $_ADDON) diff --git a/packages/mediacenter/kodi-binary-addons/visualization.fishbmc/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.fishbmc/package.mk index f5d80709a0..9d6120b27a 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.fishbmc/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.fishbmc/package.mk @@ -36,9 +36,6 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/visualization.goom/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.goom/package.mk index e6a04aa01f..dcfa1bc322 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.goom/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.goom/package.mk @@ -36,9 +36,6 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk index 1e1629597c..6e056ce78e 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.player.musicviz" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk index 15b8aeb457..7b73266b10 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk @@ -36,9 +36,6 @@ if [ "$OPENGL" = "no" ] ; then exit 0 fi -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - pre_configure_target() { export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` } diff --git a/packages/mediacenter/kodi-binary-addons/visualization.projectm/patches/visualization.projectm-01-Revert-changed-get-rid-of-DATAPATH-definition.patch b/packages/mediacenter/kodi-binary-addons/visualization.projectm/patches/visualization.projectm-01-Revert-changed-get-rid-of-DATAPATH-definition.patch index 4ef1c79d58..bdc481a5a9 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.projectm/patches/visualization.projectm-01-Revert-changed-get-rid-of-DATAPATH-definition.patch +++ b/packages/mediacenter/kodi-binary-addons/visualization.projectm/patches/visualization.projectm-01-Revert-changed-get-rid-of-DATAPATH-definition.patch @@ -31,9 +31,9 @@ index 449cb85..81205dc 100644 #include #include -#include + #include #if !defined(__APPLE__) - #include @@ -79,8 +78,6 @@ bool lastLockStatus; int lastPresetIdx; unsigned int lastLoggedPresetIdx; diff --git a/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk index bdc5c29b7b..9520e7fe56 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk @@ -42,9 +42,6 @@ if [ "$OPENGLES_SUPPORT" = yes ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGLES" fi -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - pre_configure_target() { if [ "$KODIPLAYER_DRIVER" = bcm2835-firmware ]; then BCM2835_INCLUDES="-I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \ diff --git a/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk index 7108dd4e68..40e3f44d8e 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.player.musicviz" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/visualization.vsxu/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.vsxu/package.mk index 2cc5cb46af..7dc2979d56 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.vsxu/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.vsxu/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.player.musicviz" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/visualization.waveform/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.waveform/package.mk index 900552fd5b..ed51461336 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.waveform/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.waveform/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.player.musicviz" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-binary-addons/visualization.wavforhue/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.wavforhue/package.mk index 52b9c2d59f..c35bf14a56 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.wavforhue/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.wavforhue/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.player.musicviz" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -R $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/mediacenter/kodi-platform/package.mk b/packages/mediacenter/kodi-platform/package.mk index 4aec65fe0b..141d060fd7 100644 --- a/packages/mediacenter/kodi-platform/package.mk +++ b/packages/mediacenter/kodi-platform/package.mk @@ -31,8 +31,8 @@ PKG_LONGDESC="kodi-platform:" PKG_IS_ADDON="no" PKG_AUTORECONF="no" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ +PKG_CMAKE_OPTS_TARGET="-DCMAKE_INSTALL_LIBDIR:STRING=lib \ + -DCMAKE_INSTALL_LIBDIR_NOARCH:STRING=lib \ -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \ -DBUILD_SHARED_LIBS=0" diff --git a/packages/mediacenter/kodi-platform/patches/kodi-platform-01_crosscompile-badness.patch b/packages/mediacenter/kodi-platform/patches/kodi-platform-01_crosscompile-badness.patch index 4ff62af8bd..711a11f859 100644 --- a/packages/mediacenter/kodi-platform/patches/kodi-platform-01_crosscompile-badness.patch +++ b/packages/mediacenter/kodi-platform/patches/kodi-platform-01_crosscompile-badness.patch @@ -2,12 +2,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 2765341..1bd4fc2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -26,7 +26,7 @@ else() +@@ -22,7 +22,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") endif() -set(kodiplatform_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} "${CMAKE_INSTALL_PREFIX}/include/kodi") -+set(kodiplatform_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} "${CMAKE_INSTALL_PREFIX_TOOLCHAIN}/include/kodi") ++set(kodiplatform_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR}) IF(WIN32) LIST(APPEND kodiplatform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/kodi/windows") ENDIF(WIN32) @@ -15,12 +15,23 @@ diff --git a/kodiplatform-config.cmake.in b/kodiplatform-config.cmake.in index 3fc5273..60bdf1b 100644 --- a/kodiplatform-config.cmake.in +++ b/kodiplatform-config.cmake.in -@@ -10,7 +10,7 @@ +@@ -10,16 +10,16 @@ # # propagate these properties from one build system to the other set (kodiplatform_VERSION "@kodiplatform_VERSION_MAJOR@.@kodiplatform_VERSION_MINOR@") -set (kodiplatform_INCLUDE_DIRS @kodiplatform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) -+set (kodiplatform_INCLUDE_DIRS @kodiplatform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX_TOOLCHAIN@/include) ++set (kodiplatform_INCLUDE_DIRS @kodiplatform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX_TOOLCHAIN@/include/kodi) set (kodiplatform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") set (kodiplatform_LINKER_FLAGS "@kodiplatform_LINKER_FLAGS@") set (kodiplatform_CONFIG_VARS "@kodiplatform_CONFIG_VARS@") + + # libraries come from the build tree where this file was generated + if(WIN32) +- set (kodiplatform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/kodiplatform.lib") ++ set (kodiplatform_LIBRARY "@CMAKE_INSTALL_PREFIX_TOOLCHAIN@/@CMAKE_INSTALL_LIBDIR@/kodiplatform.lib") + else(WIN32) +- set (kodiplatform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lkodiplatform") ++ set (kodiplatform_LIBRARY "-L@CMAKE_INSTALL_PREFIX_TOOLCHAIN@/@CMAKE_INSTALL_LIBDIR@ -lkodiplatform") + endif(WIN32) + set (kodiplatform_LIBRARIES ${kodiplatform_LIBRARY} "@kodiplatform_LIBRARIES@") + mark_as_advanced (kodiplatform_LIBRARY) diff --git a/packages/mediacenter/kodi-platform/patches/kodi-platform-02_no-multi-lib.patch b/packages/mediacenter/kodi-platform/patches/kodi-platform-02_no-multi-lib.patch deleted file mode 100644 index 3b57df9387..0000000000 --- a/packages/mediacenter/kodi-platform/patches/kodi-platform-02_no-multi-lib.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2016-01-06 00:56:44.616186365 +0100 -+++ b/CMakeLists.txt 2016-01-06 00:59:03.502490684 +0100 -@@ -9,7 +9,6 @@ - find_package(TinyXML REQUIRED) - find_package(Threads REQUIRED) - find_package(p8-platform REQUIRED) --include(UseMultiArch.cmake) - include(CheckAtomic.cmake) - - set(kodiplatform_NAME kodiplatform) -@@ -43,7 +42,7 @@ - set_target_properties(kodiplatform PROPERTIES VERSION ${kodiplatform_VERSION_MAJOR}.${kodiplatform_VERSION_MINOR}.${kodiplatform_VERSION_PATCH} - SOVERSION ${kodiplatform_VERSION_MAJOR}.0) - --install(TARGETS kodiplatform DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(TARGETS kodiplatform DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) - install(FILES src/util/XMLUtils.h - DESTINATION include/kodi/util) - -@@ -57,14 +56,14 @@ - ${CMAKE_INSTALL_PREFIX}/include) - - install(FILES ${CMAKE_BINARY_DIR}/kodiplatform.pc -- DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}/pkgconfig) -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) - ENDIF(NOT WIN32) - - # config mode - configure_file (kodiplatform-config.cmake.in - kodiplatform-config.cmake @ONLY) - install(FILES ${CMAKE_BINARY_DIR}/kodiplatform-config.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}/kodiplatform) -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/kodiplatform) - - # Quell warnings with in-tree builds - set(KODI_BUILD_DIR ${KODI_BUILD_DIR}) diff --git a/packages/mediacenter/p8-platform/package.mk b/packages/mediacenter/p8-platform/package.mk index d9fda1d3f5..f911c18c70 100644 --- a/packages/mediacenter/p8-platform/package.mk +++ b/packages/mediacenter/p8-platform/package.mk @@ -32,10 +32,9 @@ PKG_LONGDESC="Platform support library used by libCEC and binary add-ons for Kod PKG_IS_ADDON="no" PKG_AUTORECONF="no" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DCMAKE_INSTALL_LIBDIR_NOARCH=/usr/lib \ +PKG_CMAKE_OPTS_TARGET="-DCMAKE_INSTALL_LIBDIR:STRING=lib \ + -DCMAKE_INSTALL_LIBDIR_NOARCH:STRING=lib \ -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ -DBUILD_SHARED_LIBS=0" post_makeinstall_target() { diff --git a/packages/mediacenter/p8-platform/patches/p8-platform-02-cmake_install_prefix_toolchain.patch b/packages/mediacenter/p8-platform/patches/p8-platform-02-cmake_install_prefix_toolchain.patch new file mode 100644 index 0000000000..6f2a694a71 --- /dev/null +++ b/packages/mediacenter/p8-platform/patches/p8-platform-02-cmake_install_prefix_toolchain.patch @@ -0,0 +1,32 @@ +diff -Naur a/p8-platform-config.cmake.in b/p8-platform-config.cmake.in +--- a/p8-platform-config.cmake.in 2016-01-19 20:51:52.000000000 +0100 ++++ b/p8-platform-config.cmake.in 2017-01-03 19:48:27.000000000 +0100 +@@ -10,16 +10,16 @@ + # + # propagate these properties from one build system to the other + set (p8-platform_VERSION "@p8-platform_VERSION_MAJOR@.@p8-platform_VERSION_MINOR@") +-set (p8-platform_INCLUDE_DIRS @p8-platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) ++set (p8-platform_INCLUDE_DIRS @p8-platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX_TOOLCHAIN@/include/p8-platform) + set (p8-platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") + set (p8-platform_LINKER_FLAGS "@p8-platform_LINKER_FLAGS@") + set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@") + + # libraries come from the build tree where this file was generated + if(WIN32) +- set (p8-platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/p8-platform.lib") ++ set (p8-platform_LIBRARY "@CMAKE_INSTALL_PREFIX_TOOLCHAIN@/@CMAKE_INSTALL_LIBDIR@/p8-platform.lib") + else(WIN32) +- set (p8-platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lp8-platform") ++ set (p8-platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX_TOOLCHAIN@/@CMAKE_INSTALL_LIBDIR@ -lp8-platform") + endif(WIN32) + set (p8-platform_LIBRARIES ${p8-platform_LIBRARY} "@p8-platform_LIBRARIES@") + mark_as_advanced (p8-platform_LIBRARY) +diff -Naur a/p8-platform.pc.in b/p8-platform.pc.in +--- a/p8-platform.pc.in 2016-01-19 20:51:52.000000000 +0100 ++++ b/p8-platform.pc.in 2017-01-03 19:48:13.000000000 +0100 +@@ -7,4 +7,4 @@ + Description: @p8-platform_DESCRIPTION@ @p8-platform_VERSION_MAJOR@.@p8-platform_VERSION_MINOR@ + Version: @p8-platform_VERSION_MAJOR@.@p8-platform_VERSION_MINOR@.@p8-platform_VERSION_PATCH@ + Libs: -L${libdir} -lp8-platform +-Cflags: -I${includedir} ++Cflags: -I${includedir}/p8-platform