From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- dev-libs/libcec/Manifest | 7 +- .../libcec/files/libcec-6.0.2-musl-nullptr.patch | 29 +++++ dev-libs/libcec/libcec-4.0.4-r1.ebuild | 78 ------------- dev-libs/libcec/libcec-4.0.7.ebuild | 123 --------------------- dev-libs/libcec/libcec-6.0.2.ebuild | 10 +- 5 files changed, 37 insertions(+), 210 deletions(-) create mode 100644 dev-libs/libcec/files/libcec-6.0.2-musl-nullptr.patch delete mode 100644 dev-libs/libcec/libcec-4.0.4-r1.ebuild delete mode 100644 dev-libs/libcec/libcec-4.0.7.ebuild (limited to 'dev-libs/libcec') diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest index dca14f5cd553..bfcf2830b963 100644 --- a/dev-libs/libcec/Manifest +++ b/dev-libs/libcec/Manifest @@ -1,8 +1,5 @@ AUX libcec-4.0.7-no-override-udev.patch 850 BLAKE2B ce5c795ba3db2d6600b93af6d15d95794435b22c29eb0b65f1d6dbcbb877f076abafd2b2b8d7bd751b981a34a939d61bf7389118a7252d7fc0517c472f583fc2 SHA512 fb23ccc01fee0c61453490e2f8037b1d30124077847e09f8a5e08365bca3253fa883484d412ae1f60cd7beefc6f2075a83bcdd36e160b14ebae23f4be41fb78b -DIST libcec-4.0.4.tar.gz 344976 BLAKE2B ce88730ee6e9f57a3f874dd47343e8bb12bd9d3644b58703f0b797bfe656fa25461e6847db4023fec92d9e9740f0e58b59a203258d39d8883b8ae9cde147f455 SHA512 8991ba96fe9a87e5e1f63ff87f77fc0fc3b735c537e2ee6cb004fdc264d75cecd043e39b49cf9e64aeadd24bb1fb57911d9c4bd6c494d9ba4035d7320c268116 -DIST libcec-4.0.7.tar.gz 355249 BLAKE2B 5f742364804d0d10cfcd71635645d33c3dfde200e79332470d2b5b2e64966834a0604d4684ad5919a00aaf60f05f4dbbbc9ce13a0dcf0ba4fa11d1f6a0391673 SHA512 424540a45f9cae3d5dcccc615d487c45033f9cdeb665b8176832495597e2cd58ef7681e13b52f6a32f8a40e1146c04a1a383f5785ea1e731c5c517a9a7843a81 +AUX libcec-6.0.2-musl-nullptr.patch 829 BLAKE2B cfad08ba094e7ca92caec9a38d77d3d65b5baedf49db2b131b33a84543c2ccd0f60b99e7100434a302710c8bcf0d526a6033aa119c8f274efeff277388e75d6d SHA512 015055905a639a8599d5b0766a17bd6b3c91feb59eba543b55919fe40d9bcd0deebdd1b29a9b92e718c7d1bf8486d8413dfea986bf2639e984ba9f8b7a162d0a DIST libcec-6.0.2.tar.gz 355807 BLAKE2B 007530d839493355f283992a4390550d6ddd432977d7489c17087f7e5bb6f503c35e967ed6a620d55e2e7c25ce10814f360d146a28b860cdcdd108fae152f896 SHA512 c16ac268e67b01d4e35fad644e5927e1d9fc7bcaeff698ac5f0eadd31ec63a0bef2a2b2bc37860d1571e1e0cdc55911c2de468c661c7c7ae1d492f80188035cb -EBUILD libcec-4.0.4-r1.ebuild 2018 BLAKE2B 36e7fd1cac2551febd35fa3d0533bf9e06d8d5c8981283c6948acb78c1fb2ca405a80113afd3b31fecc315f271442a4c589d02ad300c0461a4615a0e456205df SHA512 619a8dec29e7aaf7daee20f79ccf8d330a4cf199054568f4be98e9d23f09d20a0aca4c389d0b41036acc1d53f0bfe749d70148cf22efd9aa6502d27f57a6ed0b -EBUILD libcec-4.0.7.ebuild 3271 BLAKE2B cec8de0c00a3976c3eff2e8631846f5a175ea00129b32eefc37dbe9d3000c594aa653e4cd6f5f673bc2eb0db6de1bb18a3ee16f258871c826afa43cd1ff9869a SHA512 79ffd559dd8a0ae22622571ceeb73616574fa0fcf1b0db876ec0bf92fb9d22ad5460e5119abde10bb977e51027609fca6989f372173e7e3aa72960b503218a58 -EBUILD libcec-6.0.2.ebuild 3268 BLAKE2B c6e86830fa1c49906627f5f532fb62a477da03f6608eea81cd65c038c8d9270abb4d354c4743292b99589ef25e35f15b3745d16f32bf5de2a8bf9db54d4c2bf3 SHA512 9b32a427bff242ae2012f3d993a1c4baa822e95b354d39f72301b695cd6fefbe5ff612dad8c8c6dded814903dee6439cb793dfeac47462ea02192db0603c575c +EBUILD libcec-6.0.2.ebuild 3324 BLAKE2B 211dacfda6a76d43c7a85aa98f676d8f04637b2fd44b1131dc0f27013c29f93c496da99b6e28a4837d2ea29bdf6f14caff36b379ab18e053ea7ac848d719c86b SHA512 a1cfc568f4f18a2a2836c0f527d095c265ba8a3f1a8fa237df8e0a0e907d011e2d90165e5b74a1e269bd2f201aa9e07fe7381a95feffc6153c1c4e9dcfaa6650 MISC metadata.xml 828 BLAKE2B 55df5b9af327507fdb9f415c8616affc437d82ac5a7e57b53f21f7917285b10f70e58b3fdbebf6899aa8c10dbe73186f84643842b04953da74f94b6c4112b3d6 SHA512 25e981d2c88ce87c9c41f6816dfadeb00bf3e0d5dfebc8b135ceba09552c40c29501bede0e3a73a63dcacb0741167f6180a674d82cf2b66dfb649a4aa968387a diff --git a/dev-libs/libcec/files/libcec-6.0.2-musl-nullptr.patch b/dev-libs/libcec/files/libcec-6.0.2-musl-nullptr.patch new file mode 100644 index 000000000000..d161e20c130d --- /dev/null +++ b/dev-libs/libcec/files/libcec-6.0.2-musl-nullptr.patch @@ -0,0 +1,29 @@ +https://github.com/Pulse-Eight/libcec/pull/599 + +From 452b2049b2ee3e73968c603e5524b2d349ac0c3e Mon Sep 17 00:00:00 2001 +From: psykose +Date: Sat, 9 Apr 2022 17:59:11 +0000 +Subject: [PATCH] cecloader.h: fix null return + +returning NULL is invalid for a return type of bool when NULL is defined +as `nullptr` instead of 0L +--- a/include/cecloader.h ++++ b/include/cecloader.h +@@ -172,7 +172,7 @@ bool LibCecBootloader(const char *strLib = NULL) + if (!g_libCEC) + { + std::cout << dlerror() << std::endl; +- return NULL; ++ return false; + } + } + +@@ -181,7 +181,7 @@ bool LibCecBootloader(const char *strLib = NULL) + if (!LibCecBootloader) + { + std::cout << "cannot find CECStartBootloader" << std::endl; +- return NULL; ++ return false; + } + + bool bReturn = LibCecBootloader(); diff --git a/dev-libs/libcec/libcec-4.0.4-r1.ebuild b/dev-libs/libcec/libcec-4.0.4-r1.ebuild deleted file mode 100644 index 7042dfd820b5..000000000000 --- a/dev-libs/libcec/libcec-4.0.4-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_7,3_8} ) -MY_PV=${PV/_p/-} -MY_P=${PN}-${MY_PV} - -inherit cmake linux-info python-single-r1 toolchain-funcs - -DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor" -HOMEPAGE="http://libcec.pulse-eight.com" -SRC_URI="https://github.com/Pulse-Eight/${PN}/archive/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="cubox exynos python raspberry-pi +xrandr" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="virtual/udev - >=dev-libs/libplatform-2.0.0 - sys-libs/ncurses:= - raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) - xrandr? ( x11-libs/libXrandr ) - python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - python? ( dev-lang/swig ) - virtual/pkgconfig" - -CONFIG_CHECK="~USB_ACM" - -S="${WORKDIR}/${PN}-${MY_P}" - -pkg_pretend() { - linux-info_pkg_setup -} - -pkg_setup() { - linux-info_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # Do not hardcode the python libpath #577612 - sed -i \ - -e '/DESTINATION/s:lib/python${PYTHON_VERSION}/dist-packages:${PYTHON_SITEDIR}:' \ - src/libcec/cmake/CheckPlatformSupport.cmake || die - - use python || cmake_comment_add_subdirectory "src/pyCecClient" -} - -src_configure() { - local mycmakeargs=( - -DSKIP_PYTHON_WRAPPER=$(usex !python) - -DHAVE_EXYNOS_API=$(usex exynos) - -DHAVE_TDA995X_API=$(usex cubox) - -DHAVE_RPI_API=$(usex raspberry-pi) - ) - - # raspberrypi-userland itself does not provide .pc file so using - # bcm_host.pc instead - use raspberry-pi && mycmakeargs+=( - -DRPI_INCLUDE_DIR=$( $(tc-getPKG_CONFIG) --variable=includedir bcm_host) \ - -DRPI_LIB_DIR=$( $(tc-getPKG_CONFIG) --variable=libdir bcm_host) - ) - - cmake_src_configure -} - -pkg_postinst() { - elog "You will need to ensure the user running your CEC client has" - elog "read/write access to the device. You can ensure this by adding" - elog "them to the uucp group" -} diff --git a/dev-libs/libcec/libcec-4.0.7.ebuild b/dev-libs/libcec/libcec-4.0.7.ebuild deleted file mode 100644 index f3723dd903c0..000000000000 --- a/dev-libs/libcec/libcec-4.0.7.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_7,3_8} ) -MY_PV=${PV/_p/-} -MY_P=${PN}-${MY_PV} - -inherit cmake linux-info python-single-r1 toolchain-funcs - -DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor" -HOMEPAGE="http://libcec.pulse-eight.com" -SRC_URI="https://github.com/Pulse-Eight/${PN}/archive/${MY_P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="cubox exynos python raspberry-pi kernel-cec tools +xrandr udev" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="udev? ( virtual/udev ) - >=dev-libs/libplatform-2.0.0 - tools? ( sys-libs/ncurses:= ) - raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) - xrandr? ( x11-libs/libXrandr ) - python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - python? ( dev-lang/swig )" - -BDEPEND="virtual/pkgconfig" - -CONFIG_CHECK="~USB_ACM" - -S="${WORKDIR}/${PN}-${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-4.0.7-no-override-udev.patch" - ) - -pkg_pretend() { - use udev || CONFIG_CHECK+=" ~SYSFS" - ERROR_SYSFS="When using libcec build without udev, kernel config option CONFIG_SYSFS is required to automatically detect P8 USB-CEC adapter port number" - - linux-info_pkg_setup -} - -pkg_setup() { - linux-info_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # Do not hardcode the python libpath #577612 - sed -i \ - -e '/DESTINATION/s:"lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}":${PYTHON_SITEDIR}:' \ - src/libcec/cmake/CheckPlatformSupport.cmake || die - - sed -Ee 's|[ ~]?#DIST#;?||g' debian/changelog.in > ChangeLog || die - - (use tools && use python) || cmake_comment_add_subdirectory "src/pyCecClient" - - if ! use tools; then - cmake_comment_add_subdirectory "src/cec-client" - cmake_comment_add_subdirectory "src/cecc-client" - sed -i -Ee 's|add_dependencies\(cecc?-client cec\)|#DO NOT BUILD \0|' \ - CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - -DHAVE_LINUX_API=$(usex kernel-cec ON OFF) - -DHAVE_LIBUDEV=$(usex udev ON OFF) - -DSKIP_PYTHON_WRAPPER=$(usex python OFF ON) - -DHAVE_EXYNOS_API=$(usex exynos ON OFF) - -DHAVE_TDA995X_API=$(usex cubox ON OFF) - -DHAVE_RPI_API=$(usex raspberry-pi ON OFF) - ) - - if linux_config_exists && linux_chkconfig_present SYSFS; then - mycmakeargs+=( -DHAVE_P8_USB_DETECT=ON ) - fi - - # raspberrypi-userland itself does not provide .pc file so using - # bcm_host.pc instead - use raspberry-pi && mycmakeargs+=( - -DRPI_INCLUDE_DIR=$( $(tc-getPKG_CONFIG) --variable=includedir bcm_host) \ - -DRPI_LIB_DIR=$( $(tc-getPKG_CONFIG) --variable=libdir bcm_host) - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use udev; then - cp "${S}/debian/pulse-eight-usb-cec.udev" \ - "${BUILD_DIR}/65-pulse-eight-usb-cec.udev" || die - fi -} - -src_install() { - cmake_src_install - - use python && python_optimize "${D}$(python_get_sitedir)" - - use tools && doman debian/cec-client.1 - - if use udev; then - insinto /lib/udev/rules.d - doins "${BUILD_DIR}/65-pulse-eight-usb-cec.udev" - fi -} - -pkg_postinst() { - elog "You will need to ensure the user running your CEC client has" - elog "read/write access to the device. You can ensure this by adding" - elog "them to the uucp group" -} diff --git a/dev-libs/libcec/libcec-6.0.2.ebuild b/dev-libs/libcec/libcec-6.0.2.ebuild index 80507a293bfb..2e1ceac2dcf0 100644 --- a/dev-libs/libcec/libcec-6.0.2.ebuild +++ b/dev-libs/libcec/libcec-6.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} ) MY_PV=${PV/_p/-} MY_P=${PN}-${MY_PV} -inherit cmake linux-info python-single-r1 toolchain-funcs +inherit cmake linux-info python-single-r1 toolchain-funcs udev DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor" HOMEPAGE="http://libcec.pulse-eight.com" @@ -36,6 +36,7 @@ S="${WORKDIR}/${PN}-${MY_P}" PATCHES=( "${FILESDIR}/${PN}-4.0.7-no-override-udev.patch" + "${FILESDIR}/${PN}-6.0.2-musl-nullptr.patch" ) pkg_pretend() { @@ -111,12 +112,13 @@ src_install() { use tools && doman debian/cec-client.1 if use udev; then - insinto /lib/udev/rules.d - doins "${BUILD_DIR}/65-pulse-eight-usb-cec.udev" + udev_dorules "${BUILD_DIR}/65-pulse-eight-usb-cec.udev" fi } pkg_postinst() { + use udev && udev_reload + elog "You will need to ensure the user running your CEC client has" elog "read/write access to the device. You can ensure this by adding" elog "them to the uucp group" -- cgit v1.2.3