diff options
| -rw-r--r-- | media-video/bino/Manifest | 1 | ||||
| -rw-r--r-- | media-video/bino/bino-1.6.1-r2.ebuild | 71 | ||||
| -rw-r--r-- | media-video/bino/files/bino-1.4.2-lirc-detect.patch | 35 | ||||
| -rw-r--r-- | media-video/bino/files/ffmpeg_2.9.patch | 133 |
4 files changed, 0 insertions, 240 deletions
diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest index 1260846d044b..5666c546f2fb 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 bab5c41f6f9d..000000000000 --- 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 7e476e5d46d8..000000000000 --- 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 c790d6e97741..000000000000 --- 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]; |