diff options
Diffstat (limited to 'media-video/mkvtoolnix')
| -rw-r--r-- | media-video/mkvtoolnix/Manifest | 1 | ||||
| -rw-r--r-- | media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch | 32 | ||||
| -rw-r--r-- | media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild | 126 | ||||
| -rw-r--r-- | media-video/mkvtoolnix/mkvtoolnix-9999.ebuild | 13 |
4 files changed, 168 insertions, 4 deletions
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index 6504d2726520..d97e82242434 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -1,3 +1,4 @@ DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e SHA512 196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8 DIST mkvtoolnix-47.0.0.tar.xz 7532248 BLAKE2B 7b2c8763a2b2b038933dc96a58e000f13031ffbb7bc89eedb1990c3df58598c9d1f6e03ded14a9468283b3d276ecc8c7e03941bbb977a9fd9c340ed8776693f8 SHA512 dad1c976acfbbaaa75114ea21ebd5bd1367b3fb843178c11fa5ac995169411a1f9210d43bc3adfd8990a8e69ba3c5dbe6b7416bcd9250a804df1a571d04afc2d DIST mkvtoolnix-48.0.0.tar.xz 7476388 BLAKE2B 995c468f9e2069204b539cdc3200d5543ed159c2e969bce207af828ff2ab9bd56767a10359486ed3717efcf28e1aa13f2d6b538af58fcbbc965ee5c050310739 SHA512 33cd028eb990a01433b511416b613ae0c44b398a80c4f2d56a8d419b0b76fde2c36f04024a182402d7e787ff369222df7f22873db34efe7af03746c1c2def80d +DIST mkvtoolnix-49.0.0.tar.xz 7493996 BLAKE2B 2f1266a3c4117b8369b361e92728d0b19a64f3ebcbbb1fae144af33098711196b44820a9eae61d3cd22351ff4b48e7c056697d1653ba702d13dabfe43e869018 SHA512 087638abea16639d4c452639617d0a183b58bf0496b1c150a46b80a50c15c4a4e9926437dfe002e7f574bd2b72b1e0cf810838c476dd7816bad86ed026e5f4c7 diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch b/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch new file mode 100644 index 000000000000..1c59b2c3827a --- /dev/null +++ b/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch @@ -0,0 +1,32 @@ +--- 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/mkvtoolnix-49.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild new file mode 100644 index 000000000000..7456a1ad02d0 --- /dev/null +++ b/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2020 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-1.60:= + >=dev-libs/libebml-1.4.0:= + >=dev-libs/libfmt-6.1.0:= + dev-libs/pugixml:= + media-libs/flac:= + >=media-libs/libmatroska-1.6.0:= + 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 ) + +src_prepare() { + xdg_src_prepare + if [[ ${PV} == *9999 ]]; then + ./autogen.sh || die + fi + + 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-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild index 4f1a6f2c0455..7456a1ad02d0 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild @@ -3,12 +3,12 @@ EAPI=7 -inherit flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg +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 autotools git-r3 + inherit git-r3 else SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" @@ -19,7 +19,7 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix" LICENSE="GPL-2" SLOT="0" -IUSE="debug dvd nls pch test qt5" +IUSE="dbus debug dvd nls pch qt5 test" RESTRICT="!test? ( test )" # check NEWS.md for build system changes entries for boost/libebml/libmatroska @@ -38,13 +38,13 @@ RDEPEND=" dvd? ( media-libs/libdvdread:= ) qt5? ( dev-qt/qtcore:5 - dev-qt/qtdbus: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} @@ -63,12 +63,16 @@ BDEPEND=" ) " +PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch ) + src_prepare() { xdg_src_prepare if [[ ${PV} == *9999 ]]; then ./autogen.sh || die fi + eautoreconf + # remove bundled libs rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die } @@ -80,6 +84,7 @@ src_configure() { 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) |