* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libcec/, dev-libs/libcec/files/
@ 2022-04-22 0:20 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-04-22 0:20 UTC (permalink / raw
To: gentoo-commits
commit: d65dc3c1a57f44e5cc517f49bf95efc1eee99907
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 00:01:19 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 00:20:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d65dc3c1
dev-libs/libcec: fix build with musl 1.2.3
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../libcec/files/libcec-6.0.2-musl-nullptr.patch | 29 ++++++++++++++++++++++
dev-libs/libcec/libcec-6.0.2.ebuild | 3 ++-
2 files changed, 31 insertions(+), 1 deletion(-)
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 <alice@ayaya.dev>
+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-6.0.2.ebuild b/dev-libs/libcec/libcec-6.0.2.ebuild
index 80507a293bfb..9518fad0b156 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
@@ -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() {
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libcec/, dev-libs/libcec/files/
@ 2018-01-14 13:37 Ian Whyman
0 siblings, 0 replies; 3+ messages in thread
From: Ian Whyman @ 2018-01-14 13:37 UTC (permalink / raw
To: gentoo-commits
commit: beda18baef91187b4c764e5c946ca3d965c36c6f
Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 13:37:00 2018 +0000
Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 13:37:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beda18ba
dev-libs/libcec: Fix build with ncurses[tinfo]
Closes: https://bugs.gentoo.org/615634
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-libs/libcec/files/libcec-4.0.2-no-tinfo.patch | 25 +++++++
dev-libs/libcec/libcec-4.0.2-r1.ebuild | 83 +++++++++++++++++++++++
2 files changed, 108 insertions(+)
diff --git a/dev-libs/libcec/files/libcec-4.0.2-no-tinfo.patch b/dev-libs/libcec/files/libcec-4.0.2-no-tinfo.patch
new file mode 100644
index 00000000000..673c6f86c97
--- /dev/null
+++ b/dev-libs/libcec/files/libcec-4.0.2-no-tinfo.patch
@@ -0,0 +1,25 @@
+--- libcec-libcec-4.0.2/src/cec-client/CMakeLists.txt
++++ libcec-libcec-4.0.2/src/cec-client/CMakeLists.txt
+@@ -27,8 +27,12 @@ set(cecclient_SOURCES cec-client.cpp)
+ check_library_exists(curses initscr "" HAVE_CURSES_API)
+ if (HAVE_CURSES_API)
+ list(APPEND cecclient_SOURCES curses/CursesControl.cpp)
++
++ # tinfo
++ find_library(HAVE_CURSES_TINFO tinfo)
+ endif()
+
++
+ add_executable(cec-client ${cecclient_SOURCES})
+ set_target_properties(cec-client PROPERTIES VERSION ${LIBCEC_VERSION_MAJOR}.${LIBCEC_VERSION_MINOR}.${LIBCEC_VERSION_PATCH})
+ target_link_libraries(cec-client ${p8-platform_LIBRARIES})
+@@ -44,6 +48,9 @@ if (NOT WIN32)
+ # curses
+ if (HAVE_CURSES_API)
+ target_link_libraries(cec-client curses)
++ if (HAVE_CURSES_TINFO)
++ target_link_libraries(cec-client tinfo)
++ endif()
+ endif()
+
+ # rt
diff --git a/dev-libs/libcec/libcec-4.0.2-r1.ebuild b/dev-libs/libcec/libcec-4.0.2-r1.ebuild
new file mode 100644
index 00000000000..f52629d1672
--- /dev/null
+++ b/dev-libs/libcec/libcec-4.0.2-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+MY_PV=${PV/_p/-}
+MY_P=${PN}-${MY_PV}
+
+inherit cmake-utils 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 ~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}"
+
+PATCHES=( "${FILESDIR}/${P}-no-tinfo.patch" )
+
+pkg_pretend() {
+ linux-info_pkg_setup
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake-utils_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)
+ )
+ use python && mycmakeargs+=(
+ -DPYTHON_SITEDIR="$(python_get_sitedir)"
+ )
+
+ # 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-utils_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"
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libcec/, dev-libs/libcec/files/
@ 2015-08-22 17:24 Ian Whyman
0 siblings, 0 replies; 3+ messages in thread
From: Ian Whyman @ 2015-08-22 17:24 UTC (permalink / raw
To: gentoo-commits
commit: c65bea600f7c2f12a3c3c030d938ebbfdc70724a
Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 17:22:53 2015 +0000
Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 17:23:38 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c65bea60
dev-libs/libcec: Version bump to 3.x
Bug: 554094
dev-libs/libcec/Manifest | 1 +
dev-libs/libcec/files/libcec-3.0.1-envcheck.patch | 16 +++++++
dev-libs/libcec/libcec-3.0.1.ebuild | 54 +++++++++++++++++++++++
3 files changed, 71 insertions(+)
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index de40dfd..38ac81d 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -1,3 +1,4 @@
DIST libcec-2.1.3.tar.gz 1087121 SHA256 2aa88451b528184b02077ee8c6cd10e2f89121a6a05b1b35b4b792b03108a9d1 SHA512 79ddab6e1572030d860fa2ba43db7ed4ea6eb7914d3b9936c9de622f1328c1795ae3076d0c6abde193fa610a7916439f8cebdcf3bf22b59f6546ac591b4e5956 WHIRLPOOL e8400d037dee3bdb007b5e731aa794ac5dcf94ad1d4c1d1cbe39c059c77f2b2785288f3fbc987fa64eafb1dc0e2a96a9575a3cb5740edf25088c586a1b628e3d
DIST libcec-2.1.4.tar.gz 1093796 SHA256 79bef5232a5c9ab987ca3a2d4bfcaeb80480fd26f502dc1a996fe845d90fe147 SHA512 e2107b2003e003de8efea4b46a7776516652a2b27a0e0983a763324b3ac1ed2995cb0adb76e2f450bea72a1a0bdecfc5b3408fa702c74189204d694f5e9d2d8a WHIRLPOOL 4b8120755cf08dbc7ae8f2a5314f6c4e0c2ddc059b138ab594a26f7ac931cb34536a5bb2894a65902f1ba093007c1b08abeaf4306edef95059af8c85edad3e99
DIST libcec-2.2.0.tar.gz 1099150 SHA256 fd4f47a18d6e0f4b9e6f5831280207ee2b2a5fc2741ae32ae09ad12a8aa52917 SHA512 7932a45e581e207aa651e9fe72450fda52b0441fb48e40e971a530f9d5d26b87e6446322393750d85bae223519dc2a73613352a3fe42939eff2c5f8863a09cd7 WHIRLPOOL ff8581c21e280fda6333aec840cbc08fd8d23ffa795fe173076d1863c0b8fdc86fb7838c2035940dac61362ec1c74054e6e450fff7ba5426ff57a2016c6eab83
+DIST libcec-3.0.1.tar.gz 1117284 SHA256 7e3670c8949a1964d6e5481f56dfff838857da10bdc60b506f6e9b7f117e253e SHA512 b579853d2d20d1007cb9128c8bb457da7c0c0138bba82fd45b05971be9c2232af6a064ab0a4f88bab10f6bda23baefffc43e717ad08b86bba3cf05c211ac5ee4 WHIRLPOOL 46583c7c8b45613a152fe37536992186a6929733dccde0399bed0cc86d07bb6e14da58ae42a12ee1ca192a2716b95b48bda9722749abfd40418b5f0f067f7a40
diff --git a/dev-libs/libcec/files/libcec-3.0.1-envcheck.patch b/dev-libs/libcec/files/libcec-3.0.1-envcheck.patch
new file mode 100644
index 0000000..bb8f107
--- /dev/null
+++ b/dev-libs/libcec/files/libcec-3.0.1-envcheck.patch
@@ -0,0 +1,16 @@
+diff --git a/support/git-rev.sh b/support/git-rev.sh
+index 5dce3d0..4aadae6 100755
+--- a/support/git-rev.sh
++++ b/support/git-rev.sh
+@@ -1,5 +1,8 @@
+ #!/bin/sh
+
+ ## cmake doesn't read the variable when it doesn't end with a newline, and I haven't figured out how to have it add a newline directly...
+-echo -n "`git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h"`\n"
+-
++if [ -d .git ]; then
++ echo "`git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h"`"
++else
++ echo "<unknown>"
++fi
+
diff --git a/dev-libs/libcec/libcec-3.0.1.ebuild b/dev-libs/libcec/libcec-3.0.1.ebuild
new file mode 100644
index 0000000..e1f411b
--- /dev/null
+++ b/dev-libs/libcec/libcec-3.0.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit cmake-utils eutils linux-info python-single-r1
+
+DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor"
+HOMEPAGE="http://libcec.pulse-eight.com"
+SRC_URI="http://github.com/Pulse-Eight/${PN}/archive/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~x86"
+
+IUSE="cubox exynos python raspberry-pi +xrandr"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="virtual/udev
+ dev-libs/lockdev
+ dev-libs/libplatform
+ xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ python? (
+ dev-lang/swig
+ ${PYTHON_DEPS}
+ )"
+
+CONFIG_CHECK="~USB_ACM"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=( "${FILESDIR}"/${P}-envcheck.patch )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+ use python || comment_add_subdirectory "src/pyCecClient"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_useno python SKIP_PYTHON_WRAPPER)
+ $(cmake-utils_use_has exynos EXYNOS_API) \
+ $(cmake-utils_use_has cubox TDA955X_API)
+ $(cmake-utils_use_has raspberry-pi RPI_API)
+ )
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-22 0:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-22 0:20 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libcec/, dev-libs/libcec/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2018-01-14 13:37 Ian Whyman
2015-08-22 17:24 Ian Whyman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox