update to x264-snapshot-20101023-2245

works with upcoming mplayer update as well as current ports from Brad (MAINTAINER)
2010-11-06 23:05:48 +00:00 · 2010-11-06 23:05:48 +00:00 · 36eed127e1
commit 36eed127e1
parent cd474773cf
6 changed files with 80 additions and 56 deletions
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.11 2010/06/15 10:07:41 sebastia Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/06 23:05:48 jakemsr Exp $

 COMMENT=	free H264/AVC encoder

-V=		20100511
+V=		20101023
 DISTNAME=	x264-snapshot-${V}-2245
 PKGNAME=	x264-${V}
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
 EXTRACT_SUFX=	.tar.bz2

-SHARED_LIBS=	x264	4.0
+SHARED_LIBS=	x264	5.0

 HOMEPAGE=	http://www.videolan.org/developers/x264.html

@ -29,9 +29,10 @@ USE_GMAKE=	Yes
 CONFIGURE_STYLE= simple
 CONFIGURE_ENV=	API=${LIBx264_VERSION}
 CONFIGURE_ARGS+=--disable-asm \
-		--disable-ffms-input \
-		--disable-lavf-input \
-		--disable-mp4-output \
+		--disable-ffms \
+		--disable-gpac \
+		--disable-lavf \
+		--disable-swscale \
 		--prefix=${PREFIX}

 NO_REGRESS=	Yes
@ -39,6 +40,5 @@ NO_REGRESS=	Yes
 .include <bsd.port.mk>

 .if ${NO_SHARED_LIBS:L} == "no"
-CONFIGURE_ARGS+=--enable-shared \
-		--enable-pic
+CONFIGURE_ARGS+=--enable-shared
 .endif
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@ -1,5 +1,5 @@
-MD5 (x264-snapshot-20100511-2245.tar.bz2) = SdUh/Hg8Fg/3aKDn0F1Ong==
-RMD160 (x264-snapshot-20100511-2245.tar.bz2) = OSlC3y3tcZM8UjwvlnfmBLA5eKs=
-SHA1 (x264-snapshot-20100511-2245.tar.bz2) = neo8PA9DQtS1uBC+Y96fq7y/J5w=
-SHA256 (x264-snapshot-20100511-2245.tar.bz2) = JRiKgZPTKfN0SMXJAezuaZqtyvX0mK6I6RKgLGSy+B8=
-SIZE (x264-snapshot-20100511-2245.tar.bz2) = 418097
+MD5 (x264-snapshot-20101023-2245.tar.bz2) = sY0Hf/G5TuU4YGSUVaDoZg==
+RMD160 (x264-snapshot-20101023-2245.tar.bz2) = IsivhEaIsAmoKqF418tCDhNZvO8=
+SHA1 (x264-snapshot-20101023-2245.tar.bz2) = atJD3BK9gzi+0K9Pw+vcibdkG2A=
+SHA256 (x264-snapshot-20101023-2245.tar.bz2) = tTjNnTmyJHqRBd3e6Pb3aTetPYU/P8gPiUkx3WndDmk=
+SIZE (x264-snapshot-20101023-2245.tar.bz2) = 449079
--- a/multimedia/x264/patches/patch-Makefile
+++ b/multimedia/x264/patches/patch-Makefile
@ -1,36 +1,70 @@
-$OpenBSD: patch-Makefile,v 1.5 2010/05/26 21:18:17 jakemsr Exp $
--- Makefile.orig	Tue May 11 16:45:09 2010
-+++ Makefile	Tue May 11 18:11:56 2010
-@@ -112,6 +112,7 @@ endif
+$OpenBSD: patch-Makefile,v 1.6 2010/11/06 23:05:48 jakemsr Exp $
+--- Makefile.orig	Sun Oct 31 17:45:08 2010
+++ Makefile	Sun Oct 31 18:53:02 2010
+@@ -78,7 +78,9 @@ ifdef ARCH_X86
+ ASFLAGS += -Icommon/x86/
+ SRCS   += common/x86/mc-c.c common/x86/predict-c.c
+ OBJASM  = $(ASMSRC:%.asm=%.o)
+SOBJASM = $(ASMSRC:%.asm=%.so)
+ $(OBJASM): common/x86/x86inc.asm common/x86/x86util.asm
+$(SOBJASM): common/x86/x86inc.asm common/x86/x86util.asm
+ checkasm: tools/checkasm-a.o
+ endif
+ endif
+@@ -120,8 +122,10 @@ endif
 endif
 
 OBJS = $(SRCS:%.c=%.o)
 +SOBJS = $(SRCS:%.c=%.so)
 OBJCLI = $(SRCCLI:%.c=%.o)
 OBJSO = $(SRCSO:%.c=%.o)
