gentoo auto-resync : 19:06:2024 - 00:09:54

4 files changed, 0 insertions, 115 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 351f4c449596..27af6f08efb7 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index d16fce9db191..560bb17e2da7 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,5 +1,3 @@
-AUX mkvtoolnix-58.0.0-qt5dbus.patch 1500 BLAKE2B f85f6a50bd4d4f44470ec6f85729cfca22518859b34e2cf6e1dac25a35d58170b626afe3a1f12f41b1f2d34d4763ab3b180139b402675071794a0dcd29503209 SHA512 6c6ffc83f6c4ed482347cc172467189add3662430a029d74e94d1373a1f0e519fced494812691d7b38c054bc010f1c670f1f6be97819fc142c402d5264c3595e
-AUX mkvtoolnix-67.0.0-no-uic-qtwidgets.patch 2494 BLAKE2B 1d23ca6e908947d80e3ea7567508714cd73461a7571dda88a227bf9d4ca3ec86113ad596ff64dc6bfea641c8b097fffa1b4b359a17f5b24c0305c7e6628103b7 SHA512 982953a7f992def139140298a5a6b2ceeae6afaf5123b8e12c46523ab1f799994aa2f5d435bebb8091ca63e56bb44310a39a6382c313f8e4083cfea67daff41d
 AUX mkvtoolnix-80.0.0-fix-qtmultimedia.patch 808 BLAKE2B 560d85d4ef07677adb63053997a3198cf7348e8172f052a944fefd26c45c269247e3bd9a3831c9ba70fbabffe74ed7c53ac2637c5c0e1d32f1b5faca907aedfb SHA512 c7d3fce5c74d41db6d27a9c03866afce291dcc329257073cc8767e871847d1c80539b72c0c3392efb5010623d932ac0e4cfa3c86135d264faf9607cc2fa11999
 AUX mkvtoolnix-80.0.0-no-uic-qtwidgets.patch 1035 BLAKE2B ff38fb84285d2f496ebe56325dbb3c0059c41ec32bfbf31c2f45659ee17a2b4d29391d5f7b258b2c8c7d2ffcd25644c32ba4f4c0261e51a83bd518cb967c99a1 SHA512 d0b8ebbb246049ec8749dc1dc14575e41f091c758d323a4b7597475eb6422a0886eb9e4408084d4e386467760903e5fc444685d490216cae6642634318a6eef2
 AUX mkvtoolnix-80.0.0-optional-qtdbus.patch 2501 BLAKE2B 9372aee680a4b20adef6e0b9fe444548b40573ee50a9d9ac7593407d1b9e69670fe3c16ecd2dc3d752154a5414f714f201d00a5a1b4a96065265bd553219c1ba SHA512 75eb5344605ef9c461df7e8d92ce5422d241efe01aa49d148cbb337ac29f589ce83e4e258918dd62246c84fead8d971770ca577d7ead47246b5a74b023503fd1
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch b/media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch
deleted file mode 100644
index fb94686d27ef..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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/files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch b/media-video/mkvtoolnix/files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
deleted file mode 100644
index a5f5fd2009b8..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-https://bugs.gentoo.org/844097
-
-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.
-
-First hunk (ac/qt5.m4, removing UIC check): Signed-off-by: Duane Robertson duane@duanerobertson.com
-Second hunk (rest, adding UIC check conditional on enable_gui): Signed-off-by: Sam James <sam@gentoo.org>
---- a/ac/qt5.m4
-+++ b/ac/qt5.m4
-@@ -51,7 +51,6 @@ check_qt5() {
-   AC_PATH_PROG(LCONVERT, lconvert,, [$qt_searchpath])
-   AC_PATH_PROG(MOC, moc,, [$qt_searchpath])
-   AC_PATH_PROG(RCC, rcc,, [$qt_searchpath])
--  AC_PATH_PROG(UIC, uic,, [$qt_searchpath])
- 
-   if test x"$MOC" = x; then
-     AC_MSG_CHECKING(for Qt 5)
-@@ -62,11 +61,6 @@ check_qt5() {
-     AC_MSG_CHECKING(for Qt 5)
-     AC_MSG_RESULT(no: could not find the rcc executable)
-     return
--
--  elif test x"$UIC" = x; then
--    AC_MSG_CHECKING(for Qt 5)
--    AC_MSG_RESULT(no: could not find the uic executable)
--    return
-   fi
- 
-
-
---- a/ac/qt_common.m4
-+++ b/ac/qt_common.m4
-@@ -5,6 +5,37 @@ fi
- if test x"$enable_gui" = xyes; then
-   BUILD_GUI=yes
- 
-+  # Copied from ac/qt6.m4.
-+  qmake_properties="`mktemp`"
-+
-+  "$QMAKE" -query > "$qmake_properties"
-+
-+  qmake_ver="`$ac_cv_path_EGREP '^QT_VERSION:' "$qmake_properties" | sed 's/^QT_VERSION://'`"
-+
-+  AC_MSG_CHECKING(for qmake's version)
-+  if test -z "qmake_ver"; then
-+    AC_MSG_RESULT(unknown; please contact the author)
-+    return
-+  elif ! check_version $qt_min_ver $qmake_ver; then
-+    AC_MSG_RESULT(too old: $qmake_ver, neet at least $qt_mIN-ver)
-+    return
-+  else
-+    AC_MSG_RESULT($qmake_ver)
-+  fi
-+
-+  qt_bindir="`$ac_cv_path_EGREP '^QT_INSTALL_BINS:' "$qmake_properties" | sed 's/^QT_INSTALL_BINS://'`"
-+  qt_libexecdir="`$ac_cv_path_EGREP '^QT_INSTALL_LIBEXECS:' "$qmake_properties" | sed 's/^QT_INSTALL_LIBEXECS://'`"
-+  qt_searchpath="$qt_libexecdir:$qt_bindir:$PATH"
-+
-+  rm -f "$qmake_properties"
-+
-+  AC_PATH_PROG(UIC, uic,, [$qt_searchpath])
-+  if test x"$UIC" = x; then
-+     AC_MSG_CHECKING(for Qt 5 UIC (qtwidgets))
-+     AC_MSG_RESULT(no: could not find the uic executable)
-+     exit 1
-+  fi
-+
-   if test x"$have_qt6" = "xyes" ; then
-     opt_features_yes="$opt_features_yes\n   * MKVToolNix GUI (with Qt 6)"
-   else