pkgsrc-WIP-changes archive

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

vlc-git: Handle systemwide popcount(3) and popcountll(3)



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Feb 23 22:16:31 2018 +0100
Changeset:	298f53d235455f8e4dcb15206774da377502c902

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

Log Message:
vlc-git: Handle systemwide popcount(3) and popcountll(3)

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

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          | 13 ++++++++++++
 vlc-git/patches/patch-include_vlc__common.h | 31 +++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+)

diffs:
diff --git a/vlc-git/distinfo b/vlc-git/distinfo
index 9f745ef1a4..3906ba4f88 100644
--- a/vlc-git/distinfo
+++ b/vlc-git/distinfo
@@ -4,3 +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-configure.ac) = acc8f8dece735d6e8c44f030e8e6a1552a4c9815
+SHA1 (patch-include_vlc__common.h) = 4f6cc8ba28fa46e82d371c1567be6217c2cbc77b
diff --git a/vlc-git/patches/patch-configure.ac b/vlc-git/patches/patch-configure.ac
new file mode 100644
index 0000000000..ad5e007062
--- /dev/null
+++ b/vlc-git/patches/patch-configure.ac
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- configure.ac.orig	2018-02-23 21:03:32.884950743 +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,,
diff --git a/vlc-git/patches/patch-include_vlc__common.h b/vlc-git/patches/patch-include_vlc__common.h
new file mode 100644
index 0000000000..c5f0763669
--- /dev/null
+++ b/vlc-git/patches/patch-include_vlc__common.h
@@ -0,0 +1,31 @@
+$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)


Home | Main Index | Thread Index | Old Index