commit: f272299c47ef314e249431eb574af6d7e2fa60fb Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Wed Jan 15 20:33:06 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Feb 21 13:00:54 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f272299c
media-video/mkvtoolnix: drop 83.0-r1 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/40153 Signed-off-by: Sam James <sam <AT> gentoo.org> media-video/mkvtoolnix/Manifest | 2 - .../files/mkvtoolnix-83.0.0-fix-disable-gui.patch | 88 ------------- media-video/mkvtoolnix/mkvtoolnix-83.0-r1.ebuild | 141 --------------------- 3 files changed, 231 deletions(-) diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index 1e59c814bda4..5442ee0664bf 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -1,5 +1,3 @@ -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-86.0.tar.xz 11369476 BLAKE2B a18ed1534f693f98924bc5c4bb1d3acedd154dacede17691a88b1d1a14c99d5ba4bc5483060d67624e682058e8af1a91ea0f77b095f35af340dea84a441dedc1 SHA512 ca1009439d662f32c75ee915f89ed1ccf1475f84782a5da977521e1ab1a558400d844d689ba37d3e5bcc2cb0ec70d3fac5db5594d0088668dd0ba3ac759819c6 DIST mkvtoolnix-86.0.tar.xz.sig 833 BLAKE2B d53e8f8198f5ce5faec0b6c991ecf64a43f42395182aa7ead970f17e56b01c986392922b052cc2ac5e380983b937345838a96cde84e575d72bfcff2dd3084b09 SHA512 19901f9f61e108b8c4db0dab833e0998ab2bdc227130fe6d1aea6b9f495e66aa796bd4d3f70f14dadc906226884f03aaca90e710233e58fb604f66b28fb4abee DIST mkvtoolnix-88.0.tar.xz 11241552 BLAKE2B 01edcfe995e75fa7cde1916eb37a5f75d9788d5e56ee7a07ca106d861cf2d297a7d72974b0b6f958fec175d3db675e9e852af9f50345ededcca403983dcffa85 SHA512 b1b08a42f55e841c618cbfe19f40310ea7c879d43a6a1db4152abfd5618deccc33332a73b1fc21757660891907b9eb12028b8c016134708f0464d5cc10a343c2 diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-83.0.0-fix-disable-gui.patch b/media-video/mkvtoolnix/files/mkvtoolnix-83.0.0-fix-disable-gui.patch deleted file mode 100644 index 015a92fbd78f..000000000000 --- a/media-video/mkvtoolnix/files/mkvtoolnix-83.0.0-fix-disable-gui.patch +++ /dev/null @@ -1,88 +0,0 @@ -https://bugs.gentoo.org/927380 - -Allow non-gui builds to configure without gui dependencies. - ---- a/ac/qt6.m4 -+++ b/ac/qt6.m4 -@@ -113,13 +113,15 @@ HEADERS = configure.h - SOURCES = configure.cpp - EOT - -- "$QMAKE6" -makefile -nocache $QMAKE_SPEC configure.pro 2>&5 > /dev/null -- result2=$? -+ if test x"$enable_gui" = xyes; then -+ "$QMAKE6" -makefile -nocache $QMAKE_SPEC configure.pro 2>&5 > /dev/null -+ result2=$? - -- if test $result2 != 0; then -- cd "$old_wd" -- AC_MSG_RESULT(no: not all of the required Qt6 modules were found (needed: core gui widgets network concurrent svg multimedia)) -- return -+ if test $result2 != 0; then -+ cd "$old_wd" -+ AC_MSG_RESULT(no: not all of the required Qt6 modules were found (needed: core gui widgets network concurrent svg multimedia)) -+ return -+ fi - fi - - if test -f Makefile.Release; then -@@ -135,7 +137,7 @@ EOT - - cd "$old_wd" - -- if test $result != 0 -o $result2 != 0 -o $result3 != 0; then -+ if test $result != 0 -o $result3 != 0; then - AC_MSG_CHECKING(for Qt 6) - AC_MSG_RESULT(no: qmake6 couldn't be run for a dummy project) - -@@ -169,9 +171,15 @@ EOT - - qt_searchpath="$qt_libexecdir:$qt_bindir:$PATH" - -- QT_CFLAGS="`$ac_cv_path_EGREP '^DEFINES *=' "$qmake_dir/Makefile" | sed 's/^DEFINES *= *//'`" -- QT_CFLAGS="$QT_CFLAGS `$ac_cv_path_EGREP '^CXXFLAGS *=' "$qmake_dir/Makefile" | sed -e 's/^CXXFLAGS *= *//' -e 's/-pipe//g' -e 's/-O.//g' -e 's/ -f[[a-z]][[^ ]]*//g' -e 's/ -W[[^ ]]*//g' -e 's/-std=[[^ ]]*//g' -e 's/\$([[^)]]*)//g'`" -- QT_INCFLAGS="`$ac_cv_path_EGREP '^INCPATH *=' "$qmake_dir/Makefile" | sed -e 's/^INCPATH *= *//'`" -+ if test x"$enable_gui" = xyes; then -+ QT_CFLAGS="`$ac_cv_path_EGREP '^DEFINES *=' "$qmake_dir/Makefile" | sed 's/^DEFINES *= *//'`" -+ QT_CFLAGS="$QT_CFLAGS `$ac_cv_path_EGREP '^CXXFLAGS *=' "$qmake_dir/Makefile" | sed -e 's/^CXXFLAGS *= *//' -e 's/-pipe//g' -e 's/-O.//g' -e 's/ -f[[a-z]][[^ ]]*//g' -e 's/ -W[[^ ]]*//g' -e 's/-std=[[^ ]]*//g' -e 's/\$([[^)]]*)//g'`" -+ QT_INCFLAGS="`$ac_cv_path_EGREP '^INCPATH *=' "$qmake_dir/Makefile" | sed -e 's/^INCPATH *= *//'`" -+ else -+ QT_CFLAGS="`$ac_cv_path_EGREP '^DEFINES *=' "$qmake_dir/Makefile.non_gui" | sed 's/^DEFINES *= *//'`" -+ QT_CFLAGS="$QT_CFLAGS `$ac_cv_path_EGREP '^CXXFLAGS *=' "$qmake_dir/Makefile.non_gui" | sed -e 's/^CXXFLAGS *= *//' -e 's/-pipe//g' -e 's/-O.//g' -e 's/ -f[[a-z]][[^ ]]*//g' -e 's/ -W[[^ ]]*//g' -e 's/-std=[[^ ]]*//g' -e 's/\$([[^)]]*)//g'`" -+ QT_INCFLAGS="`$ac_cv_path_EGREP '^INCPATH *=' "$qmake_dir/Makefile.non_gui" | sed -e 's/^INCPATH *= *//'`" -+ fi - - # If under MinGW/MSYS2, fix relative include paths - if ! test -z "${MINGW_PREFIX}"; then -@@ -181,16 +189,18 @@ EOT - QT_INCFLAGS="`echo $QT_INCFLAGS | sed -e 's:-I[[^/]][[^ ]]*::g'`" - QT_CFLAGS="$QT_CFLAGS $QT_INCFLAGS" - QT_CFLAGS="`echo $QT_CFLAGS | sed -e 's/\$(EXPORT_ARCH_ARGS)//'`" -- QT_LIBS="`$ac_cv_path_EGREP '^LFLAGS *=' "$qmake_dir/Makefile" | sed -e 's/^LFLAGS *= *//' -e 's/-Wl,-O[[^ ]]*//g' -e 's/ -f[[a-z]][[^ ]]*//g'`" -- QT_LIBS="$QT_LIBS `$ac_cv_path_EGREP '^LIBS *=' "$qmake_dir/Makefile" | sed -e 's/^LIBS *= *//' -e 's/\$([[^)]]*)//g' -e 's:-L[[^/]][[^ ]]*::g'`" -- QT_LIBS="`echo $QT_LIBS | sed -e 's/\$(EXPORT_ARCH_ARGS)//'`" -+ if test x"$enable_gui" = xyes; then -+ QT_LIBS="`$ac_cv_path_EGREP '^LFLAGS *=' "$qmake_dir/Makefile" | sed -e 's/^LFLAGS *= *//' -e 's/-Wl,-O[[^ ]]*//g' -e 's/ -f[[a-z]][[^ ]]*//g'`" -+ QT_LIBS="$QT_LIBS `$ac_cv_path_EGREP '^LIBS *=' "$qmake_dir/Makefile" | sed -e 's/^LIBS *= *//' -e 's/\$([[^)]]*)//g' -e 's:-L[[^/]][[^ ]]*::g'`" -+ QT_LIBS="`echo $QT_LIBS | sed -e 's/\$(EXPORT_ARCH_ARGS)//'`" -+ fi - QT_LIBS_NON_GUI="`$ac_cv_path_EGREP '^LFLAGS *=' "$qmake_dir/Makefile.non_gui" | sed -e 's/^LFLAGS *= *//' -e 's/-Wl,-O[[^ ]]*//g' -e 's/ -f[[a-z]][[^ ]]*//g'`" - QT_LIBS_NON_GUI="$QT_LIBS_NON_GUI `$ac_cv_path_EGREP '^LIBS *=' "$qmake_dir/Makefile.non_gui" | sed -e 's/^LIBS *= *//' -e 's/\$([[^)]]*)//g' -e 's:-L[[^/]][[^ ]]*::g'`" - QT_LIBS_NON_GUI="`echo $QT_LIBS_NON_GUI | sed -e 's/\$(EXPORT_ARCH_ARGS)//' -e 's/-Wl,-subsystem,windows *//g'`" - - rm -rf "$qmake_dir" - -- if test x"$QT_CFLAGS" = x -o x"$QT_LIBS" = x -o x"$QT_LIBS_NON_GUI" = x; then -+ if test x"$QT_CFLAGS" = x -o [ x"$enable_gui" = xyes -a x"$QT_LIBS" = x ] -o x"$QT_LIBS_NON_GUI" = x; then - AC_MSG_CHECKING(for Qt 6) - AC_MSG_RESULT(no: could not extract one or more compiler flags from Makefile generated by qmake6) - return -@@ -223,7 +233,7 @@ EOT - ac_save_CXXFLAGS="$CXXFLAGS" - ac_save_LIBS="$LIBS" - CXXFLAGS="$STD_CXX $CXXFLAGS $QT_CFLAGS -fPIC" -- LIBS="$LDFLAGS $QT_LIBS" -+ LIBS="$LDFLAGS $QT_LIBS_NON_GUI" - unset ac_cv_qt_compilation - - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ diff --git a/media-video/mkvtoolnix/mkvtoolnix-83.0-r1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-83.0-r1.ebuild deleted file mode 100644 index ed9f5a45e234..000000000000 --- a/media-video/mkvtoolnix/mkvtoolnix-83.0-r1.ebuild +++ /dev/null @@ -1,141 +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="debug dvd gui 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 -# <libfmt-11 https://gitlab.com/mbunkus/mkvtoolnix/-/merge_requests/2259 -RDEPEND=" - app-text/cmark:0= - dev-libs/boost:= - dev-libs/gmp:= - >=dev-libs/libebml-1.4.5:= - >=dev-libs/libfmt-8.0.1:= - <dev-libs/libfmt-11 - >=dev-libs/pugixml-1.11 - >=dev-qt/qtbase-6.2:6[dbus] - media-libs/flac:= - >=media-libs/libmatroska-1.7.1:= - media-libs/libogg - media-libs/libvorbis - sys-libs/zlib - dvd? ( media-libs/libdvdread:= ) - gui? ( - >=dev-qt/qtbase-6.2:6[concurrent,gui,network,widgets] - >=dev-qt/qtmultimedia-6.2:6 - >=dev-qt/qtsvg-6.2: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=( - # https://bugs.gentoo.org/927380 - "${FILESDIR}"/mkvtoolnix-83.0.0-fix-disable-gui.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 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. - --with-qmake6="$(qt6_get_bindir)"/qmake - ) - - # 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 -}
