diff options
| author |   Andrew Savchenko <bircoph@gentoo.org> | 2021-05-23 10:16:28 +0300 |
|---|---|---|
| committer | Andrew Savchenko <bircoph@gentoo.org> | 2021-05-23 10:23:09 +0300 |
| commit | bae380256f345d9a79a0941b6259b8fb700fbf5e (patch) | |
| tree | 9f3deb2b936910aad7df074c9a62451d6ab6b9e7 /media-video/mkvtoolnix | |
| parent | app-mobilephone/gnokii: remove my_bool usage (diff) | |
| download | gentoo-bae380256f345d9a79a0941b6259b8fb700fbf5e.tar.gz gentoo-bae380256f345d9a79a0941b6259b8fb700fbf5e.tar.bz2 gentoo-bae380256f345d9a79a0941b6259b8fb700fbf5e.zip | |
media-video/mkvtoolnix: fix OOM during build
Apply upstream patch[1] to drop iso639_language_list.cpp
optimization level to 0 due to special nature of this source file.
[1] https://gitlab.com/mbunkus/mkvtoolnix/-
/commit/ba6db89e24aa84316372d59e6bba4ac88145b32a
Closes: https://bugs.gentoo.org/786978
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Diffstat (limited to 'media-video/mkvtoolnix')
| -rw-r--r-- | media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch | 15 | ||||
| -rw-r--r-- | media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild | 3 |
2 files changed, 17 insertions, 1 deletions
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch b/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch new file mode 100644 index 000000000000..c0f91deed696 --- /dev/null +++ b/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch @@ -0,0 +1,15 @@ +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 = [ diff --git a/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild index c093e341ab9e..dbc45d73af89 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild @@ -64,7 +64,8 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch ) +PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch + "${FILESDIR}"/mkvtoolnix-56.1.0-optlevel.patch ) src_prepare() { xdg_src_prepare |