Here is an update to x264-20111027.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/multimedia/x264/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 14 Sep 2011 09:23:49 -0000 1.16
+++ Makefile 28 Oct 2011 05:29:14 -0000
@@ -2,14 +2,14 @@
COMMENT= free H264/AVC encoder
-V= 20110830
+V= 20111027
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 7.0
+SHARED_LIBS= x264 8.0
HOMEPAGE= http://www.videolan.org/developers/x264.html
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/multimedia/x264/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 14 Sep 2011 09:23:49 -0000 1.8
+++ distinfo 28 Oct 2011 05:24:13 -0000
@@ -1,5 +1,5 @@
-MD5 (x264-snapshot-20110830-2245.tar.bz2) = nGGPG33uJrkRUp9cxfwQnA==
-RMD160 (x264-snapshot-20110830-2245.tar.bz2) = uVWCA5mhaVplQ6JTpJbm2oqkdNQ=
-SHA1 (x264-snapshot-20110830-2245.tar.bz2) = TOsCBwqT46HPyHyetZ3H75v1tr0=
-SHA256 (x264-snapshot-20110830-2245.tar.bz2) =
5GSEkAIc8hgE0H3WF304AeXYcQpQhKYl614wRPc4yHw=
-SIZE (x264-snapshot-20110830-2245.tar.bz2) = 514354
+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
Index: patches/patch-Makefile
===================================================================
RCS file: /home/cvs/ports/multimedia/x264/patches/patch-Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 patch-Makefile
--- patches/patch-Makefile 14 Sep 2011 09:23:49 -0000 1.8
+++ patches/patch-Makefile 28 Oct 2011 05:34:47 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.8 2011/09/14 09:23:49 ajacoutot Exp $
---- Makefile.orig Tue Aug 30 16:45:04 2011
-+++ Makefile Thu Sep 1 00:21:08 2011
+--- 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/
SRCS += common/x86/mc-c.c common/x86/predict-c.c
@@ -68,11 +68,11 @@ $OpenBSD: patch-Makefile,v 1.8 2011/09/1
rm -f checkasm checkasm.exe tools/checkasm.o tools/checkasm-a.o
rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno) *.dyn pgopti.dpi
pgopti.dpi.lock
-@@ -231,7 +246,6 @@ install-lib-shared: lib-shared install-lib-dev
- ifeq ($(SYS),WINDOWS)
- $(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))
+@@ -233,7 +248,6 @@ ifneq ($(IMPLIBNAME),)
+ install -m 755 $(SONAME) $(DESTDIR)$(bindir)
+ install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)
+ else ifneq ($(SONAME),)
+- ln -f -s $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX)
+ install -m 755 $(SONAME) $(DESTDIR)$(libdir)
endif
- $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
+
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/multimedia/x264/patches/patch-configure,v
retrieving revision 1.9
diff -u -p -r1.9 patch-configure
--- patches/patch-configure 14 Sep 2011 09:23:49 -0000 1.9
+++ patches/patch-configure 28 Oct 2011 05:34:24 -0000
@@ -1,13 +1,13 @@
$OpenBSD: patch-configure,v 1.9 2011/09/14 09:23:49 ajacoutot Exp $
---- configure.orig Tue Aug 30 16:45:04 2011
-+++ configure Tue Aug 30 22:05:06 2011
+--- configure.orig Thu Oct 27 16:45:03 2011
++++ configure Fri Oct 28 01:34:02 2011
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
cat <<EOF
-@@ -854,17 +854,6 @@ fi
+@@ -871,18 +871,6 @@ fi
cc_check "stdint.h" "" "uint32_t test_vec __attribute__ ((vector_size (16)))
= {0,1,2,3};" && define HAVE_VECTOREXT
@@ -15,7 +15,8 @@ $OpenBSD: patch-configure,v 1.9 2011/09/
- CFLAGS="$CFLAGS -fPIC"
- ASFLAGS="$ASFLAGS -DPIC"
- # resolve textrels in the x86 asm
-- cc_check stdio.h -Wl,-Bsymbolic && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
+- cc_check stdio.h "-shared -Wl,-Bsymbolic" && SOFLAGS="$SOFLAGS
-Wl,-Bsymbolic"
+- [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
-fi
-
-if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
@@ -25,7 +26,7 @@ $OpenBSD: patch-configure,v 1.9 2011/09/
if [ "$strip" = "yes" ]; then
CFLAGS="$CFLAGS -s"
LDFLAGS="$LDFLAGS -s"
-@@ -875,9 +864,9 @@ if [ "$debug" = "yes" ]; then
+@@ -893,9 +881,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
@@ -37,7 +38,7 @@ $OpenBSD: patch-configure,v 1.9 2011/09/
fi
if cc_check '' -fno-tree-vectorize ; then
-@@ -1011,7 +1000,6 @@ if [ "$cli" = "yes" ]; then
+@@ -1036,7 +1024,6 @@ if [ "$cli" = "yes" ]; then
fi
if [ "$shared" = "yes" ]; then
@@ -45,16 +46,16 @@ $OpenBSD: patch-configure,v 1.9 2011/09/
if [ "$SYS" = "WINDOWS" -o "$SYS" = "CYGWIN" ]; then
echo "SONAME=libx264-$API.dll" >> config.mak
if [ $compiler = ICL ]; then
-@@ -1036,7 +1024,7 @@ if [ "$shared" = "yes" ]; then
+@@ -1061,7 +1048,7 @@ if [ "$shared" = "yes" ]; then
else
echo "SOSUFFIX=so" >> config.mak
echo "SONAME=libx264.so.$API" >> config.mak
-- echo 'SOFLAGS=-shared -Wl,-soname,$(SONAME)' >> config.mak
-+ echo 'SOFLAGS=-shared -fPIC' >> config.mak
+- echo "SOFLAGS=-shared -Wl,-soname,\$(SONAME) $SOFLAGS" >> config.mak
++ echo "SOFLAGS=-shared -fPIC $SOFLAGS" >> config.mak
fi
echo 'default: lib-shared' >> config.mak
echo 'install: install-lib-shared' >> config.mak
-@@ -1064,7 +1052,7 @@ echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak
+@@ -1089,7 +1076,7 @@ echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak
./version.sh >> x264_config.h
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
