Hi,
This is an x264 encoder update required for the mplayer update.
Myself and jakemsr@ have successfully encoded x264 in mencoder (see
other mail in this list for this port) and the in-tree vlc.
Tested build on i386, amd64, sparc64 and PPC. All other ports using
this library were build tested in i386.
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/x264/Makefile,v
retrieving revision 1.11
diff -u -p -u -r1.11 Makefile
--- Makefile 15 Jun 2010 10:07:41 -0000 1.11
+++ Makefile 27 Oct 2010 23:40:02 -0000
@@ -2,14 +2,14 @@
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
@@ -26,12 +26,12 @@ MODULES= gcc3
MODGCC3_ARCHES= sparc
USE_GMAKE= Yes
-CONFIGURE_STYLE= simple
+CONFIGURE_STYLE=simple
CONFIGURE_ENV= API=${LIBx264_VERSION}
CONFIGURE_ARGS+=--disable-asm \
- --disable-ffms-input \
- --disable-lavf-input \
- --disable-mp4-output \
+ --disable-ffms \
+ --disable-lavf \
+ --disable-swscale \
--prefix=${PREFIX}
NO_REGRESS= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/x264/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- distinfo 26 May 2010 21:18:17 -0000 1.5
+++ distinfo 27 Oct 2010 23:40:02 -0000
@@ -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
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 26 May 2010 21:18:17 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-$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
- endif
-
- OBJS = $(SRCS:%.c=%.o)
-+SOBJS = $(SRCS:%.c=%.so)
- OBJCLI = $(SRCCLI:%.c=%.o)
- OBJSO = $(SRCSO:%.c=%.o)
- DEP = depend
-@@ -124,8 +125,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)
-
- x264$(EXE): $(OBJCLI) libx264.a
- $(CC) -o $@ $+ $(LDFLAGS) $(LDFLAGSCLI)
-@@ -141,6 +142,9 @@ checkasm: tools/checkasm.o libx264.a
- $(AS) $(ASFLAGS) -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)
- ifeq ($(SYS),MINGW)
- $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
- else
-- $(if $(SONAME), ln -f -s $(SONAME)
$(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
- $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
- endif
- $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
Index: patches/patch-common_ppc_mc_c
===================================================================
RCS file: patches/patch-common_ppc_mc_c
diff -N patches/patch-common_ppc_mc_c
--- patches/patch-common_ppc_mc_c 14 Apr 2009 19:50:47 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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"
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/multimedia/x264/patches/patch-configure,v
retrieving revision 1.6
diff -u -p -u -r1.6 patch-configure
--- patches/patch-configure 26 May 2010 21:18:17 -0000 1.6
+++ patches/patch-configure 27 Oct 2010 23:40:02 -0000
@@ -1,61 +1,50 @@
-$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$
+
+Make sure the library gets named properly.
+
+--- configure.orig Sat Oct 23 21:45:07 2010
++++ configure Thu Oct 28 00:38:22 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
- fi
-
- if [ "$pic" = "yes" ] ; then
-- CFLAGS="$CFLAGS -fPIC"
- ASFLAGS="$ASFLAGS -DPIC"
-- # resolve textrels in the x86 asm
-- cc_check stdio.h -Wl,-Bsymbolic && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
- fi
-
--if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
-- CFLAGS="$CFLAGS -s -fomit-frame-pointer"
-- LDFLAGS="$LDFLAGS -s"
--fi
--
- if [ "$debug" = "yes" ]; then
- CFLAGS="-O1 -g $CFLAGS"
- elif [ $ARCH = ARM ]; then
- # arm-gcc-4.2 produces incorrect output with -ffast-math
+@@ -689,7 +689,7 @@ elif [ $ARCH = ARM ]; then
# and it doesn't save any speed anyway on 4.4, so disable it
-- CFLAGS="-O3 -fno-fast-math $CFLAGS"
-+ CFLAGS="-fno-fast-math $CFLAGS"
+ CFLAGS="-O3 -fno-fast-math $CFLAGS"
else
- CFLAGS="-O3 -ffast-math $CFLAGS"
+ 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 +749,8 @@ GPL=$gpl
EOF
if [ "$shared" = "yes" ]; then
- API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
++ # OpenBSD - we yoink this from CONFIGURE_ENV
++ #API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
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
+@@ -764,13 +765,16 @@ if [ "$shared" = "yes" ]; then
+ echo 'SOFLAGS=-Wl,-h,$(SONAME)' >> config.mak
else
echo "SOSUFFIX=so" >> config.mak
- echo "SONAME=libx264.so.$API" >> config.mak
-- echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
+- echo "SONAME=libx264.so.$API" >> config.mak
++ echo "SONAME=libx264.so.${API}" >> config.mak
+ echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
fi
echo 'default: $(SONAME)' >> config.mak
fi
- ./version.sh
+-./version.sh >> config.h
++#./version.sh >> config.h
++echo "#define X264_VERSION \"107\"\n#define X264_POINTVER \"0.107.x\"" \
++ >> config.h
++
--pclibs="-L$libdir -lx264 $libpthread"
-+pclibs="-L$libdir -lx264 -lm $libpthread"
+ pclibs="-L$libdir -lx264 $libpthread"
- cat > x264.pc << EOF
- prefix=$prefix
Index: patches/patch-version_sh
===================================================================
RCS file: patches/patch-version_sh
diff -N patches/patch-version_sh
--- patches/patch-version_sh 26 May 2010 21:18:17 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$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 @@
--#!/bin/bash
--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))"
-- elif 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
--else
-- echo "#define X264_VERSION \"\"" >> config.h
-- VER="x"
--fi
-+#!/bin/sh
-+echo "#define X264_VERSION \"\"" >> config.h
-+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
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/multimedia/x264/pkg/PFRAG.shared,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PFRAG.shared
--- pkg/PFRAG.shared 8 Apr 2007 17:31:01 -0000 1.1.1.1
+++ pkg/PFRAG.shared 27 Oct 2010 23:40:02 -0000
@@ -1,2 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2007/04/08 17:31:01 ajacoutot Exp $
+...@comment lib/libx264.so
@lib lib/libx264.so.${LIBx264_VERSION}
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
