gentoo resync : 28.07.2021

3 files changed, 50 insertions, 26 deletions

diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index 4c699049fd5f..d7504f08264b 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -1,3 +1,4 @@
+AUX bino-1.6.7-gcc11.patch 883 BLAKE2B 612ff39d9294567d65809f88c4dc9d77011f2dbf5aa318a827299a7323f6706bbc4d82f8834ad8dd180fdef47de8d7fa0b861e93b91f2e2b2016cc09a522ca53 SHA512 3cf037566f6cb1d3eb2eeaf332e657e9eb088627c70752da2c27e5e22956a803fde3bca9071e75ede097c348e0f0e013e9c6d2cd0c15ff80f8b2059cfcab4646
 DIST bino-1.6.7.tar.xz 825068 BLAKE2B d9019a793838f33ea1315849aa994b20a1c6127995315dc03972fe6c64a742c73434c07ba06402a1e2bd5357781d18aaf3d19ab2d61788745b2aa99ad3f4c6f4 SHA512 ae8f72b200100664b9fd55963371ce64a2f39e240676494d69b422d662f2295560ba458eb04707b82f88d3c6b3fab98a1ecb40d74799300f96b8eb8be680c9b8
-EBUILD bino-1.6.7.ebuild 1534 BLAKE2B 28f577b5b83855f516dc5624d910f97d5f27c50c1d9208a9cfbcdb4db658b0822102e2700c9949e72988da77636c5328f4b964627fcd814b7ce8ec453b6c0efc SHA512 c8d185ae01990a161576ebde09079afb23381cdd9847fa494791ceab8d56a8afe96e26783cf304bd6c2bdbb43a3ed92a23ae7c63747bd32802a223500e1f71f0
+EBUILD bino-1.6.7.ebuild 1480 BLAKE2B f7841fc972fa8ae1f69fd8cd5c6fe7deffa9deebc12de70df06a7468f90cfcccc50f505a0399d430e537a695dc4e38c9542a13c66b18aa41959fa8cdc0debb09 SHA512 1600712530afc3cdef216324decb214f2c1a907b8dbb195c41c7a83456d60cae130efd94b442b60d1bce6efa19423302368cfa2d76f3bbf9248af591df49ba59
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-video/bino/bino-1.6.7.ebuild b/media-video/bino/bino-1.6.7.ebuild
index 2969055aea7a..8c5b35e1714a 100644
--- a/media-video/bino/bino-1.6.7.ebuild
+++ b/media-video/bino/bino-1.6.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic xdg-utils
+inherit flag-o-matic xdg
 
 DESCRIPTION="Stereoscopic and multi-display media player"
 HOMEPAGE="https://bino3d.org/"
@@ -25,28 +25,28 @@ RDEPEND="
 	virtual/libintl
 	>=media-video/ffmpeg-0.7:0=
 	lirc? ( app-misc/lirc )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
 
-src_configure() {
-	# Qt5 now requires C++11, #649282
-	append-cxxflags -std=c++11
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.7-gcc11.patch
+)
 
+src_configure() {
 	if use video_cards_nvidia; then
-		append-cppflags "-I/usr/include/NVCtrl"
-		append-ldflags "-L/usr/$(get_libdir)/opengl/nvidia/lib -L/usr/$(get_libdir)"
+		append-cppflags "-I${ESYSROOT}/usr/include/NVCtrl"
+		append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/opengl/nvidia/lib -L${ESYSROOT}/usr/$(get_libdir)"
 		append-libs "Xext"
 	fi
+
 	if use lirc; then
-		append-cppflags "-I/usr/include/lirc"
+		append-cppflags "-I${ESYSROOT}/usr/include/lirc"
 		append-libs "lirc_client"
 	fi
 
-	# Fix a compilation error because of a multiple definitions in glew
+	# Fix a compilation error because of a multiple definitions error in glew
 	append-ldflags "-zmuldefs"
 
 	econf \
@@ -59,15 +59,8 @@ src_configure() {
 
 src_install() {
 	default
+
 	if ! use doc; then
-		rm -rf "${D}"/usr/share/doc/${PF}/html || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/html || die
 	fi
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-video/bino/files/bino-1.6.7-gcc11.patch b/media-video/bino/files/bino-1.6.7-gcc11.patch
new file mode 100644
index 000000000000..8d4bf4070f36
--- /dev/null
+++ b/media-video/bino/files/bino-1.6.7-gcc11.patch
@@ -0,0 +1,30 @@
+https://git.marlam.de/gitweb/?p=bino.git;a=commitdiff;h=7997ad11eefe241bb85a27c50d009c99851d7b0b
+https://bugs.gentoo.org/790128
+
+From 7997ad11eefe241bb85a27c50d009c99851d7b0b Mon Sep 17 00:00:00 2001
+From: Martin Lambers <marlam@marlam.de>
+Date: Sat, 27 Feb 2021 21:28:50 +0100
+Subject: [PATCH] fix compilation with C++ 17 compilers such as gcc 11
+
+---
+ src/base/dbg.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/base/dbg.cpp b/src/base/dbg.cpp
+index 6c6234f..044be67 100644
+--- a/src/base/dbg.cpp
++++ b/src/base/dbg.cpp
+@@ -74,8 +74,10 @@ namespace dbg
+         (void)sigaction(SIGFPE, &signal_handler, NULL);
+         (void)sigaction(SIGSEGV, &signal_handler, NULL);
+ #endif
++#if __cplusplus < 201700
+         std::set_unexpected(exception_crash);
+         std::set_terminate(exception_crash);
++#endif
+         std::set_new_handler(oom_abort);
+     }
+ 
+-- 
+2.20.1
+