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:		Mon Mar 5 11:46:58 2018 +0100
Changeset:	2a4efe9e16c2c8f1dd52dc6379a0d644b257315a

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

Log Message:
vlc-git: Drop local patches

No longer apply.
Patches accepted upstream.

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

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          | 57 -------------------------
 vlc-git/patches/patch-include_vlc__common.h | 66 -----------------------------
 3 files changed, 125 deletions(-)

diffs:
diff --git a/vlc-git/distinfo b/vlc-git/distinfo
index 848b1ffcbd..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) = b13af8a11e10653263c1c9855737964625d4e3a5
-SHA1 (patch-include_vlc__common.h) = c15dca0f41ecf7dfcdc6abe6244ad66ad48a2346
diff --git a/vlc-git/patches/patch-configure.ac b/vlc-git/patches/patch-configure.ac
deleted file mode 100644
index 9b94325db5..0000000000
--- a/vlc-git/patches/patch-configure.ac
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD$
-
---- configure.ac.orig	2018-02-23 21:03:32.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 newlocale 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 newlocale open_memstream openat pipe2 pread popcount popcountll posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale])
- 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,43 @@ AC_CHECK_HEADERS([features.h getopt.h li
- dnl  MacOS
- AC_CHECK_HEADERS([xlocale.h])
- 
-+dnl  byte swap
-+AC_MSG_CHECKING([bswap16])
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-+#include <sys/types.h>
-+#include <stdint.h>]], [
-+uint16_t A = bswap16(1);
-+])], [
-+  AC_MSG_RESULT([yes])
-+  AC_DEFINE([HAVE_BSWAP16], [1], [Define to 1 if you have the `bswap16` function.])
-+], [
-+  AC_MSG_RESULT([no])
-+])
-+
-+AC_MSG_CHECKING([bswap32])
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-+#include <sys/types.h>
-+#include <stdint.h>]], [
-+uint32_t A = bswap32(1);
-+])], [
-+  AC_MSG_RESULT([yes])
-+  AC_DEFINE([HAVE_BSWAP32], [1], [Define to 1 if you have the `bswap32` function.])
-+], [
-+  AC_MSG_RESULT([no])
-+])
-+
-+AC_MSG_CHECKING([bswap64])
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-+#include <sys/types.h>
-+#include <stdint.h>]], [
-+uint64_t A = bswap64(1);
-+])], [
-+  AC_MSG_RESULT([yes])
-+  AC_DEFINE([HAVE_BSWAP64], [1], [Define to 1 if you have the `bswap64` function.])
-+], [
-+  AC_MSG_RESULT([no])
-+])
-+
- 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__common.h b/vlc-git/patches/patch-include_vlc__common.h
deleted file mode 100644
index 5df7ab9108..0000000000
--- a/vlc-git/patches/patch-include_vlc__common.h
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD$
-
---- include/vlc_common.h.orig	2018-02-22 06:29:54.000000000 +0000
-+++ include/vlc_common.h
-@@ -556,6 +556,8 @@ static inline unsigned (ctz)(unsigned x)
- #endif
- }
- 
-+
-+#ifndef HAVE_POPCOUNT
- /** Bit weight */
- VLC_USED
- static inline unsigned (popcount)(unsigned x)
-@@ -572,7 +574,9 @@ static inline unsigned (popcount)(unsign
-     return count;
- #endif
- }
-+#endif
- 
-+#ifndef HAVE_POPCOUNTLL
- /** Bit weight of long long */
- VLC_USED
- static inline int (popcountll)(unsigned long long x)
-@@ -589,6 +593,7 @@ static inline int (popcountll)(unsigned 
-     return count;
- #endif
- }
-+#endif
- 
- VLC_USED
- static inline unsigned (parity)(unsigned x)
-@@ -602,13 +607,16 @@ static inline unsigned (parity)(unsigned
- #endif
- }
- 
-+#ifndef HAVE_BSWAP16
- /** Byte swap (16 bits) */
- VLC_USED
- static inline uint16_t (bswap16)(uint16_t x)
- {
-     return (x << 8) | (x >> 8);
- }
-+#endif
- 
-+#ifndef HAVE_BSWAP32
- /** Byte swap (32 bits) */
- VLC_USED
- static inline uint32_t (bswap32)(uint32_t x)
-@@ -622,7 +630,9 @@ static inline uint32_t (bswap32)(uint32_
-          | ((x & 0xFF000000) >> 24);
- #endif
- }
-+#endif
- 
-+#ifndef HAVE_BSWAP64
- /** Byte swap (64 bits) */
- VLC_USED
- static inline uint64_t (bswap64)(uint64_t x)
-@@ -649,6 +659,7 @@ static inline uint64_t (bswap64)(uint64_
-          | ((x & 0xFF00000000000000ULL) >> 56);
- #endif
- }
-+#endif
- 
- /* Integer overflow */
- static inline bool uadd_overflow(unsigned a, unsigned b, unsigned *res)


Home | Main Index | Thread Index | Old Index