On Wed, Aug 31, 2011 at 07:54:32PM -0400, Brad wrote:
> Here is an update to x264 20110830.
A second rev. I noticed I missed re-applying one of the Makefile
patch chunks although it doesn't change the port build at all.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/multimedia/x264/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile 11 Jul 2011 12:13:03 -0000 1.15
+++ Makefile 31 Aug 2011 01:46:20 -0000
@@ -2,15 +2,14 @@
COMMENT= free H264/AVC encoder
-V= 20110225
+V= 20110830
DISTNAME= x264-snapshot-${V}-2245
PKGNAME= x264-${V}
-REVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
EXTRACT_SUFX= .tar.bz2
-SHARED_LIBS= x264 6.0
+SHARED_LIBS= x264 7.0
HOMEPAGE= http://www.videolan.org/developers/x264.html
@@ -21,6 +20,7 @@ PERMIT_PACKAGE_CDROM= patents
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
+
WANTLIB= c m pthread
USE_GMAKE= Yes
@@ -31,6 +31,7 @@ CONFIGURE_ARGS+=--disable-asm \
--disable-gpac \
--disable-lavf \
--disable-swscale \
+ --enable-static \
--prefix=${PREFIX}
NO_REGRESS= Yes
@@ -38,5 +39,6 @@ NO_REGRESS= Yes
.include <bsd.port.mk>
.if ${NO_SHARED_LIBS:L} == "no"
-CONFIGURE_ARGS+=--enable-shared
+CONFIGURE_ARGS+=--enable-shared \
+ --system-libx264
.endif
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/multimedia/x264/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 12 Mar 2011 21:07:09 -0000 1.7
+++ distinfo 31 Aug 2011 00:57:20 -0000
@@ -1,5 +1,5 @@
-MD5 (x264-snapshot-20110225-2245.tar.bz2) = lvwVOfSI4vHWtCfV6lwu2Q==
-RMD160 (x264-snapshot-20110225-2245.tar.bz2) = oCAuNJ29IHz198jOeAt58hHhsb4=
-SHA1 (x264-snapshot-20110225-2245.tar.bz2) = B2AhOk7zK7EMjzEXOy2qlLZcZBE=
-SHA256 (x264-snapshot-20110225-2245.tar.bz2) =
mjVWqo9wkdUYR+aebds/p6zUEc0y00a5cdQGm1zN2x8=
-SIZE (x264-snapshot-20110225-2245.tar.bz2) = 485965
+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
Index: patches/patch-Makefile
===================================================================
RCS file: /home/cvs/ports/multimedia/x264/patches/patch-Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 patch-Makefile
--- patches/patch-Makefile 12 Mar 2011 21:07:09 -0000 1.7
+++ patches/patch-Makefile 1 Sep 2011 04:21:16 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.7 2011/03/12 21:07:09 jakemsr Exp $
---- Makefile.orig Fri Feb 25 16:45:04 2011
-+++ Makefile Fri Feb 25 22:17:05 2011
+--- Makefile.orig Tue Aug 30 16:45:04 2011
++++ Makefile Thu Sep 1 00:21:08 2011
@@ -87,7 +87,9 @@ ifdef ARCH_X86
ASFLAGS += -Icommon/x86/
SRCS += common/x86/mc-c.c common/x86/predict-c.c
@@ -21,51 +21,55 @@ $OpenBSD: patch-Makefile,v 1.7 2011/03/1
+SOBJSO = $(SRCSO:%.c=%.so)
DEP = depend
- .PHONY: all default fprofiled clean distclean install uninstall dox test
testclean
-@@ -143,8 +147,8 @@ libx264.a: .depend $(OBJS) $(OBJASM)
- $(AR) rc libx264.a $(OBJS) $(OBJASM)
- $(RANLIB) libx264.a
+ .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)
+ $(AR)$@ $(OBJS) $(OBJASM)
+ $(if $(RANLIB), $(RANLIB) $@)
-$(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
-- $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
+- $(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
+$(SONAME): .depend $(SOBJS) $(SOBJASM) $(SOBJSO)
-+ $(CC) -shared -fPIC -o $@ $(SOBJS) $(SOBJASM) $(SOBJSO) $(SOFLAGS)
$(LDFLAGS)
++ $(LD)$@ $(SOBJS) $(SOBJASM) $(SOBJSO) $(SOFLAGS) $(LDFLAGS)
- x264$(EXE): $(OBJCLI) libx264.a
- $(CC) -o $@ $+ $(LDFLAGSCLI) $(LDFLAGS)
-@@ -156,10 +160,21 @@ checkasm: tools/checkasm.o libx264.a
+ 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)
$(AS) $(ASFLAGS) -o $@ $<
- -@ $(STRIP) -x $@ # delete local/anonymous symbols, so they don't show
up in oprofile
+ -@ $(if $(STRIP), $(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
++ $(AS) $(ASFLAGS) -DPIC -o $@ $<
++ -@ $(if $(STRIP), $(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
+ -@ $(if $(STRIP), $(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
++ -@ $(if $(STRIP), $(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;)
+ @$(foreach SRC, $(SRCS) $(SRCCLI) $(SRCSO), $(CC) $(CFLAGS) $(SRC)
$(DEPMT) $(SRC:%.c=%.o) $(DEPMM) 1>> .depend;)
@@ -203,7 +218,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 $(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 $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno)
- - sed -e 's/ *-fprofile-\(generate\|use\)//g' config.mak > config.mak2
&& mv config.mak2 config.mak
-@@ -226,7 +241,6 @@ install: x264$(EXE) $(SONAME)
- ifeq ($(SYS),MINGW)
+ 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))
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/multimedia/x264/patches/patch-configure,v
retrieving revision 1.8
diff -u -p -r1.8 patch-configure
--- patches/patch-configure 12 Mar 2011 21:07:09 -0000 1.8
+++ patches/patch-configure 31 Aug 2011 02:05:22 -0000
@@ -1,15 +1,15 @@
$OpenBSD: patch-configure,v 1.8 2011/03/12 21:07:09 jakemsr Exp $
---- configure.orig Fri Feb 25 16:45:04 2011
-+++ configure Fri Feb 25 22:17:05 2011
+--- configure.orig Tue Aug 30 16:45:04 2011
++++ configure Tue Aug 30 22:05:06 2011
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
cat <<EOF
-@@ -712,26 +712,14 @@ if [ "$avs" = "auto" ] ; then
- fi
- fi
+@@ -854,17 +854,6 @@ fi
+
+ cc_check "stdint.h" "" "uint32_t test_vec __attribute__ ((vector_size (16)))
= {0,1,2,3};" && define HAVE_VECTOREXT
-if [ "$pic" = "yes" ] ; then
- CFLAGS="$CFLAGS -fPIC"
@@ -19,12 +19,13 @@ $OpenBSD: patch-configure,v 1.8 2011/03/
-fi
-
-if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
-- CFLAGS="$CFLAGS -s -fomit-frame-pointer"
-- LDFLAGS="$LDFLAGS -s"
+- CFLAGS="$CFLAGS -fomit-frame-pointer"
-fi
-
- if [ "$debug" = "yes" ]; then
- CFLAGS="-O1 -g $CFLAGS"
+ if [ "$strip" = "yes" ]; then
+ CFLAGS="$CFLAGS -s"
+ LDFLAGS="$LDFLAGS -s"
+@@ -875,9 +864,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
@@ -36,24 +37,26 @@ $OpenBSD: patch-configure,v 1.8 2011/03/
fi
if cc_check '' -fno-tree-vectorize ; then
-@@ -803,7 +791,6 @@ DEVNULL=$DEVNULL
- EOF
+@@ -1011,7 +1000,6 @@ if [ "$cli" = "yes" ]; then
+ fi
if [ "$shared" = "yes" ]; then
- API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
- if [ "$SYS" = "MINGW" ]; then
+ if [ "$SYS" = "WINDOWS" -o "$SYS" = "CYGWIN" ]; then
echo "SONAME=libx264-$API.dll" >> config.mak
- echo 'IMPLIBNAME=libx264.dll.a' >> config.mak
-@@ -819,14 +806,13 @@ if [ "$shared" = "yes" ]; then
+ if [ $compiler = ICL ]; then
+@@ -1036,7 +1024,7 @@ if [ "$shared" = "yes" ]; then
else
echo "SOSUFFIX=so" >> config.mak
echo "SONAME=libx264.so.$API" >> config.mak
-- echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
+- echo 'SOFLAGS=-shared -Wl,-soname,$(SONAME)' >> config.mak
++ echo 'SOFLAGS=-shared -fPIC' >> config.mak
fi
- echo 'default: $(SONAME)' >> 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
- ./version.sh >> config.h
+ ./version.sh >> x264_config.h
-pclibs="-L$libdir -lx264 $libpthread"
+pclibs="-L$libdir -lx264 -lm $libpthread"
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
