summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2019-01-05 15:06:15 +0100
committerAvatar Timo Gurr <tgurr@exherbo.org> 2019-01-05 15:46:59 +0100
commitf0279a6b2cdcad72be3587527d1e809b4db52f37 (patch)
tree04491ebb28a763d4a573a8ecfb998b97502c817c
parent6a00c6b9762045928df3676d099dab80224fbcbf (diff)
downloadmedia-f0279a6b2cdcad72be3587527d1e809b4db52f37.tar.gz
media-f0279a6b2cdcad72be3587527d1e809b4db52f37.tar.xz
mkvtoolnix: version bump to 30.0.0
-rw-r--r--packages/media-video/mkvtoolnix/files/2d7d27f50442178cffe7f5495aecee2091f6bf48.patch29
-rw-r--r--packages/media-video/mkvtoolnix/mkvtoolnix-30.0.0.exheres-0 (renamed from packages/media-video/mkvtoolnix/mkvtoolnix-29.0.0.exheres-0)4
2 files changed, 33 insertions, 0 deletions
diff --git a/packages/media-video/mkvtoolnix/files/2d7d27f50442178cffe7f5495aecee2091f6bf48.patch b/packages/media-video/mkvtoolnix/files/2d7d27f50442178cffe7f5495aecee2091f6bf48.patch
new file mode 100644
index 0000000..6fac0bf
--- /dev/null
+++ b/packages/media-video/mkvtoolnix/files/2d7d27f50442178cffe7f5495aecee2091f6bf48.patch
@@ -0,0 +1,29 @@
+Source/Upstream: Yes, fixed in git master
+Reason: Fix FTBFS
+
+From 2d7d27f50442178cffe7f5495aecee2091f6bf48 Mon Sep 17 00:00:00 2001
+From: Moritz Bunkus <moritz@bunkus.org>
+Date: Sat, 5 Jan 2019 15:10:14 +0100
+Subject: [PATCH] build system: fix building with non-UTF-8 locales
+
+Fixes #2474.
+---
+ rake.d/po.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rake.d/po.rb b/rake.d/po.rb
+index 5bf72557e..d64da2902 100644
+--- a/rake.d/po.rb
++++ b/rake.d/po.rb
+@@ -43,7 +43,7 @@ def read_po file_name
+
+ IO.readlines(file_name).each do |line|
+ line_no += 1
+- line.chomp!
++ line = line.force_encoding("UTF-8").chomp
+
+ if !line.empty? && !started
+ items.last[:line] = line_no
+--
+2.18.1
+
diff --git a/packages/media-video/mkvtoolnix/mkvtoolnix-29.0.0.exheres-0 b/packages/media-video/mkvtoolnix/mkvtoolnix-30.0.0.exheres-0
index 6a11291..3f7cba0 100644
--- a/packages/media-video/mkvtoolnix/mkvtoolnix-29.0.0.exheres-0
+++ b/packages/media-video/mkvtoolnix/mkvtoolnix-30.0.0.exheres-0
@@ -6,3 +6,7 @@ require mkvtoolnix
PLATFORMS="~amd64 ~x86"
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/2d7d27f50442178cffe7f5495aecee2091f6bf48.patch
+)
+