* [gentoo-commits] repo/gentoo:master commit in: media-video/bino/, media-video/bino/files/
@ 2018-03-15 10:24 Mikle Kolyada
0 siblings, 0 replies; 3+ messages in thread
From: Mikle Kolyada @ 2018-03-15 10:24 UTC (permalink / raw
To: gentoo-commits
commit: 14c8f4afb9108bfca7731e6a42f635fe5e83ea9b
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 15 10:23:36 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 10:23:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14c8f4af
media-video/bino: Drop old
Closes: https://bugs.gentoo.org/596824
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-video/bino/Manifest | 1 -
media-video/bino/bino-1.6.1-r2.ebuild | 71 -----------
.../bino/files/bino-1.4.2-lirc-detect.patch | 35 ------
media-video/bino/files/ffmpeg_2.9.patch | 133 ---------------------
4 files changed, 240 deletions(-)
diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index 1260846d044..5666c546f2f 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -1,2 +1 @@
-DIST bino-1.6.1.tar.xz 814212 BLAKE2B 7edd4b33a432e6476c54bcb0202549b18255cb68f90d07f164175650716f5ebcda37e82f2b73f42ff49f1d14f6ff0bb81ba95d5c354dfdfb6c4154b664040f3c SHA512 5c0951f17cf9db37a4bd759aacbd4f3ef1a865499c893ca9c4c3a3775193560234aff9a5b12bc6fc012b987d3bd73264c5a5dcead562a6719f6a1019650e19af
DIST bino-1.6.6.tar.xz 822680 BLAKE2B c863e16a4f576bffb3abf3ab03d8e4cd4ab9db0b0cc73ef2c255b18f103294a9f7e2bf382b286bb7d1d3cb9278c06965772cfc6241a7f23d2f4edc0a47059d92 SHA512 43a17f390881fcc8b7721b21ff8524b89992cd7fb0cfc467769bdddd0ad0c0d2536d161475a7fce6d4d3e758e017a38f671648dfaa4a345dc02127b7b192c8c0
diff --git a/media-video/bino/bino-1.6.1-r2.ebuild b/media-video/bino/bino-1.6.1-r2.ebuild
deleted file mode 100644
index bab5c41f6f9..00000000000
--- a/media-video/bino/bino-1.6.1-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF="1"
-
-inherit autotools-utils flag-o-matic
-
-DESCRIPTION="Stereoscopic and multi-display media player"
-HOMEPAGE="http://bino3d.org/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc libav lirc"
-
-IUSE_VIDEO_CARDS="
- video_cards_nvidia"
-IUSE+="${IUSE_VIDEO_CARDS}"
-
-RDEPEND=">=media-libs/glew-1.6.0:0=
- >=media-libs/openal-1.15.1
- dev-qt/qtgui:4
- dev-qt/qtcore:4
- dev-qt/qtopengl:4
- >=media-libs/libass-0.9.9
- libav? ( >=media-video/libav-0.7:0= )
- !libav? ( >=media-video/ffmpeg-0.7:0= )
- lirc? ( app-misc/lirc )
- video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
- virtual/libintl"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig"
-
-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() {
- local myeconfargs=(
- $(use_with video_cards_nvidia xnvctrl)
- $(use_with lirc liblircclient)
- $(use_enable debug)
- --without-equalizer
- --htmldir=/usr/share/doc/${PF}/html
- )
-
- use video_cards_nvidia && append-cppflags "-I/usr/include/NVCtrl" \
- && append-ldflags "-L/usr/$(get_libdir)/opengl/nvidia/lib \
- -L/usr/$(get_libdir)" && append-libs "Xext"
- use lirc && append-cppflags "-I/usr/include/lirc" \
- && append-libs "lirc_client"
-
- # Fix a compilation error because of a multiple definitions in glew
- append-ldflags "-zmuldefs"
-
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- use doc || ( rm -rf "${D}"/usr/share/doc/${PF}/html && dohtml "${FILESDIR}/${PN}.html" )
-}
diff --git a/media-video/bino/files/bino-1.4.2-lirc-detect.patch b/media-video/bino/files/bino-1.4.2-lirc-detect.patch
deleted file mode 100644
index 7e476e5d46d..00000000000
--- a/media-video/bino/files/bino-1.4.2-lirc-detect.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -284,14 +284,30 @@
- [AS_HELP_STRING([--without-liblircclient], [Disable remote control support via liblircclient (enabled by default)])],
- [if test "$withval" = "yes"; then lirc="yes"; else lirc="no"; fi], [lirc="yes"])
- if test "$lirc" = "yes"; then
-- PKG_CHECK_MODULES([liblircclient], [liblircclient0 >= 0.0], [HAVE_LIBLIRCCLIENT=1], [HAVE_LIBLIRCCLIENT=0])
-+ CPPFLAGS_BAK="$CPPFLAGS"
-+ CPPFLAGS="$CPPFLAGS $xliblircclient_CFLAGS"
-+ AC_SUBST([liblircclient_CFLAGS])
-+ AC_CHECK_HEADERS([lirc_client.h],
-+ [HAVE_LIBLIRCCLIENT=1],
-+ [HAVE_LIBLIRCCLIENT=0])
-+ if test "HAVE_LIBLIRCCLIENT" = "1"; then
-+ LDFLAGS_BAK="$LDFLAGS"
-+ LDFLAGS="$LDFLAGS $xliblircclient_LDFLAGS"
-+ AC_SUBST([liblircclient_LDFLAGS])
-+ AC_CHECK_LIB([lirc_client],
-+ [lirc_deinit],
-+ [HAVE_LIBLIRCCLIENT=1],
-+ [HAVE_LIBLIRCCLIENT=0])
-+ LDFLAGS="$LDFLAGS_BAK"
-+ fi
-+ CPPFLAGS="$CPPFLAGS_BAK"
- if test "$HAVE_LIBLIRCCLIENT" != "1"; then
- AC_MSG_WARN([optional library liblircclient not found:])
- AC_MSG_WARN([$liblircclient_PKG_ERRORS])
- AC_MSG_WARN([liblircclient is provided by LIRC; Debian package: liblircclient-dev])
- lirc="no"
- else
-- LIBLIRCCLIENT_PKGCONFIG_VERSION="\"`$PKG_CONFIG --modversion liblircclient0`\""
-+ LIBLIRCCLIENT_PKGCONFIG_VERSION="\"system\""
- fi
- else
- HAVE_LIBLIRCCLIENT=0
diff --git a/media-video/bino/files/ffmpeg_2.9.patch b/media-video/bino/files/ffmpeg_2.9.patch
deleted file mode 100644
index c790d6e9774..00000000000
--- a/media-video/bino/files/ffmpeg_2.9.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-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 <Andreas.Cadhalpun@googlemail.com>
-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 = video_frame::yuv422p;
- }
-@@ -898,15 +898,6 @@ void media_object::open(const std::strin
- // Activate multithreaded decoding. This must be done before opening the codec; see
- // http://lists.gnu.org/archive/html/bino-list/2011-08/msg00019.html
- codec_ctx->thread_count = video_decoding_threads();
-- // Set CODEC_FLAG_EMU_EDGE in the same situations in which ffplay sets it.
-- // I don't know what exactly this does, but it is necessary to fix the problem
-- // described in this thread: http://lists.nongnu.org/archive/html/bino-list/2012-02/msg00039.html
-- int lowres = 0;
--#ifdef FF_API_LOWRES
-- lowres = codec_ctx->lowres;
--#endif
-- if (lowres || (codec && (codec->capabilities & CODEC_CAP_DR1)))
-- codec_ctx->flags |= CODEC_FLAG_EMU_EDGE;
- }
- // Find and open the codec. AV_CODEC_ID_TEXT is a special case: it has no decoder since it is unencoded raw data.
- if (codec_ctx->codec_id != AV_CODEC_ID_TEXT && (!codec || (e = avcodec_open2(codec_ctx, codec, NULL)) < 0))
-@@ -944,8 +935,8 @@ void media_object::open(const std::strin
- _ffmpeg->video_frames.push_back(av_frame_alloc());
- _ffmpeg->video_buffered_frames.push_back(av_frame_alloc());
- #endif
-- enum PixelFormat frame_fmt = (_ffmpeg->video_frame_templates[j].layout == video_frame::bgra32
-- ? PIX_FMT_BGRA : _ffmpeg->video_codec_ctxs[j]->pix_fmt);
-+ enum AVPixelFormat frame_fmt = (_ffmpeg->video_frame_templates[j].layout == video_frame::bgra32
-+ ? AV_PIX_FMT_BGRA : _ffmpeg->video_codec_ctxs[j]->pix_fmt);
- int frame_bufsize = (avpicture_get_size(frame_fmt,
- _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height));
- _ffmpeg->video_buffers.push_back(static_cast<uint8_t *>(av_malloc(frame_bufsize)));
-@@ -958,7 +949,7 @@ void media_object::open(const std::strin
- if (_ffmpeg->video_frame_templates[j].layout == video_frame::bgra32)
- {
- // Initialize things needed for software pixel format conversion
-- int sws_bufsize = avpicture_get_size(PIX_FMT_BGRA,
-+ int sws_bufsize = avpicture_get_size(AV_PIX_FMT_BGRA,
- _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height);
- #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 28, 1)
- _ffmpeg->video_sws_frames.push_back(avcodec_alloc_frame());
-@@ -971,11 +962,11 @@ void media_object::open(const std::strin
- throw exc(HERE + ": " + strerror(ENOMEM));
- }
- avpicture_fill(reinterpret_cast<AVPicture *>(_ffmpeg->video_sws_frames[j]), _ffmpeg->video_sws_buffers[j],
-- PIX_FMT_BGRA, _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height);
-+ AV_PIX_FMT_BGRA, _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height);
- // Call sws_getCachedContext(NULL, ...) instead of sws_getContext(...) just to avoid a deprecation warning.
- _ffmpeg->video_sws_ctxs.push_back(sws_getCachedContext(NULL,
- _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height, _ffmpeg->video_codec_ctxs[j]->pix_fmt,
-- _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height, PIX_FMT_BGRA,
-+ _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height, AV_PIX_FMT_BGRA,
- SWS_POINT, NULL, NULL, NULL));
- if (!_ffmpeg->video_sws_ctxs[j])
- {
-@@ -1529,7 +1520,7 @@ read_frame:
- // We need to buffer the data because FFmpeg will clubber it when decoding the next frame.
- av_picture_copy(reinterpret_cast<AVPicture *>(_ffmpeg->video_buffered_frames[_video_stream]),
- reinterpret_cast<AVPicture *>(_ffmpeg->video_frames[_video_stream]),
-- static_cast<enum PixelFormat>(_ffmpeg->video_codec_ctxs[_video_stream]->pix_fmt),
-+ static_cast<enum AVPixelFormat>(_ffmpeg->video_codec_ctxs[_video_stream]->pix_fmt),
- _ffmpeg->video_codec_ctxs[_video_stream]->width,
- _ffmpeg->video_codec_ctxs[_video_stream]->height);
- src_frame = _ffmpeg->video_buffered_frames[_video_stream];
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/bino/, media-video/bino/files/
@ 2022-09-02 1:07 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-09-02 1:07 UTC (permalink / raw
To: gentoo-commits
commit: 68ca288e4d62bdf7631746b20d40a72e2b6ba746
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 2 00:59:33 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 2 01:07:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68ca288e
media-video/bino: fix musl build w/ gcc-12
Closes: https://bugs.gentoo.org/866290
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/bino/bino-1.6.8.ebuild | 4 ++++
.../bino/files/bino-1.6.8-time-include.patch | 24 ++++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/media-video/bino/bino-1.6.8.ebuild b/media-video/bino/bino-1.6.8.ebuild
index 0cdd8ab1a37c..f0f6a54eb8d1 100644
--- a/media-video/bino/bino-1.6.8.ebuild
+++ b/media-video/bino/bino-1.6.8.ebuild
@@ -30,6 +30,10 @@ DEPEND="${RDEPEND}"
BDEPEND="sys-devel/gettext
virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.8-time-include.patch
+)
+
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-time-include.patch b/media-video/bino/files/bino-1.6.8-time-include.patch
new file mode 100644
index 000000000000..b10f42b1a40f
--- /dev/null
+++ b/media-video/bino/files/bino-1.6.8-time-include.patch
@@ -0,0 +1,24 @@
+Sent upstream by email on 2022-09-02.
+
+From 242b5df7074739fb4c74e2682cb9f325a5269c94 Mon Sep 17 00:00:00 2001
+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)))
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/bino/, media-video/bino/files/
@ 2023-06-19 14:18 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-06-19 14:18 UTC (permalink / raw
To: gentoo-commits
commit: 17d83e9e25e9736f18c28e42984a86231ada4702
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 19 14:16:59 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 19 14:18:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17d83e9e
media-video/bino: drop 1.6.7
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/bino/Manifest | 1 -
media-video/bino/bino-1.6.7.ebuild | 67 ---------------------------
media-video/bino/files/bino-1.6.7-gcc11.patch | 30 ------------
3 files changed, 98 deletions(-)
diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index cb1e5a64e75a..0f61dee9e6c9 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -1,3 +1,2 @@
-DIST bino-1.6.7.tar.xz 825068 BLAKE2B d9019a793838f33ea1315849aa994b20a1c6127995315dc03972fe6c64a742c73434c07ba06402a1e2bd5357781d18aaf3d19ab2d61788745b2aa99ad3f4c6f4 SHA512 ae8f72b200100664b9fd55963371ce64a2f39e240676494d69b422d662f2295560ba458eb04707b82f88d3c6b3fab98a1ecb40d74799300f96b8eb8be680c9b8
DIST bino-1.6.8.tar.xz 836712 BLAKE2B 801d6f1ffbf1a7fbaabcdbb2c4bd649662d3b14b08189431a418702177f5de28a8961763c83962fd72cbf6f762fad34ed0b616efc68a723f65b6c72823618897 SHA512 d8cf5be356add4ed3fb36673038b5ffd92d0dc840798cc616fa4b11fec221c7f114347dfc7cdb7a3a24c5599b56301cddc99f84d3862d8e874612960281319cc
DIST bino-2.0.tar.gz 193004 BLAKE2B cb9f40e6eb3f925ecf83e766d613ce15c2fccf8b52a16c3b8000b8854a1defc5dab271c984db3a3780e5126b0e83e60c675956ee6e287c117874c0ef6b504fbf SHA512 5620c506f4de1a9aa7f21f0a23481c5174e7a6a47e6401a84d048dc87843249ef325e33ebc49790d405eb4697c3c571550b0e202f24e758c446ce8e4014f98b3
diff --git a/media-video/bino/bino-1.6.7.ebuild b/media-video/bino/bino-1.6.7.ebuild
deleted file mode 100644
index c265269dc9c7..000000000000
--- a/media-video/bino/bino-1.6.7.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic xdg
-
-DESCRIPTION="Stereoscopic and multi-display media player"
-HOMEPAGE="https://bino3d.org/"
-SRC_URI="https://bino3d.org/releases/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc lirc video_cards_nvidia"
-
-# <ffmpeg-5 for bug #907682 and bug #834400. >=bino-2 uses Qt 6 and drops ffmpeg.
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- >=media-libs/glew-1.6.0:0=
- >=media-libs/libass-0.9.9
- >=media-libs/openal-1.15.1
- virtual/libintl
- <media-video/ffmpeg-5:=
- lirc? ( app-misc/lirc )
- video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.7-gcc11.patch
-)
-
-src_configure() {
- if use video_cards_nvidia; then
- 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${ESYSROOT}/usr/include/lirc"
- append-libs "lirc_client"
- fi
-
- # Fix a compilation error because of a multiple definitions error in glew
- append-ldflags "-zmuldefs"
-
- econf \
- $(use_with video_cards_nvidia xnvctrl) \
- $(use_with lirc) \
- $(use_enable debug) \
- --without-equalizer \
- --with-qt-version=5
-}
-
-src_install() {
- default
-
- if ! use doc; then
- rm -rf "${ED}"/usr/share/doc/${PF}/html || die
- fi
-}
diff --git a/media-video/bino/files/bino-1.6.7-gcc11.patch b/media-video/bino/files/bino-1.6.7-gcc11.patch
deleted file mode 100644
index 8d4bf4070f36..000000000000
--- a/media-video/bino/files/bino-1.6.7-gcc11.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-19 14:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-02 1:07 [gentoo-commits] repo/gentoo:master commit in: media-video/bino/, media-video/bino/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-06-19 14:18 Sam James
2018-03-15 10:24 Mikle Kolyada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox