diff options
Diffstat (limited to 'media-video/mkvtoolnix')
| -rw-r--r-- | media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch | 37 | ||||
| -rw-r--r-- | media-video/mkvtoolnix/files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch | 76 |
2 files changed, 0 insertions, 113 deletions
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 |