Date: Fri, 16 Jan 2009 10:50:19 +0800 From: "Eric L. Chen" <d9364104@mail.nchu.edu.tw> To: Jarecki <jarecki@dwb.pl> Cc: multimedia@freebsd.org Subject: Re: x264 Message-ID: <a50d5a500901151850w5b85d9b0re19d02aacba73977@mail.gmail.com> In-Reply-To: <5E28B965-E47E-49C3-AF16-4A395BACC2C6@dwb.pl> References: <5E28B965-E47E-49C3-AF16-4A395BACC2C6@dwb.pl>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Thu, Jan 15, 2009 at 4:03 PM, Jarecki <jarecki@dwb.pl> wrote: > > Hello, > > Could you help me? > > the curent version of x264 in ports is too old for some other programs > > x264 --version > x264 0.59.x > > > Version from linux > # x264 --version > x264 0.65.1058+5 d106962 > > Its possible to add newest version of x264 (20090114) to freebds ports? for some reason I cannot compile newer version from sources. > I must create simmilar sollution as on linux box (ffmpeg, mplayer/mencoder, MP4Box (gpac), x264) in almost identical versions as on linux > Try this one. /Eric [-- Attachment #2 --] diff -purN multimedia/x264/Makefile multimedia/x264/Makefile --- multimedia/x264/Makefile 2008-06-06 22:33:38.000000000 +0800 +++ multimedia/x264/Makefile 2009-01-16 10:39:45.000000000 +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.20090115 +PORTREVISION?= 0 CATEGORIES= multimedia MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/ DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245 @@ -27,7 +27,9 @@ USE_LDCONFIG= yes HAS_CONFIGURE= yes OPTIONS= DEBUG "Enable Debugging" Off \ - OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off + OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" 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" \ @@ -35,19 +37,6 @@ CONFIGURE_ARGS+= --extra-cflags="${CPPFL .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 @@ -79,8 +68,7 @@ post-patch: ${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 -purN multimedia/x264/distinfo multimedia/x264/distinfo --- multimedia/x264/distinfo 2008-04-10 09:01:26.000000000 +0800 +++ multimedia/x264/distinfo 2009-01-16 10:39:45.000000000 +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-20090115-2245.tar.bz2) = bf87b72487f360256778040d23e236c2 +SHA256 (x264-snapshot-20090115-2245.tar.bz2) = 5e42bfc539144f102ad359b1e8f525c259f8ab900a943c578fa4fd0949eb7735 +SIZE (x264-snapshot-20090115-2245.tar.bz2) = 2378309 diff -purN multimedia/x264/files/patch-Makefile multimedia/x264/files/patch-Makefile --- multimedia/x264/files/patch-Makefile 2008-04-10 09:01:26.000000000 +0800 +++ multimedia/x264/files/patch-Makefile 2009-01-16 10:39:45.000000000 +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 @@ - cpu-32.asm dct-32.asm +--- Makefile.orig 2009-01-16 10:15:21.000000000 +0800 ++++ Makefile 2009-01-16 10:16:06.000000000 +0800 +@@ -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 -purN multimedia/x264/files/patch-configure multimedia/x264/files/patch-configure --- multimedia/x264/files/patch-configure 2008-04-10 09:01:26.000000000 +0800 +++ multimedia/x264/files/patch-configure 2009-01-16 10:39:45.000000000 +0800 @@ -1,15 +1,15 @@ ---- configure.orig 2008-04-09 16:45:06.000000000 -0400 -+++ configure 2008-04-09 20:48:37.722733173 -0400 -@@ -248,7 +248,7 @@ +--- configure.orig 2009-01-16 10:16:31.000000000 +0800 ++++ configure 2009-01-16 10:18:16.000000000 +0800 +@@ -247,7 +247,7 @@ + ASFLAGS="$ASFLAGS -f elf" fi - as_check || AS="nasm" ;; - 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" +@@ -352,7 +352,7 @@ LDFLAGS="$LDFLAGS $libpthread" fi @@ -18,8 +18,8 @@ if [ $SYS = MINGW ]; then MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm" fi -@@ -458,7 +458,7 @@ - cp config.mak gtk/config.mak +@@ -435,7 +435,7 @@ + echo '' >> config.mak if [ "$shared" = "yes" ]; then - API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ') diff -purN multimedia/x264/files/patch-gtk_Makefile multimedia/x264/files/patch-gtk_Makefile --- multimedia/x264/files/patch-gtk_Makefile 2007-06-01 22:05:52.000000000 +0800 +++ multimedia/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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?a50d5a500901151850w5b85d9b0re19d02aacba73977>