commit: b1d0ca2dbfe43ca8571963f6c2e3355c76f4389f Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Thu Aug 8 20:03:38 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Aug 17 19:15:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d0ca2d
media-video/mkvtoolnix: drop 81.0 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/37114 Signed-off-by: Michał Górny <mgorny <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 --------- media-video/mkvtoolnix/mkvtoolnix-81.0.ebuild | 167 --------------------- 5 files changed, 299 deletions(-) diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index a212124cf9fa..6f92e2e55130 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -1,5 +1,3 @@ -DIST mkvtoolnix-81.0.tar.xz 11067288 BLAKE2B 64bf3cd1872e3b67c6932ed29527e1dff2f913d257464cdca2d54a62bd2154a820d86bce857f55345aba1bcd5701872dbddcb5a029845d0079159358cb154fb0 SHA512 d23f6d1819437ba77576852141256698997e49066158903e1cea4086b9c05302d6661780e911fc258c028a84f2ac95140f6ba15d2ffd11c23cb92e422febf7c7 -DIST mkvtoolnix-81.0.tar.xz.sig 833 BLAKE2B 37e63e92628d3dcb6e9c9129e09dbef1d1d4e80515a05a9a5684d5d542ef54b024e76f1fac50b242e32172ef24493123b6103ae79fa411eefea7704cd63070d5 SHA512 3975c0b217318fdd9eeed23694c0e25536c694fa6cef63560b48ed79db7827be41cbe9a2cd8d8c1d2555beb436a5191a5ad21f0e5e73f93f2ca1c09be13826cb DIST mkvtoolnix-83.0.tar.xz 11278152 BLAKE2B f57b398c747d90021f2a13e58df23655e898a0bb68ad7f050f7a3fe0018866570fb81780f2d68a8c9ed06b66882578b5a9144c3be1bb9b79bc5f79e13f06bde5 SHA512 e70236249f9f72c4ffeab8222c03cdf373a25643f1b106a1abb695184152be8bb22e3fb5dc67b48e6193d9ac37d0b9b2ea317a31214b92648ac75a82c99f9b5d DIST mkvtoolnix-83.0.tar.xz.sig 833 BLAKE2B 3eddaa4941d84937a7b771bea66be52979437abb54cd178eb6d24b30628db3ee0ad72f23bea7419a7bc13cfd4f84d6d004b46ad63bad0eeeef8fd05f37bcaf4f SHA512 6d3ac46a40139fff67da61c77a802df243764d8c26c55e3b951d407fd3147bcf985f8a62c21b18c12fabe0afdc535a3449a6bfff3f15a5779b2aed1f94fe0ab7 DIST mkvtoolnix-84.0.tar.xz 11325260 BLAKE2B 147878e796c3ce9b3dc03e026eaeb45c21946d0a80ff76d090a8a11a22e1e02fddfe158192df264c5a006ad9007a73d68ddd5c79f0ccd1d103e827e4d0123974 SHA512 3a73bb2497a227fd2e0a65d58e72bf479662828a7b4201b37b7bfdd7f88d294a6690aee024661d8b5615036f64a4ce1c2ba64d7b24ebd352f8f5ce3ffdac543a 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 deleted file mode 100644 index d31731a266f8..000000000000 --- a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 246f824a6a0d2bc93ec4ad2ebfde7c92b42c879a Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <[email protected]> -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 <[email protected]> ---- 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 deleted file mode 100644 index 203721aedcff..000000000000 --- a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 196e704d9bd44a5bb7655d8a85b6f270b2165b3c Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <[email protected]> -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 <[email protected]> ---- 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 deleted file mode 100644 index deb8d59fa6c4..000000000000 --- a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-optional-qtdbus.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 998cd9baa8edbbc0a02509728c7ff21ddaaaad51 Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <[email protected]> -Date: Mon, 20 Nov 2023 23:18:56 +0200 -Subject: [PATCH] Add an option for qtdbus support - -Signed-off-by: Alfred Wingate <[email protected]> ---- 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-81.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-81.0.ebuild deleted file mode 100644 index 077c325ecc46..000000000000 --- a/media-video/mkvtoolnix/mkvtoolnix-81.0.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# 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="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 - media-libs/flac:= - >=media-libs/libmatroska-1.7.1:= - media-libs/libogg - media-libs/libvorbis - sys-libs/zlib - dvd? ( media-libs/libdvdread:= ) - !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 - ) - ) -" -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=( - "${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() { - 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) - $(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. - 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= - - 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 -}
