diff --git a/common/shlibs b/common/shlibs index 7667fc7f1f..2d2c3407b1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1274,7 +1274,7 @@ libdtovl.so rpi-userland-20180103_1 libwiringPi.so libwiringPi-0.0.20200408_1 libwiringPiDev.so libwiringPi-0.0.20200408_1 liblockdev.so.1 lockdev-1.0.3_1 -libcec.so.4 libcec-4.0.2_1 +libcec.so.6 libcec-6.0.2_1 librump.so.0 netbsd-rumpkernel-20140526_3 librumpvfs.so.0 netbsd-rumpkernel-20140526_3 librumpdev_disk.so.0 netbsd-rumpkernel-20140526_3 diff --git a/srcpkgs/libcec/patches/no-fqdn.patch b/srcpkgs/libcec/patches/no-fqdn.patch index 03017bb32b..0aeea0b071 100644 --- a/srcpkgs/libcec/patches/no-fqdn.patch +++ b/srcpkgs/libcec/patches/no-fqdn.patch @@ -1,11 +1,13 @@ ---- 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() +diff --git src/libcec/cmake/SetBuildInfo.cmake src/libcec/cmake/SetBuildInfo.cmake +index 3402f9f..b121361 100644 +--- src/libcec/cmake/SetBuildInfo.cmake ++++ src/libcec/cmake/SetBuildInfo.cmake +@@ -40,7 +40,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() - +- exec_program(hostname ARGS -f OUTPUT_VARIABLE BUILD_HOST RETURN_VALUE RETURN_HOST) ++ exec_program(hostname ARGS OUTPUT_VARIABLE BUILD_HOST RETURN_VALUE RETURN_HOST) + if (RETURN_HOST) + exec_program(hostname OUTPUT_VARIABLE BUILD_HOST) + endif() diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template index 5136e30e71..a21293587d 100644 --- a/srcpkgs/libcec/template +++ b/srcpkgs/libcec/template @@ -1,19 +1,19 @@ # Template file for 'libcec' pkgname=libcec -version=4.0.4 -revision=7 +version=6.0.2 +revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=cmake configure_args="Python_ADDITIONAL_VERSIONS=${py3_ver}" hostmakedepends="pkg-config libtool swig" -makedepends="eudev-libudev-devel lockdev-devel p8-platform-devel libXrandr-devel - python3-devel" +makedepends="eudev-libudev-devel lockdev-devel p8-platform-devel + libXrandr-devel python3-devel" short_desc="USB CEC Adapter communication Library" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/Pulse-Eight/libcec" distfiles="https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz" -checksum=4382a964bf8c511c22c03cdab5ba2d81c241536e6479072a61516966804f400a +checksum=090696d7a4fb772d7acebbb06f91ab92e025531c7c91824046b9e4e71ecb3377 build_options="rpi" @@ -25,11 +25,8 @@ fi post_install() { vmkdir usr/lib - if [ -d $DESTDIR/usr/lib64 ]; then - mv $DESTDIR/usr/lib64/* $DESTDIR/usr/lib - fi - mv $DESTDIR/$wrksrc/build/lib*/* $DESTDIR/usr/lib - sed -i "s#$wrksrc/build/##" $DESTDIR/usr/lib/pkgconfig/libcec.pc + mv "$DESTDIR"/$wrksrc/build/lib*/* "$DESTDIR"/usr/lib + vsed -i "s#$wrksrc/build/##" "$DESTDIR"/usr/lib/pkgconfig/libcec.pc } cec-client_package() {