From d162ba1860a88062f4cd61f8b52fc303ba0b2991 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Aug 2021 00:16:33 +0100 Subject: gentoo resync : 07.08.2021 --- media-video/mkvtoolnix/Manifest | 5 +- .../files/mkvtoolnix-58.0.0-qt5dbus.patch | 37 +++++++ media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild | 120 +++++++++++++++++++++ media-video/mkvtoolnix/mkvtoolnix-9999.ebuild | 42 +++----- 4 files changed, 177 insertions(+), 27 deletions(-) create mode 100644 media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch create mode 100644 media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild (limited to 'media-video/mkvtoolnix') diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index 6fc64d2bd049..8ef2a75f498d 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -1,8 +1,11 @@ AUX mkvtoolnix-49.0.0-qt5dbus.patch 1442 BLAKE2B 041c33dcb691377b4b50a4c24f1eac528dda0227ccf2baf3732239b481ff6007bf5a8ddd9304dd7c2faff149f1cfbdbfb194eb30a3b19eea0803f10734572421 SHA512 d9a72bb0b8fc7c9915e4efa1e9758d4f9d6b68f1ad6ef9898dd0b5e693c8e1236b37fc97a9786c233f8909417309ea6bb9c1fb71054818f31eeb4c43faa46a06 AUX mkvtoolnix-56.1.0-optlevel.patch 607 BLAKE2B 62c3ef3717a54030b1acc586e9468f4d8d783755f7762ccebe18b0f8b0214268477a5a218b2fc02f3e2f770664507d43119f13046a31c94f865f01d0000a8a68 SHA512 b8eec05844aa8ef4f27416a78f5231496e34a112126e8ef403d18cab26b94756bd60323b51cf0d59a5a44d7b379bbf09f6b7b1b7e29b9282a0a2e82a5b3f325e +AUX mkvtoolnix-58.0.0-qt5dbus.patch 1500 BLAKE2B f85f6a50bd4d4f44470ec6f85729cfca22518859b34e2cf6e1dac25a35d58170b626afe3a1f12f41b1f2d34d4763ab3b180139b402675071794a0dcd29503209 SHA512 6c6ffc83f6c4ed482347cc172467189add3662430a029d74e94d1373a1f0e519fced494812691d7b38c054bc010f1c670f1f6be97819fc142c402d5264c3595e DIST mkvtoolnix-51.0.0.tar.xz 7569264 BLAKE2B c2af73c278e794739ccb7a8eb560c23e0f54643a67259c15d2e25346ac8d2b6ba65563ec6df7f7d5716be7bbee2d2c540e667b4aff7d7e6fed662c1bba54bf69 SHA512 2e91b039dbcab9afbad29c6c8e66ac305b2518319f68301a34a909fdffb02305025106368d4338abf148be5af4adfebab2eb1b5ccf0c9c0b0cef8f9e6e58a26e DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18 SHA512 583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99 +DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 094c13ac7e73e79f3cc7eae0768625482c4808a4323239a93de34d1406583bfe676d71855dd1f7eae9a8a0ff0a7badf50c04c71f9d2fbb4afd9ff5f05b9353ea SHA512 90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3 EBUILD mkvtoolnix-51.0.0.ebuild 2921 BLAKE2B e71d3e988f14a21595f8666f57d5eee063088dc708d787c707bef93e2fe8d8c86614e8c81f2542eb7b8b91203927b04ae44b5d8c95f8710884acde992f0da6bd SHA512 76409b23ca27bd4c9528c153d016c72bb39778c80ee3c487dd6d9f23c228b475df80fbc10b2b37ce10e0f131d4d6a33e6af77117f25488218bf5a3c0057a8e2b EBUILD mkvtoolnix-57.0.0.ebuild 2973 BLAKE2B d2c5a209bf16fac4b98a093e3cc5ac7b11f12707e648d5cabed8d90ea6431020cdbeac918a2b3c7d61ddebe6eca42499c038e3c6abfea2332cd4e952c1948370 SHA512 e64b0c432ebf47a4b40d201ff83ebec6723214d44d72d9ac8757ef176319579bfcbc841ba2e595bb8870735e8ef4f846fea8670e59498fc737dacdb0f362bd20 -EBUILD mkvtoolnix-9999.ebuild 2925 BLAKE2B 40784eb4cdade88c122707ee510523023b8542f7a816adbdcd5c7c682433c5b901cdfb699347ffbede8cc9b57e941f37f9dd297ee0e5ed08e5cafc7eaf6920b7 SHA512 26dc8823f158bf7eb5deba4b185645abf210db9b638ef7728e6be8966e8287d31fe202762c21ef31a42663fa0b91ca6da9277acff58912d763c662e9ae8d1505 +EBUILD mkvtoolnix-60.0.0.ebuild 2687 BLAKE2B 97fdbe6d11985f608d996dc43954480ea3a007ad753a610836ad62d04977c319a2ebee16af88d4b1072032a54356088705cac8a4acabad1a7a94045710b6b7c3 SHA512 7e80c992f5bab78ba16a4a8540d5f3a54883d3a9ee58d4690964f2d07cf829d4762cc21941bde4ead37528d81c45f73d72996235bc7137bd7f39493be897818f +EBUILD mkvtoolnix-9999.ebuild 2687 BLAKE2B 97fdbe6d11985f608d996dc43954480ea3a007ad753a610836ad62d04977c319a2ebee16af88d4b1072032a54356088705cac8a4acabad1a7a94045710b6b7c3 SHA512 7e80c992f5bab78ba16a4a8540d5f3a54883d3a9ee58d4690964f2d07cf829d4762cc21941bde4ead37528d81c45f73d72996235bc7137bd7f39493be897818f MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9 diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch b/media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch new file mode 100644 index 000000000000..fb94686d27ef --- /dev/null +++ b/media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch @@ -0,0 +1,37 @@ +Index: mkvtoolnix-58.0.0/ac/qt5.m4 +=================================================================== +--- mkvtoolnix-58.0.0.orig/ac/qt5.m4 ++++ mkvtoolnix-58.0.0/ac/qt5.m4 +@@ -98,12 +98,14 @@ 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]) +- fi ++ 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 + + with_qt_pkg_config_modules="`echo "$with_qt_pkg_config_modules" | sed -e 's/,/ /g'`" +@@ -244,6 +246,11 @@ AC_ARG_WITH([qt_pkg_config_modules], + AC_ARG_WITH([qt_pkg_config], + AC_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 + diff --git a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild new file mode 100644 index 000000000000..cd70327db014 --- /dev/null +++ b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2021 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-1.66:= + >=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:= ) + 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-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild index d84291b28039..cd70327db014 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,34 +19,32 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix" LICENSE="GPL-2" SLOT="0" -IUSE="dbus debug dvd nls pch qt5 test" +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-1.60:= + >=dev-libs/boost-1.66:= >=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.0:= + >=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 ) - ) + 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 @@ -64,7 +62,7 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch ) +PATCHES=( "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch ) src_prepare() { xdg_src_prepare @@ -89,7 +87,9 @@ src_configure() { $(use_enable debug) $(usex pch "" --disable-precompiled-headers) $(use_enable dbus) - $(use_enable qt5 qt) + --disable-qt6 + --enable-qt5 + --with-qmake=$(qt5_get_bindir)/qmake $(use_with dvd dvdread) $(use_with nls gettext) $(usex nls "" --with-po4a-translate=false) @@ -99,16 +99,6 @@ src_configure() { --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[@]}" } -- cgit v1.2.3