gentoo auto-resync : 14:12:2023 - 05:46:30

3 files changed, 130 insertions, 0 deletions

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
new file mode 100644
index 000000000000..d31731a266f8
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch
@@ -0,0 +1,29 @@
+From 246f824a6a0d2bc93ec4ad2ebfde7c92b42c879a Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+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 <parona@protonmail.com>
+--- 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
new file mode 100644
index 000000000000..203721aedcff
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch
@@ -0,0 +1,31 @@
+From 196e704d9bd44a5bb7655d8a85b6f270b2165b3c Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+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 <parona@protonmail.com>
+--- 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
new file mode 100644
index 000000000000..deb8d59fa6c4
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-optional-qtdbus.patch
@@ -0,0 +1,70 @@
+From 998cd9baa8edbbc0a02509728c7ff21ddaaaad51 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Mon, 20 Nov 2023 23:18:56 +0200
+Subject: [PATCH] Add an option for qtdbus support
+
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- 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
+