diff options
| author | wiz <wiz@pkgsrc.org> | 2013-06-15 22:57:58 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2013-06-15 22:57:58 +0000 |
| commit | 5d34a9be79c84c3b09a6fcec9e909e4b4f2fba66 (patch) | |
| tree | 1c88f20c7436befb57a873b79e54b74e2045edbc | |
| parent | 7860cc8f144a91bd31c5d88868d2b60369f2e041 (diff) | |
| download | pkgsrc-5d34a9be79c84c3b09a6fcec9e909e4b4f2fba66.tar.gz | |
Merge two patches for the same file.
| -rw-r--r-- | multimedia/vlc/distinfo | 6 | ||||
| -rw-r--r-- | multimedia/vlc/patches/patch-ap | 13 | ||||
| -rw-r--r-- | multimedia/vlc/patches/patch-at | 13 |
3 files changed, 14 insertions, 18 deletions
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo index b774ff7f8a3..1a7308610c0 100644 --- a/multimedia/vlc/distinfo +++ b/multimedia/vlc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.60 2013/04/30 09:23:09 prlw1 Exp $ +$NetBSD: distinfo,v 1.61 2013/06/15 22:57:58 wiz Exp $ SHA1 (vlc-1.1.13.tar.bz2) = 05bbc7ff427f3b919b29a45ce014caff9ba92648 RMD160 (vlc-1.1.13.tar.bz2) = c5aa438a9085ddbf28e849df442b75475693290d @@ -13,11 +13,11 @@ SHA1 (patch-af) = f5aec21c08a09bbfadad398bd57d3627164d1b6f SHA1 (patch-ag) = 5e23bac844429632c0dee0dea4ecbdfb5f8ba2fd SHA1 (patch-ah) = 6d5d5c0e17bd845fad757e75a9e68db698510374 SHA1 (patch-ai) = 328bd66ef6c11275894c74012e7d6fec8fcbd5d3 -SHA1 (patch-ap) = 423b571ca8a1b740812aea021e331912ba34c868 SHA1 (patch-ar) = 153164870e9dc50ad32106d9f8ebd25b35ed3dd3 SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086 -SHA1 (patch-at) = 5761ec0809d2b03511666ae81f7b4ae01b6f5930 +SHA1 (patch-at) = c87d63d438296653bc1bf234452fb48dbb0547e5 SHA1 (patch-au) = 7e1d1e7f2734051fffb988cc4ea01a1a7b264b78 SHA1 (patch-configure.ac) = db79a1e99bf2859eeb2615359db9a30a3eadfb2d SHA1 (patch-include_vlc_fixups.h) = 0e17c6749665b4f95bc13a0aff0bc8af9e942c9d SHA1 (patch-modules_audio__output_pulse.c) = 994389b214f3e2b7b8b7ccaf3bb535a94523f81b +SHA1 (patch-modules_codec_flac.c) = 962783164f505a8b9e5c1be18e162dfdc7917cb3 diff --git a/multimedia/vlc/patches/patch-ap b/multimedia/vlc/patches/patch-ap deleted file mode 100644 index d4ef19d3ff5..00000000000 --- a/multimedia/vlc/patches/patch-ap +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2011/01/24 18:54:04 drochner Exp $ - ---- bin/override.c.orig 2010-08-09 05:29:21.000000000 +0900 -+++ bin/override.c 2011-01-05 00:30:10.000000000 +0900 -@@ -120,7 +120,7 @@ - * - * Some evil libraries modify the environment. We currently ignore the calls as - * they could crash the process. This may cause funny behaviour though. */ --int putenv (char *str) -+int putenv (const char *str) - { - if (override) - { diff --git a/multimedia/vlc/patches/patch-at b/multimedia/vlc/patches/patch-at index 938da885547..4839d439c24 100644 --- a/multimedia/vlc/patches/patch-at +++ b/multimedia/vlc/patches/patch-at @@ -1,6 +1,6 @@ -$NetBSD: patch-at,v 1.1 2011/01/24 18:54:04 drochner Exp $ +$NetBSD: patch-at,v 1.2 2013/06/15 22:57:58 wiz Exp $ ---- bin/override.c.orig 2011-01-24 11:11:26.000000000 +0000 +--- bin/override.c.orig 2013-06-15 22:57:03.000000000 +0000 +++ bin/override.c @@ -27,7 +27,7 @@ @@ -11,3 +11,12 @@ $NetBSD: patch-at,v 1.1 2011/01/24 18:54:04 drochner Exp $ && (defined (__ELF__) && !defined (__sun__)) /* Solaris crashes on printf("%s", NULL); which is legal, but annoying. */ +@@ -120,7 +120,7 @@ static void *getsym (const char *name) + * + * Some evil libraries modify the environment. We currently ignore the calls as + * they could crash the process. This may cause funny behaviour though. */ +-int putenv (char *str) ++int putenv (const char *str) + { + if (override) + { |