diff --git a/packages/devel/libcec/package.mk b/packages/devel/libcec/package.mk index 1b4ba9d897..e59e2939b0 100644 --- a/packages/devel/libcec/package.mk +++ b/packages/devel/libcec/package.mk @@ -32,28 +32,34 @@ PKG_LONGDESC="libCEC is an open-source dual licensed library designed for commun PKG_IS_ADDON="no" PKG_AUTORECONF="no" -if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver" +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" + +if [ "$KODIPLAYER_DRIVER" = "bcm2835-firmware" ]; then + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-firmware" fi if [ "$KODIPLAYER_DRIVER" = "libfslvpuwrap" ]; then - EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_IMX_API=1" + PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET -DHAVE_IMX_API=1" else - EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_IMX_API=0" + PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET -DHAVE_IMX_API=0" fi if [ "$KODIPLAYER_DRIVER" = "libamcodec" ]; then if [ "$TARGET_ARCH" = "aarch64" ]; then - EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_AOCEC_API=1" + PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET -DHAVE_AOCEC_API=1" else - EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_AMLOGIC_API=1" + PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET -DHAVE_AMLOGIC_API=1" fi else - EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_AOCEC_API=0 -DHAVE_AMLOGIC_API=0" + PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET -DHAVE_AOCEC_API=0 -DHAVE_AMLOGIC_API=0" fi -configure_target() { - if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then +pre_configure_target() { + if [ "$KODIPLAYER_DRIVER" = "bcm2835-firmware" ]; then export CXXFLAGS="$CXXFLAGS \ -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \ -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux" @@ -61,16 +67,6 @@ configure_target() { # detecting RPi support fails without -lvchiq_arm export LDFLAGS="$LDFLAGS -lvchiq_arm" fi - - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DBUILD_SHARED_LIBS=1 \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DCMAKE_INSTALL_LIBDIR_NOARCH=/usr/lib \ - -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - $EXTRA_CMAKE_OPTS \ - .. } post_makeinstall_target() {