| 1 |
commit: f78a96cb4bcaab84cb31ea3bd69753f6bf8fc68f |
| 2 |
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> |
| 3 |
AuthorDate: Sat Aug 15 13:59:09 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 20 19:02:30 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f78a96cb |
| 7 |
|
| 8 |
media-video/mkvtoolnix: bump to 49.0.0 |
| 9 |
|
| 10 |
Also introduce USE flag to make dbus support optional. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/737252 |
| 13 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 14 |
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/17132 |
| 16 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 17 |
|
| 18 |
media-video/mkvtoolnix/Manifest | 1 + |
| 19 |
.../files/mkvtoolnix-49.0.0-qt5dbus.patch | 32 ++++++++++++++++++++++ |
| 20 |
...oolnix-9999.ebuild => mkvtoolnix-49.0.0.ebuild} | 13 ++++++--- |
| 21 |
media-video/mkvtoolnix/mkvtoolnix-9999.ebuild | 13 ++++++--- |
| 22 |
4 files changed, 51 insertions(+), 8 deletions(-) |
| 23 |
|
| 24 |
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest |
| 25 |
index 6504d272652..d97e8224243 100644 |
| 26 |
--- a/media-video/mkvtoolnix/Manifest |
| 27 |
+++ b/media-video/mkvtoolnix/Manifest |
| 28 |
@@ -1,3 +1,4 @@ |
| 29 |
DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e SHA512 196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8 |
| 30 |
DIST mkvtoolnix-47.0.0.tar.xz 7532248 BLAKE2B 7b2c8763a2b2b038933dc96a58e000f13031ffbb7bc89eedb1990c3df58598c9d1f6e03ded14a9468283b3d276ecc8c7e03941bbb977a9fd9c340ed8776693f8 SHA512 dad1c976acfbbaaa75114ea21ebd5bd1367b3fb843178c11fa5ac995169411a1f9210d43bc3adfd8990a8e69ba3c5dbe6b7416bcd9250a804df1a571d04afc2d |
| 31 |
DIST mkvtoolnix-48.0.0.tar.xz 7476388 BLAKE2B 995c468f9e2069204b539cdc3200d5543ed159c2e969bce207af828ff2ab9bd56767a10359486ed3717efcf28e1aa13f2d6b538af58fcbbc965ee5c050310739 SHA512 33cd028eb990a01433b511416b613ae0c44b398a80c4f2d56a8d419b0b76fde2c36f04024a182402d7e787ff369222df7f22873db34efe7af03746c1c2def80d |
| 32 |
+DIST mkvtoolnix-49.0.0.tar.xz 7493996 BLAKE2B 2f1266a3c4117b8369b361e92728d0b19a64f3ebcbbb1fae144af33098711196b44820a9eae61d3cd22351ff4b48e7c056697d1653ba702d13dabfe43e869018 SHA512 087638abea16639d4c452639617d0a183b58bf0496b1c150a46b80a50c15c4a4e9926437dfe002e7f574bd2b72b1e0cf810838c476dd7816bad86ed026e5f4c7 |
| 33 |
|
| 34 |
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch b/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch |
| 35 |
new file mode 100644 |
| 36 |
index 00000000000..1c59b2c3827 |
| 37 |
--- /dev/null |
| 38 |
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch |
| 39 |
@@ -0,0 +1,32 @@ |
| 40 |
+--- a/ac/qt5.m4 2020-07-31 11:25:31.371508129 -0500 |
| 41 |
++++ b/ac/qt5.m4 2020-07-31 11:30:14.967322450 -0500 |
| 42 |
+@@ -14,6 +14,11 @@ |
| 43 |
+ AC_ARG_WITH([qt_pkg_config], |
| 44 |
+ 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]), |
| 45 |
+ [ with_qt_pkg_config=${withval} ], [ with_qt_pkg_config=yes ]) |
| 46 |
++AC_ARG_ENABLE([dbus], |
| 47 |
++ AC_HELP_STRING([--enable-dbus],[enable/disable qtdbus/dbus from being included in build (yes)]), |
| 48 |
++ [],[enable_dbus=yes]) |
| 49 |
++ |
| 50 |
++ |
| 51 |
+ |
| 52 |
+ if test x"$enable_qt" = "xyes" -a \ |
| 53 |
+ '(' x"$enable_gui" = x"yes" -o x"$enable_gui" = "x" ')'; then |
| 54 |
+@@ -169,11 +174,13 @@ |
| 55 |
+ AC_MSG_RESULT(no: not found by pkg-config) |
| 56 |
+ fi |
| 57 |
+ |
| 58 |
+- if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then |
| 59 |
+- PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no]) |
| 60 |
+- if test x"$dbus_found" = xyes; then |
| 61 |
+- with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus" |
| 62 |
+- AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present]) |
| 63 |
++ if test x"$enable_dbus" = xyes; then |
| 64 |
++ if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then |
| 65 |
++ PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no]) |
| 66 |
++ if test x"$dbus_found" = xyes; then |
| 67 |
++ with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus" |
| 68 |
++ AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present]) |
| 69 |
++ fi |
| 70 |
+ fi |
| 71 |
+ fi |
| 72 |
|
| 73 |
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild |
| 74 |
similarity index 90% |
| 75 |
copy from media-video/mkvtoolnix/mkvtoolnix-9999.ebuild |
| 76 |
copy to media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild |
| 77 |
index 4f1a6f2c045..7456a1ad02d 100644 |
| 78 |
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild |
| 79 |
+++ b/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild |
| 80 |
@@ -3,12 +3,12 @@ |
| 81 |
|
| 82 |
EAPI=7 |
| 83 |
|
| 84 |
-inherit flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg |
| 85 |
+inherit autotools flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg |
| 86 |
|
| 87 |
if [[ ${PV} == *9999 ]] ; then |
| 88 |
EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git" |
| 89 |
EGIT_SUBMODULES=() |
| 90 |
- inherit autotools git-r3 |
| 91 |
+ inherit git-r3 |
| 92 |
else |
| 93 |
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz" |
| 94 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
| 95 |
@@ -19,7 +19,7 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix" |
| 96 |
|
| 97 |
LICENSE="GPL-2" |
| 98 |
SLOT="0" |
| 99 |
-IUSE="debug dvd nls pch test qt5" |
| 100 |
+IUSE="dbus debug dvd nls pch qt5 test" |
| 101 |
RESTRICT="!test? ( test )" |
| 102 |
|
| 103 |
# check NEWS.md for build system changes entries for boost/libebml/libmatroska |
| 104 |
@@ -38,13 +38,13 @@ RDEPEND=" |
| 105 |
dvd? ( media-libs/libdvdread:= ) |
| 106 |
qt5? ( |
| 107 |
dev-qt/qtcore:5 |
| 108 |
- dev-qt/qtdbus:5 |
| 109 |
dev-qt/qtgui:5 |
| 110 |
dev-qt/qtnetwork:5 |
| 111 |
dev-qt/qtwidgets:5 |
| 112 |
dev-qt/qtconcurrent:5 |
| 113 |
dev-qt/qtmultimedia:5 |
| 114 |
app-text/cmark:0= |
| 115 |
+ dbus? ( dev-qt/qtdbus:5 ) |
| 116 |
) |
| 117 |
" |
| 118 |
DEPEND="${RDEPEND} |
| 119 |
@@ -63,12 +63,16 @@ BDEPEND=" |
| 120 |
) |
| 121 |
" |
| 122 |
|
| 123 |
+PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch ) |
| 124 |
+ |
| 125 |
src_prepare() { |
| 126 |
xdg_src_prepare |
| 127 |
if [[ ${PV} == *9999 ]]; then |
| 128 |
./autogen.sh || die |
| 129 |
fi |
| 130 |
|
| 131 |
+ eautoreconf |
| 132 |
+ |
| 133 |
# remove bundled libs |
| 134 |
rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die |
| 135 |
} |
| 136 |
@@ -80,6 +84,7 @@ src_configure() { |
| 137 |
local myeconfargs=( |
| 138 |
$(use_enable debug) |
| 139 |
$(usex pch "" --disable-precompiled-headers) |
| 140 |
+ $(use_enable dbus) |
| 141 |
$(use_enable qt5 qt) |
| 142 |
$(use_with dvd dvdread) |
| 143 |
$(use_with nls gettext) |
| 144 |
|
| 145 |
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild |
| 146 |
index 4f1a6f2c045..7456a1ad02d 100644 |
| 147 |
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild |
| 148 |
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild |
| 149 |
@@ -3,12 +3,12 @@ |
| 150 |
|
| 151 |
EAPI=7 |
| 152 |
|
| 153 |
-inherit flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg |
| 154 |
+inherit autotools flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg |
| 155 |
|
| 156 |
if [[ ${PV} == *9999 ]] ; then |
| 157 |
EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git" |
| 158 |
EGIT_SUBMODULES=() |
| 159 |
- inherit autotools git-r3 |
| 160 |
+ inherit git-r3 |
| 161 |
else |
| 162 |
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz" |
| 163 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
| 164 |
@@ -19,7 +19,7 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix" |
| 165 |
|
| 166 |
LICENSE="GPL-2" |
| 167 |
SLOT="0" |
| 168 |
-IUSE="debug dvd nls pch test qt5" |
| 169 |
+IUSE="dbus debug dvd nls pch qt5 test" |
| 170 |
RESTRICT="!test? ( test )" |
| 171 |
|
| 172 |
# check NEWS.md for build system changes entries for boost/libebml/libmatroska |
| 173 |
@@ -38,13 +38,13 @@ RDEPEND=" |
| 174 |
dvd? ( media-libs/libdvdread:= ) |
| 175 |
qt5? ( |
| 176 |
dev-qt/qtcore:5 |
| 177 |
- dev-qt/qtdbus:5 |
| 178 |
dev-qt/qtgui:5 |
| 179 |
dev-qt/qtnetwork:5 |
| 180 |
dev-qt/qtwidgets:5 |
| 181 |
dev-qt/qtconcurrent:5 |
| 182 |
dev-qt/qtmultimedia:5 |
| 183 |
app-text/cmark:0= |
| 184 |
+ dbus? ( dev-qt/qtdbus:5 ) |
| 185 |
) |
| 186 |
" |
| 187 |
DEPEND="${RDEPEND} |
| 188 |
@@ -63,12 +63,16 @@ BDEPEND=" |
| 189 |
) |
| 190 |
" |
| 191 |
|
| 192 |
+PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch ) |
| 193 |
+ |
| 194 |
src_prepare() { |
| 195 |
xdg_src_prepare |
| 196 |
if [[ ${PV} == *9999 ]]; then |
| 197 |
./autogen.sh || die |
| 198 |
fi |
| 199 |
|
| 200 |
+ eautoreconf |
| 201 |
+ |
| 202 |
# remove bundled libs |
| 203 |
rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die |
| 204 |
} |
| 205 |
@@ -80,6 +84,7 @@ src_configure() { |
| 206 |
local myeconfargs=( |
| 207 |
$(use_enable debug) |
| 208 |
$(usex pch "" --disable-precompiled-headers) |
| 209 |
+ $(use_enable dbus) |
| 210 |
$(use_enable qt5 qt) |
| 211 |
$(use_with dvd dvdread) |
| 212 |
$(use_with nls gettext) |
Archives