gentoo resync : 18.03.2018

5 files changed, 2 insertions, 245 deletions

diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index 7f23ff435ad0..ddf76bd75cc5 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -1,8 +1,4 @@
-AUX bino-1.4.2-lirc-detect.patch 1532 BLAKE2B cd77579d2154856dafe3b6e8688b90bf626ee352cf728c8c2e33b7d921cb2b1ba324107881d3410eb0681583ae7cc918cbbff9f9248326783611f0a6eb037c10 SHA512 f332b468b70cc5de1c9928609ae61710e988c72347e3bf0a935817948d9bd7d252b4727e87fb6f13b59198bf71edd756e7c7ce9fd8051503a3dbed74be1ce298
 AUX bino.html 658 BLAKE2B 9eab6fd2e14b72928ce0c73c21a61ac26981bb23df9eaf3f89132729debc32a10fa0d703c5f3340aa758d741aa1ac733df3718e5577148609f1ae1e1e5c4e47f SHA512 c4861b4536ebc08fd9a68a9b8d420b323eb16ab057b74a83fd56c5c4e0c1f7c4fc7665a0933eabf58e5eca7c38206597e7b6ddb99722054804a64821950f23be
-AUX ffmpeg_2.9.patch 8244 BLAKE2B 838401a9f2b739238261ca962b90d388a7b5439871283c9ea2d1ce11402bd0e8edb0cb7f43e81639386a8d7a1b65f63f4b67e782cab3316bfcafb0458b06a59b SHA512 3248e42632cbc0e61615f15d7948733d697c6560a485da3c99f126bdbd10d6af40669d6c6795dc49a000f1e092a7063334c7b16554178877e0469fe6270d3bfd
-DIST bino-1.6.1.tar.xz 814212 BLAKE2B 7edd4b33a432e6476c54bcb0202549b18255cb68f90d07f164175650716f5ebcda37e82f2b73f42ff49f1d14f6ff0bb81ba95d5c354dfdfb6c4154b664040f3c SHA512 5c0951f17cf9db37a4bd759aacbd4f3ef1a865499c893ca9c4c3a3775193560234aff9a5b12bc6fc012b987d3bd73264c5a5dcead562a6719f6a1019650e19af
 DIST bino-1.6.6.tar.xz 822680 BLAKE2B c863e16a4f576bffb3abf3ab03d8e4cd4ab9db0b0cc73ef2c255b18f103294a9f7e2bf382b286bb7d1d3cb9278c06965772cfc6241a7f23d2f4edc0a47059d92 SHA512 43a17f390881fcc8b7721b21ff8524b89992cd7fb0cfc467769bdddd0ad0c0d2536d161475a7fce6d4d3e758e017a38f671648dfaa4a345dc02127b7b192c8c0
-EBUILD bino-1.6.1-r2.ebuild 1839 BLAKE2B 8fc2e64f6167b3ca0f53d019b880f0c1f1eb6e5af1925ee8e288e1030cea74404855b5f3d66a507ec6ed817d2f506b7ecd656406eb1208b4cd3cab5cb2f0bf67 SHA512 3305fde5b3f6a1a4a2e29fbc22ac4027568af1d5865d9cc9968f5f82f6c3da5b08096ec20611ef88344bdeb6f4e78da55dde3e11580f3e1db1411632d9764d88
-EBUILD bino-1.6.6.ebuild 1508 BLAKE2B c52d9837ac70fbbea9953a3c29f16087beb83df1106c80d952d5c590c150acda8a376a2c2d1d52d2bf809dfae0d629aba23866a8ec159e62f7897fdedff64537 SHA512 46208a0a904684b03a3ddb9eea7f2eb52901733b5013cfe579d0dba722efbb677aa2c702734a8b781d1e3d26ca9e2a7d679cb5093178c95a432156380fdd2ecd
+EBUILD bino-1.6.6.ebuild 1506 BLAKE2B e1f92d28cf775fac59764eb3bb94e7135b456c8c75185695b80a38508c4d3c74666de12139bb8d9e802adadc484f4e4c9831c7e2b6a87e5f5601415b90693eb7 SHA512 c9a1572eb268f31cacf5ae70b07e8883a8204e9acd16c7e4790d15358804ba31a9b6beaa474ea04fc69e340f261932efda7328511e87c6ae9260fa61ebe7d61a
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
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/bino-1.6.6.ebuild b/media-video/bino/bino-1.6.6.ebuild
index e73529bb07f9..b1090b68ef19 100644
--- a/media-video/bino/bino-1.6.6.ebuild
+++ b/media-video/bino/bino-1.6.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc libav lirc video_cards_nvidia"
 
 RDEPEND="
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];