summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2019-01-13 07:28:48 +0100
committerAvatar Timo Gurr <tgurr@exherbo.org> 2019-01-13 07:28:48 +0100
commit7e31992e76330b292ef88342457809eecef31b31 (patch)
treefeb900da843bb199f26b3d7417e49ebdf31c9ab1
parenta78261920bdf165559651d7a485464101e891792 (diff)
downloadmedia-7e31992e76330b292ef88342457809eecef31b31.tar.gz
media-7e31992e76330b292ef88342457809eecef31b31.tar.xz
mkvtoolnix: version bump to 30.1.0
-rw-r--r--packages/media-video/mkvtoolnix/files/2d7d27f50442178cffe7f5495aecee2091f6bf48.patch29
-rw-r--r--packages/media-video/mkvtoolnix/mkvtoolnix-30.1.0.exheres-0 (renamed from packages/media-video/mkvtoolnix/mkvtoolnix-30.0.0.exheres-0)4
2 files changed, 0 insertions, 33 deletions
diff --git a/packages/media-video/mkvtoolnix/files/2d7d27f50442178cffe7f5495aecee2091f6bf48.patch b/packages/media-video/mkvtoolnix/files/2d7d27f50442178cffe7f5495aecee2091f6bf48.patch
deleted file mode 100644
index 6fac0bf..0000000
--- a/packages/media-video/mkvtoolnix/files/2d7d27f50442178cffe7f5495aecee2091f6bf48.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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-30.0.0.exheres-0 b/packages/media-video/mkvtoolnix/mkvtoolnix-30.1.0.exheres-0
index 3f7cba0..6a11291 100644
--- a/packages/media-video/mkvtoolnix/mkvtoolnix-30.0.0.exheres-0
+++ b/packages/media-video/mkvtoolnix/mkvtoolnix-30.1.0.exheres-0
@@ -6,7 +6,3 @@ require mkvtoolnix
PLATFORMS="~amd64 ~x86"
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/2d7d27f50442178cffe7f5495aecee2091f6bf48.patch
-)
-