* [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/files/, media-video/mkvtoolnix/
@ 2015-12-28 7:32 Alexis Ballier
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2015-12-28 7:32 UTC (permalink / raw
To: gentoo-commits
commit: 36615defaf6b097f19699a18003b68aa9a311dda
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 07:31:19 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 07:31:19 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36615def
media-video/mkvtoolnix: remove old
Package-Manager: portage-2.2.26
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-video/mkvtoolnix/Manifest | 6 -
.../files/mkvtoolnix-5.8.0-boost-configure.patch | 63 -----------
.../files/mkvtoolnix-5.8.0-system-pugixml.patch | 31 ------
.../files/mkvtoolnix-6.6.0-boost-1.56.patch | 52 ---------
.../files/mkvtoolnix-8.2.0-fix-curl-support.patch | 11 --
media-video/mkvtoolnix/mkvtoolnix-6.6.0.ebuild | 89 ---------------
media-video/mkvtoolnix/mkvtoolnix-8.2.0-r1.ebuild | 123 ---------------------
media-video/mkvtoolnix/mkvtoolnix-8.3.0.ebuild | 121 --------------------
media-video/mkvtoolnix/mkvtoolnix-8.4.0.ebuild | 116 -------------------
media-video/mkvtoolnix/mkvtoolnix-8.5.0.ebuild | 116 -------------------
media-video/mkvtoolnix/mkvtoolnix-8.5.1.ebuild | 115 -------------------
11 files changed, 843 deletions(-)
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index efbc55f..93aba3f 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,8 +1,2 @@
-DIST mkvtoolnix-6.6.0.tar.xz 5174424 SHA256 cb1f965617fe064cf78457d3fbd0685eb31ae5b7e205cf4c8e74b6f27f3399e3 SHA512 c86f10a0a919e6d28c2587b60663c38713cfa6ca0a5188524b81af2fd60e4ea626a01431d29c6ae5885eae05d71af93d857986c5008aec4963dacc3ead9dc26f WHIRLPOOL 55a15bb2fdb62af85e189c39b1a1391d33eb08b4ba116fc307965be6817a944b21d18c034b9a3da16a6e84e93544dbd59f3c7fe9406ab454e15cf8ee1eb815c3
-DIST mkvtoolnix-8.2.0.tar.xz 5856988 SHA256 eb6d3d7a0254bb4326dccc9983418801783198cdf4a259f31261dab4e843a5c4 SHA512 200fad08f6912081d7aabbae9330dc41b90af8d6fdce592090b9fedf2325a91f70d3a85ff40b03b57b0682a075050b6b73307872c1e716e8261849c3fb97968b WHIRLPOOL 1b25cd8913eb02018d62de369171ee1a48d31cbce6684c0c7febd2f88c3286bbf386c825ddeae54ef411dc14cc128c9e833408f9b0ac9cb1d5e525ba34aaa4ae
-DIST mkvtoolnix-8.3.0.tar.xz 5863384 SHA256 87bd82222995d35c310a426ed43e0b27cbfefa0caadcbcca8296787314affc37 SHA512 fb3ac11480c20ae360fef9081991876ef2d7a717f24ec631bb8482ee7d22f79164aafeaf561dee503f1c0a83fe3ed6db319b420c34d638450aada762e6eb00c0 WHIRLPOOL b3cd3f4785c891c75eac3754136aa0b709ff0e784eea6d0e915478eea6fbdbe7132c56a997a007ba6d690649b6caaae46a8b45ae055aab7ae557486d99aab417
-DIST mkvtoolnix-8.4.0.tar.xz 3234284 SHA256 f6a5506d14a0b16abb3765d6f78cded0267e01096926b30e8f72df9d30aaf878 SHA512 ab9ab49baf06a8ef713872a09c58fdb1560628dbe3b2b661d809972f56a36c751a390a78ae260624510963b92e177d090088030bb96f9ab9e96e1a372772d22f WHIRLPOOL 811a0466413bdba84959c5ae84d637aba4371018ee3deed70d65f24472c0bf6a714003574efb4e4dcdc3bfb1b3c48595a347ab0bcdd935a9b49e2f1ab4c36c58
-DIST mkvtoolnix-8.5.0.tar.xz 3280556 SHA256 ec3f4566dbc324c3bda7314c70d87046136664d72888945f9fdb8d129e1e05a3 SHA512 18f1bac6ba46d3ec3235d4b8ec8fc9bd0b5993344205172f254d3ca8aa7afdb399d81d9e7d8b24fe004661c83757e82b4874865acaa231e7721b1d8382adfdd3 WHIRLPOOL 453a55adf80fca61be3b102c39ccd48aa057983e8e3d4aea563ffe67ad86ded6889f0e1926e600556d43c4fccacdc79facd6438b8dccb9591a6e86de2919e8b1
-DIST mkvtoolnix-8.5.1.tar.xz 3288800 SHA256 db9ae151ef236afac190c0137d8d4df4e43c105dbd298e3913b5afae1fdd5b43 SHA512 cf2d254df0851f4450a59b187ec9c4d293c1128d062ab12d098bc77ea4c2213a2d5b78989ee170789aa2bac9c23a531ed7b87f6d7206f03ee73a0821c021fffa WHIRLPOOL 7a7858fd6f22c9bf812cb28528f7612a3fb7a7056889534e24a45fe1bc88e69c9c6220088cd45e66f2072150b876af7eeaa417b2f7f02dff19c1ea4d03853ba9
DIST mkvtoolnix-8.5.2.tar.xz 3304356 SHA256 efaae6d5e3d0963e2f53ae9c45f151be28561a6c6a28fad46e6220baf9862bbc SHA512 14a2d3d20499ccc2cfd0b1cfbbaa66def6ba512df0624f3e79d317670c4c17bf6552b9e62daed225b369fbab2fad3ce98877ccb7583096cd61da4c91ffed54ef WHIRLPOOL 536bbf36ac76e46d0205f5b2db58d986065ba38acd513129e0604154130cdf8861f3d8a52cb341980161b302f2853199c031b9908665ff13d2bb7db193a56a66
DIST mkvtoolnix-8.6.1.tar.xz 3242840 SHA256 815d8355b6a83af01c957543cee8716f1dad53e03b2ecf58b821099cd3c8fa77 SHA512 f3b14547da01a3a1268ec9b356e830391da7058741d7d8b67dcc9df5098ae9617fece67b82d6a73324f95c7060b182d94929c637baa6b9c806b2d472937151e1 WHIRLPOOL d8f4f9d3b2db77820bc018f41ac5a864057f18b22ed7711fc5c7bc3996b31041606a244b4f06b19abbaec6686990834c37ab27d5e58dd37b7c8313b24afdca51
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch b/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch
deleted file mode 100644
index 72b94b9..0000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/ac/ax_boost_filesystem.m4 b/ac/ax_boost_filesystem.m4
-index 97c4ad0..87b94a8 100644
---- a/ac/ax_boost_filesystem.m4
-+++ b/ac/ax_boost_filesystem.m4
-@@ -81,14 +81,14 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
- AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
- if test "x$ax_boost_user_filesystem_lib" = "x"; then
-- for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_filesystem.*\)\.so.*$,\1,' -e 's,^lib\(boost_filesystem.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_filesystem.*\)\.a.*$,\1,'`; do
-+ for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.so* $BOOSTLIBDIR/libboost_filesystem*.dylib* $BOOSTLIBDIR/libboost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.\(dylib\|a\|so\).*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
- [link_filesystem="no"],[$BOOST_SYSTEM_LIB])
- done
- if test "x$link_filesystem" != "xyes"; then
-- for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.dll.*$;\1;' -e 's;^\(boost_filesystem.*\)\.a*$;\1;'` ; do
-+ for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.dll* $BOOSTLIBDIR/boost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.\(dll\|a\).*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
-diff --git a/ac/ax_boost_regex.m4 b/ac/ax_boost_regex.m4
-index ffd537f..2cef64f 100644
---- a/ac/ax_boost_regex.m4
-+++ b/ac/ax_boost_regex.m4
-@@ -75,14 +75,14 @@ AC_DEFUN([AX_BOOST_REGEX],
- AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available])
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
- if test "x$ax_boost_user_regex_lib" = "x"; then
-- for libextension in `ls $BOOSTLIBDIR/libboost_regex*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_regex.*\)\.so.*$,\1,' -e 's,^lib\(boost_regex.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_regex.*\)\.a.*$,\1,'`; do
-+ for libextension in `ls $BOOSTLIBDIR/libboost_regex*.so* $BOOSTLIBDIR/libboost_regex*.dylib* $BOOSTLIBDIR/libboost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_regex.*\)\.so.*$;\1;' -e 's;^lib\(boost_regex.*\)\.dylib.*;\1;' -e 's;^lib\(boost_regex.*\)\.a.*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
- [link_regex="no"])
- done
- if test "x$link_regex" != "xyes"; then
-- for libextension in `ls $BOOSTLIBDIR/boost_regex*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a*$;\1;'` ; do
-+ for libextension in `ls $BOOSTLIBDIR/boost_regex*.dll* $BOOSTLIBDIR/boost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a.*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-diff --git a/ac/ax_boost_system.m4 b/ac/ax_boost_system.m4
-index b0685b9..a71907b 100644
---- a/ac/ax_boost_system.m4
-+++ b/ac/ax_boost_system.m4
-@@ -83,14 +83,14 @@ AC_DEFUN([AX_BOOST_SYSTEM],
-
- LDFLAGS_SAVE=$LDFLAGS
- if test "x$ax_boost_user_system_lib" = "x"; then
-- for libextension in `ls $BOOSTLIBDIR/libboost_system*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_system.*\)\.so.*$,\1,' -e 's,^lib\(boost_system.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_system.*\)\.a.*$,\1,'`; do
-+ for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
- [link_system="no"])
- done
- if test "x$link_system" != "xyes"; then
-- for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e 's;^\(boost_system.*\)\.a*$;\1;'` ; do
-+ for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-system-pugixml.patch b/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-system-pugixml.patch
deleted file mode 100644
index a3fcf21..0000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-system-pugixml.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- mkvtoolnix-5.8.0/rake.d/target.rb
-+++ mkvtoolnix-5.8.0/rake.d/target.rb
-@@ -107,7 +107,6 @@
- when :mtxunittest then "tests/unit/libmtxunittest.a"
- when :avi then "lib/avilib-0.6.10/libavi.a"
- when :rmff then "lib/librmff/librmff.a"
-- when :pugixml then "lib/pugixml/src/libpugixml.a"
- when :mpegparser then "src/mpegparser/libmpegparser.a"
- when :ebml then c?("EBML_MATROSKA_INTERNAL") ? "lib/libebml/src/libebml.a" : nil
- when :matroska then c?("EBML_MATROSKA_INTERNAL") ? "lib/libmatroska/src/libmatroska.a" : nil
---- mkvtoolnix-5.8.0/Rakefile
-+++ mkvtoolnix-5.8.0/Rakefile
-@@ -55,8 +55,8 @@
- $applications = $programs.collect { |name| "src/#{$application_subdirs[name]}#{name}" + c(:EXEEXT) }
- $manpages = $programs.collect { |name| "doc/man/#{name}.1" }
-
-- $system_includes = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Ilib/pugixml/src -Isrc"
-- $system_libdirs = "-Llib/avilib-0.6.10 -Llib/librmff -Llib/pugixml/src -Lsrc/common"
-+ $system_includes = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Isrc"
-+ $system_libdirs = "-Llib/avilib-0.6.10 -Llib/librmff -Lsrc/common"
-
- $source_directories = %w{lib/avilib-0.6.10 lib/librmff src src/input src/output src/common src/common/chapters src/common/compression src/common/strings src/common/tags src/common/xml
- src/mmg src/mmg/header_editor src/mmg/options src/mmg/tabs src/extract src/propedit src/merge src/info src/mpegparser}
-@@ -605,7 +605,6 @@
-
- [ { :name => 'avi', :dir => 'lib/avilib-0.6.10' },
- { :name => 'rmff', :dir => 'lib/librmff' },
-- { :name => 'pugixml', :dir => 'lib/pugixml/src' },
- { :name => 'mpegparser', :dir => 'src/mpegparser' },
- { :name => 'mtxcommon', :dir => [ 'src/common' ] + %w{chapters compression strings tags xml }.collect { |e| "src/common/#{e}" } },
- { :name => 'mtxinput', :dir => 'src/input' },
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-6.6.0-boost-1.56.patch b/media-video/mkvtoolnix/files/mkvtoolnix-6.6.0-boost-1.56.patch
deleted file mode 100644
index c99d06b..0000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-6.6.0-boost-1.56.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Nuar mkvtoolnix-6.6.0/src/common/iso639.cpp mkvtoolnix-6.6.0-fix/src/common/iso639.cpp
---- mkvtoolnix-6.6.0/src/common/iso639.cpp 2013-12-01 16:51:35.000000000 +0000
-+++ mkvtoolnix-6.6.0-fix/src/common/iso639.cpp 2015-02-09 07:00:26.134735208 +0000
-@@ -13,6 +13,7 @@
-
- #include "common/common_pch.h"
-
-+#include <boost/version.hpp>
- #include <unordered_map>
-
- #include "common/iso639.h"
-@@ -590,20 +591,36 @@
- auto range = iso639_languages | badap::indexed(0);
- auto end = boost::end(range);
- for (auto lang = boost::begin(range); lang != end; lang++) {
-- auto names = split(lang->english_name, ";");
-+#if BOOST_VERSION < 105600
-+ auto const &english_name = lang->english_name;
-+ auto index = lang.index();
-+#else
-+ auto const &english_name = lang->value().english_name;
-+ auto index = lang->index();
-+#endif
-+
-+ auto names = split(english_name, ";");
- strip(names);
- if (brng::find(names, s) != names.end())
-- return lang.index();
-+ return index;
- }
-
- if (!allow_short_english_name)
- return -1;
-
- for (auto lang = boost::begin(range); lang != end; lang++) {
-- auto names = split(lang->english_name, ";");
-+#if BOOST_VERSION < 105600
-+ auto const &english_name = lang->english_name;
-+ auto index = lang.index();
-+#else
-+ auto const &english_name = lang->value().english_name;
-+ auto index = lang->index();
-+#endif
-+
-+ auto names = split(english_name, ";");
- strip(names);
- if (names.end() != brng::find_if(names, [&](std::string const &name) { return balg::istarts_with(name, s); }))
-- return lang.index();
-+ return index;
- }
-
- return -1;
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-8.2.0-fix-curl-support.patch b/media-video/mkvtoolnix/files/mkvtoolnix-8.2.0-fix-curl-support.patch
deleted file mode 100644
index 67ce30f..0000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-8.2.0-fix-curl-support.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/mkvtoolnix-gui/main_window/main_window.cpp
-+++ b/src/mkvtoolnix-gui/main_window/main_window.cpp
-@@ -118,7 +118,7 @@ MainWindow::setupMenu() {
- #if defined(HAVE_CURL_EASY_H)
- connect(ui->actionHelpCheckForUpdates, &QAction::triggered, this, &MainWindow::checkForUpdates);
- #else
-- ui->actionGUICheckForUpdates->setVisible(false);
-+ ui->actionHelpCheckForUpdates->setVisible(false);
- #endif // HAVE_CURL_EASY_H
- }
-
diff --git a/media-video/mkvtoolnix/mkvtoolnix-6.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-6.6.0.ebuild
deleted file mode 100644
index d7c1bba..0000000
--- a/media-video/mkvtoolnix/mkvtoolnix-6.6.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug pch qt4 wxwidgets"
-
-RDEPEND="
- >=dev-libs/libebml-1.3.0:=
- >=media-libs/libmatroska-1.4.1:=
- >=dev-libs/boost-1.46.0:=
- dev-libs/pugixml
- media-libs/flac
- media-libs/libogg
- media-libs/libvorbis
- sys-apps/file
- >=sys-devel/gcc-4.6
- sys-libs/zlib
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- wxwidgets? ( x11-libs/wxGTK:2.8[X] )
-"
-DEPEND="${RDEPEND}
- dev-lang/ruby
- virtual/pkgconfig
-"
-
-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() {
- epatch "${FILESDIR}"/${PN}-5.8.0-system-pugixml.patch \
- "${FILESDIR}"/${PN}-5.8.0-boost-configure.patch \
- "${FILESDIR}"/${PN}-6.6.0-boost-1.56.patch
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use wxwidgets ; then
- WX_GTK_VER="2.8"
- need-wxwidgets unicode
- myconf="--with-wx-config=${WX_CONFIG}"
- fi
-
- econf \
- $(use_enable debug) \
- $(use_enable qt4 qt) \
- $(use_enable wxwidgets) \
- $(usex pch "" --disable-precompiled-headers) \
- ${myconf} \
- --disable-optimization \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-boost="${EPREFIX}"/usr \
- --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
- --without-curl
-}
-
-src_compile() {
- ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_install() {
- DESTDIR="${D}" ./drake -j$(makeopts_jobs) install || die
-
- dodoc AUTHORS ChangeLog README TODO
- doman doc/man/*.1
-
- use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.2.0-r1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.2.0-r1.ebuild
deleted file mode 100644
index f7fa4eb..0000000
--- a/media-video/mkvtoolnix/mkvtoolnix-8.2.0-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER="3.0"
-inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="curl debug pch qt5 wxwidgets"
-
-ruby_atom() {
- local ruby_slot=${1/ruby/}
- ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
- echo "dev-lang/ruby:${ruby_slot}"
-}
-
-# hacks to avoid using the ruby eclasses since this requires something similar
-# to the python-any-r1 eclass for ruby which currently doesn't exist
-RUBY_IMPLS=( ruby22 ruby21 ruby20 )
-RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
- echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
-
-RDEPEND="
- >=dev-libs/boost-1.46.0:=
- >=dev-libs/libebml-1.3.1:=
- dev-libs/pugixml
- media-libs/flac
- >=media-libs/libmatroska-1.4.2:=
- media-libs/libogg
- media-libs/libvorbis
- sys-apps/file
- >=sys-devel/gcc-4.6
- sys-libs/zlib
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- )
- wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-"
-DEPEND="${RDEPEND}
- || ( ${RUBY_BDEPS} )
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-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() {
- local ruby_impl
- for ruby_impl in "${RUBY_IMPLS[@]}"; do
- if has_version "$(ruby_atom ${ruby_impl})"; then
- export RUBY=${ruby_impl}
- break
- fi
- done
- [[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
-
- epatch "${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
- epatch "${FILESDIR}"/${P}-fix-curl-support.patch #555340
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use qt5 ; then
- # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
- myconf+=(
- --with-moc=/usr/$(get_libdir)/qt5/bin/moc
- --with-uic=/usr/$(get_libdir)/qt5/bin/uic
- --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
- --with-mkvtoolnix-gui
- )
- fi
-
- if use wxwidgets ; then
- need-wxwidgets unicode
- myconf+=( --with-wx-config=${WX_CONFIG} )
- fi
-
- econf \
- $(use_enable debug) \
- $(use_enable qt5 qt) \
- $(use_enable wxwidgets) \
- $(use_with curl) \
- $(usex pch "" --disable-precompiled-headers) \
- "${myconf[@]}" \
- --disable-optimization \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-boost="${EPREFIX}"/usr \
- --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_install() {
- DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
-
- dodoc AUTHORS ChangeLog README.md TODO
- doman doc/man/*.1
-
- use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.3.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.3.0.ebuild
deleted file mode 100644
index bb94e9e..0000000
--- a/media-video/mkvtoolnix/mkvtoolnix-8.3.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER="3.0"
-inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="curl debug pch qt5 wxwidgets"
-
-ruby_atom() {
- local ruby_slot=${1/ruby/}
- ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
- echo "dev-lang/ruby:${ruby_slot}"
-}
-
-# hacks to avoid using the ruby eclasses since this requires something similar
-# to the python-any-r1 eclass for ruby which currently doesn't exist
-RUBY_IMPLS=( ruby22 ruby21 ruby20 )
-RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
- echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
-
-RDEPEND="
- >=dev-libs/boost-1.46.0:=
- >=dev-libs/libebml-1.3.1:=
- dev-libs/pugixml
- media-libs/flac
- >=media-libs/libmatroska-1.4.2:=
- media-libs/libogg
- media-libs/libvorbis
- sys-apps/file
- >=sys-devel/gcc-4.6
- sys-libs/zlib
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- )
- wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-"
-DEPEND="${RDEPEND}
- || ( ${RUBY_BDEPS} )
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-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() {
- local ruby_impl
- for ruby_impl in "${RUBY_IMPLS[@]}"; do
- if has_version "$(ruby_atom ${ruby_impl})"; then
- export RUBY=${ruby_impl}
- break
- fi
- done
- [[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
-
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use qt5 ; then
- # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
- myconf+=(
- --with-moc=/usr/$(get_libdir)/qt5/bin/moc
- --with-uic=/usr/$(get_libdir)/qt5/bin/uic
- --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
- --with-mkvtoolnix-gui
- )
- fi
-
- if use wxwidgets ; then
- need-wxwidgets unicode
- myconf+=( --with-wx-config=${WX_CONFIG} )
- fi
-
- econf \
- $(use_enable debug) \
- $(use_enable qt5 qt) \
- $(use_enable wxwidgets) \
- $(use_with curl) \
- $(usex pch "" --disable-precompiled-headers) \
- "${myconf[@]}" \
- --disable-optimization \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-boost="${EPREFIX}"/usr \
- --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_install() {
- DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
-
- dodoc AUTHORS ChangeLog README.md TODO
- doman doc/man/*.1
-
- use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.4.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.4.0.ebuild
deleted file mode 100644
index 9c244eb..0000000
--- a/media-video/mkvtoolnix/mkvtoolnix-8.4.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER="3.0"
-inherit eutils multilib toolchain-funcs versionator multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="curl debug pch test qt5"
-
-ruby_atom() {
- local ruby_slot=${1/ruby/}
- ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
- echo "dev-lang/ruby:${ruby_slot}"
-}
-
-# hacks to avoid using the ruby eclasses since this requires something similar
-# to the python-any-r1 eclass for ruby which currently doesn't exist
-RUBY_IMPLS=( ruby22 ruby21 ruby20 )
-RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
- echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
-
-RDEPEND="
- >=dev-libs/boost-1.46.0:=
- >=dev-libs/libebml-1.3.1:=
- dev-libs/pugixml
- media-libs/flac
- >=media-libs/libmatroska-1.4.2:=
- 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
- )
-"
-DEPEND="${RDEPEND}
- || ( ${RUBY_BDEPS} )
- sys-devel/gettext
- virtual/pkgconfig
- test? ( dev-cpp/gtest )
-"
-
-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() {
- local ruby_impl
- for ruby_impl in "${RUBY_IMPLS[@]}"; do
- if has_version "$(ruby_atom ${ruby_impl})"; then
- export RUBY=${ruby_impl}
- break
- fi
- done
- [[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
-
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use qt5 ; then
- # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
- myconf+=(
- --with-moc=/usr/$(get_libdir)/qt5/bin/moc
- --with-uic=/usr/$(get_libdir)/qt5/bin/uic
- --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
- )
- fi
-
- econf \
- $(use_enable debug) \
- $(use_enable qt5 qt) \
- $(use_with curl) \
- $(usex pch "" --disable-precompiled-headers) \
- "${myconf[@]}" \
- --disable-optimization \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-boost="${EPREFIX}"/usr \
- --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:unit || die
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
- DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
-
- dodoc AUTHORS ChangeLog README.md
- doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.5.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.5.0.ebuild
deleted file mode 100644
index 9c244eb..0000000
--- a/media-video/mkvtoolnix/mkvtoolnix-8.5.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER="3.0"
-inherit eutils multilib toolchain-funcs versionator multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="curl debug pch test qt5"
-
-ruby_atom() {
- local ruby_slot=${1/ruby/}
- ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
- echo "dev-lang/ruby:${ruby_slot}"
-}
-
-# hacks to avoid using the ruby eclasses since this requires something similar
-# to the python-any-r1 eclass for ruby which currently doesn't exist
-RUBY_IMPLS=( ruby22 ruby21 ruby20 )
-RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
- echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
-
-RDEPEND="
- >=dev-libs/boost-1.46.0:=
- >=dev-libs/libebml-1.3.1:=
- dev-libs/pugixml
- media-libs/flac
- >=media-libs/libmatroska-1.4.2:=
- 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
- )
-"
-DEPEND="${RDEPEND}
- || ( ${RUBY_BDEPS} )
- sys-devel/gettext
- virtual/pkgconfig
- test? ( dev-cpp/gtest )
-"
-
-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() {
- local ruby_impl
- for ruby_impl in "${RUBY_IMPLS[@]}"; do
- if has_version "$(ruby_atom ${ruby_impl})"; then
- export RUBY=${ruby_impl}
- break
- fi
- done
- [[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
-
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use qt5 ; then
- # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
- myconf+=(
- --with-moc=/usr/$(get_libdir)/qt5/bin/moc
- --with-uic=/usr/$(get_libdir)/qt5/bin/uic
- --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
- )
- fi
-
- econf \
- $(use_enable debug) \
- $(use_enable qt5 qt) \
- $(use_with curl) \
- $(usex pch "" --disable-precompiled-headers) \
- "${myconf[@]}" \
- --disable-optimization \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-boost="${EPREFIX}"/usr \
- --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:unit || die
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
- DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
-
- dodoc AUTHORS ChangeLog README.md
- doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.5.1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.5.1.ebuild
deleted file mode 100644
index 4d20251..0000000
--- a/media-video/mkvtoolnix/mkvtoolnix-8.5.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib toolchain-funcs versionator multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="curl debug pch test qt5"
-
-ruby_atom() {
- local ruby_slot=${1/ruby/}
- ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
- echo "dev-lang/ruby:${ruby_slot}"
-}
-
-# hacks to avoid using the ruby eclasses since this requires something similar
-# to the python-any-r1 eclass for ruby which currently doesn't exist
-RUBY_IMPLS=( ruby22 ruby21 ruby20 )
-RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
- echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
-
-RDEPEND="
- >=dev-libs/boost-1.46.0:=
- >=dev-libs/libebml-1.3.3:=
- dev-libs/pugixml
- media-libs/flac
- >=media-libs/libmatroska-1.4.4:=
- 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
- )
-"
-DEPEND="${RDEPEND}
- || ( ${RUBY_BDEPS} )
- sys-devel/gettext
- virtual/pkgconfig
- test? ( dev-cpp/gtest )
-"
-
-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() {
- local ruby_impl
- for ruby_impl in "${RUBY_IMPLS[@]}"; do
- if has_version "$(ruby_atom ${ruby_impl})"; then
- export RUBY=${ruby_impl}
- break
- fi
- done
- [[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
-
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use qt5 ; then
- # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
- myconf+=(
- --with-moc=/usr/$(get_libdir)/qt5/bin/moc
- --with-uic=/usr/$(get_libdir)/qt5/bin/uic
- --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
- )
- fi
-
- econf \
- $(use_enable debug) \
- $(use_enable qt5 qt) \
- $(use_with curl) \
- $(usex pch "" --disable-precompiled-headers) \
- "${myconf[@]}" \
- --disable-optimization \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-boost="${EPREFIX}"/usr \
- --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:unit || die
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
- DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
-
- dodoc AUTHORS ChangeLog README.md
- doman doc/man/*.1
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/files/, media-video/mkvtoolnix/
@ 2022-05-18 2:07 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-05-18 2:07 UTC (permalink / raw
To: gentoo-commits
commit: e20ef76c972a6bfbb900f5d8c36239013b288cd2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 02:07:08 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 18 02:07:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e20ef76c
media-video/mkvtoolnix: add 67.0.0
Quoting same comments I put in the patch:
"""
We should only check for UIC (provided by qtwidgets) if we're building the GUI.
Qt (just qtcore) itself is *always* needed to build mkvtoolnix (it's used
for e.g. MIME type detection since 59.0.0), but the rest of Qt
(like qtwidgets) is only needed for the GUI build.
The build system incorrectly unconditionally checks for UIC. We fix it here
to only check for it when doing a GUI build.
First hunk (ac/qt5.m4, removing UIC check): Signed-off-by: Duane Robertson duane <AT> duanerobertson.com
Second hunk (rest, adding UIC check conditional on enable_gui): Signed-off-by: Sam James <sam <AT> gentoo.org>
"""
Closes: https://bugs.gentoo.org/844097
Signed-off-by: Duane Robertson <duane <AT> duanerobertson.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mkvtoolnix/Manifest | 1 +
.../files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch | 76 +++++++++++++
media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild | 126 +++++++++++++++++++++
3 files changed, 203 insertions(+)
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 55b203cc0880..696b51f30dc3 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -2,3 +2,4 @@ DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B e0253dc0f48b0c98ee30590560daecbb7c
DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 094c13ac7e73e79f3cc7eae0768625482c4808a4323239a93de34d1406583bfe676d71855dd1f7eae9a8a0ff0a7badf50c04c71f9d2fbb4afd9ff5f05b9353ea SHA512 90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3
DIST mkvtoolnix-61.0.0.tar.xz 7662500 BLAKE2B de9d73658fe779b34b21fded8e6676b76fed5ce5ecd598aeff12e8c4f120353f63413f260bacc30c0a102a4eb6d4b907feaabdd84d80d20469a3ae8341bce5f1 SHA512 9f35b5af8784eb4b92b437f41b5df677aa7fc859827eaef4d0e2d8531ad9908331f70a852c7e6e965a5f8cec47b38c6c91b8fbdbcaee0edca54f8cbb000ba582
DIST mkvtoolnix-64.0.0.tar.xz 7700012 BLAKE2B f0c64786fdc3d05915650a08ca398dc7f5356b9a9ce9cb108fb40a4394a7518dd45143717fde7af1dccd3e7e43d343f81d69633c78f1201670924257529baede SHA512 252fdf0a9497d34f2a407ca0d3e584d1cd5a2f566b793a3a6b9af8473855d89e55ce79a8b4aff71d5a25f7a15ca991f84a3c4441168553af9feffdfe75e19844
+DIST mkvtoolnix-67.0.0.tar.xz 7791720 BLAKE2B 815172f1e120d90ec33cbc6dac1bb3aad793edc0b629f0bab9400a0732d3b692f983d7eca82c61c453ccd245dea948d0950bcb357e3104d2012554871e09c80c SHA512 eed390cb305b5fcaddf11d68a9021f9ddc22a62d1eb95f4c0a34161a7662dd62495c87193a2d951f0fe30fb9a6b5b93f06ed7fedc24ed674da531f2c2317c997
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch b/media-video/mkvtoolnix/files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
new file mode 100644
index 000000000000..a5f5fd2009b8
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
@@ -0,0 +1,76 @@
+https://bugs.gentoo.org/844097
+
+We should only check for UIC (provided by qtwidgets) if we're building the GUI.
+
+Qt (just qtcore) itself is *always* needed to build mkvtoolnix (it's used
+for e.g. MIME type detection since 59.0.0), but the rest of Qt
+(like qtwidgets) is only needed for the GUI build.
+
+The build system incorrectly unconditionally checks for UIC. We fix it here
+to only check for it when doing a GUI build.
+
+First hunk (ac/qt5.m4, removing UIC check): Signed-off-by: Duane Robertson duane@duanerobertson.com
+Second hunk (rest, adding UIC check conditional on enable_gui): Signed-off-by: Sam James <sam@gentoo.org>
+--- a/ac/qt5.m4
++++ b/ac/qt5.m4
+@@ -51,7 +51,6 @@ check_qt5() {
+ AC_PATH_PROG(LCONVERT, lconvert,, [$qt_searchpath])
+ AC_PATH_PROG(MOC, moc,, [$qt_searchpath])
+ AC_PATH_PROG(RCC, rcc,, [$qt_searchpath])
+- AC_PATH_PROG(UIC, uic,, [$qt_searchpath])
+
+ if test x"$MOC" = x; then
+ AC_MSG_CHECKING(for Qt 5)
+@@ -62,11 +61,6 @@ check_qt5() {
+ AC_MSG_CHECKING(for Qt 5)
+ AC_MSG_RESULT(no: could not find the rcc executable)
+ return
+-
+- elif test x"$UIC" = x; then
+- AC_MSG_CHECKING(for Qt 5)
+- AC_MSG_RESULT(no: could not find the uic executable)
+- return
+ fi
+
+
+
+--- a/ac/qt_common.m4
++++ b/ac/qt_common.m4
+@@ -5,6 +5,37 @@ fi
+ if test x"$enable_gui" = xyes; then
+ BUILD_GUI=yes
+
++ # Copied from ac/qt6.m4.
++ qmake_properties="`mktemp`"
++
++ "$QMAKE" -query > "$qmake_properties"
++
++ qmake_ver="`$ac_cv_path_EGREP '^QT_VERSION:' "$qmake_properties" | sed 's/^QT_VERSION://'`"
++
++ AC_MSG_CHECKING(for qmake's version)
++ if test -z "qmake_ver"; then
++ AC_MSG_RESULT(unknown; please contact the author)
++ return
++ elif ! check_version $qt_min_ver $qmake_ver; then
++ AC_MSG_RESULT(too old: $qmake_ver, neet at least $qt_mIN-ver)
++ return
++ else
++ AC_MSG_RESULT($qmake_ver)
++ fi
++
++ qt_bindir="`$ac_cv_path_EGREP '^QT_INSTALL_BINS:' "$qmake_properties" | sed 's/^QT_INSTALL_BINS://'`"
++ qt_libexecdir="`$ac_cv_path_EGREP '^QT_INSTALL_LIBEXECS:' "$qmake_properties" | sed 's/^QT_INSTALL_LIBEXECS://'`"
++ qt_searchpath="$qt_libexecdir:$qt_bindir:$PATH"
++
++ rm -f "$qmake_properties"
++
++ AC_PATH_PROG(UIC, uic,, [$qt_searchpath])
++ if test x"$UIC" = x; then
++ AC_MSG_CHECKING(for Qt 5 UIC (qtwidgets))
++ AC_MSG_RESULT(no: could not find the uic executable)
++ exit 1
++ fi
++
+ if test x"$have_qt6" = "xyes" ; then
+ opt_features_yes="$opt_features_yes\n * MKVToolNix GUI (with Qt 6)"
+ else
diff --git a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
new file mode 100644
index 000000000000..e228b9bbe6b3
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multiprocessing qmake-utils xdg
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
+ EGIT_SUBMODULES=()
+ inherit git-r3
+else
+ SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+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="dbus debug dvd gui nls pch test"
+RESTRICT="!test? ( test )"
+
+# check NEWS.md for build system changes entries for boost/libebml/libmatroska
+# version requirement updates and other packaging info
+RDEPEND="
+ >=dev-libs/boost-1.66:=
+ dev-libs/gmp:=
+ >=dev-libs/libebml-1.4.2:=
+ >=dev-libs/libfmt-8.0.1:=
+ >=dev-libs/pugixml-1.11:=
+ media-libs/flac:=
+ >=media-libs/libmatroska-1.6.3:=
+ media-libs/libogg:=
+ media-libs/libvorbis:=
+ sys-libs/zlib
+ dvd? ( media-libs/libdvdread:= )
+ dev-qt/qtcore:5
+ gui? (
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtmultimedia:5
+ )
+ app-text/cmark:0=
+ dbus? ( dev-qt/qtdbus:5 )
+"
+DEPEND="${RDEPEND}
+ >=dev-cpp/nlohmann_json-3.9.1
+ >=dev-libs/utfcpp-3.1.2
+ test? ( dev-cpp/gtest )
+"
+BDEPEND="
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-ruby/rake
+ virtual/pkgconfig
+ nls? (
+ sys-devel/gettext
+ app-text/po4a
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
+ "${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
+)
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == *9999 ]]; then
+ ./autogen.sh || die
+ fi
+
+ # bug #692018
+ sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die
+
+ eautoreconf
+
+ # remove bundled libs
+ rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
+}
+
+src_configure() {
+ # bug #692322, use system dev-libs/utfcpp
+ append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
+
+ local myeconfargs=(
+ $(use_enable debug)
+ $(usex pch "" --disable-precompiled-headers)
+ $(use_enable dbus)
+ $(use_enable gui)
+ --disable-qt6
+ --enable-qt5
+ --with-qmake="$(qt5_get_bindir)"/qmake
+ $(use_with dvd dvdread)
+ $(use_with nls gettext)
+ $(usex nls "" --with-po4a-translate=false)
+ --disable-update-check
+ --disable-optimization
+ --with-boost="${ESYSROOT}"/usr
+ --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+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
+ dodoc NEWS.md
+ doman doc/man/*.1
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/files/, media-video/mkvtoolnix/
@ 2022-10-28 18:50 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-10-28 18:50 UTC (permalink / raw
To: gentoo-commits
commit: b9c110cc37fa362e7a4bd9d0ace799ee2e2996e0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 17:52:11 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 18:47:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c110cc
media-video/mkvtoolnix: drop versions
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mkvtoolnix/Manifest | 6 -
.../files/mkvtoolnix-49.0.0-qt5dbus.patch | 32 -----
.../files/mkvtoolnix-56.1.0-optlevel.patch | 15 ---
media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild | 131 --------------------
media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild | 121 -------------------
media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild | 124 -------------------
media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild | 126 -------------------
media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild | 132 --------------------
media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild | 133 ---------------------
9 files changed, 820 deletions(-)
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 68ec6cca8e30..6334b56ee408 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,8 +1,2 @@
-DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18 SHA512 583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99
-DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 094c13ac7e73e79f3cc7eae0768625482c4808a4323239a93de34d1406583bfe676d71855dd1f7eae9a8a0ff0a7badf50c04c71f9d2fbb4afd9ff5f05b9353ea SHA512 90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3
-DIST mkvtoolnix-61.0.0.tar.xz 7662500 BLAKE2B de9d73658fe779b34b21fded8e6676b76fed5ce5ecd598aeff12e8c4f120353f63413f260bacc30c0a102a4eb6d4b907feaabdd84d80d20469a3ae8341bce5f1 SHA512 9f35b5af8784eb4b92b437f41b5df677aa7fc859827eaef4d0e2d8531ad9908331f70a852c7e6e965a5f8cec47b38c6c91b8fbdbcaee0edca54f8cbb000ba582
-DIST mkvtoolnix-64.0.0.tar.xz 7700012 BLAKE2B f0c64786fdc3d05915650a08ca398dc7f5356b9a9ce9cb108fb40a4394a7518dd45143717fde7af1dccd3e7e43d343f81d69633c78f1201670924257529baede SHA512 252fdf0a9497d34f2a407ca0d3e584d1cd5a2f566b793a3a6b9af8473855d89e55ce79a8b4aff71d5a25f7a15ca991f84a3c4441168553af9feffdfe75e19844
-DIST mkvtoolnix-67.0.0.tar.xz 7791720 BLAKE2B 815172f1e120d90ec33cbc6dac1bb3aad793edc0b629f0bab9400a0732d3b692f983d7eca82c61c453ccd245dea948d0950bcb357e3104d2012554871e09c80c SHA512 eed390cb305b5fcaddf11d68a9021f9ddc22a62d1eb95f4c0a34161a7662dd62495c87193a2d951f0fe30fb9a6b5b93f06ed7fedc24ed674da531f2c2317c997
-DIST mkvtoolnix-68.0.0.tar.xz 10911424 BLAKE2B e4704592212aa919a7cbd62b3906b5af6c4bb88293299e93a4ad65cc8857615b1654ed554c17daf60e1b001d8e5265afda808e81ee51f372be2f738d737fdd4d SHA512 fd078208f5ef0438f06b3bb19c3f3c477f87561997a847c56a731265ee9627b089cc568e1d31a9a2c7e46f63aeeabccf98a27694b6b4b1586ba93f7656d20838
DIST mkvtoolnix-69.0.0.tar.xz 10946800 BLAKE2B aed865e723d315aaddbfe6351c98bdafaee8b75968a2c03256e37e96d5ee7324d92ef8a5bb12c559c46264ebdcefd7a802884ac33db59fa5935621769ec9bfd1 SHA512 c7ce69e9a921103da4745c75cd6fa41a49dbb8637f48097233388e5d8be121714d3fde10f745b78e84a8ef70e46f0168f36f069331f04623805c0bda8a90060c
DIST mkvtoolnix-71.1.0.tar.xz 10989788 BLAKE2B 6b90ac9e103a75f5db76fa06def3593c7dc3c77d1179400aecda7217692fbe7f3866d838a541895d704ab9ddfb9972855c3cdad928356552136f9481cd65cf41 SHA512 f0565813ee4a303f0710b2d8019b6275e5ce7542174475e8ef9d4828c3e5ff5cf8a7940eb0e878b419e0b22a9fd55e2fc41e8e26c1b0777b95caac30d82fad5b
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch b/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch
deleted file mode 100644
index 1c59b2c3827a..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/ac/qt5.m4 2020-07-31 11:25:31.371508129 -0500
-+++ b/ac/qt5.m4 2020-07-31 11:30:14.967322450 -0500
-@@ -14,6 +14,11 @@
- AC_ARG_WITH([qt_pkg_config],
- AC_HELP_STRING([--without-qt-pkg-config], [do not use pkg-config for detecting Qt; instead rely on QT_CFLAGS/QT_LIBS being set correctly already]),
- [ with_qt_pkg_config=${withval} ], [ with_qt_pkg_config=yes ])
-+AC_ARG_ENABLE([dbus],
-+ AC_HELP_STRING([--enable-dbus],[enable/disable qtdbus/dbus from being included in build (yes)]),
-+ [],[enable_dbus=yes])
-+
-+
-
- if test x"$enable_qt" = "xyes" -a \
- '(' x"$enable_gui" = x"yes" -o x"$enable_gui" = "x" ')'; then
-@@ -169,11 +174,13 @@
- AC_MSG_RESULT(no: not found by pkg-config)
- fi
-
-- if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
-- PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
-- if test x"$dbus_found" = xyes; then
-- with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
-- AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
-+ if test x"$enable_dbus" = xyes; then
-+ if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
-+ PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
-+ if test x"$dbus_found" = xyes; then
-+ with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
-+ AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
-+ fi
- fi
- fi
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch b/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch
deleted file mode 100644
index c0f91deed696..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://gitlab.com/mbunkus/mkvtoolnix/-/commit/ba6db89e24aa84316372d59e6bba4ac88145b32a
-https://bugs.gentoo.org/786978#c10
-diff --git a/Rakefile b/Rakefile
-index 8c9487436ac627cc503e5f233d3f9c756f67fd86..ce564127eeb136b1c1784568ad68a4d593d0931a 100644
---- a/Rakefile
-+++ b/Rakefile
-@@ -355,7 +355,7 @@ cxx_compiler = lambda do |*args|
- # Even -O1 causes compilation time & memory usage to skyrocket,
- # possibly exponentially, with the number of entries to
- # emplace_back() into the vector.
-- flags.gsub!(%r{ -O\d+ }, ' -O0 ')
-+ flags.gsub!(%r{(^| )-O[^ ]*}, ' -O0')
- end
-
- args = [
diff --git a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
deleted file mode 100644
index fff9c5471fbe..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
- EGIT_SUBMODULES=()
- inherit git-r3
-else
- SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
- KEYWORDS="amd64 ppc ppc64 x86"
-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="dbus debug dvd nls pch qt5 test"
-RESTRICT="!test? ( test )"
-
-# check NEWS.md for build system changes entries for boost/libebml/libmatroska
-# version requirement updates and other packaging info
-RDEPEND="
- dev-libs/boost:=
- >=dev-libs/libebml-1.4.0:=
- >=dev-libs/libfmt-6.1.0:=
- dev-libs/libpcre2:=
- dev-libs/pugixml:=
- media-libs/flac:=
- >=media-libs/libmatroska-1.6.3:=
- media-libs/libogg:=
- media-libs/libvorbis:=
- sys-apps/file
- sys-libs/zlib
- dvd? ( media-libs/libdvdread:= )
- 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:0=
- dbus? ( dev-qt/qtdbus:5 )
- )
-"
-DEPEND="${RDEPEND}
- dev-cpp/nlohmann_json
- dev-libs/utfcpp
- test? ( dev-cpp/gtest )
-"
-BDEPEND="
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-ruby/rake
- virtual/pkgconfig
- nls? (
- sys-devel/gettext
- app-text/po4a
- )
-"
-
-PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch
- "${FILESDIR}"/mkvtoolnix-56.1.0-optlevel.patch )
-
-src_prepare() {
- xdg_src_prepare
- if [[ ${PV} == *9999 ]]; then
- ./autogen.sh || die
- fi
-
- # https://bugs.gentoo.org/692018
- sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die
-
- eautoreconf
-
- # remove bundled libs
- rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
-}
-
-src_configure() {
- # bug 692322, use system dev-libs/utfcpp
- append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
-
- local myeconfargs=(
- $(use_enable debug)
- $(usex pch "" --disable-precompiled-headers)
- $(use_enable dbus)
- $(use_enable qt5 qt)
- $(use_with dvd dvdread)
- $(use_with nls gettext)
- $(usex nls "" --with-po4a-translate=false)
- --disable-update-check
- --disable-optimization
- --with-boost="${ESYSROOT}"/usr
- --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
- )
-
- if use qt5 ; then
- # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
- myeconfargs+=(
- --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 "${myeconfargs[@]}"
-}
-
-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
- dodoc NEWS.md
- doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
deleted file mode 100644
index b4be2070e7c0..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
- EGIT_SUBMODULES=()
- inherit git-r3
-else
- SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-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="dbus debug dvd nls pch test"
-RESTRICT="!test? ( test )"
-
-# check NEWS.md for build system changes entries for boost/libebml/libmatroska
-# version requirement updates and other packaging info
-RDEPEND="
- dev-libs/boost:=
- >=dev-libs/libebml-1.4.0:=
- >=dev-libs/libfmt-6.1.0:=
- <dev-libs/libfmt-9.0.0:=
- dev-libs/libpcre2:=
- dev-libs/pugixml:=
- media-libs/flac:=
- >=media-libs/libmatroska-1.6.3:=
- media-libs/libogg:=
- media-libs/libvorbis:=
- sys-apps/file
- sys-libs/zlib
- dvd? ( media-libs/libdvdread:= )
- 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:0=
- dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${RDEPEND}
- dev-cpp/nlohmann_json
- dev-libs/utfcpp
- test? ( dev-cpp/gtest )
-"
-BDEPEND="
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-ruby/rake
- virtual/pkgconfig
- nls? (
- sys-devel/gettext
- app-text/po4a
- )
-"
-
-PATCHES=( "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch )
-
-src_prepare() {
- xdg_src_prepare
- if [[ ${PV} == *9999 ]]; then
- ./autogen.sh || die
- fi
-
- # https://bugs.gentoo.org/692018
- sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die
-
- eautoreconf
-
- # remove bundled libs
- rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
-}
-
-src_configure() {
- # bug 692322, use system dev-libs/utfcpp
- append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
-
- local myeconfargs=(
- $(use_enable debug)
- $(usex pch "" --disable-precompiled-headers)
- $(use_enable dbus)
- --disable-qt6
- --enable-qt5
- --with-qmake=$(qt5_get_bindir)/qmake
- $(use_with dvd dvdread)
- $(use_with nls gettext)
- $(usex nls "" --with-po4a-translate=false)
- --disable-update-check
- --disable-optimization
- --with-boost="${ESYSROOT}"/usr
- --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-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
- dodoc NEWS.md
- doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
deleted file mode 100644
index cfd401ed0150..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multiprocessing qmake-utils xdg
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
- EGIT_SUBMODULES=()
- inherit git-r3
-else
- SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
- KEYWORDS="amd64 ppc ppc64 x86"
-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="dbus debug dvd nls pch test gui"
-RESTRICT="!test? ( test )"
-
-# check NEWS.md for build system changes entries for boost/libebml/libmatroska
-# version requirement updates and other packaging info
-RDEPEND="
- dev-libs/boost:=
- >=dev-libs/libebml-1.4.0:=
- >=dev-libs/libfmt-6.1.0:=
- <dev-libs/libfmt-9.0.0:=
- dev-libs/libpcre2:=
- dev-libs/pugixml:=
- media-libs/flac:=
- >=media-libs/libmatroska-1.6.3:=
- media-libs/libogg:=
- media-libs/libvorbis:=
- sys-apps/file
- sys-libs/zlib
- dvd? ( media-libs/libdvdread:= )
- dev-qt/qtcore:5
- gui? (
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- dev-qt/qtconcurrent:5
- dev-qt/qtmultimedia:5
- )
- app-text/cmark:0=
- dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${RDEPEND}
- dev-cpp/nlohmann_json
- dev-libs/utfcpp
- test? ( dev-cpp/gtest )
-"
-BDEPEND="
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-ruby/rake
- virtual/pkgconfig
- nls? (
- sys-devel/gettext
- app-text/po4a
- )
-"
-
-PATCHES=( "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch )
-
-src_prepare() {
- xdg_src_prepare
- if [[ ${PV} == *9999 ]]; then
- ./autogen.sh || die
- fi
-
- # https://bugs.gentoo.org/692018
- sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die
-
- eautoreconf
-
- # remove bundled libs
- rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
-}
-
-src_configure() {
- # bug 692322, use system dev-libs/utfcpp
- append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
-
- local myeconfargs=(
- $(use_enable debug)
- $(usex pch "" --disable-precompiled-headers)
- $(use_enable dbus)
- $(use_enable gui)
- --disable-qt6
- --enable-qt5
- --with-qmake=$(qt5_get_bindir)/qmake
- $(use_with dvd dvdread)
- $(use_with nls gettext)
- $(usex nls "" --with-po4a-translate=false)
- --disable-update-check
- --disable-optimization
- --with-boost="${ESYSROOT}"/usr
- --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-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
- dodoc NEWS.md
- doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild
deleted file mode 100644
index f827b04ecbae..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multiprocessing qmake-utils xdg
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
- EGIT_SUBMODULES=()
- inherit git-r3
-else
- SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-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="dbus debug dvd gui nls pch test"
-RESTRICT="!test? ( test )"
-
-# check NEWS.md for build system changes entries for boost/libebml/libmatroska
-# version requirement updates and other packaging info
-RDEPEND="
- dev-libs/boost:=
- dev-libs/gmp:=
- >=dev-libs/libebml-1.4.2:=
- >=dev-libs/libfmt-8.0.1:=
- <dev-libs/libfmt-9.0.0:=
- >=dev-libs/pugixml-1.11:=
- media-libs/flac:=
- >=media-libs/libmatroska-1.6.3:=
- media-libs/libogg:=
- media-libs/libvorbis:=
- sys-libs/zlib
- dvd? ( media-libs/libdvdread:= )
- dev-qt/qtcore:5
- gui? (
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- dev-qt/qtconcurrent:5
- dev-qt/qtmultimedia:5
- )
- app-text/cmark:0=
- dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${RDEPEND}
- >=dev-cpp/nlohmann_json-3.9.1
- >=dev-libs/utfcpp-3.1.2
- test? ( dev-cpp/gtest )
-"
-BDEPEND="
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-ruby/rake
- virtual/pkgconfig
- nls? (
- sys-devel/gettext
- app-text/po4a
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
-)
-
-src_prepare() {
- xdg_src_prepare
-
- if [[ ${PV} == *9999 ]]; then
- ./autogen.sh || die
- fi
-
- # https://bugs.gentoo.org/692018
- sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die
-
- eautoreconf
-
- # remove bundled libs
- rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
-}
-
-src_configure() {
- # bug #692322, use system dev-libs/utfcpp
- append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
-
- local myeconfargs=(
- $(use_enable debug)
- $(usex pch "" --disable-precompiled-headers)
- $(use_enable dbus)
- $(use_enable gui)
- --disable-qt6
- --enable-qt5
- --with-qmake=$(qt5_get_bindir)/qmake
- $(use_with dvd dvdread)
- $(use_with nls gettext)
- $(usex nls "" --with-po4a-translate=false)
- --disable-update-check
- --disable-optimization
- --with-boost="${ESYSROOT}"/usr
- --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-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
- dodoc NEWS.md
- doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
deleted file mode 100644
index a27ee5107f3f..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multiprocessing qmake-utils xdg
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
- EGIT_SUBMODULES=()
- inherit git-r3
-else
- SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
- KEYWORDS="amd64 ppc ppc64 x86"
-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="dbus debug dvd gui nls pch test"
-RESTRICT="!test? ( test )"
-
-# check NEWS.md for build system changes entries for boost/libebml/libmatroska
-# version requirement updates and other packaging info
-RDEPEND="
- dev-libs/boost:=
- dev-libs/gmp:=
- >=dev-libs/libebml-1.4.2:=
- >=dev-libs/libfmt-8.0.1:=
- <dev-libs/libfmt-9.0.0:=
- >=dev-libs/pugixml-1.11:=
- media-libs/flac:=
- >=media-libs/libmatroska-1.6.3:=
- media-libs/libogg:=
- media-libs/libvorbis:=
- sys-libs/zlib
- dvd? ( media-libs/libdvdread:= )
- dev-qt/qtcore:5
- gui? (
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- dev-qt/qtconcurrent:5
- dev-qt/qtmultimedia:5
- )
- app-text/cmark:0=
- dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${RDEPEND}
- >=dev-cpp/nlohmann_json-3.9.1
- >=dev-libs/utfcpp-3.1.2
- test? ( dev-cpp/gtest )
-"
-BDEPEND="
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-ruby/rake
- virtual/pkgconfig
- nls? (
- sys-devel/gettext
- app-text/po4a
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
- "${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
-)
-
-src_prepare() {
- default
-
- if [[ ${PV} == *9999 ]]; then
- ./autogen.sh || die
- fi
-
- # bug #692018
- sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die
-
- eautoreconf
-
- # remove bundled libs
- rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
-}
-
-src_configure() {
- # bug #692322, use system dev-libs/utfcpp
- append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
-
- local myeconfargs=(
- $(use_enable debug)
- $(usex pch "" --disable-precompiled-headers)
- $(use_enable dbus)
-
- # Qt (of some version) is always needed, even for non-GUI builds,
- # to do e.g. MIME detection. See e.g. bug #844097.
- # But most of the Qt deps are conditional on a GUI build.
- --disable-qt6
- --enable-qt5
- $(use_enable gui)
- --with-qmake="$(qt5_get_bindir)"/qmake
-
- $(use_with dvd dvdread)
- $(use_with nls gettext)
- $(usex nls "" --with-po4a-translate=false)
- --disable-update-check
- --disable-optimization
- --with-boost="${ESYSROOT}"/usr
- --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-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
- dodoc NEWS.md
- doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild b/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild
deleted file mode 100644
index 07634bd57696..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multiprocessing qmake-utils xdg
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
- EGIT_SUBMODULES=()
- inherit git-r3
-else
- SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-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="dbus debug dvd gui nls pch test"
-RESTRICT="!test? ( test )"
-
-# check NEWS.md for build system changes entries for boost/libebml/libmatroska
-# version requirement updates and other packaging info
-RDEPEND="
- dev-libs/boost:=
- dev-libs/gmp:=
- >=dev-libs/libebml-1.4.2:=
- >=dev-libs/libfmt-8.0.1:=
- >=dev-libs/pugixml-1.11:=
- media-libs/flac:=
- >=media-libs/libmatroska-1.6.3:=
- media-libs/libogg:=
- media-libs/libvorbis:=
- sys-libs/zlib
- dvd? ( media-libs/libdvdread:= )
- dev-qt/qtcore:5
- gui? (
- dev-qt/qtsvg:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- dev-qt/qtconcurrent:5
- dev-qt/qtmultimedia:5
- )
- app-text/cmark:0=
- dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${RDEPEND}
- >=dev-cpp/nlohmann_json-3.9.1
- >=dev-libs/utfcpp-3.1.2
- test? ( dev-cpp/gtest )
-"
-BDEPEND="
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-ruby/rake
- virtual/pkgconfig
- nls? (
- sys-devel/gettext
- app-text/po4a
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
- "${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
- "${FILESDIR}"/${P}-fmt-9.patch
-)
-
-src_prepare() {
- default
-
- if [[ ${PV} == *9999 ]]; then
- ./autogen.sh || die
- fi
-
- # bug #692018
- sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die
-
- eautoreconf
-
- # remove bundled libs
- rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
-}
-
-src_configure() {
- # bug #692322, use system dev-libs/utfcpp
- append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
-
- local myeconfargs=(
- $(use_enable debug)
- $(usex pch "" --disable-precompiled-headers)
- $(use_enable dbus)
-
- # Qt (of some version) is always needed, even for non-GUI builds,
- # to do e.g. MIME detection. See e.g. bug #844097.
- # But most of the Qt deps are conditional on a GUI build.
- --disable-qt6
- --enable-qt5
- $(use_enable gui)
- --with-qmake="$(qt5_get_bindir)"/qmake
-
- $(use_with dvd dvdread)
- $(use_with nls gettext)
- $(usex nls "" --with-po4a-translate=false)
- --disable-update-check
- --disable-optimization
- --with-boost="${ESYSROOT}"/usr
- --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-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
- dodoc NEWS.md
- doman doc/man/*.1
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/files/, media-video/mkvtoolnix/
@ 2023-12-14 4:23 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-12-14 4:23 UTC (permalink / raw
To: gentoo-commits
commit: ebf68d134946a79adc16422461ddb51fc45f8cdc
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Sun Nov 19 13:19:13 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 04:22:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf68d13
media-video/mkvtoolnix: add 80.0
Closes: https://bugs.gentoo.org/914337
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33922
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mkvtoolnix/Manifest | 2 +
.../files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch | 29 ++++++++
.../files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch | 31 ++++++++
.../files/mkvtoolnix-80.0.0-optional-qtdbus.patch | 70 ++++++++++++++++++
...vtoolnix-9999.ebuild => mkvtoolnix-80.0.ebuild} | 84 +++++++++++++++-------
media-video/mkvtoolnix/mkvtoolnix-9999.ebuild | 84 +++++++++++++++-------
6 files changed, 248 insertions(+), 52 deletions(-)
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index d51ec57a4d96..f85d77ed670b 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,3 +1,5 @@
DIST mkvtoolnix-72.0.0.tar.xz 10994204 BLAKE2B 2118837c01d8d31644e0147dfdec9fd619d18ffbab5d317e5dd84788a83cdf162ea7d72e98549bbc2ffc7953e0b80a0e23018658d8c5ad529fc719b291589a97 SHA512 dc18c6e63e724181e38753921ec3374752dbb7c4d20650cf0787e9049aaec4f6bb6c744e49b3783921804f192de742fba92826615a1edc8516d2a41621be658c
DIST mkvtoolnix-75.0.0.tar.xz 11009552 BLAKE2B d9c32a453ac1f07e201b99fdcaaa5e553b42c1d17fafdeb1a84808ee572caf00b4b49d04c90d7801564f4856e9b3057a45ef79041e72f76bc829c3b5d9536c58 SHA512 eca45828ec3cbb540c67d12d369f3314246d08812933a018e5c4f69e8bd2fa4e17143a33a1841c5a8da3befbc22509fa508e6688ea858980d13c44aaae4ead08
DIST mkvtoolnix-77.0.tar.xz 11044004 BLAKE2B 5aa43e155c1318dc6c3fd4418fb59ec498ad488a8459cf0aefa0bc0660ff93dd51f2699642ea633695fbf76ae1b4b6cfddddfca1b0e72e16357b579ce8dbee42 SHA512 b310077cfaddef3163c732943f1aaf7e63fb9f7efb19fdb27a35e2d0ad92dfc4536ea29366b44745f3f918703b02e2d52edb63369c23540df1312f3d54c06bb0
+DIST mkvtoolnix-80.0.tar.xz 11056764 BLAKE2B 6178b65ce57b1ab897c91a456fa9887499e683619654b2a7f8fbcd8b7d98f04dd831d2c875da85a644357ec8c8de3b408394f7b29def9203f35a28ec19513a0d SHA512 066c10a9112ca0cdb59567235aae70e94ccab25b0e2d6156f4ba1090e102614b07c37eb0116a9ee540b2ed8f4b9d58a699f553b974a3f2636c65241915b3b6bc
+DIST mkvtoolnix-80.0.tar.xz.sig 833 BLAKE2B 6c08689419877da7f3f16b8453a44f837792f5e7f3de7fb8574597dee3317ffadf2418cae82949a7585ab53cf1e0a60391ba898fc4607290d678501c3ffd4672 SHA512 47df9f0199275873b300b229fc91d14d5ab93c423e4fb8f31055b84619ae00609850ccb77f6d84c8eb3e4afee76acbe3e0779d03f3041d01d598f462788c618d
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch
new file mode 100644
index 000000000000..d31731a266f8
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch
@@ -0,0 +1,29 @@
+From 246f824a6a0d2bc93ec4ad2ebfde7c92b42c879a Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Tue, 21 Nov 2023 01:10:23 +0200
+Subject: [PATCH] Fix detection of QtDBus and QtMultimedia
+
+* Sometimes you may have qtdbus and qtmultimedia present at the same
+ time.
+
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- a/ac/qt6.m4
++++ b/ac/qt6.m4
+@@ -95,10 +95,12 @@ EOT
+
+ if test $result2 != 0; then
+ continue
+- elif test $qt_module = dbus; then
++ fi
++ if test $qt_module = dbus; then
+ qmake_qt_ui="$qmake_qt_ui dbus"
+ AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
+- elif test $qt_module = multimedia; then
++ fi
++ if test $qt_module = multimedia; then
+ qmake_qt_ui="$qmake_qt_ui multimedia"
+ fi
+ done
+--
+2.43.0
+
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch
new file mode 100644
index 000000000000..203721aedcff
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch
@@ -0,0 +1,31 @@
+From 196e704d9bd44a5bb7655d8a85b6f270b2165b3c Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Mon, 20 Nov 2023 23:41:06 +0200
+Subject: [PATCH] Only check for uic in qt5 if gui is enabled
+
+We should only check for UIC (provided by qtwidgets) if we're building the GUI.
+
+Qt (just qtcore) itself is *always* needed to build mkvtoolnix (it's used
+for e.g. MIME type detection since 59.0.0), but the rest of Qt
+(like qtwidgets) is only needed for the GUI build.
+
+The build system incorrectly unconditionally checks for UIC. We fix it here
+to only check for it when doing a GUI build.
+
+https://bugs.gentoo.org/844097
+
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- a/ac/qt5.m4
++++ b/ac/qt5.m4
+@@ -63,7 +63,7 @@ check_qt5() {
+ AC_MSG_RESULT(no: could not find the rcc executable)
+ return
+
+- elif test x"$UIC" = x; then
++ elif test x"$UIC" = x && test x"$enable_gui" = xyes; then
+ AC_MSG_CHECKING(for Qt 5)
+ AC_MSG_RESULT(no: could not find the uic executable)
+ return
+--
+2.43.0
+
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-optional-qtdbus.patch b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-optional-qtdbus.patch
new file mode 100644
index 000000000000..deb8d59fa6c4
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-optional-qtdbus.patch
@@ -0,0 +1,70 @@
+From 998cd9baa8edbbc0a02509728c7ff21ddaaaad51 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Mon, 20 Nov 2023 23:18:56 +0200
+Subject: [PATCH] Add an option for qtdbus support
+
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- a/ac/qt5.m4
++++ b/ac/qt5.m4
+@@ -103,11 +103,13 @@ check_qt5() {
+ return
+ fi
+
+- if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
+- PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
+- if test x"$dbus_found" = xyes; then
+- with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
+- AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
++ if test x"$enable_dbus" = xyes; then
++ if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
++ PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
++ if test x"$dbus_found" = xyes; then
++ with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
++ AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
++ fi
+ fi
+ fi
+
+@@ -254,6 +256,11 @@ AC_ARG_WITH([qt_pkg_config_modules],
+ AC_ARG_WITH([qt_pkg_config],
+ AS_HELP_STRING([--without-qt-pkg-config],[do not use pkg-config for detecting Qt 5; instead rely on QT_CFLAGS/QT_LIBS being set correctly already]),
+ [ with_qt_pkg_config=${withval} ], [ with_qt_pkg_config=yes ])
++AC_ARG_ENABLE([dbus],
++ AC_HELP_STRING([--enable-dbus],[enable/disable qtdbus/dbus from being included in build (yes)]),
++ [],[enable_dbus=yes])
++
++
+
+ have_qt5=no
+
+--- a/ac/qt6.m4
++++ b/ac/qt6.m4
+@@ -96,9 +96,12 @@ EOT
+ if test $result2 != 0; then
+ continue
+ fi
+- if test $qt_module = dbus; then
+- qmake_qt_ui="$qmake_qt_ui dbus"
+- AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
++ if test x"$enable_dbus" = xyes; then
++ PKG_CHECK_EXISTS([Qt6DBus],[dbus_found=yes],[dbus_found=no])
++ if test x"$dbus_found" = xyes; then
++ qmake_qt_ui="$qmake_qt_ui dbus"
++ AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
++ fi
+ fi
+ if test $qt_module = multimedia; then
+ qmake_qt_ui="$qmake_qt_ui multimedia"
+@@ -272,6 +275,9 @@ AC_ARG_ENABLE([gui],
+ AC_ARG_ENABLE([qt6],
+ AS_HELP_STRING([--enable-qt6],[compile with Qt 6 (yes)]),
+ [],[enable_qt6=yes])
++AC_ARG_ENABLE([dbus],
++ AC_HELP_STRING([--enable-dbus],[enable/disable qtdbus/dbus from being included in build (yes)]),
++ [],[enable_dbus=yes])
+
+ have_qt6=no
+
+--
+2.43.0
+
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-80.0.ebuild
similarity index 63%
copy from media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
copy to media-video/mkvtoolnix/mkvtoolnix-80.0.ebuild
index 4637f4ccbfb9..20d89f9877dc 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-80.0.ebuild
@@ -6,12 +6,20 @@ EAPI=8
inherit autotools flag-o-matic multiprocessing qmake-utils xdg
if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+
EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
EGIT_SUBMODULES=()
- inherit git-r3
else
- SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+ inherit verify-sig
+
+ SRC_URI="
+ https://mkvtoolnix.download/sources/${P}.tar.xz
+ verify-sig? ( https://mkvtoolnix.download/sources/${P}.tar.xz.sig )
+ "
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+ VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/mkvtoolnix.asc"
fi
DESCRIPTION="Tools to create, alter, and inspect Matroska files"
@@ -19,34 +27,44 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
LICENSE="GPL-2"
SLOT="0"
-IUSE="dbus debug dvd gui nls pch test"
+IUSE="dbus debug dvd gui nls qt6 pch test"
RESTRICT="!test? ( test )"
# check NEWS.md for build system changes entries for boost/libebml/libmatroska
# version requirement updates and other packaging info
RDEPEND="
+ app-text/cmark:0=
dev-libs/boost:=
dev-libs/gmp:=
>=dev-libs/libebml-1.4.4:=
>=dev-libs/libfmt-8.0.1:=
- >=dev-libs/pugixml-1.11:=
+ >=dev-libs/pugixml-1.11
media-libs/flac:=
>=media-libs/libmatroska-1.7.1:=
- media-libs/libogg:=
- media-libs/libvorbis:=
+ media-libs/libogg
+ media-libs/libvorbis
sys-libs/zlib
dvd? ( media-libs/libdvdread:= )
- dev-qt/qtcore:5
- gui? (
- dev-qt/qtsvg:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- dev-qt/qtconcurrent:5
- dev-qt/qtmultimedia:5
+ !qt6? (
+ dev-qt/qtcore:5
+ dbus? ( dev-qt/qtdbus:5 )
+ gui? (
+ dev-qt/qtsvg:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtmultimedia:5
+ )
+ )
+ qt6? (
+ dev-qt/qtbase:6[dbus?]
+ gui? (
+ dev-qt/qtbase:6[concurrent,gui,network,widgets]
+ dev-qt/qtmultimedia:6
+ dev-qt/qtsvg:6
+ )
)
- app-text/cmark:0=
- dbus? ( dev-qt/qtdbus:5 )
"
DEPEND="${RDEPEND}
>=dev-cpp/nlohmann_json-3.9.1
@@ -64,9 +82,14 @@ BDEPEND="
)
"
+if [[ ${PV} != *9999 ]] ; then
+ BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-mkvtoolnix )"
+fi
+
PATCHES=(
- "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
- "${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
+ "${FILESDIR}"/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch
+ "${FILESDIR}"/mkvtoolnix-80.0.0-fix-qtmultimedia.patch
+ "${FILESDIR}"/mkvtoolnix-80.0.0-optional-qtdbus.patch
)
src_prepare() {
@@ -93,15 +116,7 @@ src_configure() {
$(use_enable debug)
$(usex pch "" --disable-precompiled-headers)
$(use_enable dbus)
-
- # Qt (of some version) is always needed, even for non-GUI builds,
- # to do e.g. MIME detection. See e.g. bug #844097.
- # But most of the Qt deps are conditional on a GUI build.
- --disable-qt6
- --enable-qt5
$(use_enable gui)
- --with-qmake="$(qt5_get_bindir)"/qmake
-
$(use_with dvd dvdread)
$(use_with nls gettext)
#$(use_with nls po4a)
@@ -111,6 +126,23 @@ src_configure() {
--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
)
+ # Qt (of some version) is always needed, even for non-GUI builds,
+ # to do e.g. MIME detection. See e.g. bug #844097.
+ # But most of the Qt deps are conditional on a GUI build.
+ if use qt6; then
+ myeconfargs+=(
+ --enable-qt6
+ --disable-qt5
+ --with-qmake6="$(qt6_get_bindir)"/qmake
+ )
+ else
+ myeconfargs+=(
+ --disable-qt6
+ --enable-qt5
+ --with-qmake="$(qt5_get_bindir)"/qmake
+ )
+ fi
+
# Work around bug #904710.
use nls || export ac_cv_path_PO4A=
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index 4637f4ccbfb9..20d89f9877dc 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -6,12 +6,20 @@ EAPI=8
inherit autotools flag-o-matic multiprocessing qmake-utils xdg
if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+
EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
EGIT_SUBMODULES=()
- inherit git-r3
else
- SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+ inherit verify-sig
+
+ SRC_URI="
+ https://mkvtoolnix.download/sources/${P}.tar.xz
+ verify-sig? ( https://mkvtoolnix.download/sources/${P}.tar.xz.sig )
+ "
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+ VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/mkvtoolnix.asc"
fi
DESCRIPTION="Tools to create, alter, and inspect Matroska files"
@@ -19,34 +27,44 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
LICENSE="GPL-2"
SLOT="0"
-IUSE="dbus debug dvd gui nls pch test"
+IUSE="dbus debug dvd gui nls qt6 pch test"
RESTRICT="!test? ( test )"
# check NEWS.md for build system changes entries for boost/libebml/libmatroska
# version requirement updates and other packaging info
RDEPEND="
+ app-text/cmark:0=
dev-libs/boost:=
dev-libs/gmp:=
>=dev-libs/libebml-1.4.4:=
>=dev-libs/libfmt-8.0.1:=
- >=dev-libs/pugixml-1.11:=
+ >=dev-libs/pugixml-1.11
media-libs/flac:=
>=media-libs/libmatroska-1.7.1:=
- media-libs/libogg:=
- media-libs/libvorbis:=
+ media-libs/libogg
+ media-libs/libvorbis
sys-libs/zlib
dvd? ( media-libs/libdvdread:= )
- dev-qt/qtcore:5
- gui? (
- dev-qt/qtsvg:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- dev-qt/qtconcurrent:5
- dev-qt/qtmultimedia:5
+ !qt6? (
+ dev-qt/qtcore:5
+ dbus? ( dev-qt/qtdbus:5 )
+ gui? (
+ dev-qt/qtsvg:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtmultimedia:5
+ )
+ )
+ qt6? (
+ dev-qt/qtbase:6[dbus?]
+ gui? (
+ dev-qt/qtbase:6[concurrent,gui,network,widgets]
+ dev-qt/qtmultimedia:6
+ dev-qt/qtsvg:6
+ )
)
- app-text/cmark:0=
- dbus? ( dev-qt/qtdbus:5 )
"
DEPEND="${RDEPEND}
>=dev-cpp/nlohmann_json-3.9.1
@@ -64,9 +82,14 @@ BDEPEND="
)
"
+if [[ ${PV} != *9999 ]] ; then
+ BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-mkvtoolnix )"
+fi
+
PATCHES=(
- "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
- "${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
+ "${FILESDIR}"/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch
+ "${FILESDIR}"/mkvtoolnix-80.0.0-fix-qtmultimedia.patch
+ "${FILESDIR}"/mkvtoolnix-80.0.0-optional-qtdbus.patch
)
src_prepare() {
@@ -93,15 +116,7 @@ src_configure() {
$(use_enable debug)
$(usex pch "" --disable-precompiled-headers)
$(use_enable dbus)
-
- # Qt (of some version) is always needed, even for non-GUI builds,
- # to do e.g. MIME detection. See e.g. bug #844097.
- # But most of the Qt deps are conditional on a GUI build.
- --disable-qt6
- --enable-qt5
$(use_enable gui)
- --with-qmake="$(qt5_get_bindir)"/qmake
-
$(use_with dvd dvdread)
$(use_with nls gettext)
#$(use_with nls po4a)
@@ -111,6 +126,23 @@ src_configure() {
--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
)
+ # Qt (of some version) is always needed, even for non-GUI builds,
+ # to do e.g. MIME detection. See e.g. bug #844097.
+ # But most of the Qt deps are conditional on a GUI build.
+ if use qt6; then
+ myeconfargs+=(
+ --enable-qt6
+ --disable-qt5
+ --with-qmake6="$(qt6_get_bindir)"/qmake
+ )
+ else
+ myeconfargs+=(
+ --disable-qt6
+ --enable-qt5
+ --with-qmake="$(qt5_get_bindir)"/qmake
+ )
+ fi
+
# Work around bug #904710.
use nls || export ac_cv_path_PO4A=
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/files/, media-video/mkvtoolnix/
@ 2024-04-01 7:18 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-04-01 7:18 UTC (permalink / raw
To: gentoo-commits
commit: 8de73ec9de78a5fb682033e708171fe98c78aee2
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Thu Mar 21 10:17:28 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 1 07:17:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8de73ec9
media-video/mkvtoolnix: add 83.0
Bug: https://bugs.gentoo.org/927380
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mkvtoolnix/Manifest | 2 +
.../files/mkvtoolnix-83.0.0-fix-disable-gui.patch | 88 +++++++++++++
media-video/mkvtoolnix/mkvtoolnix-83.0.ebuild | 139 +++++++++++++++++++++
3 files changed, 229 insertions(+)
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 3f890c6e5ab0..e9d8ebdda53e 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -3,3 +3,5 @@ DIST mkvtoolnix-81.0.tar.xz 11067288 BLAKE2B 64bf3cd1872e3b67c6932ed29527e1dff2f
DIST mkvtoolnix-81.0.tar.xz.sig 833 BLAKE2B 37e63e92628d3dcb6e9c9129e09dbef1d1d4e80515a05a9a5684d5d542ef54b024e76f1fac50b242e32172ef24493123b6103ae79fa411eefea7704cd63070d5 SHA512 3975c0b217318fdd9eeed23694c0e25536c694fa6cef63560b48ed79db7827be41cbe9a2cd8d8c1d2555beb436a5191a5ad21f0e5e73f93f2ca1c09be13826cb
DIST mkvtoolnix-82.0.tar.xz 11067168 BLAKE2B a910898b4097ee8115f3354653d65d913e28fc0271c2869a72d4b0f70a6a17848b28c33ae0aee4d88b42bb911bf6d825211c723c47f7c1eee0f5204705e12223 SHA512 fd384bfc4350e972f44e2b488fb066641cf7e73860f179d4423a548f870521ad8414f53a98f67ad8809f261657fe378c5bed96069620a73be511bcd31dfa933f
DIST mkvtoolnix-82.0.tar.xz.sig 833 BLAKE2B 53c96149a41a46892cfeb43ca786cd8c166747e508f3fa2aceca9520652741f738adad5f6e8809f97c5086d678bcd15d4f95f1ca964df5465b450679eb18eb2a SHA512 abea27631ea4f08182e86f99f1a8e38769e0ebc5a5d66426da7024348e6d00c0044644c107a982d902142167805c4771d318cc4ec66e4d9cea115a92806e8e95
+DIST mkvtoolnix-83.0.tar.xz 11278152 BLAKE2B f57b398c747d90021f2a13e58df23655e898a0bb68ad7f050f7a3fe0018866570fb81780f2d68a8c9ed06b66882578b5a9144c3be1bb9b79bc5f79e13f06bde5 SHA512 e70236249f9f72c4ffeab8222c03cdf373a25643f1b106a1abb695184152be8bb22e3fb5dc67b48e6193d9ac37d0b9b2ea317a31214b92648ac75a82c99f9b5d
+DIST mkvtoolnix-83.0.tar.xz.sig 833 BLAKE2B 3eddaa4941d84937a7b771bea66be52979437abb54cd178eb6d24b30628db3ee0ad72f23bea7419a7bc13cfd4f84d6d004b46ad63bad0eeeef8fd05f37bcaf4f SHA512 6d3ac46a40139fff67da61c77a802df243764d8c26c55e3b951d407fd3147bcf985f8a62c21b18c12fabe0afdc535a3449a6bfff3f15a5779b2aed1f94fe0ab7
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-83.0.0-fix-disable-gui.patch b/media-video/mkvtoolnix/files/mkvtoolnix-83.0.0-fix-disable-gui.patch
new file mode 100644
index 000000000000..015a92fbd78f
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-83.0.0-fix-disable-gui.patch
@@ -0,0 +1,88 @@
+https://bugs.gentoo.org/927380
+
+Allow non-gui builds to configure without gui dependencies.
+
+--- a/ac/qt6.m4
++++ b/ac/qt6.m4
+@@ -113,13 +113,15 @@ HEADERS = configure.h
+ SOURCES = configure.cpp
+ EOT
+
+- "$QMAKE6" -makefile -nocache $QMAKE_SPEC configure.pro 2>&5 > /dev/null
+- result2=$?
++ if test x"$enable_gui" = xyes; then
++ "$QMAKE6" -makefile -nocache $QMAKE_SPEC configure.pro 2>&5 > /dev/null
++ result2=$?
+
+- if test $result2 != 0; then
+- cd "$old_wd"
+- AC_MSG_RESULT(no: not all of the required Qt6 modules were found (needed: core gui widgets network concurrent svg multimedia))
+- return
++ if test $result2 != 0; then
++ cd "$old_wd"
++ AC_MSG_RESULT(no: not all of the required Qt6 modules were found (needed: core gui widgets network concurrent svg multimedia))
++ return
++ fi
+ fi
+
+ if test -f Makefile.Release; then
+@@ -135,7 +137,7 @@ EOT
+
+ cd "$old_wd"
+
+- if test $result != 0 -o $result2 != 0 -o $result3 != 0; then
++ if test $result != 0 -o $result3 != 0; then
+ AC_MSG_CHECKING(for Qt 6)
+ AC_MSG_RESULT(no: qmake6 couldn't be run for a dummy project)
+
+@@ -169,9 +171,15 @@ EOT
+
+ qt_searchpath="$qt_libexecdir:$qt_bindir:$PATH"
+
+- QT_CFLAGS="`$ac_cv_path_EGREP '^DEFINES *=' "$qmake_dir/Makefile" | sed 's/^DEFINES *= *//'`"
+- QT_CFLAGS="$QT_CFLAGS `$ac_cv_path_EGREP '^CXXFLAGS *=' "$qmake_dir/Makefile" | sed -e 's/^CXXFLAGS *= *//' -e 's/-pipe//g' -e 's/-O.//g' -e 's/ -f[[a-z]][[^ ]]*//g' -e 's/ -W[[^ ]]*//g' -e 's/-std=[[^ ]]*//g' -e 's/\$([[^)]]*)//g'`"
+- QT_INCFLAGS="`$ac_cv_path_EGREP '^INCPATH *=' "$qmake_dir/Makefile" | sed -e 's/^INCPATH *= *//'`"
++ if test x"$enable_gui" = xyes; then
++ QT_CFLAGS="`$ac_cv_path_EGREP '^DEFINES *=' "$qmake_dir/Makefile" | sed 's/^DEFINES *= *//'`"
++ QT_CFLAGS="$QT_CFLAGS `$ac_cv_path_EGREP '^CXXFLAGS *=' "$qmake_dir/Makefile" | sed -e 's/^CXXFLAGS *= *//' -e 's/-pipe//g' -e 's/-O.//g' -e 's/ -f[[a-z]][[^ ]]*//g' -e 's/ -W[[^ ]]*//g' -e 's/-std=[[^ ]]*//g' -e 's/\$([[^)]]*)//g'`"
++ QT_INCFLAGS="`$ac_cv_path_EGREP '^INCPATH *=' "$qmake_dir/Makefile" | sed -e 's/^INCPATH *= *//'`"
++ else
++ QT_CFLAGS="`$ac_cv_path_EGREP '^DEFINES *=' "$qmake_dir/Makefile.non_gui" | sed 's/^DEFINES *= *//'`"
++ QT_CFLAGS="$QT_CFLAGS `$ac_cv_path_EGREP '^CXXFLAGS *=' "$qmake_dir/Makefile.non_gui" | sed -e 's/^CXXFLAGS *= *//' -e 's/-pipe//g' -e 's/-O.//g' -e 's/ -f[[a-z]][[^ ]]*//g' -e 's/ -W[[^ ]]*//g' -e 's/-std=[[^ ]]*//g' -e 's/\$([[^)]]*)//g'`"
++ QT_INCFLAGS="`$ac_cv_path_EGREP '^INCPATH *=' "$qmake_dir/Makefile.non_gui" | sed -e 's/^INCPATH *= *//'`"
++ fi
+
+ # If under MinGW/MSYS2, fix relative include paths
+ if ! test -z "${MINGW_PREFIX}"; then
+@@ -181,16 +189,18 @@ EOT
+ QT_INCFLAGS="`echo $QT_INCFLAGS | sed -e 's:-I[[^/]][[^ ]]*::g'`"
+ QT_CFLAGS="$QT_CFLAGS $QT_INCFLAGS"
+ QT_CFLAGS="`echo $QT_CFLAGS | sed -e 's/\$(EXPORT_ARCH_ARGS)//'`"
+- QT_LIBS="`$ac_cv_path_EGREP '^LFLAGS *=' "$qmake_dir/Makefile" | sed -e 's/^LFLAGS *= *//' -e 's/-Wl,-O[[^ ]]*//g' -e 's/ -f[[a-z]][[^ ]]*//g'`"
+- QT_LIBS="$QT_LIBS `$ac_cv_path_EGREP '^LIBS *=' "$qmake_dir/Makefile" | sed -e 's/^LIBS *= *//' -e 's/\$([[^)]]*)//g' -e 's:-L[[^/]][[^ ]]*::g'`"
+- QT_LIBS="`echo $QT_LIBS | sed -e 's/\$(EXPORT_ARCH_ARGS)//'`"
++ if test x"$enable_gui" = xyes; then
++ QT_LIBS="`$ac_cv_path_EGREP '^LFLAGS *=' "$qmake_dir/Makefile" | sed -e 's/^LFLAGS *= *//' -e 's/-Wl,-O[[^ ]]*//g' -e 's/ -f[[a-z]][[^ ]]*//g'`"
++ QT_LIBS="$QT_LIBS `$ac_cv_path_EGREP '^LIBS *=' "$qmake_dir/Makefile" | sed -e 's/^LIBS *= *//' -e 's/\$([[^)]]*)//g' -e 's:-L[[^/]][[^ ]]*::g'`"
++ QT_LIBS="`echo $QT_LIBS | sed -e 's/\$(EXPORT_ARCH_ARGS)//'`"
++ fi
+ QT_LIBS_NON_GUI="`$ac_cv_path_EGREP '^LFLAGS *=' "$qmake_dir/Makefile.non_gui" | sed -e 's/^LFLAGS *= *//' -e 's/-Wl,-O[[^ ]]*//g' -e 's/ -f[[a-z]][[^ ]]*//g'`"
+ QT_LIBS_NON_GUI="$QT_LIBS_NON_GUI `$ac_cv_path_EGREP '^LIBS *=' "$qmake_dir/Makefile.non_gui" | sed -e 's/^LIBS *= *//' -e 's/\$([[^)]]*)//g' -e 's:-L[[^/]][[^ ]]*::g'`"
+ QT_LIBS_NON_GUI="`echo $QT_LIBS_NON_GUI | sed -e 's/\$(EXPORT_ARCH_ARGS)//' -e 's/-Wl,-subsystem,windows *//g'`"
+
+ rm -rf "$qmake_dir"
+
+- if test x"$QT_CFLAGS" = x -o x"$QT_LIBS" = x -o x"$QT_LIBS_NON_GUI" = x; then
++ if test x"$QT_CFLAGS" = x -o [ x"$enable_gui" = xyes -a x"$QT_LIBS" = x ] -o x"$QT_LIBS_NON_GUI" = x; then
+ AC_MSG_CHECKING(for Qt 6)
+ AC_MSG_RESULT(no: could not extract one or more compiler flags from Makefile generated by qmake6)
+ return
+@@ -223,7 +233,7 @@ EOT
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ ac_save_LIBS="$LIBS"
+ CXXFLAGS="$STD_CXX $CXXFLAGS $QT_CFLAGS -fPIC"
+- LIBS="$LDFLAGS $QT_LIBS"
++ LIBS="$LDFLAGS $QT_LIBS_NON_GUI"
+ unset ac_cv_qt_compilation
+
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
diff --git a/media-video/mkvtoolnix/mkvtoolnix-83.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-83.0.ebuild
new file mode 100644
index 000000000000..393a62599642
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-83.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multiprocessing qmake-utils xdg
+
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
+ EGIT_SUBMODULES=()
+else
+ inherit verify-sig
+
+ SRC_URI="
+ https://mkvtoolnix.download/sources/${P}.tar.xz
+ verify-sig? ( https://mkvtoolnix.download/sources/${P}.tar.xz.sig )
+ "
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+ VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/mkvtoolnix.asc"
+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 dvd gui nls pch test"
+RESTRICT="!test? ( test )"
+
+# check NEWS.md for build system changes entries for boost/libebml/libmatroska
+# version requirement updates and other packaging info
+RDEPEND="
+ app-text/cmark:0=
+ dev-libs/boost:=
+ dev-libs/gmp:=
+ >=dev-libs/libebml-1.4.5:=
+ >=dev-libs/libfmt-8.0.1:=
+ >=dev-libs/pugixml-1.11
+ >=dev-qt/qtbase-6.2:6[dbus]
+ media-libs/flac:=
+ >=media-libs/libmatroska-1.7.1:=
+ media-libs/libogg
+ media-libs/libvorbis
+ sys-libs/zlib
+ dvd? ( media-libs/libdvdread:= )
+ gui? (
+ >=dev-qt/qtbase-6.2:6[concurrent,gui,network,widgets]
+ >=dev-qt/qtmultimedia-6.2:6
+ >=dev-qt/qtsvg-6.2:6
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-cpp/nlohmann_json-3.9.1
+ >=dev-libs/utfcpp-3.1.2
+ test? ( dev-cpp/gtest )
+"
+BDEPEND="
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-ruby/rake
+ virtual/pkgconfig
+ nls? (
+ sys-devel/gettext
+ app-text/po4a
+ )
+"
+
+if [[ ${PV} != *9999 ]] ; then
+ BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-mkvtoolnix )"
+fi
+
+PATCHES=(
+ # https://bugs.gentoo.org/927380
+ "${FILESDIR}"/mkvtoolnix-83.0.0-fix-disable-gui.patch
+)
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == *9999 ]]; then
+ ./autogen.sh || die
+ fi
+
+ # bug #692018
+ sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die
+
+ eautoreconf
+
+ # remove bundled libs
+ rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
+}
+
+src_configure() {
+ # bug #692322, use system dev-libs/utfcpp
+ append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
+
+ local myeconfargs=(
+ $(use_enable debug)
+ $(usex pch "" --disable-precompiled-headers)
+ $(use_enable gui)
+ $(use_with dvd dvdread)
+ $(use_with nls gettext)
+ #$(use_with nls po4a)
+ --disable-update-check
+ --disable-optimization
+ --with-boost="${ESYSROOT}"/usr
+ --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
+
+ # Qt (of some version) is always needed, even for non-GUI builds,
+ # to do e.g. MIME detection. See e.g. bug #844097.
+ # But most of the Qt deps are conditional on a GUI build.
+ --with-qmake6="$(qt6_get_bindir)"/qmake
+ )
+
+ # Work around bug #904710.
+ use nls || export ac_cv_path_PO4A=
+
+ econf "${myeconfargs[@]}"
+}
+
+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
+ dodoc NEWS.md
+ doman doc/man/*.1
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/files/, media-video/mkvtoolnix/
@ 2024-06-09 6:24 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2024-06-09 6:24 UTC (permalink / raw
To: gentoo-commits
commit: 6cdacfa91764b6ef1ae7789e64d853c27d92b23d
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Sun Jun 2 11:33:31 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jun 9 06:24:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cdacfa9
media-video/mkvtoolnix: fix libcxx incompatibility
Closes: https://bugs.gentoo.org/933417
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36973
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/mkvtoolnix-84.0.0-fix-libcxx-c++20.patch | 44 ++++++++++++++++++++++
...olnix-84.0.ebuild => mkvtoolnix-84.0-r1.ebuild} | 4 ++
2 files changed, 48 insertions(+)
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-84.0.0-fix-libcxx-c++20.patch b/media-video/mkvtoolnix/files/mkvtoolnix-84.0.0-fix-libcxx-c++20.patch
new file mode 100644
index 000000000000..9a45aaa9cb9e
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-84.0.0-fix-libcxx-c++20.patch
@@ -0,0 +1,44 @@
+https://bugs.gentoo.org/933417
+https://gitlab.com/mbunkus/mkvtoolnix/-/issues/3695
+https://gitlab.com/mbunkus/mkvtoolnix/-/commit/7e1bea9527616ab6ab38425e7290579f05dd9bb1
+
+From 7e1bea9527616ab6ab38425e7290579f05dd9bb1 Mon Sep 17 00:00:00 2001
+From: Moritz Bunkus <mo@bunkus.online>
+Date: Tue, 30 Apr 2024 16:05:35 +0200
+Subject: [PATCH] replace removed `std::result_of` with `std::invoke_result`
+
+`std::result_of` was deprecated in C++17 & removed in C++20. A lot of
+compilers still make it available even when running in C++20 mode,
+while others don't.
+
+Therefore replace it with equivalent use of `std::invoke_result`.
+
+Fixes #3695.
+--- a/NEWS.md
++++ b/NEWS.md
+@@ -1,3 +1,11 @@
++# Version ?
++
++## Bug fixes
++
++* fixed compilation of `src/common/sorting.h` with certain compilers due to
++ the deprecation & removal of `std::result_of<>` in C++20. Fixes #3695.
++
++
+ # Version 84.0 "Sleeper" 2024-04-28
+
+ ## New features and enhancements
+--- a/src/common/sorting.h
++++ b/src/common/sorting.h
+@@ -27,7 +27,7 @@ namespace mtx::sort {
+
+ template< typename Titer
+ , typename Tcriterion_maker
+- , typename Tcriterion = typename std::result_of< Tcriterion_maker(typename std::iterator_traits<Titer>::value_type) >::type
++ , typename Tcriterion = typename std::invoke_result< Tcriterion_maker, typename std::iterator_traits<Titer>::value_type >::type
+ , typename Tcomparator = std::less<Tcriterion>
+ >
+ void
+--
+GitLab
+
diff --git a/media-video/mkvtoolnix/mkvtoolnix-84.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-84.0-r1.ebuild
similarity index 97%
rename from media-video/mkvtoolnix/mkvtoolnix-84.0.ebuild
rename to media-video/mkvtoolnix/mkvtoolnix-84.0-r1.ebuild
index 6731cce63b2d..f5eaf0cade1f 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-84.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-84.0-r1.ebuild
@@ -73,6 +73,10 @@ if [[ ${PV} != *9999 ]] ; then
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-mkvtoolnix )"
fi
+PATCHES=(
+ "${FILESDIR}"/mkvtoolnix-84.0.0-fix-libcxx-c++20.patch
+)
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-06-09 6:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-28 18:50 [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/files/, media-video/mkvtoolnix/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-06-09 6:24 Joonas Niilola
2024-04-01 7:18 Sam James
2023-12-14 4:23 Sam James
2022-05-18 2:07 Sam James
2015-12-28 7:32 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox