vlc-git: Add locally a patch pending upstream

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Feb 22 10:58:45 2018 +0100
Changeset:	e15d0c6fe06e0bd30d44e511db9aebc4a5350212

Modified Files:
	vlc-git/Makefile
	vlc-git/distinfo
Added Files:
	vlc-git/patches/patch-configure.ac
	vlc-git/patches/patch-include_vlc__fixups.h

Log Message:
vlc-git: Add locally a patch pending upstream

configure: Improve the detection of POSIX locale features
https://patches.videolan.org/patch/19661/

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e15d0c6fe06e0bd30d44e511db9aebc4a5350212

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 vlc-git/Makefile                            | 18 +++++++--
 vlc-git/distinfo                            |  6 +--
 vlc-git/patches/patch-configure.ac          | 28 ++++++++++++++
 vlc-git/patches/patch-include_vlc__fixups.h | 58 +++++++++++++++++++++++++++++
 4 files changed, 102 insertions(+), 8 deletions(-)

diffs:
diff --git a/vlc-git/Makefile b/vlc-git/Makefile
index 5e5b1f748c..53649f6cfa 100644
--- a/vlc-git/Makefile
+++ b/vlc-git/Makefile
@@ -2,9 +2,13 @@
 
 DISTNAME=		vlc-${VLC_VERSION}
 CATEGORIES=		multimedia
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vlc/}
-MASTER_SITES+=		http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
-EXTRACT_SUFX=		.tar.xz
+GIT_REPOSITORIES=	vlc
+GIT_REPO.vlc=		https://git.videolan.org/git/vlc/vlc-3.0.git
+#MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vlc/}
+#MASTER_SITES+=		http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
+#EXTRACT_SUFX=		.tar.xz
+
+WRKSRC=			${WRKDIR}/${PKGBASE}
 
 VLC_VERSION=		3.0.0
 
@@ -16,7 +20,7 @@ LICENSE=		gnu-gpl-v2
 CONFLICTS=		vlc07-[0-9]* vlc08-[0-9]*
 
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake perl pkg-config
+USE_TOOLS+=		gmake perl pkg-config autoreconf autoconf automake bison autopoint
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
@@ -140,6 +144,12 @@ SUBST_MESSAGE.fnt=	Fixing hardcoded font paths.
 CHECK_WRKREF_SKIP=	lib/libvlccore.a \
 			lib/libvlccore.so*
 
+pre-configure:
+	${RUN} cd ${WRKSRC} && ${SH} ./bootstrap
+
+
+.include "../../wip/mk/git-package.mk"
+
 .include "../../audio/fluidsynth/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
 .include "../../multimedia/libkate/buildlink3.mk"
diff --git a/vlc-git/distinfo b/vlc-git/distinfo
index 9d4ba0031e..c7de729906 100644
--- a/vlc-git/distinfo
+++ b/vlc-git/distinfo
@@ -4,7 +4,5 @@ SHA1 (vlc-3.0.0.tar.xz) = 50610841b060321242793cf6ad3d58759dc5973b
 RMD160 (vlc-3.0.0.tar.xz) = c0ad23fdf03ae5c9524ed05c7bc0d63745587287
 SHA512 (vlc-3.0.0.tar.xz) = 9bdc64e16ddd2e8d2693179f2fcac8462d7defff186262a049ba325ef00882fbd75a9d323b506ba06876a8168fd5e90319837c8dcd136b206161e67748c2a9f7
 Size (vlc-3.0.0.tar.xz) = 25191148 bytes
