diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-10-28 22:00:05 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-10-28 22:00:05 +0100 |
| commit | 9c602d90d61cea9fe83c596c68a99e383ee15f73 (patch) | |
| tree | bca80b41af9c142cee7e07f14622dff065e60932 /media-video/mkvtoolnix/files | |
| parent | cf7630078a53ff74b245b148bd722994068e28f9 (diff) | |
gentoo auto-resync : 28:10:2022 - 22:00:04
Diffstat (limited to 'media-video/mkvtoolnix/files')
| -rw-r--r-- | media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch | 32 | ||||
| -rw-r--r-- | media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch | 15 |
2 files changed, 0 insertions, 47 deletions
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch b/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch deleted file mode 100644 index 1c59b2c3827a..000000000000 --- a/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/ac/qt5.m4 2020-07-31 11:25:31.371508129 -0500 -+++ b/ac/qt5.m4 2020-07-31 11:30:14.967322450 -0500 -@@ -14,6 +14,11 @@ - AC_ARG_WITH([qt_pkg_config], - AC_HELP_STRING([--without-qt-pkg-config], [do not use pkg-config for detecting Qt; 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]) -+ -+ - - if test x"$enable_qt" = "xyes" -a \ - '(' x"$enable_gui" = x"yes" -o x"$enable_gui" = "x" ')'; then -@@ -169,11 +174,13 @@ - AC_MSG_RESULT(no: not found by pkg-config) - 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 diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch b/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch deleted file mode 100644 index c0f91deed696..000000000000 --- a/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://gitlab.com/mbunkus/mkvtoolnix/-/commit/ba6db89e24aa84316372d59e6bba4ac88145b32a -https://bugs.gentoo.org/786978#c10 -diff --git a/Rakefile b/Rakefile -index 8c9487436ac627cc503e5f233d3f9c756f67fd86..ce564127eeb136b1c1784568ad68a4d593d0931a 100644 ---- a/Rakefile -+++ b/Rakefile -@@ -355,7 +355,7 @@ cxx_compiler = lambda do |*args| - # Even -O1 causes compilation time & memory usage to skyrocket, - # possibly exponentially, with the number of entries to - # emplace_back() into the vector. -- flags.gsub!(%r{ -O\d+ }, ' -O0 ') -+ flags.gsub!(%r{(^| )-O[^ ]*}, ' -O0') - end - - args = [ |