[gentoo-commits] repo/gentoo:master commit in: media-video/bino/files/

2022-09-01 Thread Sam James 
commit: d9e622d2e8728c68789de267f76df889d4c07ccc
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep  2 05:33:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep  2 05:33:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e622d2

media-video/bino/files: update patches w/ commit links

Now committed, yay!

Signed-off-by: Sam James  gentoo.org>

 media-video/bino/files/bino-1.6.8-respect-AR.patch   | 3 +--
 media-video/bino/files/bino-1.6.8-time-include.patch | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

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
index b4f9177affe1..8bf545ba11e8 100644
--- a/media-video/bino/files/bino-1.6.8-respect-AR.patch
+++ b/media-video/bino/files/bino-1.6.8-respect-AR.patch
@@ -1,6 +1,5 @@
-Sent upstream by email on 2022-09-02.
+https://git.marlam.de/gitweb/?p=bino.git;a=commitdiff;h=94fbab21a6d98fe6f6fffa0283b60da30f1d7c20
 
-From 66399974bec4cc3b9c7570b222bc778078f5dc7f Mon Sep 17 00:00:00 2001
 From: Sam James 
 Date: Fri, 2 Sep 2022 02:04:00 +0100
 Subject: [PATCH 1/2] build: respect AR

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
index b10f42b1a40f..e331f9a29cfe 100644
--- a/media-video/bino/files/bino-1.6.8-time-include.patch
+++ b/media-video/bino/files/bino-1.6.8-time-include.patch
@@ -1,6 +1,5 @@
-Sent upstream by email on 2022-09-02.
+https://git.marlam.de/gitweb/?p=bino.git;a=commit;h=99a9fe61134ba9ca379d2bddb52e8322cad769e5
 
-From 242b5df7074739fb4c74e2682cb9f325a5269c94 Mon Sep 17 00:00:00 2001
 From: Sam James 
 Date: Fri, 2 Sep 2022 02:04:26 +0100
 Subject: [PATCH 2/2] Fix build with GCC 12 and musl (missing  include)

[gentoo-commits] repo/gentoo:master commit in: media-video/bino/files/, media-video/bino/

2022-09-01 Thread Sam James 
commit: 4b65b862e51fbd4c8de5d394b3fbd2323a933785
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep  2 01:02:24 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep  2 01:07:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b65b862

media-video/bino: respect AR

Closes: https://bugs.gentoo.org/804486
Signed-off-by: Sam James  gentoo.org>

 media-video/bino/bino-1.6.8.ebuild | 10 +-
 media-video/bino/files/bino-1.6.8-respect-AR.patch | 22 ++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/media-video/bino/bino-1.6.8.ebuild 
b/media-video/bino/bino-1.6.8.ebuild
index f0f6a54eb8d1..b304712373c8 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/;
@@ -32,8 +32,16 @@ BDEPEND="sys-devel/gettext
 
 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 ..b4f9177affe1
--- /dev/null
+++ b/media-video/bino/files/bino-1.6.8-respect-AR.patch
@@ -0,0 +1,22 @@
+Sent upstream by email on 2022-09-02.
+
+From 66399974bec4cc3b9c7570b222bc778078f5dc7f Mon Sep 17 00:00:00 2001
+From: Sam James 
+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 
+--- 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
+

[gentoo-commits] repo/gentoo:master commit in: media-video/bino/files/, media-video/bino/

2021-07-25 Thread Sam James 
commit: 5f696cf69f7580b3b3e4483e58437a5e29400a25
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 25 22:57:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 25 23:23:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f696cf6

media-video/bino: update EAPI 6 -> 7, fix build with GCC 11

Closes: https://bugs.gentoo.org/790128
Signed-off-by: Sam James  gentoo.org>

 media-video/bino/bino-1.6.7.ebuild| 43 +++
 media-video/bino/files/bino-1.6.7-gcc11.patch | 30 +++
 2 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/media-video/bino/bino-1.6.7.ebuild 
