pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

vlc-git: Drop local patches



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Feb 23 21:58:53 2018 +0100
Changeset:	66150a15500f0857d1a7f3e0d046d9cb51f780a4

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

Log Message:
vlc-git: Drop local patches

Patch applied upstream (modified by upstream):

From 192c77e42d5b4151f1ea884882ead50056f3e28b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi%remlab.net@localhost>
Date: Thu, 22 Feb 2018 21:51:05 +0200
Subject: [PATCH] configure: test for newlocale() separate from uselocale()

As NetBSD only implements a barely sensical subset of the locale_t API.

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

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

diffstat:
 vlc-git/distinfo                            |  2 -
 vlc-git/patches/patch-configure.ac          | 28 --------------
 vlc-git/patches/patch-include_vlc__fixups.h | 58 -----------------------------
 3 files changed, 88 deletions(-)

diffs:
diff --git a/vlc-git/distinfo b/vlc-git/distinfo
index c7de729906..9f745ef1a4 100644
--- a/vlc-git/distinfo
+++ b/vlc-git/distinfo
@@ -4,5 +4,3 @@ 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-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
deleted file mode 100644
index 89aec4b817..0000000000
--- a/vlc-git/patches/patch-configure.ac
+++ /dev/null
@@ -1,28 +0,0 @@
-$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
deleted file mode 100644
index e4bbf1e162..0000000000
--- a/vlc-git/patches/patch-include_vlc__fixups.h
+++ /dev/null
@@ -1,58 +0,0 @@
-$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;


Home | Main Index | Thread Index | Old Index