summaryrefslogtreecommitdiff
path: root/multimedia/vlc
diff options
context:
space:
mode:
authorprlw1 <prlw1@pkgsrc.org>2013-04-29 22:53:56 +0000
committerprlw1 <prlw1@pkgsrc.org>2013-04-29 22:53:56 +0000
commit64539b12870a67b66a3840044afd6f8664605872 (patch)
tree25fa2bc0de6395f74a5648a11eba6f4182ddc23e /multimedia/vlc
parent915bb68ead935b22c58d7b4b9af9fe847a5d655a (diff)
downloadpkgsrc-64539b12870a67b66a3840044afd6f8664605872.tar.gz
Fix vlc build to cope with locale changes.
Diffstat (limited to 'multimedia/vlc')
-rw-r--r--multimedia/vlc/distinfo5
-rw-r--r--multimedia/vlc/patches/patch-configure.ac14
-rw-r--r--multimedia/vlc/patches/patch-include_vlc_fixups.h19
3 files changed, 34 insertions, 4 deletions
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index ecd7a673600..b58cbbd449f 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.57 2013/02/05 18:53:34 drochner Exp $
+$NetBSD: distinfo,v 1.58 2013/04/29 22:53:56 prlw1 Exp $
SHA1 (vlc-1.1.13.tar.bz2) = 05bbc7ff427f3b919b29a45ce014caff9ba92648
RMD160 (vlc-1.1.13.tar.bz2) = c5aa438a9085ddbf28e849df442b75475693290d
@@ -18,5 +18,6 @@ SHA1 (patch-ar) = 153164870e9dc50ad32106d9f8ebd25b35ed3dd3
SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086
SHA1 (patch-at) = 5761ec0809d2b03511666ae81f7b4ae01b6f5930
SHA1 (patch-au) = 7e1d1e7f2734051fffb988cc4ea01a1a7b264b78
-SHA1 (patch-configure.ac) = db79a1e99bf2859eeb2615359db9a30a3eadfb2d
+SHA1 (patch-configure.ac) = 07e1ccae490028170be79577813089b5db0ea7dd
+SHA1 (patch-include_vlc_fixups.h) = 7a2c1d118db7ffc35faa8471598555caf28471f4
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 3bc2cb49bdf..d7825b087fb 100644
--- a/multimedia/vlc/patches/patch-configure.ac
+++ b/multimedia/vlc/patches/patch-configure.ac
@@ -1,6 +1,7 @@
-$NetBSD: patch-configure.ac,v 1.1 2013/01/22 11:46:38 wiz Exp $
+$NetBSD: patch-configure.ac,v 1.2 2013/04/29 22:53:57 prlw1 Exp $
-automake-1.13 compat.
+- automake-1.13 compat
+- fix build
--- configure.ac.orig 2011-12-20 15:24:09.000000000 +0000
+++ configure.ac
@@ -13,3 +14,12 @@ automake-1.13 compat.
# 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
new file mode 100644
index 00000000000..ea2da832483
--- /dev/null
+++ b/multimedia/vlc/patches/patch-include_vlc_fixups.h
@@ -0,0 +1,19 @@
+$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;