Here is an update to x264-20120520. Builds with everything in the tree Ok.
Tested on amd64 and sparc64. Index: Makefile =================================================================== RCS file: /home/cvs/ports/multimedia/x264/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- Makefile 7 Nov 2011 15:53:08 -0000 1.17 +++ Makefile 21 May 2012 00:37:32 -0000 @@ -2,14 +2,14 @@ COMMENT= free H264/AVC encoder -V= 20111027 +V= 20120520 DISTNAME= x264-snapshot-${V}-2245 PKGNAME= x264-${V} CATEGORIES= multimedia -MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ +MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/ EXTRACT_SUFX= .tar.bz2 -SHARED_LIBS= x264 8.0 +SHARED_LIBS= x264 9.0 HOMEPAGE= http://www.videolan.org/developers/x264.html Index: distinfo =================================================================== RCS file: /home/cvs/ports/multimedia/x264/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- distinfo 7 Nov 2011 15:53:08 -0000 1.9 +++ distinfo 21 May 2012 00:00:51 -0000 @@ -1,5 +1,5 @@ -MD5 (x264-snapshot-20111027-2245.tar.bz2) = 2HX9KPjoVvQEnEQ3AQqFEg== -RMD160 (x264-snapshot-20111027-2245.tar.bz2) = 4Xfz0ZIGh2qVoCOlKYeob+IpLaU= -SHA1 (x264-snapshot-20111027-2245.tar.bz2) = QCjXnRZv+JJ3OzZGk/EHn2yB7ek= -SHA256 (x264-snapshot-20111027-2245.tar.bz2) = Oj58zGo13/HpbVDniNXhGq8+2zYpZpARsh9DOiBFQnI= -SIZE (x264-snapshot-20111027-2245.tar.bz2) = 531078 +MD5 (x264-snapshot-20120520-2245.tar.bz2) = 3MoCmaBr6+WRBItvjH9xsg== +RMD160 (x264-snapshot-20120520-2245.tar.bz2) = HST4DFZA4swqls1/nk+V0lvpOPM= +SHA1 (x264-snapshot-20120520-2245.tar.bz2) = 5cNMwQ8IHGfHIrbSaJ2/Ai8YXlA= +SHA256 (x264-snapshot-20120520-2245.tar.bz2) = bpgZ5MRvm4HN2X1gl3+WfXZC05+bhx43RmwCc20hWjA= +SIZE (x264-snapshot-20120520-2245.tar.bz2) = 552411 Index: patches/patch-Makefile =================================================================== RCS file: /home/cvs/ports/multimedia/x264/patches/patch-Makefile,v retrieving revision 1.9 diff -u -p -r1.9 patch-Makefile --- patches/patch-Makefile 7 Nov 2011 15:53:08 -0000 1.9 +++ patches/patch-Makefile 21 May 2012 00:23:17 -0000 @@ -1,28 +1,28 @@ $OpenBSD: patch-Makefile,v 1.9 2011/11/07 15:53:08 ajacoutot Exp $ ---- Makefile.orig Thu Oct 27 16:45:03 2011 -+++ Makefile Fri Oct 28 01:31:11 2011 -@@ -87,7 +87,9 @@ ifdef ARCH_X86 - ASFLAGS += -Icommon/x86/ +--- Makefile.orig Sun May 20 16:45:03 2012 ++++ Makefile Sun May 20 20:23:07 2012 +@@ -100,7 +100,9 @@ ifdef ARCH_X86 + ASFLAGS += -I$(SRCPATH)/common/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 + OBJCHK += tools/checkasm-a.o endif endif -@@ -131,8 +133,10 @@ endif +@@ -146,8 +148,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 + OBJS += $(SRCS:%.c=%.o) ++SOBJS += $(SRCS:%.c=%.so) + OBJCLI += $(SRCCLI:%.c=%.o) + OBJSO += $(SRCSO:%.c=%.o) ++SOBJSO += $(SRCSO:%.c=%.so) - .PHONY: all default fprofiled clean distclean install uninstall dox test testclean lib-static lib-shared cli install-lib-dev install-lib-static install-lib-shared install-cli -@@ -147,11 +151,11 @@ $(LIBX264): .depend $(OBJS) $(OBJASM) + .PHONY: all default fprofiled clean distclean install uninstall lib-static lib-shared cli install-lib-dev install-lib-static install-lib-shared install-cli + +@@ -160,8 +164,8 @@ $(LIBX264): .depend $(OBJS) $(OBJASM) $(AR)$@ $(OBJS) $(OBJASM) $(if $(RANLIB), $(RANLIB) $@) @@ -31,13 +31,18 @@ $OpenBSD: patch-Makefile,v 1.9 2011/11/0 +$(SONAME): .depend $(SOBJS) $(SOBJASM) $(SOBJSO) + $(LD)$@ $(SOBJS) $(SOBJASM) $(SOBJSO) $(SOFLAGS) $(LDFLAGS) + ifneq ($(EXE),) + .PHONY: x264 checkasm +@@ -170,7 +174,7 @@ checkasm: checkasm$(EXE) + endif + x264$(EXE): .depend $(OBJCLI) $(CLI_LIBX264) - $(LD)$@ $(OBJCLI) $(CLI_LIBX264) $(LDFLAGSCLI) $(LDFLAGS) + $(LD)$@ $(OBJCLI) -L. -lx264 $(LDFLAGSCLI) $(LDFLAGS) - checkasm: tools/checkasm.o $(LIBX264) - $(LD)$@ $+ $(LDFLAGS) -@@ -160,10 +164,21 @@ checkasm: tools/checkasm.o $(LIBX264) + checkasm$(EXE): .depend $(OBJCHK) $(LIBX264) + $(LD)$@ $(OBJCHK) $(LIBX264) $(LDFLAGS) +@@ -181,10 +185,21 @@ $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK): .depen $(AS) $(ASFLAGS) -o $@ $< -@ $(if $(STRIP), $(STRIP) -x $@) # delete local/anonymous symbols, so they don't show up in oprofile @@ -56,19 +61,19 @@ $OpenBSD: patch-Makefile,v 1.9 2011/11/0 +%.so: %.c + $(CC) $(CFLAGS) -fPIC -c -o $@ $< + - .depend: config.mak - @rm -f .depend - @$(foreach SRC, $(SRCS) $(SRCCLI) $(SRCSO), $(CC) $(CFLAGS) $(SRC) $(DEPMT) $(SRC:%.c=%.o) $(DEPMM) 1>> .depend;) -@@ -203,7 +218,7 @@ fprofiled: + %.dll.o: %.rc x264.h + $(RC) $(RCFLAGS)$@ -DDLL $< + +@@ -230,7 +245,7 @@ fprofiled: endif clean: - rm -f $(OBJS) $(OBJASM) $(OBJCLI) $(OBJSO) $(SONAME) *.a *.lib *.exp *.pdb x264 x264.exe .depend TAGS -+ rm -f $(OBJS) $(SOBJS) $(OBJASM) $(SOBJASM) $(OBJCLI) $(OBJSO) $(SONAME) *.a *.lib *.exp *.pdb x264 x264.exe .depend TAGS - rm -f checkasm checkasm.exe tools/checkasm.o tools/checkasm-a.o ++ rm -f $(OBJS) $(SOBJS) $(OBJASM) $(SOBJASM) $(OBJCLI) $(OBJSO) $(SOBJSO) $(SONAME) *.a *.lib *.exp *.pdb x264 x264.exe .depend TAGS + rm -f checkasm checkasm.exe $(OBJCHK) rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno) *.dyn pgopti.dpi pgopti.dpi.lock -@@ -233,7 +248,6 @@ ifneq ($(IMPLIBNAME),) +@@ -259,7 +274,6 @@ ifneq ($(IMPLIBNAME),) install -m 755 $(SONAME) $(DESTDIR)$(bindir) install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir) else ifneq ($(SONAME),) Index: patches/patch-configure =================================================================== RCS file: /home/cvs/ports/multimedia/x264/patches/patch-configure,v retrieving revision 1.10 diff -u -p -r1.10 patch-configure --- patches/patch-configure 7 Nov 2011 15:53:08 -0000 1.10 +++ patches/patch-configure 21 May 2012 00:23:12 -0000 @@ -1,13 +1,13 @@ $OpenBSD: patch-configure,v 1.10 2011/11/07 15:53:08 ajacoutot Exp $ ---- configure.orig Thu Oct 27 16:45:03 2011 -+++ configure Fri Oct 28 01:34:02 2011 +--- configure.orig Sun May 20 16:45:03 2012 ++++ configure Sun May 20 20:09:21 2012 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if test x"$1" = x"-h" -o x"$1" = x"--help" ; then cat <<EOF -@@ -871,18 +871,6 @@ fi +@@ -921,18 +921,6 @@ fi cc_check "stdint.h" "" "uint32_t test_vec __attribute__ ((vector_size (16))) = {0,1,2,3};" && define HAVE_VECTOREXT @@ -26,7 +26,7 @@ $OpenBSD: patch-configure,v 1.10 2011/11 if [ "$strip" = "yes" ]; then CFLAGS="$CFLAGS -s" LDFLAGS="$LDFLAGS -s" -@@ -893,9 +881,9 @@ if [ "$debug" = "yes" ]; then +@@ -943,9 +931,9 @@ if [ "$debug" = "yes" ]; then 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 @@ -38,15 +38,15 @@ $OpenBSD: patch-configure,v 1.10 2011/11 fi if cc_check '' -fno-tree-vectorize ; then -@@ -1036,7 +1024,6 @@ if [ "$cli" = "yes" ]; then +@@ -1093,7 +1081,6 @@ if [ "$cli" = "yes" ]; then fi if [ "$shared" = "yes" ]; then -- API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ') +- API=$(grep '#define X264_BUILD' < ${SRCPATH}/x264.h | cut -f 3 -d ' ') if [ "$SYS" = "WINDOWS" -o "$SYS" = "CYGWIN" ]; then echo "SONAME=libx264-$API.dll" >> config.mak if [ $compiler = ICL ]; then -@@ -1061,7 +1048,7 @@ if [ "$shared" = "yes" ]; then +@@ -1121,7 +1108,7 @@ if [ "$shared" = "yes" ]; then else echo "SOSUFFIX=so" >> config.mak echo "SONAME=libx264.so.$API" >> config.mak @@ -55,9 +55,9 @@ $OpenBSD: patch-configure,v 1.10 2011/11 fi echo 'default: lib-shared' >> config.mak echo 'install: install-lib-shared' >> config.mak -@@ -1089,7 +1076,7 @@ echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak +@@ -1149,7 +1136,7 @@ echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak - ./version.sh >> x264_config.h + ${SRCPATH}/version.sh "${SRCPATH}" >> x264_config.h -pclibs="-L$libdir -lx264 $libpthread" +pclibs="-L$libdir -lx264 -lm $libpthread" Index: patches/patch-version_sh =================================================================== RCS file: /home/cvs/ports/multimedia/x264/patches/patch-version_sh,v retrieving revision 1.3 diff -u -p -r1.3 patch-version_sh --- patches/patch-version_sh 6 Nov 2010 23:05:48 -0000 1.3 +++ patches/patch-version_sh 21 May 2012 00:23:12 -0000 @@ -1,14 +1,18 @@ $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 @@ +--- version.sh.orig Sun May 20 16:45:03 2012 ++++ version.sh Sun May 20 20:08:39 2012 +@@ -1,24 +1,6 @@ -#!/bin/bash +-[ -n "$1" ] && cd $1 -git rev-list HEAD | sort > config.git-hash -LOCALVER=`wc -l config.git-hash | awk '{print $1}'` -if [ $LOCALVER \> 1 ] ; then - VER=`git rev-list origin/master | sort | join config.git-hash - | wc -l | awk '{print $1}'` -- if [ $VER != $LOCALVER ] ; then -- VER="$VER+$(($LOCALVER-$VER))" +- VER_DIFF=$(($LOCALVER-$VER)) +- echo "#define X264_REV $VER" +- echo "#define X264_REV_DIFF $VER_DIFF" +- if [ $VER_DIFF != 0 ] ; then +- VER="$VER+$VER_DIFF" - fi - if git status | grep -q "modified:" ; then - VER="${VER}M" -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.