+SOBJSO = $(SRCSO:%.c=%.so)
 DEP  = depend
-@@ -124,8 +125,8 @@ libx264.a: .depend $(OBJS) $(OBJASM)
+ 
+ .PHONY: all default fprofiled clean distclean install uninstall dox test testclean
+@@ -132,8 +136,8 @@ libx264.a: .depend $(OBJS) $(OBJASM)
 	$(AR) rc libx264.a $(OBJS) $(OBJASM)
 	$(RANLIB) libx264.a
 
 -$(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
 -	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
-+$(SONAME): .depend $(SOBJS) $(OBJASM) $(OBJSO)
-+	$(CC) -shared -o $@ $(SOBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
+$(SONAME): .depend $(SOBJS) $(SOBJASM) $(SOBJSO)
+	$(CC) -shared -fPIC -o $@ $(SOBJS) $(SOBJASM) $(SOBJSO) $(SOFLAGS) $(LDFLAGS)
 
 x264$(EXE): $(OBJCLI) libx264.a
- 	$(CC) -o $@ $+ $(LDFLAGS) $(LDFLAGSCLI)
-@@ -141,6 +142,9 @@ checkasm: tools/checkasm.o libx264.a
+ 	$(CC) -o $@ $+ $(LDFLAGSCLI) $(LDFLAGS)
+@@ -145,10 +149,21 @@ checkasm: tools/checkasm.o libx264.a
 	$(AS) $(ASFLAGS) -o $@ $<
 	-@ $(STRIP) -x $@ # delete local/anonymous symbols, so they don't show up in oprofile
 
+%.so: %.asm
+	$(AS) $(ASFLAGS) -DPIC -o $@ &<
+	-@ $(STRIP) -x $@ # delete local/anonymous symbols, so they don't show up in oprofile
+
+ %.o: %.S
+ 	$(AS) $(ASFLAGS) -o $@ $<
+ 	-@ $(STRIP) -x $@ # delete local/anonymous symbols, so they don't show up in oprofile
+ 
+%.so: %.S
+	$(AS) $(ASFLAGS) -DPIC -o $@ $<
+	-@ $(STRIP) -x $@ # delete local/anonymous symbols, so they don't show up in oprofile
+
 +%.so: %.c
 +	$(CC) $(CFLAGS) -fPIC -c -o $@ $<
 +
 .depend: config.mak
 	@rm -f .depend
 	@$(foreach SRC, $(SRCS) $(SRCCLI) $(SRCSO), $(CC) $(CFLAGS) $(SRC) -MT $(SRC:%.c=%.o) -MM -g0 1>> .depend;)
-@@ -206,7 +210,6 @@ install: x264$(EXE) $(SONAME)
+@@ -192,7 +207,7 @@ fprofiled:
+ endif
+ 
+ clean:
+-	rm -f $(OBJS) $(OBJASM) $(OBJCLI) $(OBJSO) $(SONAME) *.a x264 x264.exe .depend TAGS
+	rm -f $(OBJS) $(SOBJS) $(OBJASM) $(SOBJASM) $(OBJCLI) $(OBJSO) $(SONAME) *.a x264 x264.exe .depend TAGS
+ 	rm -f checkasm checkasm.exe tools/checkasm.o tools/checkasm-a.o
+ 	rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno)
+ 	- sed -e 's/ *-fprofile-\(generate\|use\)//g' config.mak > config.mak2 && mv config.mak2 config.mak
+@@ -214,7 +229,6 @@ install: x264$(EXE) $(SONAME)
 ifeq ($(SYS),MINGW)
 	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
 else
--- a/multimedia/x264/patches/patch-common_ppc_mc_c
+++ b/multimedia/x264/patches/patch-common_ppc_mc_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-common_ppc_mc_c,v 1.2 2009/04/14 19:50:47 kili Exp $
--- common/ppc/mc.c.orig	Tue Jan  6 16:45:09 2009
-+++ common/ppc/mc.c	Tue Jan  6 13:10:49 2009
-@@ -24,7 +24,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-#include <stdint.h>
-+#include <inttypes.h>
- #include <stdarg.h>
- 
- #include "x264.h"
--- a/multimedia/x264/patches/patch-configure
+++ b/multimedia/x264/patches/patch-configure
@ -1,22 +1,23 @@
-$OpenBSD: patch-configure,v 1.6 2010/05/26 21:18:17 jakemsr Exp $
--- configure.orig	Tue May 11 13:45:10 2010
-+++ configure	Thu May 20 10:24:27 2010
+$OpenBSD: patch-configure,v 1.7 2010/11/06 23:05:48 jakemsr Exp $
+--- configure.orig	Sun Oct 31 17:45:08 2010
+++ configure	Sun Oct 31 17:51:47 2010
@@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
 
 if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
 
-@@ -606,25 +606,17 @@ if [ "$avs_input" = "auto" ] ; then
+@@ -670,26 +670,14 @@ if [ "$avs" = "auto" ] ; then
+     fi
 fi
 
- if [ "$pic" = "yes" ] ; then
+-if [ "$pic" = "yes" ] ; then
 -    CFLAGS="$CFLAGS -fPIC"
-     ASFLAGS="$ASFLAGS -DPIC"
+-    ASFLAGS="$ASFLAGS -DPIC"
 -    # resolve textrels in the x86 asm
 -    cc_check stdio.h -Wl,-Bsymbolic && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
- fi
- 
+-fi
+-
 -if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
 -    CFLAGS="$CFLAGS -s -fomit-frame-pointer"
 -    LDFLAGS="$LDFLAGS -s"
@ -34,8 +35,8 @@ $OpenBSD: patch-configure,v 1.6 2010/05/26 21:18:17 jakemsr Exp $
 +    CFLAGS="-ffast-math $CFLAGS"
 fi
 
- if cc_check "stdio.h" "" "fseeko(stdin,0,0);" ; then
-@@ -663,7 +655,6 @@ DEVNULL=$DEVNULL
+ if cc_check '' -fno-tree-vectorize ; then
+@@ -749,7 +737,6 @@ GPL=$gpl
 EOF
 
 if [ "$shared" = "yes" ]; then
@ -43,7 +44,7 @@ $OpenBSD: patch-configure,v 1.6 2010/05/26 21:18:17 jakemsr Exp $
     if [ "$SYS" = "MINGW" ]; then
         echo "SONAME=libx264-$API.dll" >> config.mak
         echo 'IMPLIBNAME=libx264.dll.a' >> config.mak
-@@ -679,14 +670,13 @@ if [ "$shared" = "yes" ]; then
+@@ -765,14 +752,13 @@ if [ "$shared" = "yes" ]; then
     else
         echo "SOSUFFIX=so" >> config.mak
         echo "SONAME=libx264.so.$API" >> config.mak
@ -52,7 +53,7 @@ $OpenBSD: patch-configure,v 1.6 2010/05/26 21:18:17 jakemsr Exp $
     echo 'default: $(SONAME)' >> config.mak
 fi
 
- ./version.sh
+ ./version.sh >> config.h
 
 -pclibs="-L$libdir -lx264 $libpthread"
 +pclibs="-L$libdir -lx264 -lm $libpthread"
--- a/multimedia/x264/patches/patch-version_sh
+++ b/multimedia/x264/patches/patch-version_sh
@ -1,7 +1,7 @@
-$OpenBSD: patch-version_sh,v 1.2 2010/05/26 21:18:17 jakemsr Exp $
--- version.sh.orig	Tue May 11 16:45:10 2010
-+++ version.sh	Tue May 11 18:16:17 2010
-@@ -1,19 +1,6 @@
+$OpenBSD: patch-version_sh,v 1.3 2010/11/06 23:05:48 jakemsr Exp $
+--- version.sh.orig	Wed Aug  4 16:45:08 2010
+++ version.sh	Thu Aug  5 13:23:09 2010
+@@ -1,20 +1,6 @@
 -#!/bin/bash
 -git rev-list HEAD | sort > config.git-hash
 -LOCALVER=`wc -l config.git-hash | awk '{print $1}'`
@ -9,18 +9,19 @@ $OpenBSD: patch-version_sh,v 1.2 2010/05/26 21:18:17 jakemsr Exp $
 -    VER=`git rev-list origin/master | sort | join config.git-hash - | wc -l | awk '{print $1}'`
 -    if [ $VER != $LOCALVER ] ; then
 -        VER="$VER+$(($LOCALVER-$VER))"
-    elif git status | grep -q "modified:" ; then
+-    fi
+-    if git status | grep -q "modified:" ; then
 -        VER="${VER}M"
 -    fi
 -    VER="$VER $(git rev-list HEAD -n 1 | cut -c 1-7)"
-    echo "#define X264_VERSION \" r$VER\"" >> config.h
+-    echo "#define X264_VERSION \" r$VER\""
 -else
-    echo "#define X264_VERSION \"\"" >> config.h
+-    echo "#define X264_VERSION \"\""
 -    VER="x"
 -fi
 +#!/bin/sh
-+echo "#define X264_VERSION \"\"" >> config.h
+echo "#define X264_VERSION \"\""
 +VER="x"
 rm -f config.git-hash
 API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'`
- echo "#define X264_POINTVER \"0.$API.$VER\"" >> config.h
+ echo "#define X264_POINTVER \"0.$API.$VER\""