diff options
| author | prlw1 <prlw1@pkgsrc.org> | 2013-04-30 08:42:21 +0000 |
|---|---|---|
| committer | prlw1 <prlw1@pkgsrc.org> | 2013-04-30 08:42:21 +0000 |
| commit | 69b27190d33ad4ed2aba0a8cc967ca467bab799a (patch) | |
| tree | 23e8da9e8241e45db1ea745d38f77d6515c0764c /multimedia | |
| parent | b27ff79f6d3a83248b4c3be2bd34284c992e36c5 (diff) | |
| download | pkgsrc-69b27190d33ad4ed2aba0a8cc967ca467bab799a.tar.gz | |
Revert previous
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/vlc/distinfo | 5 | ||||
| -rw-r--r-- | multimedia/vlc/patches/patch-configure.ac | 14 | ||||
| -rw-r--r-- | multimedia/vlc/patches/patch-include_vlc_fixups.h | 19 |
3 files changed, 4 insertions, 34 deletions
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo index b58cbbd449f..a79971d431e 100644 --- a/multimedia/vlc/distinfo +++ b/multimedia/vlc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.58 2013/04/29 22:53:56 prlw1 Exp $ +$NetBSD: distinfo,v 1.59 2013/04/30 08:42:21 prlw1 Exp $ SHA1 (vlc-1.1.13.tar.bz2) = 05bbc7ff427f3b919b29a45ce014caff9ba92648 RMD160 (vlc-1.1.13.tar.bz2) = c5aa438a9085ddbf28e849df442b75475693290d @@ -18,6 +18,5 @@ SHA1 (patch-ar) = 153164870e9dc50ad32106d9f8ebd25b35ed3dd3 SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086 SHA1 (patch-at) = 5761ec0809d2b03511666ae81f7b4ae01b6f5930 SHA1 (patch-au) = 7e1d1e7f2734051fffb988cc4ea01a1a7b264b78 -SHA1 (patch-configure.ac) = 07e1ccae490028170be79577813089b5db0ea7dd -SHA1 (patch-include_vlc_fixups.h) = 7a2c1d118db7ffc35faa8471598555caf28471f4 +SHA1 (patch-configure.ac) = db79a1e99bf2859eeb2615359db9a30a3eadfb2d SHA1 (patch-modules_audio__output_pulse.c) = 994389b214f3e2b7b8b7ccaf3bb535a94523f81b diff --git a/multimedia/vlc/patches/patch-configure.ac b/multimedia/vlc/patches/patch-configure.ac index d7825b087fb..a0d6d53e53b 100644 --- a/multimedia/vlc/patches/patch-configure.ac +++ b/multimedia/vlc/patches/patch-configure.ac @@ -1,7 +1,6 @@ -$NetBSD: patch-configure.ac,v 1.2 2013/04/29 22:53:57 prlw1 Exp $ +$NetBSD: patch-configure.ac,v 1.3 2013/04/30 08:42:22 prlw1 Exp $ -- automake-1.13 compat -- fix build +automake-1.13 compat. --- configure.ac.orig 2011-12-20 15:24:09.000000000 +0000 +++ configure.ac @@ -14,12 +13,3 @@ $NetBSD: patch-configure.ac,v 1.2 2013/04/29 22:53:57 prlw1 Exp $ # Disable with "./configure --disable-silent-rules" or "make V=1" m4_ifdef([AM_SILENT_RULES], [ -@@ -854,6 +854,8 @@ AC_CHECK_TYPE(ssize_t,, [ - AC_DEFINE(ssize_t, int) - ]) - -+AC_CHECK_TYPES([locale_t],,,[#include <locale.h>]) -+ - dnl Check for poll - AC_SEARCH_LIBS(poll, [poll], [AC_DEFINE(HAVE_POLL, 1, [Define to 1 if the OS is usabl... err, has poll().])], [ - if test ${SYS} != "mingw32" -a ${SYS} != "mingwce" diff --git a/multimedia/vlc/patches/patch-include_vlc_fixups.h b/multimedia/vlc/patches/patch-include_vlc_fixups.h deleted file mode 100644 index ea2da832483..00000000000 --- a/multimedia/vlc/patches/patch-include_vlc_fixups.h +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-include_vlc_fixups.h,v 1.1 2013/04/29 22:53:57 prlw1 Exp $ - -build fix - ---- include/vlc_fixups.h.orig 2011-07-12 18:11:23.000000000 +0000 -+++ include/vlc_fixups.h -@@ -180,7 +180,12 @@ static inline char *getenv (const char * - #ifndef HAVE_USELOCALE - #define LC_NUMERIC_MASK 0 - #define LC_MESSAGES_MASK 0 -+#ifdef HAVE_LOCALE_H -+#include <locale.h> -+#endif -+#ifndef HAVE_LOCALE_T - typedef void *locale_t; -+#endif - static inline locale_t uselocale(locale_t loc) - { - (void)loc; |