summaryrefslogtreecommitdiff
path: root/media-video
diff options
context:
space:
mode:
Diffstat (limited to 'media-video')
-rw-r--r--media-video/Manifest.gzbin29895 -> 29892 bytes
-rw-r--r--media-video/bino/Manifest6
-rw-r--r--media-video/bino/bino-1.6.1-r2.ebuild71
-rw-r--r--media-video/bino/bino-1.6.6.ebuild2
-rw-r--r--media-video/bino/files/bino-1.4.2-lirc-detect.patch35
-rw-r--r--media-video/bino/files/ffmpeg_2.9.patch133
-rw-r--r--media-video/jubler/Manifest7
-rw-r--r--media-video/jubler/files/jubler-4.6.1-ffmpeg-1.patch274
-rw-r--r--media-video/jubler/files/jubler-4.6.1-ffmpeg-2.patch37
-rw-r--r--media-video/jubler/files/jubler-4.6.1-gentoo.patch163
-rw-r--r--media-video/jubler/jubler-4.6.1-r3.ebuild98
-rw-r--r--media-video/jubler/jubler-5.1.ebuild2
-rw-r--r--media-video/mkvtoolnix/Manifest2
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-21.0.0.ebuild121
-rw-r--r--media-video/simplescreenrecorder/Manifest5
-rw-r--r--media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.8-qtbindir.patch11
-rw-r--r--media-video/simplescreenrecorder/simplescreenrecorder-0.3.10.ebuild (renamed from media-video/simplescreenrecorder/simplescreenrecorder-0.3.8.ebuild)42
17 files changed, 151 insertions, 858 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index b2fc0b103176..76dd4878d708 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
Binary files differ
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];
diff --git a/media-video/jubler/Manifest b/media-video/jubler/Manifest
index 2cc998ebf042..918267376786 100644
--- a/media-video/jubler/Manifest
+++ b/media-video/jubler/Manifest
@@ -1,9 +1,4 @@
-AUX jubler-4.6.1-ffmpeg-1.patch 14239 BLAKE2B 4562145ffb0f9e1f417acab7d0e3de47bf84230366c4ee05ebd6557d195ba138de03062b3400e6aaca8a4d32ddf30e487690611973b38dcf2430da39adde1a85 SHA512 c20848a23dfea2e023e041af8c5a249aa0f7399cb21012a997fcbc864691599f817eb1fa5b58fd0b8494ad936119a1366cbb75cac940e2e45b6edb13d35f4c69
-AUX jubler-4.6.1-ffmpeg-2.patch 1846 BLAKE2B c97f66a0624f49a79fa08c89674c15389cd0fe77ae7f83e1adf59be375a779f2fef79f81873c4a7c5ec5c6aaae50a63f71a572a4bd10f8a09b495ddb4d3515db SHA512 c5c3d6749c6860a91de1f9901c23590803782a69530534fd3635a385e21c0d1d493f43821e26d10491199b86682719fd3d4b0603641812b741714eda0c795d10
-AUX jubler-4.6.1-gentoo.patch 7061 BLAKE2B 2a3128e115c09264b86bdd4160de8d4799f1904f786c3d14f128bc41d2df84eafea1ee67b28ca505441b9ab73c0e687ed5513f3d0e9ff999ef9b1fbd827eb6bc SHA512 d7d50774c3f3f6780bce455d6e0b2765d14588b3545a913b8f8adedb947877115fcae788eb1d3fed322fac472ae33362c53e36808a3f276b60926e183bab8e0d
AUX update-4.6.1.xml 20433 BLAKE2B 47c995796107adf2eef200ae7c40958270b5f41be029c40fe17b0e67d52adff929f9df766c0027ca8901eb31163bf8d5eff705affb49ae4f610e4f268492f7ad SHA512 f50876c78c25f7fc5c20511911427713a11f7063055fc3d3ad0a77b6416af7385108a5426e9c75e773fcbe329cb8a12e580b350bac86442f03a50a7d517306e4
-DIST Jubler-source-4.6.1.tar.bz2 1971701 BLAKE2B 055b15eae2ae2bc1f5529823592ca2a61936d256a7635d51ea925711c8a456400c47d528cb9d4145dea64faf3b860869d63a7c712c281d81ea8a388f9f625860 SHA512 629aef58f98d2d8569a58a4c68c9bf440cd4693ca8847a0b8ad9e84458cd88de44542b5fc84e25033c1e22b26a4d675e070c5a58203a6bbe671072e5cdc2680a
DIST jubler-5.1.tar.bz2 1815531 BLAKE2B 59f9c3c57b906a73e16b32841900ef16450758115d930e767bc4d63882ad2b8a35100a34057ab6bb353f4bea87cb4036e080d8d13a844ae4bfcae8bb361d5b18 SHA512 e2a0da737362a3c8dc12966aec1e9939291237fc714a586186b72daa16abf967c8fea8dac04fb191cb803aa11db20cf6d67468d2383f17f5c6114a643860acef
-EBUILD jubler-4.6.1-r3.ebuild 3029 BLAKE2B 5ce9538583db5962bc177b43c5afe37f2eda3ed390962df2849fc28c8a9f29aad65ef1bd9931229a45942d1b9a89c97a8b0b659d4a785b9a00543d0b4bf15216 SHA512 03dfd15739806037ed90c4c92400c87eca9ae382553be794fcff5464ecb185b9184b3dbbb9ecaef8a0eafe3018591619d2b0beff6bbfe06ebef0487ace847e65
-EBUILD jubler-5.1.ebuild 1714 BLAKE2B 902a0b4b1f2d2e4e332443702915b6f6342474ebe37c640e3fdb0da5c6915b752a93c6dba9c128bca5b1d9a9672b8cf62736d3abd015bc788c9d59079a8465aa SHA512 a33595f4312901c38d5a4b7400e0fe72824408323c4914857cc12f3b61409fdd1bebed59cf9f225e951b9a14f35e1a3f6136611fc73543419764126875b03784
+EBUILD jubler-5.1.ebuild 1713 BLAKE2B b7d2d4f1064b797e107f372d0949bc9de829e9fbae7f5d9d28976b7f0068cc3c31054cf084228024e41e79228dab05eadf12f0f090ee9dc4e041871d2a46d29a SHA512 1c372639fde50e4cf4dd7a4025a45f972941cc138a60f489cec88e545b234e5dd1fe433a87acde8117dad613c3a68df74aed64bd822015cfd569cf34d666d6f6
MISC metadata.xml 292 BLAKE2B 9d8724a93d3fe4fb781615a11ad6e90963fcedcead3075387baf4dafb9dde7e31f0e2ade52adfdae19122d3a24682c4f58a9630c676ba040813569ca41c41b74 SHA512 c7131847c06b95cec1212b3ead2a170abc2a5eeae13d6e7db0683370c7e8949e6ebbcffd320f54c3bf26cf50b88cdd44bc02a7e315e7a943407a68c8747c4031
diff --git a/media-video/jubler/files/jubler-4.6.1-ffmpeg-1.patch b/media-video/jubler/files/jubler-4.6.1-ffmpeg-1.patch
deleted file mode 100644
index 18df9069d198..000000000000
--- a/media-video/jubler/files/jubler-4.6.1-ffmpeg-1.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-Index: Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c
-===================================================================
---- Jubler-4.6.1.orig/resources/ffmpeg/ffdecode/decodeaudio.c
-+++ Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c
-@@ -67,19 +67,19 @@ jboolean decodeAudio(JNIEnv * env, jobje
- AVStream *audio_st=NULL;
- int got_audio, len, err=0, audio_index=-1, i=0, pack_duration=0, packsize=0, codec_is_open=-1, video_index=-1, codec_enc_is_open=-1;
- jlong pack_pts=0;
-- char *outbuf=NULL;
-+ AVFrame *outbuf=NULL;
- unsigned char *packptr;
- jboolean ret = JNI_TRUE, nobrk = JNI_TRUE;
-
- av_register_all();
-
- /* Open the input/output files */
-- err = av_open_input_file(&fcx, input_filename, NULL, 0, NULL);
-+ err = avformat_open_input(&fcx, input_filename, NULL, NULL);
- if(err<0){
- DEBUG(env, this, "decodeAudio", "Could not open file '%s'.", input_filename);
- ret = JNI_FALSE;
- }
-- outbuf = malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
-+ outbuf = avcodec_alloc_frame();
- if(outbuf==NULL) {
- DEBUG(env, this, "decodeAudio", "Could not allocate memory for outbuf.");
- ret = JNI_FALSE;
-@@ -129,7 +129,7 @@ jboolean decodeAudio(JNIEnv * env, jobje
- }
- else {
- /* open it */
-- if ((codec_is_open = avcodec_open(ccx, codec)) < 0) {
-+ if ((codec_is_open = avcodec_open2(ccx, codec, NULL)) < 0) {
- DEBUG(env, this, "decodeAudio", "Could not open codec.");
- ret = JNI_FALSE;
- }
-@@ -158,10 +158,10 @@ jboolean decodeAudio(JNIEnv * env, jobje
- }
-
- /* use wav as the output format of the file */
-- fmt = guess_format(NULL, output_filename, NULL);
-+ fmt = av_guess_format(NULL, output_filename, NULL);
- if (!fmt) {
- DEBUG(env, this, "decodeAudio", "Could not deduce output format from file extension: using WAV.");
-- fmt = guess_format("wav", NULL, NULL);
-+ fmt = av_guess_format("wav", NULL, NULL);
- }
- if (!fmt) {
- DEBUG(env, this, "decodeAudio", "Could not find suitable output format.");
-@@ -182,35 +182,28 @@ jboolean decodeAudio(JNIEnv * env, jobje
- audio_st = add_audio_stream(env, this, ofcx, fmt->audio_codec, ccx->sample_rate, ccx->channels);
- }
-
-- /* set the output parameters (must be done even if no parameters) */
-- if (av_set_parameters(ofcx, NULL) < 0) {
-- DEBUG(env, this, "decodeAudio", "Invalid output format parameters.");
-- ret = JNI_FALSE;
-- }
-- else {
- codec_enc = avcodec_find_encoder(audio_st->codec->codec_id);
- if (!codec_enc) {
- DEBUG(env, this, "decodeAudio", "Encoder codec not found.");
- ret = JNI_FALSE;
- }
- else {
-- if ((codec_enc_is_open = avcodec_open(audio_st->codec, codec_enc)) < 0) {
-+ if ((codec_enc_is_open = avcodec_open2(audio_st->codec, codec_enc, NULL)) < 0) {
- DEBUG(env, this, "decodeAudio", "Could not open encoder codec.");
- ret = JNI_FALSE;
- }
- else {
- if (!(fmt->flags & AVFMT_NOFILE)) {
-- if (url_fopen(&ofcx->pb, output_filename, URL_WRONLY) < 0) {
-+ if (avio_open(&ofcx->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
- DEBUG(env, this, "decodeAudio", "Could not open file '%s'", output_filename);
- ret = JNI_FALSE;
- }
- else {
-- av_write_header(ofcx);
-+ avformat_write_header(ofcx,NULL);
- }
- }
- }
- }
-- }
- }
- }
- else {
-@@ -243,7 +236,7 @@ jboolean decodeAudio(JNIEnv * env, jobje
- ccx->request_channels = 2;
- }
- got_audio = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-- len = avcodec_decode_audio2(ccx, (short *)outbuf, &got_audio, packptr, packsize);
-+ len = avcodec_decode_audio4(ccx, outbuf, &got_audio, &pkt);
-
- if (len < 0) {
- DEBUG(env, this, "decodeAudio", "Error while decoding.");
-@@ -258,7 +251,7 @@ jboolean decodeAudio(JNIEnv * env, jobje
- * this is the frame we want */
- if (pack_pts >= seek_time_start) {
- /* if a frame has been decoded, output it */
-- audio_enc_out(env, this, ofcx, audio_st, (short *)outbuf, got_audio);
-+ audio_enc_out(env, this, ofcx, audio_st, (short *)(outbuf->data[0]), av_samples_get_buffer_size(NULL, ccx->channels, outbuf->nb_samples, ccx->sample_fmt, 1));
- /* if the next frame gets past our stop time, we want to stop decoding */
- if ( pack_pts + pack_duration > seek_time_stop ) {
- av_free_packet(&pkt);
-@@ -269,7 +262,7 @@ jboolean decodeAudio(JNIEnv * env, jobje
- /* If the next frame will be past our start seek time, this is the frame we want */
- else if (pack_pts + pack_duration > seek_time_start) {
- /* if a frame has been decoded, output it */
-- audio_enc_out(env, this, ofcx, audio_st, (short *)outbuf, got_audio);
-+ audio_enc_out(env, this, ofcx, audio_st, (short *)(outbuf->data[0]), av_samples_get_buffer_size(NULL, ccx->channels, outbuf->nb_samples, ccx->sample_fmt, 1));
- /* if the next frame gets past our stop time, we want to stop decoding */
- if ( pack_pts + pack_duration > seek_time_stop ) {
- av_free_packet(&pkt);
-@@ -301,7 +294,7 @@ jboolean decodeAudio(JNIEnv * env, jobje
-
- /* close the output file */
- if (!(fmt->flags & AVFMT_NOFILE) && ofcx->pb != NULL) {
-- url_fclose(ofcx->pb);
-+ avio_close(ofcx->pb);
- }
-
- /* free the stream */
-@@ -309,7 +302,7 @@ jboolean decodeAudio(JNIEnv * env, jobje
- }
-
- if(codec_is_open >= 0) avcodec_close(ccx);
-- if(outbuf != NULL) free(outbuf);
-+ if(outbuf != NULL) av_free(outbuf);
- if(fcx != NULL) av_close_input_file(fcx);
-
- return ret;
-Index: Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeframe.c
-===================================================================
---- Jubler-4.6.1.orig/resources/ffmpeg/ffdecode/decodeframe.c
-+++ Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeframe.c
-@@ -122,7 +122,7 @@ AVPicture* decodeFrame(JNIEnv * env, job
- AVFrame *frame=avcodec_alloc_frame();
-
- /* Open the input file */
-- err = av_open_input_file(&fcx, input_filename, NULL, 0, NULL);
-+ err = avformat_open_input(&fcx, input_filename, NULL, NULL);
- if(err<0){
- DEBUG(env, this, "decodeFrame", "Could not open file '%s'.", input_filename);
- retflag = FALSE;
-@@ -157,7 +157,7 @@ AVPicture* decodeFrame(JNIEnv * env, job
- }
- else {
- // Open codec
-- if((codec_is_open = avcodec_open(ccx, codec)) < 0 ) {
-+ if((codec_is_open = avcodec_open2(ccx, codec, NULL)) < 0 ) {
- DEBUG(env, this, "decodeFrame", "Could not open codec.");
- retflag = FALSE;
- }
-@@ -190,7 +190,7 @@ AVPicture* decodeFrame(JNIEnv * env, job
- pack_duration = av_rescale_q(pkt.duration, fcx->streams[video_index]->time_base, AV_TIME_BASE_Q);
- comp_pts += pkt.duration;
- // Decode this packet
-- len = avcodec_decode_video(ccx, frame, &got_picture, pkt.data, pkt.size);
-+ len = avcodec_decode_video2(ccx, frame, &got_picture, &pkt);
- if (len < 0) {
- DEBUG(env, this, "decodeFrame", "Error while decoding.");
- retflag = FALSE;
-@@ -265,7 +265,7 @@ int file_info(JNIEnv * env, jobject this
- av_register_all();
-
- // Open the input file.
-- err = av_open_input_file(&fcx, input_filename, NULL, 0, NULL);
-+ err = avformat_open_input(&fcx, input_filename, NULL, NULL);
- if(err<0){
- DEBUG(env, this, "file_info", "Could not open file '%s'.", input_filename);
- return 1;
-@@ -275,9 +275,9 @@ int file_info(JNIEnv * env, jobject this
- err = av_find_stream_info(fcx);
-
- // Give us information about the file and exit
-- dump_format(fcx, 0, input_filename, FALSE);
-+ av_dump_format(fcx, 0, input_filename, FALSE);
-
-- av_close_input_file(fcx);
-+ avformat_close_input(&fcx);
- return 0;
- }
-
-Index: Jubler-4.6.1/resources/ffmpeg/ffdecode/grabinfo.c
-===================================================================
---- Jubler-4.6.1.orig/resources/ffmpeg/ffdecode/grabinfo.c
-+++ Jubler-4.6.1/resources/ffmpeg/ffdecode/grabinfo.c
-@@ -82,7 +82,7 @@ void get_information(JNIEnv * env, jobje
- av_register_all();
-
- // Open the input file.
-- err = av_open_input_file(&fcx, video_c, NULL, 0, NULL);
-+ err = avformat_open_input(&fcx, video_c, NULL, NULL);
- if(err<0) {
- DEBUG(env, this, "get_information", "Could not open file '%s'.", video_c);
- ret = JNI_FALSE;
-Index: Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c
-===================================================================
---- Jubler-4.6.1.orig/resources/ffmpeg/ffdecode/makecache.c
-+++ Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c
-@@ -59,7 +59,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
- float ratewindow = 0;
- unsigned int offset=0, maxbyte=0, sampledcounter=1;
- FILE *cachefile=NULL;
-- uint8_t *outbuf=NULL;
-+ AVFrame *outbuf=NULL;
- jboolean nobrk = JNI_TRUE;
-
- int ENDIANESS = isLittleEndian();
-@@ -81,7 +81,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
- ret = JNI_TRUE;
-
- // Open the input file.
-- err = av_open_input_file(&fcx, audio_c, NULL, 0, NULL);
-+ err = avformat_open_input(&fcx, audio_c, NULL, NULL);
- cachefile = fopen(cache_c, "wb");
- if(err<0){
- DEBUG(env, this, "makeCache", "Could not open audio file '%s'.", audio_c);
-@@ -91,7 +91,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
- DEBUG(env, this, "makeCache", "Could not open cache file '%s'.", cache_c);
- ret = JNI_FALSE;
- }
-- outbuf = malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
-+ outbuf = avcodec_alloc_frame();
- if(outbuf==NULL) {
- DEBUG(env, this, "makeCache", "Could not allocate memory for outbuf.");
- ret = JNI_FALSE;
-@@ -123,7 +123,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
- }
- else {
- /* open it */
-- if ((codec_is_open = avcodec_open(ccx, codec)) < 0) {
-+ if ((codec_is_open = avcodec_open2(ccx, codec,NULL)) < 0) {
- DEBUG(env, this, "makeCache", "Could not open codec.");
- ret = JNI_FALSE;
- }
-@@ -175,7 +175,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
- pack_pts = av_rescale_q(pkt.pts, fcx->streams[audio_index]->time_base, AV_TIME_BASE_Q);
- // Decode the paket
- got_audio = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-- len = avcodec_decode_audio2(ccx, (short *)outbuf, &got_audio, pkt.data, pkt.size);
-+ len = avcodec_decode_audio4(ccx, outbuf, &got_audio, &pkt);
-
- if (len < 0) {
- DEBUG(env, this, "makeCache", "Error while decoding.");
-@@ -196,7 +196,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
- if (bytecounter+offset + step*channels >= maxbyte) {
- for (j = 1; j <= channels ; j++) {
- // actually sample is not the whole sample, but the data for one channel each time
-- sample = (char)outbuf[bytecounter+ENDIANESS];
-+ sample = (char)outbuf->data[0][bytecounter+ENDIANESS];
- // min max averaging: only keep the highest and the lowest sample value
- if (maxsample[j-1] < sample) maxsample[j-1] = sample;
- if (minsample[j-1] > sample) minsample[j-1] = sample;
-@@ -215,7 +215,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
- }
- else {
- for (j = 1; j <= channels; j++) {
-- sample = (char)outbuf[bytecounter+ENDIANESS];
-+ sample = (char)outbuf->data[0][bytecounter+ENDIANESS];
- // min max averaging
- if (maxsample[j-1] < sample) maxsample[j-1] = sample;
- if (minsample[j-1] > sample) minsample[j-1] = sample;
-@@ -254,7 +254,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
- if(minsample != NULL) free(minsample);
- if(cachefile != NULL) fclose(cachefile);
- if(codec_is_open >= 0) avcodec_close(ccx);
-- if(outbuf != NULL) free(outbuf);
-+ if(outbuf != NULL) av_free(outbuf);
- if(fcx != NULL) av_close_input_file(fcx);
-
- return ret;
diff --git a/media-video/jubler/files/jubler-4.6.1-ffmpeg-2.patch b/media-video/jubler/files/jubler-4.6.1-ffmpeg-2.patch
deleted file mode 100644
index 28f50b57d6ad..000000000000
--- a/media-video/jubler/files/jubler-4.6.1-ffmpeg-2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c b/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c
-index 92bf071..d163010 100644
---- a/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c
-+++ b/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c
-@@ -37,6 +37,13 @@ jboolean decodeAudio(JNIEnv* env, jobject this, const char *input_filename, cons
- AVStream *add_audio_stream(JNIEnv* env, jobject this, AVFormatContext *oc, int codec_id, int sample_rate, int channels);
- void audio_enc_out(JNIEnv * env, jobject this, AVFormatContext *ofcx, AVStream *audio_st, const short *samples, int buf_size);
-
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#ifndef MAX_AUDIO_FRAME_SIZE
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-+#else
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE MAX_AUDIO_FRAME_SIZE
-+#endif
-+#endif
-
- JNIEXPORT jboolean JNICALL Java_com_panayotis_jubler_media_preview_decoders_FFMPEG_createClip(JNIEnv * env, jobject this, jstring audio, jstring wav, jlong start, jlong stop) {
- const char * audio_c;
-diff --git a/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c b/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c
-index d7ea88b..0190b79 100644
---- a/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c
-+++ b/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c
-@@ -38,6 +38,14 @@
- #include "defaults.h"
- #include "utilities.h"
-
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#ifndef MAX_AUDIO_FRAME_SIZE
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-+#else
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE MAX_AUDIO_FRAME_SIZE
-+#endif
-+#endif
-+
- JNIEXPORT jboolean JNICALL Java_com_panayotis_jubler_media_preview_decoders_NativeDecoder_makeCache(JNIEnv * env, jobject this, jstring audio, jstring cache, jstring original) {
- const char *audio_c;
- const char *cache_c;
diff --git a/media-video/jubler/files/jubler-4.6.1-gentoo.patch b/media-video/jubler/files/jubler-4.6.1-gentoo.patch
deleted file mode 100644
index 25afdba2fcc9..000000000000
--- a/media-video/jubler/files/jubler-4.6.1-gentoo.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-diff -Nur Jubler-4.6.1/build.xml Jubler-4.6.1_patched/build.xml
---- Jubler-4.6.1/build.xml 2011-02-05 23:46:03.000000000 +0200
-+++ Jubler-4.6.1_patched/build.xml 2011-02-13 14:46:56.562977001 +0200
-@@ -1,36 +1,9 @@
- <?xml version="1.0" encoding="UTF-8"?>
--<project name="Jubler" default="dist" basedir=".">
-+<project name="Jubler" default="allparts" basedir=".">
- <description>Builds, tests, and runs the project Jubler.</description>
- <property file="core/src/com/panayotis/jubler/information/version.prop" />
--
-- <taskdef resource="net/sf/antcontrib/antlib.xml">
-- <classpath>
-- <pathelement location="resources/libs/ant-contrib/ant-contrib-1.0b3.jar"/>
-- </classpath>
-- </taskdef>
-+ <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-
-- <taskdef name="jarbundler"
-- onerror="report"
-- classpath="/opt/local/share/java/jarbundler.jar"
-- classname="net.sourceforge.jarbundler.JarBundler" />
--
-- <taskdef name="izpack"
-- onerror="report"
-- classpath="../../Tools/IzPack/standalone-compiler.jar"
-- classname="com.izforge.izpack.ant.IzPackTask"/>
--
-- <taskdef name="launch4j"
-- onerror="report"
-- classpath="/opt/local/share/launch4j/launch4j.jar:/opt/local/share/launch4j/lib/xstream.jar"
-- classname="net.sf.launch4j.ant.Launch4jTask"/>
--
-- <target name="jupidator">
-- <ant antfile="../jupidator/build.xml" inheritall="false" target="jar"/>
-- <copy file="../jupidator/dist/jupidator.jar" todir="dist/lib"/>
-- <ant antfile="../jupidator/build.xml" inheritall="false" target="clean"/>
-- </target>
--
--
- <target name="i18n">
- <exec dir="resources/i18n" executable="bash" failonerror="true">
- <arg line="compile"/>
-@@ -45,12 +18,14 @@
- <move file="resources/help/jubler-faq.html" todir="dist/help"/>
- <copy file="resources/help/question.png" todir="dist/help"/>
- </target>
--
-+
-+ <target name="jupidator"/>
-+
- <target name="changelog" depends="jupidator">
- <delete file="ChangeLog.html"/>
- <echo message="" file="ChangeLog.html"/>
-- <java fork="true" classname="com.panayotis.jupidator.helpers.ChangeLogCreator" classpath="dist/lib/jupidator.jar">
-- <arg value="http://www.jubler.org/files/updates/update.xml"/>
-+ <java fork="true" classname="com.panayotis.jupidator.helpers.ChangeLogCreator" classpath="resources/libs/jupidator.jar">
-+ <arg value="update-${version}.xml"/>
- <arg value="ChangeLog.html"/>
- </java>
- </target>
-@@ -311,7 +286,7 @@
- </target>
-
- <!-- Create an isntallation-like file tree -->
-- <target name="-linuxinstall" depends="-linuxproperties, -cleandestdir, -linuxdesktopintegration">
-+ <target name="-linuxinstall" depends="-linuxproperties, -cleandestdir, linuxdesktopintegration">
- <!-- Basic Jubler files -->
- <copy file="dist/Jubler.jar" todir="${libdir}"/>
- <copy todir="${libdir}/lib">
-@@ -337,7 +312,7 @@
- </target>
-
- <!-- Linux desktop intergration -->
-- <target name="-linuxdesktopintegration" depends="-linuxproperties">
-+ <target name="linuxdesktopintegration" depends="-linuxproperties">
- <!-- Icon files -->
- <copy file="resources/installers/linux/jubler.menu" tofile="${sharedir}/menu/jubler"/>
- <copy file="resources/installers/linux/jubler.xpm" todir="${sharedir}/pixmaps"/>
-diff -Nur Jubler-4.6.1/core/src/com/panayotis/jubler/information/HelpBrowser.java Jubler-4.6.1_patched/core/src/com/panayotis/jubler/information/HelpBrowser.java
---- Jubler-4.6.1/core/src/com/panayotis/jubler/information/HelpBrowser.java 2011-01-31 01:19:02.000000000 +0200
-+++ Jubler-4.6.1_patched/core/src/com/panayotis/jubler/information/HelpBrowser.java 2011-02-12 14:38:50.220780001 +0200
-@@ -47,7 +47,7 @@
-
- history = new ArrayList<String>();
-
-- String initpage = "file:" + SystemFileFinder.getJublerAppPath() + "/help/jubler-faq.html";
-+ String initpage = "file:" + SystemFileFinder.getJublerAppPath() + "/../help/jubler-faq.html";
- setPage(initpage);
- history.add(initpage);
-
-diff -Nur Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemDependent.java Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemDependent.java
---- Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemDependent.java 2011-01-31 01:19:02.000000000 +0200
-+++ Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemDependent.java 2011-02-12 14:43:25.740780001 +0200
-@@ -182,7 +182,7 @@
- Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
- else { //assume Unix or Linux
- String[] browsers = {
-- "firefox", "konqueror", "opera", "epiphany", "mozilla", "netscape"};
-+ "xdg-open", "firefox", "konqueror", "opera", "epiphany", "mozilla", "netscape"};
- String browser = null;
- for (int count = 0; count < browsers.length && browser == null; count++)
- if (Runtime.getRuntime().exec(
-diff -Nur Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemFileFinder.java Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemFileFinder.java
---- Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemFileFinder.java 2011-02-05 01:59:45.000000000 +0200
-+++ Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemFileFinder.java 2011-02-12 14:38:18.520780001 +0200
-@@ -56,9 +56,8 @@
-
- public static boolean loadLibrary(String name) {
- File libfile = findFile("lib" + FileCommunicator.FS + System.mapLibraryName(name));
-- if (libfile != null)
- try {
-- System.load(libfile.getAbsolutePath());
-+ System.loadLibrary(name);
- return true;
- } catch (UnsatisfiedLinkError e) {
- DEBUG.debug(e);
-diff -Nur Jubler-4.6.1/resources/ffmpeg/ffdecode/Makefile Jubler-4.6.1_patched/resources/ffmpeg/ffdecode/Makefile
---- Jubler-4.6.1/resources/ffmpeg/ffdecode/Makefile 2011-01-31 16:26:26.000000000 +0200
-+++ Jubler-4.6.1_patched/resources/ffmpeg/ffdecode/Makefile 2011-02-15 20:26:34.213149001 +0200
-@@ -12,9 +12,6 @@
- # Name of the produced library
- PROJ=ffdecode
-
--# Paths of include files
--JAVA_HOME=${shell /bin/sh ../../system/findjava.sh -j}
--
- # Current Path
- CPATH=${shell pwd}
-
-@@ -42,7 +39,6 @@
- # Various options
- FFCONF=configure
- LIBSUF=_${SYSTEM}.${ARCH}
--MAKEOPTS=-j3
-
- # Find requested files
- NATIVES=${shell cd ../../src && grep -r ' native ' * | grep -v '/.svn/' | gawk -F ':' '{print $$1}' | uniq | sed -e 's/\.java$$//g' | tr '/' '.' }
-@@ -136,7 +132,6 @@
- CCPREF_NOS=${shell echo ${CCPREF} | sed -e 's/-$$//g' }
- DCONFIG=--with-mp4v2 --host=${CCPREF_NOS}
-
--CC=${CCPREF}gcc
- RANLIB=${CCPREF}ranlib
-
- ifeq (${NOSTRIP},)
-@@ -151,7 +146,7 @@
- .SUFFIXES:.o .c
-
- .c.o:
-- ${CC} ${CFLAGS} ${GCCOPTS} -std=c99 -pedantic -O3 -Wall ${INCS} ${JINCLUDE} -c -o $@ $?
-+ ${CC} ${CFLAGS} ${GCCOPTS} -std=c99 -pedantic -Wall ${INCS} ${JINCLUDE} -c -o $@ $?
-
-
- develop:javacheck
-@@ -208,7 +203,7 @@
- LIB:${LIBNAME}
-
- ${LIBNAME}:${LIBRARYREQ} ${OBJS} ${RANLIBREQ}
-- ${LD} ${GCCOPTS} -o ${LIBNAME} ${OBJS} ${LIBS}
-+ ${LD} ${LDFLAGS} ${GCCOPTS} -o ${LIBNAME} ${OBJS} ${LIBS}
- ${STRIPCMD} ${LIBNAME}
-
-
diff --git a/media-video/jubler/jubler-4.6.1-r3.ebuild b/media-video/jubler/jubler-4.6.1-r3.ebuild
deleted file mode 100644
index c8541a6b8181..000000000000
--- a/media-video/jubler/jubler-4.6.1-r3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-WANT_ANT_TASKS="ant-nodeps ant-contrib"
-inherit fdo-mime eutils java-pkg-2 java-ant-2 toolchain-funcs
-
-MY_PN=${PN/#j/J}
-DESCRIPTION="Java subtitle editor"
-HOMEPAGE="http://www.jubler.org/"
-SRC_URI="https://${PN}.googlecode.com/files/${MY_PN}-source-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="mplayer nls spell"
-
-RDEPEND=">=virtual/jre-1.5
- virtual/ffmpeg
- mplayer? ( media-video/mplayer[libass] )
- spell? (
- app-text/aspell
- >=dev-java/zemberek-2.0[l10n_tr]
- )"
-
-DEPEND=">=virtual/jdk-1.5
- virtual/ffmpeg
- app-text/xmlto
- >=dev-java/jupidator-0.6.0
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_unpack() {
- unpack ${A}
- cp "${FILESDIR}"/update-${PV}.xml "${S}" || die
-}
-
-java_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
- epatch "${FILESDIR}"/${P}-ffmpeg-1.patch
- epatch "${FILESDIR}"/${P}-ffmpeg-2.patch
- chmod +x resources/installers/linux/iconinstall
- #cd resources/libs || die
- java-pkg_jarfrom --build-only --into resources/libs jupidator
- rm -R plugins/{autoupdate,macapp} || die "unneeded plugin cleanup failed"
- rm -R resources/libs/ant-contrib || die "jar cleanup failed"
- if ! use mplayer; then
- rm -R plugins/mplayer || die "mplayer plugin removal failed"
- fi
- if ! use spell; then
- rm -R plugins/{zemberek,aspell} || die "spellcheck plugin removal failed"
- fi
- sed -i -e "s/CODEC_TYPE/AVMEDIA_TYPE/g" $(find resources/ffmpeg/ffdecode -name "*.c")
- sed -i -e "s:PKT_FLAG_KEY:AV_PKT_FLAG_KEY:g" $(find resources/ffmpeg/ffdecode -name "*.c")
-}
-
-src_compile() {
- java-pkg_filter-compiler ecj-3.2
- ANT_TASKS="ant-nodeps ant-contrib" eant $(use nls && echo allparts) $(use nls || echo parts) help changelog || die "eant failed"
- #cp -v dist/help/jubler-faq.html build/classes/help || die "cp failed"
- cd resources/ffmpeg/ffdecode || die
- CC=$(tc-getCC) NOSTRIP=true emake linuxdyn || die "make failed"
-}
-
-src_install() {
- java-pkg_dojar dist/Jubler.jar
- use nls && java-pkg_dojar dist/i18n/*.jar
- insinto /usr/share/jubler/lib/lib
- doins dist/lib/*.jar || die "Plugin installation failed"
- #java-pkg_dojar dist/lib/*.jar
- use spell && java-pkg_register-dependency zemberek zemberek2-cekirdek.jar
- use spell && java-pkg_register-dependency zemberek zemberek2-tr.jar
- java-pkg_doso resources/ffmpeg/ffdecode/libffdecode.so
- doicon resources/installers/linux/jubler.png
- domenu resources/installers/linux/jubler.desktop
-
- DESTDIR="${D}" eant linuxdesktopintegration
- rm -vr "${D}/usr/share/menu" || die
-
- java-pkg_dolauncher jubler --main Jubler
- dohtml ChangeLog.html || die "dohtml failed"
- dodoc README || die "dodoc failed"
- doman resources/installers/linux/jubler.1 || die "doman failed"
- insinto /usr/share/jubler/help
- doins dist/help/* || die "doins failed"
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
-}
diff --git a/media-video/jubler/jubler-5.1.ebuild b/media-video/jubler/jubler-5.1.ebuild
index 18165e1abb2e..7b4baee2da7f 100644
--- a/media-video/jubler/jubler-5.1.ebuild
+++ b/media-video/jubler/jubler-5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-source-${PV}.tar.bz2 -> ${P}.tar.bz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="mplayer spell nls"
RDEPEND="
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index bcea6853ad32..d5bda64265aa 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,8 +1,10 @@
DIST mkvtoolnix-19.0.0.tar.xz 4616780 BLAKE2B 72eb3b1a34bbed0d492098c02c1f60c7ce7f0ea6a8fbff6b88bd9d7af5891dda8c8adb9a0f856c65106fb430b481183ce74b9369590cd4dcfe881d7db84eb06d SHA512 dd18eeffc8a5210ca3c8a287321ad106f63cff8fbe5ad3891460aab7e60f2d5261a3f335f3991524a95724861288593cfb3bd9df6829a2f7751f6a1fdaba0ca6
DIST mkvtoolnix-20.0.0.tar.xz 4670268 BLAKE2B fd10e5bd739338252d4d1c8878382652660e59b9669c85a3f9bfab1349da6cbcd4a79b23a1db9f59adb5ccb12aa1ae046978f722e887ab0668c91270cf50b705 SHA512 1ba7b2d02fcaa2252409702e82e04075237a33b8f2cfe8b85e4ea416d7ad55d0454659c821eb851fa666b15acceec40a5be00691ddaa4ea098cd3a4d2db0d313
+DIST mkvtoolnix-21.0.0.tar.xz 4682788 BLAKE2B 52d9920fc5b735f7d8af1f6e60828f143a914ce7cd7c635daacb6d2da584b0158f80e0f4d39824130b0c8fcc83b7c3a1215b2e965cb8b47b2b297df2d78414d5 SHA512 881e0c38eee2d36ab9dea5ccaa8ad74e0076cdc13606f873ab58bfeeec09c05e947529d3bad665b1d4df6a816faca30e8a685bc19115f90c18dac3c1ae27c252
DIST mkvtoolnix-9.6.0.tar.xz 3810216 BLAKE2B 0213f7643b517436610fd2abd5862026cad81ae48018bbdde6fd83b226eaba6d36589925fd49b7244a47569f7fd15480eac9af559df1da7c131a05aea4865606 SHA512 5f469215a10dc865e51f77c43961705d70b1b0e38d70b930e5065d8d89b8379734d9826a63e2cb7ae9cb6723ed8a1d16793df35bad6244cedaa19bc4df49b436
EBUILD mkvtoolnix-19.0.0.ebuild 2549 BLAKE2B f205d940a9fe250d842cfeaffefd389be863556cfbb6d1d2960551c5b16ece35269c9c64f2c110655e38f2cda894c5940bf686fb04602ad997cca05f61ecb0b9 SHA512 e8291ce11ad3871b538ccce78d81e258ff4112098a14587f12a03969a40cec24ddb884a2c9e3c16503ac1272a586e6e61fef8d414c28e9ee526949c97e52124c
EBUILD mkvtoolnix-20.0.0.ebuild 2711 BLAKE2B 05bc79c266139415bfa53d7c739bfd4b1738b606d2d7660d41eb1fa68a4738970371ab915e0413b30ff8a482452ed8b4568f076c32a8383955f5c2a7f237bff8 SHA512 db31f33ad3f2f302fb978a5a5ce59c265141844142b1d557a1febc42b2c3a0ac1a13a9b5cd04d8903a7c1dab01f3fea9701aa634edd165c40d04e6d64ff9f5df
+EBUILD mkvtoolnix-21.0.0.ebuild 2711 BLAKE2B 05bc79c266139415bfa53d7c739bfd4b1738b606d2d7660d41eb1fa68a4738970371ab915e0413b30ff8a482452ed8b4568f076c32a8383955f5c2a7f237bff8 SHA512 db31f33ad3f2f302fb978a5a5ce59c265141844142b1d557a1febc42b2c3a0ac1a13a9b5cd04d8903a7c1dab01f3fea9701aa634edd165c40d04e6d64ff9f5df
EBUILD mkvtoolnix-9.6.0.ebuild 2797 BLAKE2B 63dcef388c97df90fa9d47572d2af82839fb1687409060aedeb824400e5e2d450674689c69e630bc02f00ff92f784ab29d3b445b39a4317884a30513e30151b2 SHA512 bd376bb7787b79719e4e3bba4361e55be0d8c39d55b6c37c905c84bf8b583f718b66d7ce9941f87213514ce38c33f2d2a506f2fd8e1edcd6d0fb4e11e45d4052
EBUILD mkvtoolnix-9999.ebuild 2711 BLAKE2B 05bc79c266139415bfa53d7c739bfd4b1738b606d2d7660d41eb1fa68a4738970371ab915e0413b30ff8a482452ed8b4568f076c32a8383955f5c2a7f237bff8 SHA512 db31f33ad3f2f302fb978a5a5ce59c265141844142b1d557a1febc42b2c3a0ac1a13a9b5cd04d8903a7c1dab01f3fea9701aa634edd165c40d04e6d64ff9f5df
MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-21.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-21.0.0.ebuild
new file mode 100644
index 000000000000..9cc2c6abecac
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-21.0.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
+ inherit git-r3
+else
+ SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug pch test qt5"
+
+# check NEWS.md for build system changes entries for boost/libebml/libmatroska
+# version requirement updates and other packaging info
+RDEPEND="
+ >=dev-libs/boost-1.49.0:=
+ >=dev-libs/libebml-1.3.5:=
+ dev-libs/jsoncpp:=
+ dev-libs/pugixml
+ media-libs/flac
+ >=media-libs/libmatroska-1.4.8:=
+ media-libs/libogg
+ media-libs/libvorbis
+ sys-apps/file
+ sys-libs/zlib
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtmultimedia:5
+ app-text/cmark
+ )
+"
+DEPEND="${RDEPEND}
+ dev-ruby/rake
+ sys-devel/gettext
+ virtual/pkgconfig
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+ app-text/po4a
+ test? ( dev-cpp/gtest )
+"
+
+DOCS="AUTHORS NEWS.md README.md"
+
+pkg_pretend() {
+ # https://bugs.gentoo.org/419257
+ local ver=4.6
+ local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+ if ! version_is_at_least ${ver} $(gcc-version); then
+ eerror ${msg}
+ die ${msg}
+ fi
+}
+
+src_prepare() {
+ default
+ [[ ${PV} == "9999" ]] && { ./autogen.sh || die; }
+}
+
+src_configure() {
+ local myconf
+
+ if use qt5 ; then
+ # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+ myconf+=(
+ --with-moc=$(qt5_get_bindir)/moc
+ --with-uic=$(qt5_get_bindir)/uic
+ --with-rcc=$(qt5_get_bindir)/rcc
+ --with-qmake=$(qt5_get_bindir)/qmake
+ )
+ fi
+
+ econf \
+ $(use_enable debug) \
+ $(use_enable qt5 qt) \
+ $(usex pch "" --disable-precompiled-headers) \
+ "${myconf[@]}" \
+ --disable-update-check \
+ --disable-optimization \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --with-boost="${EPREFIX}"/usr \
+ --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+ rake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+ rake V=1 -j$(makeopts_jobs) tests:unit || die
+ rake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+ DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
+
+ einstalldocs
+ doman doc/man/*.1
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index bc938cd7eb23..a5dccd9f7b47 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,9 +1,8 @@
-AUX simplescreenrecorder-0.3.8-qtbindir.patch 659 BLAKE2B c5de5c06d2dae1e3e0133b77a7d02fade47de65c9a90e9e3a8c5e69dfb8bc6dd3f17e09b974f6021b2ed23b2cc2a5934b84b553cf22e3d4b37e6527416982109 SHA512 5321b44e6cdfbe9081d716008c1da4b5f828a298a2e73e313b7bd960274f1d5151f8c653f2fc165ab7fe27d20ef76fc6a77f4e87de2cf91a91e6f84f8b66bf4f
AUX simplescreenrecorder-0.3.9-cmake.patch 3098 BLAKE2B 5f744c8b56e04022a1048f9fb37924ec4443b12da7bd8c6d8569bab302f39cbe7d697948e578e4b2f19050ff78d7a3d278d0c9481aadafc5b9883e7b84923bc4 SHA512 ffcbc6822d1d0fe833018206fc23bf3c880d5a39bb607346b78dcb6d37e320b357f73b4216d8724c30052cebe70cc0167889fbd4c1ddd2a3713cbaf8ad4ae338
AUX simplescreenrecorder-0.3.9-pulseaudio_dep.patch 427 BLAKE2B 9ce385a87222d4684f6626db9f6be5d7efc04e84e5175a804e415f053c4c3e4684b0b7338615e74801485f1962d1f8ccc114ec357d6c1446ab56816d0880ede6 SHA512 d9616bf99d784c5ab0a1446b965ebec4e089a3ecafc2ed128dbc04747ad2511a84d679e309530369241816b662f527d7109dfb26df13888d8c4f917a99ea2c72
-DIST simplescreenrecorder-0.3.8.tar.gz 2037017 BLAKE2B 891d4ab5e02a0a47452dfdd0c936819a46ea558221edb5699dd95682561153f7db9f4a301414145e8582f944490ce6d4f722b71e197fc5fa54008c3dbbc25f4c SHA512 f94c7ac7d5f6fdebd1c68da7469b6c46a21b399e2ad8744c52d3e9959d2ec74d15e6ac061d7fe41f02ebb9ee9a89fbd8feecf4e0a10110975f3857a7fbb66365
+DIST simplescreenrecorder-0.3.10.tar.gz 1823448 BLAKE2B 5eef2a803be90b357b08ba6a009cd9bfda73bc7c29200de50c32902598b7044aedaa0a39d9eb71ab0a660bb1a3c03f7d57ae2437203037951f06821ce8a417bb SHA512 dc7b9de386b5f87e8315695ef105dea2491d09b98b19029146dd29562fec001bf6b3fd3f30e91bc87bdb55ec87ff213567b5b17a234b0c06c6b7fe93db63d4ae
DIST simplescreenrecorder-0.3.9.tar.gz 1816221 BLAKE2B 995ac44da0a5e65dcb33a10b353085f6907531b2af84a0b4c5898f1a44d45676a759b94facdf7f6f311444bcb1ea2cbd8dcf143b8c6e0efac4a7eb06484d1096 SHA512 36dc30597d1cb07f060dcb667d79074851fec75f369efe349d1a1852110e663f0704fd0ec7d85fd0fc0dac27e478b7422f6e273dfecbb27ddeb6d2228217a3b2
-EBUILD simplescreenrecorder-0.3.8.ebuild 2734 BLAKE2B d59ba3285fab99bf61f5ab9eeeb03dbce471c529d5b3ada2494e95318403b936db3ac0d92b2100dc12b6351bf0a9a24136856924012fa8ef996ce1bb876296d6 SHA512 99bc9d5244b5ad58c88db47f0d4bc0d8f5468e3174a652446eba8a11e455b66137beefd18982c23b8180ba95b486b527f147c44d760e7b6e344ec63fbc8131b7
+EBUILD simplescreenrecorder-0.3.10.ebuild 2827 BLAKE2B 97ee9516f58c00e93ffafb47e416c5d7d6b686deec24271a7c59f8f713a327b8179733d3e1f4f2a9799cbaf32206b24e6fcd9ead61bf442092b5d641d7bffc98 SHA512 42d178d475278d1d7c888215b3d11182786575eb3d7447628ee4eeda73799da27c0c291b9ca40fddb4db66a00ebdd969a8dc82b68ab9e8f67d4685eaf236d3d4
EBUILD simplescreenrecorder-0.3.9-r1.ebuild 2913 BLAKE2B da8680a70094428174dd39a169b38cedaec5a4304c031d1024fe5616832252fee8b391889e0de413d291397f3edf39eefc8027136221202f5341b51e542fc5db SHA512 33b9d71372a3fa47492e8afc0d5341b99a2ab33544ca53badabc8678e4f1b2c71a0f6592f7b7c13f6dc6120ca7390b5863ec34a6193402e9ff98245c4bb1f88f
EBUILD simplescreenrecorder-9999.ebuild 2827 BLAKE2B 97ee9516f58c00e93ffafb47e416c5d7d6b686deec24271a7c59f8f713a327b8179733d3e1f4f2a9799cbaf32206b24e6fcd9ead61bf442092b5d641d7bffc98 SHA512 42d178d475278d1d7c888215b3d11182786575eb3d7447628ee4eeda73799da27c0c291b9ca40fddb4db66a00ebdd969a8dc82b68ab9e8f67d4685eaf236d3d4
MISC metadata.xml 508 BLAKE2B c43c69903c35e9e1f87c94cb26b06a8d6c4dd1a51c8a3409027ab8c867e54851aa8e4bfcaf4a0a37298795ded69743e82d2b0a4e0bb84cb3d88d6a6c5c4a1c0f SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce
diff --git a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.8-qtbindir.patch b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.8-qtbindir.patch
deleted file mode 100644
index 6e1cc7d5cc44..000000000000
--- a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.8-qtbindir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac 2016-11-07 01:21:01.000000000 +0100
-+++ b/configure.ac 2017-12-04 19:49:32.993241964 +0100
-@@ -56,7 +56,7 @@
- AM_COND_IF([WITH_QT5], [
- PKG_CHECK_MODULES([QT5], [Qt5Core >= 5.1.0 Qt5Gui Qt5Widgets Qt5X11Extras], [
- QT_PATH1="$( eval $PKG_CONFIG --variable=libdir Qt5Core )/qt5/bin"
-- QT_PATH2="$( eval $PKG_CONFIG --variable=exec_prefix Qt5Core )/bin"
-+ QT_PATH2="$( eval $PKG_CONFIG --variable=host_bins Qt5Core )/bin"
- AC_PATH_PROGS([MOC], [moc-qt5 moc], [moc], [$QT_PATH1:$QT_PATH2])
- AC_PATH_PROGS([RCC], [rcc-qt5 rcc], [rcc], [$QT_PATH1:$QT_PATH2])
- AC_PATH_PROGS([UIC], [uic-qt5 uic], [uic], [$QT_PATH1:$QT_PATH2])
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.8.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.10.ebuild
index af9ce70e97a2..da1692bb1d65 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.8.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools flag-o-matic multilib-minimal
+inherit cmake-multilib flag-o-matic xdg-utils
if [[ ${PV} = 9999 ]]; then
inherit git-r3
@@ -23,7 +23,7 @@ else
fi
SLOT="0"
-IUSE="+asm debug jack mp3 pulseaudio theora vorbis vpx x264"
+IUSE="+asm jack mp3 pulseaudio theora vorbis vpx x264"
RDEPEND="
dev-qt/qtcore:5
@@ -47,8 +47,6 @@ DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
"
-PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" )
-
pkg_setup() {
if [[ ${ABI} == amd64 ]]; then
elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
@@ -72,30 +70,34 @@ pkg_setup() {
append-flags -fPIC
}
-src_prepare() {
- default
- eautoreconf
-}
-
multilib_src_configure() {
- local myconf=(
- $(multilib_native_use_enable debug assert)
- $(multilib_native_use_with pulseaudio)
- $(multilib_native_use_with jack)
- $(use_enable asm x86-asm)
+ local mycmakeargs=(
+ -DENABLE_32BIT_GLINJECT="$(usex abi_x86_32)"
+ -DENABLE_X86_ASM="$(usex asm)"
+ -DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
+ -DWITH_JACK="$(multilib_native_usex jack)"
+ -DWITH_GLINJECT="true"
)
# libav doesn't have AVFrame::channels
# https://github.com/MaartenBaert/ssr/issues/195#issuecomment-45646159
- if has_version media-video/libav; then
- myconf+=( --disable-ffmpeg-versions )
+ if has_version media-video/libav ; then
+ mycmakeargs+=( -DENABLE_FFMPEG_VERSIONS="false" )
fi
if multilib_is_native_abi ; then
- myconf+=( --with-qt5 )
+ mycmakeargs+=( -DWITH_QT5="true" )
else
- myconf+=( --disable-ssrprogram )
+ mycmakeargs+=( -DWITH_SIMPLESCREENRECORDER="false" )
fi
- ECONF_SOURCE="${S}" econf "${myconf[@]}"
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-10 10:58:38 +0000