head	1.3;
access;
symbols
	pkgsrc-2015Q3:1.2.0.18
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.16
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.14
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.12
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.10
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.8
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.6
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.4
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.2
	pkgsrc-2013Q3-base:1.2;
locks; strict;
comment	@# @;


1.3
date	2015.10.25.10.53.18;	author wiz;	state dead;
branches;
next	1.2;
commitid	lsG7QXEk8Q3RKtGy;

1.2
date	2013.08.23.12.45.50;	author drochner;	state Exp;
branches;
next	1.1;
commitid	VmO8GytR2GxzRz2x;

1.1
date	2013.07.22.15.01.33;	author drochner;	state Exp;
branches;
next	;
commitid	r13fPy3eJLc7EtYw;


desc
@@


1.3
log
@Finish move of vlc2 to vlc20.
@
text
@$NetBSD: patch-ca,v 1.2 2013/08/23 12:45:50 drochner Exp $

on NetBSD-current, just define "uselocale", nothing else
fixes build

--- include/vlc_fixups.h.orig	2013-08-23 11:39:38.000000000 +0000
+++ include/vlc_fixups.h
@@@@ -210,14 +210,26 @@@@ int unsetenv (const char *);
 
 /* locale.h */
 #ifndef HAVE_USELOCALE
+#ifdef __NetBSD__
+#include <sys/param.h>
+#if __NetBSD_Version__ >= 699002300
+/* NetBSD-current has locale_t but no uselocale */
+#define NetBSD_LOCALE_HACK
+#endif
+#endif
+#ifdef NetBSD_LOCALE_HACK
+#include <locale.h>
+#else
 #define LC_NUMERIC_MASK  0
 #define LC_MESSAGES_MASK 0
 typedef void *locale_t;
+#endif
 static inline locale_t uselocale(locale_t loc)
 {
     (void)loc;
     return NULL;
 }
+#ifndef NetBSD_LOCALE_HACK
 static inline void freelocale(locale_t loc)
 {
     (void)loc;
@@@@ -228,6 +240,7 @@@@ static inline locale_t newlocale(int mas
     return NULL;
 }
 #endif
+#endif
 
 /* Alignment of critical static data structures */
 #ifdef ATTRIBUTE_ALIGNED_MAX
@


1.2
log
@update to 2.0.8
from the announcement:
2.0.8 is a small update that fixes some regressions of the 2.0.x branch
of VLC. 2.0.8 fixes numerous crashes and dangerous behaviors.
2.0.8 also fixes ISDB-S tunning and some OSX issues.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@update to 2.0.7
changes:
-bugfixes
-translation updates
@
text
@d3 2
a4 2
if !HAVE_USELOCALE, just define "uselocale", nothing else
fixes build on NetBSD
d6 1
a6 1
--- include/vlc_fixups.h.orig	2013-06-29 12:47:02.000000000 +0000
d8 1
a8 1
@@@@ -210,23 +210,12 @@@@ int unsetenv (const char *);
d12 8
a19 3
-#define LC_NUMERIC_MASK  0
-#define LC_MESSAGES_MASK 0
-typedef void *locale_t;
d21 5
d31 7
a37 9
-static inline void freelocale(locale_t loc)
-{
-    (void)loc;
-}
-static inline locale_t newlocale(int mask, const char * locale, locale_t base)
-{
-    (void)mask; (void)locale; (void)base;
-    return NULL;
-}
d39 1
d42 1
@