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

Update to x264-20160930.

Browse Source
This commit is contained in:
ajacoutot 2016-10-03 08:04:37 +00:00
parent eb91596e0c
commit 40e26390e0
4 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
multimedia/x264/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.38 2016/05/09 06:09:09 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.39 2016/10/03 08:04:37 ajacoutot Exp $
COMMENT= free H.264/MPEG-4 AVC encoder
V= 20160508
V= 20160930
DISTNAME= x264-snapshot-${V}-2245
PKGNAME= x264-${V}
CATEGORIES= multimedia

4
multimedia/x264/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (x264-snapshot-20160508-2245.tar.bz2) = GwIu+uAAQKT/Q9TDiT8gFIQ0O+AVjlo8JK7LJElD+HY=
SIZE (x264-snapshot-20160508-2245.tar.bz2) = 730078
SHA256 (x264-snapshot-20160930-2245.tar.bz2) = CeJLCXEats5Dxv8yti8OeNTPlLAcbKYwI4MLEHKA2Oc=
SIZE (x264-snapshot-20160930-2245.tar.bz2) = 732934

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

@ -1,11 +1,14 @@
$OpenBSD: patch-common_osdep_h,v 1.6 2016/05/09 06:09:09 ajacoutot Exp $
--- common/osdep.h.orig Sun May 8 16:45:04 2016
+++ common/osdep.h Sun May 8 21:27:57 2016
$OpenBSD: patch-common_osdep_h,v 1.7 2016/10/03 08:04:37 ajacoutot Exp $
Enable the use of __sync_fetch_and_add() on alpha, mips64, powerpc and sparc64.
--- common/osdep.h.orig Fri Sep 30 16:45:03 2016
+++ common/osdep.h Sat Oct 1 16:25:09 2016
@@ -249,7 +249,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)
+#if defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 0) &&\
+ (ARCH_ALPHA || ARCH_MIPS || ARCH_PPC || ARCH_SPARC64 || ARCH_X86 || ARCH_X86_64)
return __sync_fetch_and_add( val, add );

25
multimedia/x264/patches/patch-configure
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-configure,v 1.20 2016/05/09 06:09:09 ajacoutot Exp $
--- configure.orig Sun May 8 16:45:04 2016
+++ configure Sun May 8 21:29:24 2016
$OpenBSD: patch-configure,v 1.21 2016/10/03 08:04:37 ajacoutot Exp $
--- configure.orig Fri Sep 30 16:45:03 2016
+++ configure Sat Oct 1 16:23:52 2016
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
cat <<EOF
@@ -1164,10 +1164,6 @@ if [ "$pic" = "yes" ] ; then
@@ -1180,10 +1180,6 @@ if [ "$pic" = "yes" ] ; then
[ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
fi
@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.20 2016/05/09 06:09:09 ajacoutot Exp $
if [ "$strip" = "yes" ]; then
LDFLAGS="$LDFLAGS -s"
fi
@@ -1175,8 +1171,12 @@ fi
@@ -1191,12 +1187,16 @@ fi
if [ "$debug" = "yes" ]; then
CFLAGS="-O1 -g $CFLAGS"
RCFLAGS="$RCFLAGS -DDEBUG"
@ -29,10 +29,15 @@ $OpenBSD: patch-configure,v 1.20 2016/05/09 06:09:09 ajacoutot Exp $
else
- CFLAGS="-O3 -ffast-math $CFLAGS"
+ CFLAGS="-ffast-math $CFLAGS"
if [ "$lto" = "auto" ] && [ $compiler = GNU ] && cc_check "" "-flto" ; then
lto="yes"
CFLAGS="$CFLAGS -flto"
- LDFLAGS="$LDFLAGS -O3 -flto"
+ LDFLAGS="$LDFLAGS -flto"
fi
fi
if cc_check '' -fno-tree-vectorize ; then
@@ -1203,10 +1203,6 @@ if cc_check '' -Wshadow ; then
[ "$lto" = "auto" ] && lto="no"
@@ -1225,10 +1225,6 @@ if cc_check '' -Wshadow ; then
CFLAGS="-Wshadow $CFLAGS"
fi
@ -43,7 +48,7 @@ $OpenBSD: patch-configure,v 1.20 2016/05/09 06:09:09 ajacoutot Exp $
if [ $compiler = ICC -o $compiler = ICL ] ; then
if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then
define HAVE_INTEL_DISPATCHER
@@ -1383,7 +1379,6 @@ if [ "$cli" = "yes" ]; then
@@ -1405,7 +1401,6 @@ if [ "$cli" = "yes" ]; then
fi
if [ "$shared" = "yes" ]; then
@ -51,7 +56,7 @@ $OpenBSD: patch-configure,v 1.20 2016/05/09 06:09:09 ajacoutot Exp $
if [ "$SYS" = "WINDOWS" -o "$SYS" = "CYGWIN" ]; then
echo "SONAME=libx264-$API.dll" >> config.mak
if [ $compiler_style = MS ]; then
@@ -1411,7 +1406,7 @@ if [ "$shared" = "yes" ]; then
@@ -1433,7 +1428,7 @@ if [ "$shared" = "yes" ]; then
else
echo "SOSUFFIX=so" >> config.mak
echo "SONAME=libx264.so.$API" >> config.mak