cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only use __builtin_parity on x86; should unbreak alpha, powerpc, sparc64.

Browse Source 
from Brad (maintainer)
This commit is contained in:
ajacoutot 2015-12-22 06:46:54 +00:00
parent 0986de7918
commit bfe8ca3dbb
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/vlc/Makefile
View File

@ -1,8 +1,4 @@
# $OpenBSD: Makefile,v 1.198 2015/12/02 12:46:15 jca Exp $
BROKEN-alpha= undefined reference to __builtin_parity
BROKEN-powerpc= undefined reference to __builtin_parity
BROKEN-sparc64= undefined reference to __builtin_parity
# $OpenBSD: Makefile,v 1.199 2015/12/22 06:46:54 ajacoutot Exp $
SHARED_ONLY= Yes
@ -13,7 +9,7 @@ V= 2.2.1
DISTNAME= vlc-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-jack= vlc-jack-${V}
REVISION-main= 3
REVISION-main= 4
CATEGORIES= x11
MASTER_SITES= https://download.videolan.org/pub/videolan/vlc/${V}/
EXTRACT_SUFX= .tar.xz

12
x11/vlc/patches/patch-include_vlc_common_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-include_vlc_common_h,v 1.5 2015/12/22 06:46:54 ajacoutot Exp $
--- include/vlc_common.h.orig Mon Dec 21 20:46:19 2015
+++ include/vlc_common.h Mon Dec 21 20:51:06 2015
@@ -561,7 +561,7 @@ static inline unsigned popcount (unsigned x)
VLC_USED
static inline unsigned parity (unsigned x)
{
-#if VLC_GCC_VERSION(3,4)
+#if VLC_GCC_VERSION(3,4) && (defined(__amd64__) || defined(__i386__))
return __builtin_parity (x);
#else
for (unsigned i = 4 * sizeof (x); i > 0; i /= 2)