Enable the use of built-in atomic ops on mips64.

from Brad (maintainer)
This commit is contained in:
ajacoutot 2015-12-25 07:51:36 +00:00
parent 56e2d44015
commit 9655763532
3 changed files with 10 additions and 7 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.34 2015/08/13 07:35:21 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.35 2015/12/25 07:51:36 ajacoutot Exp $
COMMENT= free H.264/MPEG-4 AVC encoder
V= 20150728
DISTNAME= x264-snapshot-${V}-2245
PKGNAME= x264-${V}
REVISION= 0
CATEGORIES= multimedia
MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/
EXTRACT_SUFX= .tar.bz2

View File

@ -1,13 +1,13 @@
$OpenBSD: patch-common_osdep_h,v 1.3 2015/07/06 21:54:33 ajacoutot Exp $
--- common/osdep.h.orig Sun Jul 5 01:21:16 2015
+++ common/osdep.h Sun Jul 5 01:23:16 2015
$OpenBSD: patch-common_osdep_h,v 1.4 2015/12/25 07:51:37 ajacoutot Exp $
--- common/osdep.h.orig Tue Jul 28 16:45:03 2015
+++ common/osdep.h Wed Dec 23 21:39:40 2015
@@ -234,7 +234,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
+#if defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 0) &&\
+ (ARCH_X86 || ARCH_X86_64 || ARCH_ALPHA || ARCH_PPC || ARCH_SPARC)
+ (ARCH_ALPHA || ARCH_MIPS || ARCH_PPC || ARCH_SPARC || ARCH_X86 || ARCH_X86_64)
return __sync_fetch_and_add( val, add );
#else
x264_pthread_mutex_lock( mutex );

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.15 2015/11/09 06:44:09 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.16 2015/12/25 07:51:37 ajacoutot Exp $
COMMENT= free H.265/HEVC encoder
DISTNAME= x265_1.8+93
PKGNAME= x265-1.8.93
REVISION= 0
CATEGORIES= multimedia
MASTER_SITES= http://comstyle.com/source/
@ -38,7 +39,8 @@ CONFIGURE_ARGS= -DENABLE_TESTS=On
CONFIGURE_ARGS+= -DCMAKE_ASM_YASM_FLAGS_DEBUG="-g dwarf2"
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \
${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "mips64" || \
${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "powerpc" || \
${MACHINE_ARCH} == "sparc64"
CONFIGURE_ARGS+= -DNO_ATOMICS=Off
.else