diff --git a/common/shlibs b/common/shlibs index 2d6194918f..cb7dba58b3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1180,7 +1180,7 @@ libmmal_core.so rpi-firmware-20150206_1 libmmal_util.so rpi-firmware-20150206_1 libOpenVG.so rpi-firmware-20150206_1 liblockdev.so.1 lockdev-1.0.3_1 -libcec.so.2 libcec-2.1.1_1 +libcec.so.3.0 libcec-3.0.1_1 libpython3.3m.so.1.0 python3-3.3.0_1 librump.so.0 netbsd-rumpkernel-20130321_1 librumpvfs.so.0 netbsd-rumpkernel-20130321_1 diff --git a/srcpkgs/libcec/patches/no-fqdn.patch b/srcpkgs/libcec/patches/no-fqdn.patch new file mode 100644 index 0000000000..03017bb32b --- /dev/null +++ b/srcpkgs/libcec/patches/no-fqdn.patch @@ -0,0 +1,11 @@ +--- src/libcec/cmake/SetBuildInfo.cmake.orig 2015-07-22 12:50:52.632027301 +0200 ++++ src/libcec/cmake/SetBuildInfo.cmake 2015-07-22 12:51:05.703027767 +0200 +@@ -45,7 +45,7 @@ else() + # add host on which this was built to compile info + find_program(HAVE_HOSTNAME_BIN hostname /bin /usr/bin /usr/local/bin) + if(HAVE_HOSTNAME_BIN) +- exec_program(hostname ARGS -f OUTPUT_VARIABLE BUILD_HOST) ++ exec_program(hostname ARGS OUTPUT_VARIABLE BUILD_HOST) + set(LIB_INFO "${LIB_INFO}@${BUILD_HOST}") + endif() + diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template index 00b0df79df..21f6223f3f 100644 --- a/srcpkgs/libcec/template +++ b/srcpkgs/libcec/template @@ -1,32 +1,38 @@ # Template file for 'libcec' pkgname=libcec -version=2.2.0 -revision=2 +version=3.0.1 +revision=1 wrksrc="${pkgname}-${pkgname}-${version}" -build_style=gnu-configure -hostmakedepends="automake pkg-config libtool" -makedepends="libudev-devel lockdev-devel" +build_style=cmake +hostmakedepends="cmake pkg-config libtool swig" +makedepends="libudev-devel lockdev-devel platform-devel platform-devel libXrandr-devel + lockdev-devel python-devel" short_desc="USB CEC Adapter communication Library" maintainer="Juan RP " homepage="https://github.com/Pulse-Eight/libcec" license="GPL-2" distfiles="https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz" -checksum=fd4f47a18d6e0f4b9e6f5831280207ee2b2a5fc2741ae32ae09ad12a8aa52917 +checksum=7e3670c8949a1964d6e5481f56dfff838857da10bdc60b506f6e9b7f117e253e build_options="rpi" +LDFLAGS+=" -L${XBPS_CROSS_BASE}/usr/lib" + if [ "$XBPS_TARGET_MACHINE" = "armv6l" -o "$XBPS_TARGET_MACHINE" = "armv7l" ]; then build_options_default="rpi" fi if [ "$build_option_rpi" ]; then - configure_args+=" --enable-rpi" - configure_args+=" --with-rpi-include-path=${XBPS_CROSS_BASE}/opt/vc/include" - configure_args+=" --with-rpi-lib-path=${XBPS_CROSS_BASE}/opt/vc/lib" - configure_args+=" LDFLAGS=" + configure_args+=" -DRPI_INCLUDE_DIR=${XBPS_CROSS_BASE}/opt/vc/include" + configure_args+=" -DRPI_LIB_DIR=${XBPS_CROSS_BASE}/opt/vc/lib" makedepends+=" rpi-firmware" fi -pre_configure() { - autoreconf -fi +post_install() { + vmkdir usr/lib + if [ -d $DESTDIR/usr/lib64 ]; then + mv $DESTDIR/usr/lib64/* $DESTDIR/usr/lib + fi + sed -i "s#$wrksrc/build/##" $DESTDIR/usr/lib/pkgconfig/libcec.pc + mv $DESTDIR/$wrksrc/build/lib*/* $DESTDIR/usr/lib } cec-client_package() { @@ -39,10 +45,9 @@ cec-client_package() { libcec-devel_package() { short_desc+=" - development files" - depends="libudev-devel libcec>=${version}_${revision}" + depends="libudev-devel platform-devel libcec>=${version}_${revision}" pkg_install() { vmove usr/include - vmove "usr/lib/*.a" vmove "usr/lib/*.so" vmove usr/lib/pkgconfig }