b/media-video/bino/bino-1.6.7.ebuild
index 2969055aea7..8c5b35e1714 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 000..8d4bf4070f3
--- /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 
+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, _handler, NULL);
+ (void)sigaction(SIGSEGV, _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
+

[gentoo-commits] repo/gentoo:master commit in: media-video/bino/files/

2019-03-01 Thread Andreas Sturmlechner 
commit: 1aa133496b883f3397ee437b438be513ca55692d
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Mar  1 16:54:37 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar  2 00:02:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aa13349

media-video/bino: remove unused file

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/bino/files/bino.html | 24 
 1 file changed, 24 deletions(-)

diff --git a/media-video/bino/files/bino.html b/media-video/bino/files/bino.html
deleted file mode 100644
index 28a6982c169..000
--- a/media-video/bino/files/bino.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-Bino
-
-
-
-
-
-
-Bino
-
-
-Up:(dir)
-
-
-Warning
-
-You have chosen not to install the documentation of Bino.
-If you want to have the documentation installed, please enable the 
doc use flag of media-video/bino.
-Alternatively you may do a:
-
-USE="doc" emerge media-video/bino
-
-

[gentoo-commits] repo/gentoo:master commit in: media-video/bino/files/, media-video/bino/

2016-12-05 Thread Alexis Ballier 
commit: a3b9e2c859ba23d5f868fd6b4d6ac89eeb47c04c
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Dec  5 12:11:01 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Dec  5 12:11:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3b9e2c8

media-video/bino: apply debian patch to build with ffmpeg 3, bug #587860

Package-Manager: portage-2.3.2

 media-video/bino/bino-1.6.1-r2.ebuild   |   1 +
 media-video/bino/files/ffmpeg_2.9.patch | 133 
 2 files changed, 134 insertions(+)

diff --git a/media-video/bino/bino-1.6.1-r2.ebuild 
b/media-video/bino/bino-1.6.1-r2.ebuild
index 708c92d..4442bd2 100644
--- a/media-video/bino/bino-1.6.1-r2.ebuild
+++ b/media-video/bino/bino-1.6.1-r2.ebuild
@@ -46,6 +46,7 @@ DOCS=( AUTHORS ChangeLog NEWS README README.Linux )
 
 PATCHES=(
"${FILESDIR}/${PN}-1.4.2-lirc-detect.patch" # detect lirc
+   "${FILESDIR}/ffmpeg_2.9.patch" # build with latest ffmpeg, #587860
 )
 
 src_configure() {

diff --git a/media-video/bino/files/ffmpeg_2.9.patch 
b/media-video/bino/files/ffmpeg_2.9.patch
new file mode 100644
index ..c790d6e
--- /dev/null
+++ b/media-video/bino/files/ffmpeg_2.9.patch
@@ -0,0 +1,133 @@
+https://bugs.gentoo.org/show_bug.cgi?id=587860
+https://github.com/schaal/bino/blob/master/debian/patches/ffmpeg_2.9.patch
+
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- bino-1.6.0.orig/src/media_object.cpp
 bino-1.6.0/src/media_object.cpp
+@@ -427,20 +427,20 @@ void media_object::set_video_frame_templ
+ video_frame_template.value_range = video_frame::u8_full;
+ video_frame_template.chroma_location = video_frame::center;
+ if (!_always_convert_to_bgra32
+-&& (video_codec_ctx->pix_fmt == PIX_FMT_YUV444P
+-|| video_codec_ctx->pix_fmt == PIX_FMT_YUV444P10
+-|| video_codec_ctx->pix_fmt == PIX_FMT_YUV422P
+-|| video_codec_ctx->pix_fmt == PIX_FMT_YUV422P10
+-|| video_codec_ctx->pix_fmt == PIX_FMT_YUV420P
+-|| video_codec_ctx->pix_fmt == PIX_FMT_YUV420P10))
++&& (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV444P
++|| video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV444P10
++|| video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV422P
++|| video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV422P10
++|| video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV420P
++|| video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV420P10))
+ {
+-if (video_codec_ctx->pix_fmt == PIX_FMT_YUV444P
+-|| video_codec_ctx->pix_fmt == PIX_FMT_YUV444P10)
++if (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV444P
++|| video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV444P10)
+ {
+ video_frame_template.layout = video_frame::yuv444p;
+ }
+-else if (video_codec_ctx->pix_fmt == PIX_FMT_YUV422P
+-|| video_codec_ctx->pix_fmt == PIX_FMT_YUV422P10)
++else if (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV422P
++|| video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV422P10)
+ {
+ video_frame_template.layout = video_frame::yuv422p;
+ }
+@@ -453,9 +453,9 @@ void media_object::set_video_frame_templ
+ {
+ video_frame_template.color_space = video_frame::yuv709;
+ }
+-if (video_codec_ctx->pix_fmt == PIX_FMT_YUV444P10
+-|| video_codec_ctx->pix_fmt == PIX_FMT_YUV422P10
+-|| video_codec_ctx->pix_fmt == PIX_FMT_YUV420P10)
++if (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV444P10
++|| video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV422P10
++|| video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV420P10)
+ {
+ video_frame_template.value_range = video_frame::u10_mpeg;
+ if (video_codec_ctx->color_range == AVCOL_RANGE_JPEG)
+@@ -482,15 +482,15 @@ void media_object::set_video_frame_templ
+ }
+ }
+ else if (!_always_convert_to_bgra32
+-&& (video_codec_ctx->pix_fmt == PIX_FMT_YUVJ444P
+-|| video_codec_ctx->pix_fmt == PIX_FMT_YUVJ422P
+-|| video_codec_ctx->pix_fmt == PIX_FMT_YUVJ420P))
++&& (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUVJ444P
++|| video_codec_ctx->pix_fmt == AV_PIX_FMT_YUVJ422P
++|| video_codec_ctx->pix_fmt == AV_PIX_FMT_YUVJ420P))
+ {
+-if (video_codec_ctx->pix_fmt == PIX_FMT_YUVJ444P)
++if (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUVJ444P)
+ {
+ video_frame_template.layout = video_frame::yuv444p;
+ }
+-else if (video_codec_ctx->pix_fmt == PIX_FMT_YUVJ422P)
++else if (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUVJ422P)
+ {
+ video_frame_template.layout =