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

Update to x264-20160508.

Browse Source 
from Brad (maintainer)
This commit is contained in:
ajacoutot 2016-05-09 06:09:09 +00:00
parent 088ac8f980
commit 6635918b1b
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
multimedia/x264/Makefile
View File

@ -1,16 +1,15 @@
# $OpenBSD: Makefile,v 1.37 2016/03/10 22:51:45 naddy Exp $
# $OpenBSD: Makefile,v 1.38 2016/05/09 06:09:09 ajacoutot Exp $
COMMENT= free H.264/MPEG-4 AVC encoder
V= 20150728
V= 20160508
DISTNAME= x264-snapshot-${V}-2245
PKGNAME= x264-${V}
REVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS= x264 15.0
SHARED_LIBS= x264 16.0
HOMEPAGE= http://www.videolan.org/developers/x264.html

4
multimedia/x264/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (x264-snapshot-20150728-2245.tar.bz2) = TEBLjjmxUPmk7XSU0GX5p3Xaybnu9D/kMzXqOi6Ns0g=
SIZE (x264-snapshot-20150728-2245.tar.bz2) = 717901
SHA256 (x264-snapshot-20160508-2245.tar.bz2) = GwIu+uAAQKT/Q9TDiT8gFIQ0O+AVjlo8JK7LJElD+HY=
SIZE (x264-snapshot-20160508-2245.tar.bz2) = 730078

10
multimedia/x264/patches/patch-Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.15 2015/08/13 07:35:21 ajacoutot Exp $
--- Makefile.orig Tue Jul 28 16:45:03 2015
+++ Makefile Tue Jul 28 21:51:16 2015
@@ -197,7 +197,7 @@ example: example$(EXE)
$OpenBSD: patch-Makefile,v 1.16 2016/05/09 06:09:09 ajacoutot Exp $
--- Makefile.orig Sun May 8 16:45:04 2016
+++ Makefile Sun May 8 21:27:57 2016
@@ -199,7 +199,7 @@ example: example$(EXE)
endif
x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(CLI_LIBX264)
@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.15 2015/08/13 07:35:21 ajacoutot Exp $
checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) $(LIBX264)
$(LD)$@ $(OBJCHK) $(LIBX264) $(LDFLAGS)
@@ -300,7 +300,6 @@ ifneq ($(IMPLIBNAME),)
@@ -302,7 +302,6 @@ ifneq ($(IMPLIBNAME),)
$(INSTALL) -m 755 $(SONAME) $(DESTDIR)$(bindir)
$(INSTALL) -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)
else ifneq ($(SONAME),)

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

@ -1,7 +1,7 @@
$OpenBSD: patch-common_osdep_h,v 1.5 2016/01/02 07:49:19 ajacoutot Exp $
--- common/osdep.h.orig Tue Jul 28 16:45:03 2015
+++ common/osdep.h Fri Dec 25 03:30:17 2015
@@ -234,7 +234,8 @@ int x264_threading_init( void );
$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
@@ -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

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

@ -1,13 +1,13 @@
$OpenBSD: patch-configure,v 1.19 2015/08/13 07:35:21 ajacoutot Exp $
--- configure.orig Tue Jul 28 16:45:03 2015
+++ configure Tue Jul 28 21:52:10 2015
$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
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
cat <<EOF
@@ -1127,18 +1127,18 @@ if [ "$pic" = "yes" ] ; then
@@ -1164,10 +1164,6 @@ if [ "$pic" = "yes" ] ; then
[ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
fi
@ -18,9 +18,10 @@ $OpenBSD: patch-configure,v 1.19 2015/08/13 07:35:21 ajacoutot Exp $
if [ "$strip" = "yes" ]; then
LDFLAGS="$LDFLAGS -s"
fi
@@ -1175,8 +1171,12 @@ fi
if [ "$debug" = "yes" ]; then
CFLAGS="-O1 -g $CFLAGS"
RCFLAGS="$RCFLAGS -DDEBUG"
+elif [ $ARCH = ARM ]; then
+ # arm-gcc-4.2 produces incorrect output with -ffast-math
+ # and it doesn't save any speed anyway on 4.4, so disable it
@ -31,7 +32,7 @@ $OpenBSD: patch-configure,v 1.19 2015/08/13 07:35:21 ajacoutot Exp $
fi
if cc_check '' -fno-tree-vectorize ; then
@@ -1165,10 +1165,6 @@ if cc_check '' -Wshadow ; then
@@ -1203,10 +1203,6 @@ if cc_check '' -Wshadow ; then
CFLAGS="-Wshadow $CFLAGS"
fi
@ -42,7 +43,7 @@ $OpenBSD: patch-configure,v 1.19 2015/08/13 07:35:21 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
@@ -1339,7 +1335,6 @@ if [ "$cli" = "yes" ]; then
@@ -1383,7 +1379,6 @@ if [ "$cli" = "yes" ]; then
fi
if [ "$shared" = "yes" ]; then
@ -50,7 +51,7 @@ $OpenBSD: patch-configure,v 1.19 2015/08/13 07:35:21 ajacoutot Exp $
if [ "$SYS" = "WINDOWS" -o "$SYS" = "CYGWIN" ]; then
echo "SONAME=libx264-$API.dll" >> config.mak
if [ $compiler_style = MS ]; then
@@ -1367,7 +1362,7 @@ if [ "$shared" = "yes" ]; then
@@ -1411,7 +1406,7 @@ if [ "$shared" = "yes" ]; then
else
echo "SOSUFFIX=so" >> config.mak
echo "SONAME=libx264.so.$API" >> config.mak