| 1 |
commit: 4bfec4188daa52de0eb9d27c483fec11dfed3540 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 18 02:08:46 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 18 02:08:51 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bfec418 |
| 7 |
|
| 8 |
media-video/mkvtoolnix: sync live ebuild |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/844097 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
media-video/mkvtoolnix/mkvtoolnix-9999.ebuild | 48 +++++++++++++++------------ |
| 14 |
1 file changed, 27 insertions(+), 21 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild |
| 17 |
index 6bb7e14ab307..e228b9bbe6b3 100644 |
| 18 |
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild |
| 19 |
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild |
| 20 |
@@ -1,7 +1,7 @@ |
| 21 |
-# Copyright 1999-2021 Gentoo Authors |
| 22 |
+# Copyright 1999-2022 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI=7 |
| 26 |
+EAPI=8 |
| 27 |
|
| 28 |
inherit autotools flag-o-matic multiprocessing qmake-utils xdg |
| 29 |
|
| 30 |
@@ -19,36 +19,37 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix" |
| 31 |
|
| 32 |
LICENSE="GPL-2" |
| 33 |
SLOT="0" |
| 34 |
-IUSE="dbus debug dvd nls pch test" |
| 35 |
+IUSE="dbus debug dvd gui nls pch test" |
| 36 |
RESTRICT="!test? ( test )" |
| 37 |
|
| 38 |
# check NEWS.md for build system changes entries for boost/libebml/libmatroska |
| 39 |
# version requirement updates and other packaging info |
| 40 |
RDEPEND=" |
| 41 |
>=dev-libs/boost-1.66:= |
| 42 |
- >=dev-libs/libebml-1.4.0:= |
| 43 |
- >=dev-libs/libfmt-6.1.0:= |
| 44 |
- dev-libs/libpcre2:= |
| 45 |
- dev-libs/pugixml:= |
| 46 |
+ dev-libs/gmp:= |
| 47 |
+ >=dev-libs/libebml-1.4.2:= |
| 48 |
+ >=dev-libs/libfmt-8.0.1:= |
| 49 |
+ >=dev-libs/pugixml-1.11:= |
| 50 |
media-libs/flac:= |
| 51 |
>=media-libs/libmatroska-1.6.3:= |
| 52 |
media-libs/libogg:= |
| 53 |
media-libs/libvorbis:= |
| 54 |
- sys-apps/file |
| 55 |
sys-libs/zlib |
| 56 |
dvd? ( media-libs/libdvdread:= ) |
| 57 |
dev-qt/qtcore:5 |
| 58 |
- dev-qt/qtgui:5 |
| 59 |
- dev-qt/qtnetwork:5 |
| 60 |
- dev-qt/qtwidgets:5 |
| 61 |
- dev-qt/qtconcurrent:5 |
| 62 |
- dev-qt/qtmultimedia:5 |
| 63 |
+ gui? ( |
| 64 |
+ dev-qt/qtgui:5 |
| 65 |
+ dev-qt/qtnetwork:5 |
| 66 |
+ dev-qt/qtwidgets:5 |
| 67 |
+ dev-qt/qtconcurrent:5 |
| 68 |
+ dev-qt/qtmultimedia:5 |
| 69 |
+ ) |
| 70 |
app-text/cmark:0= |
| 71 |
dbus? ( dev-qt/qtdbus:5 ) |
| 72 |
" |
| 73 |
DEPEND="${RDEPEND} |
| 74 |
- dev-cpp/nlohmann_json |
| 75 |
- dev-libs/utfcpp |
| 76 |
+ >=dev-cpp/nlohmann_json-3.9.1 |
| 77 |
+ >=dev-libs/utfcpp-3.1.2 |
| 78 |
test? ( dev-cpp/gtest ) |
| 79 |
" |
| 80 |
BDEPEND=" |
| 81 |
@@ -62,16 +63,20 @@ BDEPEND=" |
| 82 |
) |
| 83 |
" |
| 84 |
|
| 85 |
-PATCHES=( "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch ) |
| 86 |
+PATCHES=( |
| 87 |
+ "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch |
| 88 |
+ "${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch |
| 89 |
+) |
| 90 |
|
| 91 |
src_prepare() { |
| 92 |
- xdg_src_prepare |
| 93 |
+ default |
| 94 |
+ |
| 95 |
if [[ ${PV} == *9999 ]]; then |
| 96 |
./autogen.sh || die |
| 97 |
fi |
| 98 |
|
| 99 |
- # https://bugs.gentoo.org/692018 |
| 100 |
- sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die |
| 101 |
+ # bug #692018 |
| 102 |
+ sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die |
| 103 |
|
| 104 |
eautoreconf |
| 105 |
|
| 106 |
@@ -80,16 +85,17 @@ src_prepare() { |
| 107 |
} |
| 108 |
|
| 109 |
src_configure() { |
| 110 |
- # bug 692322, use system dev-libs/utfcpp |
| 111 |
+ # bug #692322, use system dev-libs/utfcpp |
| 112 |
append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp |
| 113 |
|
| 114 |
local myeconfargs=( |
| 115 |
$(use_enable debug) |
| 116 |
$(usex pch "" --disable-precompiled-headers) |
| 117 |
$(use_enable dbus) |
| 118 |
+ $(use_enable gui) |
| 119 |
--disable-qt6 |
| 120 |
--enable-qt5 |
| 121 |
- --with-qmake=$(qt5_get_bindir)/qmake |
| 122 |
+ --with-qmake="$(qt5_get_bindir)"/qmake |
| 123 |
$(use_with dvd dvdread) |
| 124 |
$(use_with nls gettext) |
| 125 |
$(usex nls "" --with-po4a-translate=false) |
Archives