gentoo auto-resync : 02:09:2022 - 10:16:01

5 files changed, 65 insertions, 4 deletions

diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index a2fb05864f18..b80dcb624f03 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -1,6 +1,8 @@
 AUX bino-1.6.7-gcc11.patch 883 BLAKE2B 612ff39d9294567d65809f88c4dc9d77011f2dbf5aa318a827299a7323f6706bbc4d82f8834ad8dd180fdef47de8d7fa0b861e93b91f2e2b2016cc09a522ca53 SHA512 3cf037566f6cb1d3eb2eeaf332e657e9eb088627c70752da2c27e5e22956a803fde3bca9071e75ede097c348e0f0e013e9c6d2cd0c15ff80f8b2059cfcab4646
+AUX bino-1.6.8-respect-AR.patch 559 BLAKE2B 2c24d3082cb446ecbc269f93fa6d427f273ffd903bb5f79fe07a604ee0a6264fd592892455435b26cfed3e0d9d0af60637df4194788497978ee1a7f4faeb6eb9 SHA512 9c6866256dfb8bd1c3ccc894a33a88d1c557d99d876c95bc0b7a51e0351379ed0853a8ed539f939870a3c69f876bc2ffe59da487827ba809beca146ae32048f6
+AUX bino-1.6.8-time-include.patch 662 BLAKE2B 6100dd865f2fcac6110e247dcc7576a5cf3a1ab7304e29d45b87331c3814101927193fb704f97a2216eae1878ae1a522502ed0725088ac3e4dfa0ffe4677dd69 SHA512 60426c7cd1f80ea370fe6b38d25f5dfc308e0ea0ed554cffdec2d3cc7b06baaf37d19c63705f34bc27f574ac773d7105880e1244b424f15ea273ccb983217082
 DIST bino-1.6.7.tar.xz 825068 BLAKE2B d9019a793838f33ea1315849aa994b20a1c6127995315dc03972fe6c64a742c73434c07ba06402a1e2bd5357781d18aaf3d19ab2d61788745b2aa99ad3f4c6f4 SHA512 ae8f72b200100664b9fd55963371ce64a2f39e240676494d69b422d662f2295560ba458eb04707b82f88d3c6b3fab98a1ecb40d74799300f96b8eb8be680c9b8
 DIST bino-1.6.8.tar.xz 836712 BLAKE2B 801d6f1ffbf1a7fbaabcdbb2c4bd649662d3b14b08189431a418702177f5de28a8961763c83962fd72cbf6f762fad34ed0b616efc68a723f65b6c72823618897 SHA512 d8cf5be356add4ed3fb36673038b5ffd92d0dc840798cc616fa4b11fec221c7f114347dfc7cdb7a3a24c5599b56301cddc99f84d3862d8e874612960281319cc
 EBUILD bino-1.6.7.ebuild 1480 BLAKE2B f7841fc972fa8ae1f69fd8cd5c6fe7deffa9deebc12de70df06a7468f90cfcccc50f505a0399d430e537a695dc4e38c9542a13c66b18aa41959fa8cdc0debb09 SHA512 1600712530afc3cdef216324decb214f2c1a907b8dbb195c41c7a83456d60cae130efd94b442b60d1bce6efa19423302368cfa2d76f3bbf9248af591df49ba59
-EBUILD bino-1.6.8.ebuild 1515 BLAKE2B c53f5230459a32bc4d2c63f2232471cbe9f462e2dbdb8f7c5c2965d34b7e8e63064c87c7e6b015334278675edd846fe751a151b343c1a3a5cad6114dc9af9b0d SHA512 d4e684d64a8e8427bdba68ba78fb2b978993619a735fe6c9c74fde6fb733991f5adea74a667e2ce24ef15adcc4f3f59bf8cfce4f668f4006f249ff6d10855d09
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+EBUILD bino-1.6.8.ebuild 1691 BLAKE2B b28102ac3932f17568e51bc2be1d5b2b3f4c72a22b427d25237ee78b118000b3b40dbb2ef090ca3d4bb4f7ed82fe7bbd31fe903f2f55c82a7e5c8a583c0a5508 SHA512 6d42a7e573b9192af4d7623225272dcd9cdf1c21fe1bc314dede33821b71cc67ac98d65be151cf0eac930e8c1206220481b3c17ecb6cd4f9396421371b7bfcd0
+MISC metadata.xml 251 BLAKE2B d8d3e540aec003dfab0b6663c9087bee59dbf7dbff2128c27883615d7250c03073926b9e023cf27925cce18736f86ca20ac3cb2a66d5fcaa0c009471ae95f822 SHA512 de4a63914b8a58e54b0d04d2461cc66199ad857191a11668b0f5b1c0f8713a3486cf22ea3d4df58ba8087775524608fb3d399cee3393f64770fdaa872f818467
diff --git a/media-video/bino/bino-1.6.8.ebuild b/media-video/bino/bino-1.6.8.ebuild
index 0cdd8ab1a37c..d7bdc7c2def6 100644
--- a/media-video/bino/bino-1.6.8.ebuild
+++ b/media-video/bino/bino-1.6.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic qmake-utils xdg
+inherit autotools flag-o-matic qmake-utils xdg
 
 DESCRIPTION="Stereoscopic and multi-display media player"
 HOMEPAGE="https://bino3d.org/"
@@ -11,7 +11,7 @@ SRC_URI="https://bino3d.org/releases/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc lirc video_cards_nvidia"
 
 RDEPEND="
@@ -30,6 +30,18 @@ DEPEND="${RDEPEND}"
 BDEPEND="sys-devel/gettext
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.8-time-include.patch
+	"${FILESDIR}"/${PN}-1.6.8-respect-AR.patch
+)
+
+src_prepare() {
+	default
+
+	# Needed for AR patch
+	eautoreconf
+}
+
 src_configure() {
 	if use video_cards_nvidia; then
 		append-cppflags "-I${ESYSROOT}/usr/include/NVCtrl"
diff --git a/media-video/bino/files/bino-1.6.8-respect-AR.patch b/media-video/bino/files/bino-1.6.8-respect-AR.patch
new file mode 100644
index 000000000000..8bf545ba11e8
--- /dev/null
+++ b/media-video/bino/files/bino-1.6.8-respect-AR.patch
@@ -0,0 +1,21 @@
+https://git.marlam.de/gitweb/?p=bino.git;a=commitdiff;h=94fbab21a6d98fe6f6fffa0283b60da30f1d7c20
+
+From: Sam James <sam@gentoo.org>
+Date: Fri, 2 Sep 2022 02:04:00 +0100
+Subject: [PATCH 1/2] build: respect AR
+
+Search for AR using the normal mechanisms like e.g. CC
+to allow it to be easily overridden in the environment.
+
+Bug: https://bugs.gentoo.org/804486
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,6 +38,7 @@ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ AC_PROG_LN_S
++AM_PROG_AR
+ AC_LANG([C++])
+ AC_C_BIGENDIAN
+ 
diff --git a/media-video/bino/files/bino-1.6.8-time-include.patch b/media-video/bino/files/bino-1.6.8-time-include.patch
new file mode 100644
index 000000000000..e331f9a29cfe
--- /dev/null
+++ b/media-video/bino/files/bino-1.6.8-time-include.patch
@@ -0,0 +1,23 @@
+https://git.marlam.de/gitweb/?p=bino.git;a=commit;h=99a9fe61134ba9ca379d2bddb52e8322cad769e5
+
+From: Sam James <sam@gentoo.org>
+Date: Fri, 2 Sep 2022 02:04:26 +0100
+Subject: [PATCH 2/2] Fix build with GCC 12 and musl (missing <ctime> include)
+
+Fixes build errors like:
+```
+../../src/base/str.h:146:30: error: 'time_t' was not declared in this scope
+  146 |     std::string rfc2822_time(time_t t);
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/base/str.h
++++ b/src/base/str.h
+@@ -31,6 +31,7 @@
+ #include <vector>
+ #include <cstdarg>
+ #include <cerrno>
++#include <ctime>
+ 
+ #ifdef __GNUC__
+ # define STR_AFP(a, b) __attribute__ ((format (printf, a, b)))
diff --git a/media-video/bino/metadata.xml b/media-video/bino/metadata.xml
index 115e9d64a669..063b7cd3b4ca 100644
--- a/media-video/bino/metadata.xml
+++ b/media-video/bino/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">marlam/bino-mirror</remote-id>
+	</upstream>
 </pkgmetadata>