Date: Sun, 23 Nov 2008 21:43:56 +0800 (CST) From: gslin <gslin@gslin.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: gslin@gslin.org, multimedia@FreeBSD.org Subject: ports/129085: [PATCH] multimedia/x264: update to 0.0.20081122 Message-ID: <200811231343.mANDhuSU070648@aqua.pixnet.tw> Resent-Message-ID: <200811231410.mANEA3ne028991@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 129085 >Category: ports >Synopsis: [PATCH] multimedia/x264: update to 0.0.20081122 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Nov 23 14:10:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: gslin >Release: FreeBSD 7.0-RELEASE-p2 amd64 >Organization: >Environment: System: FreeBSD aqua 7.0-RELEASE-p2 FreeBSD 7.0-RELEASE-p2 #1: Sat Jul 5 18:46:26 CST >Description: - Update to 0.0.20081122 Removed file(s): - files/patch-gtk_Makefile Port maintainer (multimedia@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- x264-0.0.20081122.patch begins here --- diff -ruN --exclude=CVS /usr/ports/multimedia/x264/Makefile /.amd_mnt/10.1.1.100/vol/home/admin/gslin/work/ports/x264/Makefile --- /usr/ports/multimedia/x264/Makefile 2008-06-06 22:33:38.000000000 +0800 +++ /.amd_mnt/10.1.1.100/vol/home/admin/gslin/work/ports/x264/Makefile 2008-11-23 21:39:30.878628000 +0800 @@ -6,8 +6,8 @@ # $Id: Makefile 30 2006-10-30 22:15:26Z buhnux $ PORTNAME= x264 -PORTVERSION= 0.0.20080409 -PORTREVISION?= 2 +PORTVERSION= 0.0.20081122 +PORTREVISION?= 0 CATEGORIES= multimedia MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/ DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245 @@ -79,8 +79,7 @@ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \ s|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ - ${WRKSRC}/Makefile \ - ${WRKSRC}/*/Makefile + ${WRKSRC}/Makefile .if ${SLAVE_PORT:L}=="no" .if 0 # BROKEN diff -ruN --exclude=CVS /usr/ports/multimedia/x264/distinfo /.amd_mnt/10.1.1.100/vol/home/admin/gslin/work/ports/x264/distinfo --- /usr/ports/multimedia/x264/distinfo 2008-04-10 09:01:26.000000000 +0800 +++ /.amd_mnt/10.1.1.100/vol/home/admin/gslin/work/ports/x264/distinfo 2008-11-23 21:34:30.890582000 +0800 @@ -1,3 +1,3 @@ -MD5 (x264-snapshot-20080409-2245.tar.bz2) = 2a1b0ad913885cfde72159671ad51280 -SHA256 (x264-snapshot-20080409-2245.tar.bz2) = 6a921b0fc21cf508fd4df003b400903dee50cc046e3d4a8570aef34f4a000b32 -SIZE (x264-snapshot-20080409-2245.tar.bz2) = 1919929 +MD5 (x264-snapshot-20081122-2245.tar.bz2) = b216f23b61cc06fc759f3ba3e649d427 +SHA256 (x264-snapshot-20081122-2245.tar.bz2) = c4758514d67f90642c7107036dfe1a5f73e7479e0d5c00adba894dc9093ce046 +SIZE (x264-snapshot-20081122-2245.tar.bz2) = 2281659 diff -ruN --exclude=CVS /usr/ports/multimedia/x264/files/patch-Makefile /.amd_mnt/10.1.1.100/vol/home/admin/gslin/work/ports/x264/files/patch-Makefile --- /usr/ports/multimedia/x264/files/patch-Makefile 2008-04-10 09:01:26.000000000 +0800 +++ /.amd_mnt/10.1.1.100/vol/home/admin/gslin/work/ports/x264/files/patch-Makefile 2008-11-23 21:36:39.338785000 +0800 @@ -1,20 +1,17 @@ ---- Makefile.orig 2008-04-09 16:45:06.000000000 -0400 -+++ Makefile 2008-04-09 20:47:32.490510083 -0400 -@@ -26,7 +26,7 @@ +--- Makefile.orig 2008-11-23 21:35:15.465150000 +0800 ++++ Makefile 2008-11-23 21:36:10.839959000 +0800 +@@ -26,12 +26,12 @@ cpu-32.asm dct-32.asm X86SRC = $(X86SRC0:%=common/x86/%) -ifeq ($(ARCH),X86) +ifeq ($(ARCH),i386) - SRCS += common/x86/mc-c.c common/x86/predict-c.c - ASMSRC = $(X86SRC) common/x86/pixel-32.asm - OBJASM = $(ASMSRC:%.asm=%.o) -@@ -35,7 +35,7 @@ - checkasm: tools/checkasm-32.o + ARCH_X86 = yes + ASMSRC = $(X86SRC) common/x86/pixel-32.asm endif -ifeq ($(ARCH),X86_64) +ifeq ($(ARCH),amd64) - SRCS += common/x86/mc-c.c common/x86/predict-c.c - ASMSRC = $(X86SRC:-32.asm=-64.asm) - OBJASM = $(ASMSRC:%.asm=%.o) + ARCH_X86 = yes + ASMSRC = $(X86SRC:-32.asm=-64.asm) + ASFLAGS += -DARCH_X86_64 diff -ruN --exclude=CVS /usr/ports/multimedia/x264/files/patch-configure /.amd_mnt/10.1.1.100/vol/home/admin/gslin/work/ports/x264/files/patch-configure --- /usr/ports/multimedia/x264/files/patch-configure 2008-04-10 09:01:26.000000000 +0800 +++ /.amd_mnt/10.1.1.100/vol/home/admin/gslin/work/ports/x264/files/patch-configure 2008-11-23 21:38:28.013759000 +0800 @@ -1,5 +1,5 @@ ---- configure.orig 2008-04-09 16:45:06.000000000 -0400 -+++ configure 2008-04-09 20:48:37.722733173 -0400 +--- configure.orig 2008-11-23 21:37:10.042222000 +0800 ++++ configure 2008-11-23 21:37:23.016296000 +0800 @@ -248,7 +248,7 @@ fi as_check || AS="nasm" @@ -7,9 +7,9 @@ - x86_64) + x86_64 | amd64) ARCH="X86_64" - AS="yasm" if [ "$SYS" = MACOSX ];then -@@ -372,7 +372,7 @@ + ASFLAGS="-f macho64 -m amd64 -DPIC -DPREFIX" +@@ -353,7 +353,7 @@ LDFLAGS="$LDFLAGS $libpthread" fi @@ -18,12 +18,3 @@ if [ $SYS = MINGW ]; then MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm" fi -@@ -458,7 +458,7 @@ - cp config.mak gtk/config.mak - - if [ "$shared" = "yes" ]; then -- API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ') -+ API=50 - if [ "$SYS" = "MINGW" ]; then - echo "SONAME=libx264-$API.dll" >> config.mak - echo 'IMPLIBNAME=libx264.dll.a' >> config.mak diff -ruN --exclude=CVS /usr/ports/multimedia/x264/files/patch-gtk_Makefile /.amd_mnt/10.1.1.100/vol/home/admin/gslin/work/ports/x264/files/patch-gtk_Makefile --- /usr/ports/multimedia/x264/files/patch-gtk_Makefile 2007-06-01 22:05:52.000000000 +0800 +++ /.amd_mnt/10.1.1.100/vol/home/admin/gslin/work/ports/x264/files/patch-gtk_Makefile 1970-01-01 08:00:00.000000000 +0800 @@ -1,20 +0,0 @@ ---- gtk/Makefile.orig Fri Jun 1 08:18:59 2007 -+++ gtk/Makefile Fri Jun 1 08:19:28 2007 -@@ -46,14 +46,14 @@ - - X264GTK_PC = x264gtk.pc - --EXTERNAL_DEPS= ../muxers.o ../matroska.o ../libx264.a -+EXTERNAL_DEPS= ../muxers.o ../matroska.o - - - all: $(ENCODE_BIN) $(TEST_BIN) $(MO_FILES) $(X264GTK_PC) - - # Already provides iconv/intl --CPPFLAGS = -g `pkg-config --cflags gtk+-2.0 gthread-2.0` -I.. -DX264_DATA_DIR=\"${datadir}\" --LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0` ../libx264.a -+CPPFLAGS = -g `pkg-config --cflags gtk+-2.0 gthread-2.0 x264` -I.. -DX264_DATA_DIR=\"${datadir}\" -+LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0 x264` - - - # gettext rules diff -ruN --exclude=CVS /usr/ports/multimedia/x264/pkg-plist /.amd_mnt/10.1.1.100/vol/home/admin/gslin/work/ports/x264/pkg-plist --- /usr/ports/multimedia/x264/pkg-plist 2008-04-10 09:01:26.000000000 +0800 +++ /.amd_mnt/10.1.1.100/vol/home/admin/gslin/work/ports/x264/pkg-plist 2008-11-23 21:42:34.014714000 +0800 @@ -1,6 +1,7 @@ +@comment $FreeBSD$ bin/x264 include/x264.h lib/libx264.a lib/libx264.so -lib/libx264.so.50 +lib/libx264.so.65 libdata/pkgconfig/x264.pc --- x264-0.0.20081122.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811231343.mANDhuSU070648>