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

Use atomic ops on aarch64.

Browse Source 
from Brad (maintainer)
This commit is contained in:
ajacoutot 2017-03-01 08:53:46 +00:00
parent 0d2d4cbfb7
commit 079f9042e5
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
multimedia/x264/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.40 2017/01/26 03:16:57 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.41 2017/03/01 08:53:46 ajacoutot Exp $
COMMENT= free H.264/MPEG-4 AVC encoder
@ -8,6 +8,7 @@ PKGNAME= x264-${V}
CATEGORIES= multimedia
MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/
EXTRACT_SUFX= .tar.bz2
REVISION= 0
SHARED_LIBS= x264 17.0

11
multimedia/x264/patches/patch-common_osdep_h
View File

@ -1,16 +1,17 @@
$OpenBSD: patch-common_osdep_h,v 1.8 2017/01/26 03:16:57 ajacoutot Exp $
$OpenBSD: patch-common_osdep_h,v 1.9 2017/03/01 08:53:46 ajacoutot Exp $
Enable the use of __sync_fetch_and_add() on alpha, mips64, powerpc and sparc64.
Enable the use of __sync_fetch_and_add() on aarch64, alpha, mips64, powerpc
and sparc64.
--- common/osdep.h.orig Wed Jan 25 16:45:03 2017
+++ common/osdep.h Wed Jan 25 20:05:15 2017
+++ common/osdep.h Tue Feb 28 13:34:03 2017
@@ -252,7 +252,8 @@ int x264_threading_init( void );
static ALWAYS_INLINE int x264_pthread_fetch_and_add( int *val, int add, x264_pthread_mutex_t *mutex )
{
#if HAVE_THREAD
-#if defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 0) && (ARCH_X86 || ARCH_X86_64)
+#if defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 0) &&\
+ (ARCH_ALPHA || ARCH_MIPS || ARCH_PPC || ARCH_SPARC64 || ARCH_X86 || ARCH_X86_64)
+#if defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 0) && \
+ (ARCH_AARCH64 || ARCH_ALPHA || ARCH_MIPS || ARCH_PPC || ARCH_SPARC64 || ARCH_X86 || ARCH_X86_64)
return __sync_fetch_and_add( val, add );
#else
x264_pthread_mutex_lock( mutex );

11
multimedia/x265/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2017/02/18 22:56:12 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.24 2017/03/01 08:53:46 ajacoutot Exp $
COMMENT= free H.265/HEVC encoder
@ -7,6 +7,7 @@ DISTNAME= x265_${VER}
PKGNAME= x265-${VER}
CATEGORIES= multimedia
MASTER_SITES= https://ftp.videolan.org/pub/videolan/x265/
REVISION= 0
SHARED_LIBS= x265 10.0
@ -39,10 +40,10 @@ NO_TEST= Yes
CONFIGURE_ARGS+= -DCMAKE_ASM_YASM_FLAGS_DEBUG="-g dwarf2"
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \
${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "mips64" || \
${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "powerpc" || \
${MACHINE_ARCH} == "sparc64"
.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "alpha" || \
${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el" || \
${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
CONFIGURE_ARGS+= -DNO_ATOMICS=Off
.else
CONFIGURE_ARGS+= -DNO_ATOMICS=On