diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-12-03 12:15:03 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-12-03 12:15:03 +0000 |
| commit | 778b00d18ee37766e985aec0b90f38e632979b30 (patch) | |
| tree | 444bf62824412eb138bf3aa75c29d4b2efeb7f2c /multimedia | |
| parent | d8d1e69fc83a8879c4fd007381d5741730923bfe (diff) | |
| download | pkgsrc-778b00d18ee37766e985aec0b90f38e632979b30.tar.gz | |
mkvtoolnix: Fix runtime crash on SunOS. Bump PKGREVISION.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mkvtoolnix/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/mkvtoolnix/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/mkvtoolnix/patches/patch-src_common_locale.cpp | 20 |
3 files changed, 24 insertions, 2 deletions
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index d38b051e596..b9a7d52f9d2 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.119 2018/12/02 17:13:41 adam Exp $ +# $NetBSD: Makefile,v 1.120 2018/12/03 12:15:03 jperkin Exp $ DISTNAME= mkvtoolnix-29.0.0 +PKGREVISION= 1 CATEGORIES= multimedia MASTER_SITES= https://mkvtoolnix.download/sources/ EXTRACT_SUFX= .tar.xz diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo index ce7ba7be9ea..7a3294149ce 100644 --- a/multimedia/mkvtoolnix/distinfo +++ b/multimedia/mkvtoolnix/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.57 2018/12/02 17:13:41 adam Exp $ +$NetBSD: distinfo,v 1.58 2018/12/03 12:15:03 jperkin Exp $ SHA1 (mkvtoolnix-29.0.0.tar.xz) = c794cc9e37dc24207051c21eb8e7f4a2deef7cb6 RMD160 (mkvtoolnix-29.0.0.tar.xz) = 174006d8e7aab417335c60bd168dc8698842689c @@ -6,3 +6,4 @@ SHA512 (mkvtoolnix-29.0.0.tar.xz) = bfb5e31fdd43dbb1c3a54a9b82af414abd43f8edad1c Size (mkvtoolnix-29.0.0.tar.xz) = 7051380 bytes SHA1 (patch-Rakefile) = bac8a1e581725e329079ab0acccd83795d707594 SHA1 (patch-build-config.in) = a9072de691ee3e011b472280dd276a67f1799fac +SHA1 (patch-src_common_locale.cpp) = 46ba293fb0dee8af0e6e6fbe17c725a509101109 diff --git a/multimedia/mkvtoolnix/patches/patch-src_common_locale.cpp b/multimedia/mkvtoolnix/patches/patch-src_common_locale.cpp new file mode 100644 index 00000000000..eb12d063b53 --- /dev/null +++ b/multimedia/mkvtoolnix/patches/patch-src_common_locale.cpp @@ -0,0 +1,20 @@ +$NetBSD: patch-src_common_locale.cpp,v 1.1 2018/12/03 12:15:03 jperkin Exp $ + +Remove broken SunOS section that is no longer needed. +https://gitlab.com/mbunkus/mkvtoolnix/issues/2450 + +--- src/common/locale.cpp.orig 2018-12-01 11:15:36.000000000 +0000 ++++ src/common/locale.cpp +@@ -292,12 +292,6 @@ get_local_charset() { + setlocale(LC_CTYPE, ""); + #if defined(COMP_MINGW) || defined(COMP_MSC) + lc_charset = "CP" + to_string(GetACP()); +-#elif defined(SYS_SOLARIS) +- int i; +- +- lc_charset = nl_langinfo(CODESET); +- if (parse_number(lc_charset, i)) +- lc_charset = "ISO"s + lc_charset + "-US"s; + #elif HAVE_NL_LANGINFO + lc_charset = nl_langinfo(CODESET); + #elif HAVE_LOCALE_CHARSET |