Attachment 94594 Details for Bug 132780 – x264.patch

[patch] x264.patch

x264.patch (text/plain), 6.77 KB, created by baptiste.daroussin on 2009-03-18 17:00:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: baptiste.daroussin

Created: 2009-03-18 17:00:14 UTC

Size: 6.77 KB

patch

obsolete

>diff -Naur /usr/ports/multimedia/x264/Makefile ./x264/Makefile
>--- /usr/ports/multimedia/x264/Makefile	2009-03-15 23:57:21.000000000 +0100
>+++ ./x264/Makefile	2009-03-18 16:06:56.000000000 +0100
>@@ -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.20081218
>+#PORTREVISION?=	2
> CATEGORIES=	multimedia
> MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/ \
> 		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
>@@ -21,18 +21,20 @@
> 
> BUILD_DEPENDS=	yasm>=0.6.0:${PORTSDIR}/devel/yasm
> 
>-WANT_GNOME=	yes
>+#WANT_GNOME=	yes
> USE_BZIP2=	yes
> EXTRACT_AFTER_ARGS?=	| ${TAR} -xf - --exclude .svn
> WRKSRC=		${WRKDIR}/${DISTNAME}
> USE_GMAKE=	yes
>-ALL_TARGET=	default
>+#ALL_TARGET=	default
> USE_LDCONFIG=	yes
> HAS_CONFIGURE=	yes
> 
> OPTIONS=	DEBUG "Enable Debugging" Off \
> 		OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off \
>-		PGO "Enable Profile-Guided Optimization" Off
>+		PGO "Enable Profile-Guided Optimization" Off \
>+		GPAC "Enable MPEG-4 Output" On \
>+		X11_OUTPUT "Enable X11 Output" Off
> 
> CONFIGURE_ARGS+=	--extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${LOCALBASE}/include" \
> 			--extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib" \
>@@ -40,19 +42,6 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if defined(WITH_GTK2) && ${SLAVE_PORT:L}=="yes"
>-LIB_DEPENDS+=	x264.50:${PORTSDIR}/multimedia/x264
>-BUILD_WRKSRC=	${WRKSRC}/gtk
>-INSTALL_WRKSRC=	${WRKSRC}/gtk
>-ALL_TARGET=	all
>-USE_GETTEXT=	yes
>-USE_GNOME=	gtk20
>-CONFIGURE_ARGS+=	--enable-gtk
>-.else
>-OPTIONS+=	GPAC "Enable MPEG-4 Output" On \
>-		X11_OUTPUT "Enable X11 Output" Off
>-.endif
>-
> .if ${ARCH}=="i386"
> MAKE_ENV+=	ARCH_X86="1"
> .endif
>@@ -68,7 +57,7 @@
> Y4M_VIDEO=example.y4m
> Y4M_VIDEO_DISTFILE=example.y4m.bz2
> 
>-DISTFILES+=	${Y4M_VIDEO_DISTFILE}
>+DISTFILES+=	${Y4M_VIDEO_DISTFILE}:pgo
> ALL_TARGET=	fprofiled
> MAKE_ENV+=	VIDS="${WRKDIR}/${Y4M_VIDEO}"
> 
>@@ -98,12 +87,14 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \
>-		s|-lpthread|${PTHREAD_LIBS}|g' \
>+		s|-lpthread|${PTHREAD_LIBS}|g; \
>+		s|bash|sh|; \
>+		s|gpac_static|gpac|g' \
> 		${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|bash|sh|' ${WRKSRC}/version.sh
> 	@${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 -Naur /usr/ports/multimedia/x264/distinfo ./x264/distinfo
>--- /usr/ports/multimedia/x264/distinfo	2009-03-15 23:57:21.000000000 +0100
>+++ ./x264/distinfo	2009-03-17 19:52:32.000000000 +0100
>@@ -1,6 +1,3 @@
>-MD5 (x264/x264-snapshot-20080409-2245.tar.bz2) = 2a1b0ad913885cfde72159671ad51280
>-SHA256 (x264/x264-snapshot-20080409-2245.tar.bz2) = 6a921b0fc21cf508fd4df003b400903dee50cc046e3d4a8570aef34f4a000b32
>-SIZE (x264/x264-snapshot-20080409-2245.tar.bz2) = 1919929
>-MD5 (x264/example.y4m.bz2) = e0948016cd4a52e75d6a74d998bd6ae6
>-SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
>-SIZE (x264/example.y4m.bz2) = 4910029
>+MD5 (x264/x264-snapshot-20081218-2245.tar.bz2) = a5034835110bf3302539648323c73517
>+SHA256 (x264/x264-snapshot-20081218-2245.tar.bz2) = 729fbdd18d4e84980fb8533cdf60379f86728e950277370c226486d2a7857167
>+SIZE (x264/x264-snapshot-20081218-2245.tar.bz2) = 2336724
>diff -Naur /usr/ports/multimedia/x264/files/patch-Makefile ./x264/files/patch-Makefile
>--- /usr/ports/multimedia/x264/files/patch-Makefile	2008-04-10 03:01:26.000000000 +0200
>+++ ./x264/files/patch-Makefile	2009-03-17 19:09:34.000000000 +0100
>@@ -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 @@
>-           cpu-32.asm dct-32.asm
>+--- ./Makefile.orig	2008-12-18 22:45:07.000000000 +0100
>++++ ./Makefile	2009-03-17 19:09:28.000000000 +0100
>+@@ -26,12 +26,12 @@
>+           cpu-a.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 -Naur /usr/ports/multimedia/x264/files/patch-configure ./x264/files/patch-configure
>--- /usr/ports/multimedia/x264/files/patch-configure	2008-04-10 03:01:26.000000000 +0200
>+++ ./x264/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
>@@ -1,29 +0,0 @@
>---- configure.orig	2008-04-09 16:45:06.000000000 -0400
>-+++ configure	2008-04-09 20:48:37.722733173 -0400
>-@@ -248,7 +248,7 @@
>-     fi
>-     as_check || AS="nasm"
>-     ;;
>--  x86_64)
>-+  x86_64 | amd64)
>-     ARCH="X86_64"
>-     AS="yasm"
>-     if [ "$SYS" = MACOSX ];then
>-@@ -372,7 +372,7 @@
>-     LDFLAGS="$LDFLAGS $libpthread"
>- fi
>- 
>--MP4_LDFLAGS="-lgpac_static"
>-+MP4_LDFLAGS="-lgpac"
>- 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 -Naur /usr/ports/multimedia/x264/files/patch-gtk_Makefile ./x264/files/patch-gtk_Makefile
>--- /usr/ports/multimedia/x264/files/patch-gtk_Makefile	2007-06-01 16:05:52.000000000 +0200
>+++ ./x264/files/patch-gtk_Makefile	1970-01-01 01:00:00.000000000 +0100
>@@ -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 -Naur /usr/ports/multimedia/x264/pkg-plist ./x264/pkg-plist
>--- /usr/ports/multimedia/x264/pkg-plist	2008-04-10 03:01:26.000000000 +0200
>+++ ./x264/pkg-plist	2009-03-17 19:12:03.000000000 +0100
>@@ -2,5 +2,5 @@
> include/x264.h
> lib/libx264.a
> lib/libx264.so
>-lib/libx264.so.50
>+lib/libx264.so.65
> libdata/pkgconfig/x264.pc

Actions: View | Diff

Attachments on bug 132780: 94594 | 94595