-SHA1 (patch-compat_Makefile.am) = 8a5f9c82a748542423172a3a32daefd386ae815d
-SHA1 (patch-compat_Makefile.in) = 2f171749c89443d7352a11c3a59cd2a37eb3df0d
-SHA1 (patch-include_vlc__common.h) = eaa22a53ffa93fbd56d070ef2da22beda9516d9b
-SHA1 (patch-include_vlc__fixups.h) = 6b823f6dde367cb0f7e54022c1d5b626067bbed6
+SHA1 (patch-configure.ac) = ff63a901c2ad77f6f926ccf0e94622df2808abbb
+SHA1 (patch-include_vlc__fixups.h) = 4052aea4009bc56e19639b5ad0ad73c5ed5c94f0
diff --git a/vlc-git/patches/patch-configure.ac b/vlc-git/patches/patch-configure.ac
new file mode 100644
index 0000000000..89aec4b817
--- /dev/null
+++ b/vlc-git/patches/patch-configure.ac
@@ -0,0 +1,28 @@
+$NetBSD$
+
+--- configure.ac.orig	2018-02-22 06:29:54.000000000 +0000
++++ configure.ac
+@@ -590,7 +590,7 @@ dnl Check for system libs needed
+ need_libc=false
+ 
+ dnl Check for usual libc functions
+-AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale])
++AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale freelocale newlocale])
+ AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf])
+ AC_REPLACE_FUNCS([gettimeofday])
+ AC_CHECK_FUNC(fdatasync,,
+@@ -852,6 +852,14 @@ AC_CHECK_HEADERS([features.h getopt.h li
+ dnl  MacOS
+ AC_CHECK_HEADERS([xlocale.h])
+ 
++dnl  POSIX
++AC_CHECK_HEADERS([locale.h])
++
++dnl  locale_t in locale.h
++AC_CHECK_TYPE([locale_t],
++  AC_DEFINE([HAVE_LOCALE_T], [1], [locale_t available]),,
++  [#include <locale.h>])
++
+ dnl LP64 and LLP64 architectures had better define ssize_t by themselves...
+ AH_TEMPLATE(ssize_t, [Define to `int' if <stddef.h> does not define.]) dnl ` (fix VIM syntax highlight
+ AC_CHECK_TYPE(ssize_t,, [
diff --git a/vlc-git/patches/patch-include_vlc__fixups.h b/vlc-git/patches/patch-include_vlc__fixups.h
new file mode 100644
index 0000000000..e4bbf1e162
--- /dev/null
+++ b/vlc-git/patches/patch-include_vlc__fixups.h
@@ -0,0 +1,58 @@
+$NetBSD$
+
+--- include/vlc_fixups.h.orig	2018-02-22 06:29:54.000000000 +0000
++++ include/vlc_fixups.h
+@@ -316,24 +316,51 @@ void *aligned_alloc(size_t, size_t);
+ 
+ #if defined(__native_client__) && defined(__cplusplus)
+ # define HAVE_USELOCALE
++# define HAVE_FREELOCALE
++# define HAVE_NEWLOCALE
+ #endif
+ 
+ /* locale.h */
+-#ifndef HAVE_USELOCALE
++#ifdef HAVE_LOCALE_H
++#include <locale.h>
++#endif
++
++#ifndef LC_ALL_MASK
+ #define LC_ALL_MASK      0
++#endif
++
++#ifndef LC_NUMERIC_MASK
+ #define LC_NUMERIC_MASK  0
++#endif
++
++#ifndef LC_MESSAGES_MASK
+ #define LC_MESSAGES_MASK 0
+-#define LC_GLOBAL_LOCALE ((locale_t)(uintptr_t)1)
++#endif
++
++#ifndef HAVE_LOCALE_T
+ typedef void *locale_t;
++#endif
++
++#ifndef LC_GLOBAL_LOCALE
++#define LC_GLOBAL_LOCALE ((locale_t)(uintptr_t)1)
++#endif
++
++#ifndef HAVE_USELOCALE
+ static inline locale_t uselocale(locale_t loc)
+ {
+     (void)loc;
+     return NULL;
+ }
++#endif
++
++#ifndef HAVE_FREELOCALE
+ static inline void freelocale(locale_t loc)
+ {
+     (void)loc;
+ }
++#endif
++
++#ifndef HAVE_NEWLOCALE
+ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
+ {
+     (void)mask; (void)locale; (void)base;