From baptiste.daroussin@gmail.com  Wed Mar 18 16:59:52 2009
Return-Path: <baptiste.daroussin@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 73079106567F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 18 Mar 2009 16:59:52 +0000 (UTC)
	(envelope-from baptiste.daroussin@gmail.com)
Received: from mail-ew0-f171.google.com (mail-ew0-f171.google.com [209.85.219.171])
	by mx1.freebsd.org (Postfix) with ESMTP id B560A8FC1C
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 18 Mar 2009 16:59:51 +0000 (UTC)
	(envelope-from baptiste.daroussin@gmail.com)
Received: by ewy19 with SMTP id 19so107223ewy.43
        for <FreeBSD-gnats-submit@freebsd.org>; Wed, 18 Mar 2009 09:59:50 -0700 (PDT)
Received: by 10.216.26.70 with SMTP id b48mr319932wea.141.1237395590546;
        Wed, 18 Mar 2009 09:59:50 -0700 (PDT)
Received: from wicklow.lan (stc92-3-82-245-249-89.fbx.proxad.net [82.245.249.89])
        by mx.google.com with ESMTPS id f4sm562817nfh.6.2009.03.18.09.59.49
        (version=TLSv1/SSLv3 cipher=RC4-MD5);
        Wed, 18 Mar 2009 09:59:50 -0700 (PDT)
Received: by wicklow.lan (Postfix, from userid 0)
	id BD538F1960; Wed, 18 Mar 2009 18:00:49 +0100 (CET)
Message-Id: <20090318170049.BD538F1960@wicklow.lan>
Date: Wed, 18 Mar 2009 18:00:49 +0100 (CET)
From: Bapt <baptiste.daroussin@gmail.com>
Reply-To: Bapt <baptiste.daroussin@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update x264 needed for an update on mplayer
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         132780
>Category:       ports
>Synopsis:       Update multimedia/x264 needed for an update on mplayer
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 18 17:00:14 UTC 2009
>Closed-Date:    Tue Mar 31 13:58:29 UTC 2009
>Last-Modified:  Tue Mar 31 14:00:07 UTC 2009
>Originator:     Bapt
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD wicklow.lan 8.0-CURRENT FreeBSD 8.0-CURRENT #8: Sun Mar 15 12:39:49 CET 2009 root@wicklow.lan:/usr/obj/usr/src/sys/WICKLOW i386


	
>Description:
this is an upgrade of x264 for version .so.65 (need to chase the lib version change).
this version doesn't support x264-gtk anymore so multimedia/x264-gtk needs to be removed.
	
>How-To-Repeat:
	
>Fix:

	

--- x264.patch begins here ---
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
--- x264.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-multimedia 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Wed Mar 18 17:59:43 UTC 2009 
Responsible-Changed-Why:  
Fix synopsis and assign. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=132780 
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Mon Mar 30 22:21:30 UTC 2009 
State-Changed-Why:  
ffmpeg does not build with this new version. Can you provide a patch to fix 
that build? 

libavcodec/libx264.c: In function 'X264_init': 
libavcodec/libx264.c:165: error: 'x264_param_t' has no member named 'b_bframe_adaptive' 
libavcodec/libx264.c:230: error: 'struct <anonymous>' has no member named 'b_bidir_me' 
libavcodec/libx264.c:231: error: 'struct <anonymous>' has no member named 'b_bframe_rdo' 
libavcodec/libx264.c:256: error: 'struct <anonymous>' has no member named 'psz_rc_eq' 



Responsible-Changed-From-To: freebsd-multimedia->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Mon Mar 30 22:21:30 UTC 2009 
Responsible-Changed-Why:  
Track 

http://www.freebsd.org/cgi/query-pr.cgi?pr=132780 

From: Baptiste Daroussin <baptiste.daroussin@gmail.com>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/132780: Update multimedia/x264 needed for an update on
	mplayer
Date: Tue, 31 Mar 2009 11:05:24 +0200

 --X1bOJ3K7DJ5YkBrT
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Here is a patch add to the files repository of ffmpeg ports, it is a backport of
 de libavcodec/libx264.c from ffmpeg-0.5 and it works.
 
 Bapt
 
 --X1bOJ3K7DJ5YkBrT
 Content-Type: text/x-csrc; charset=us-ascii
 Content-Disposition: attachment; filename="patch-libavcodec__libx264.c"
 
 --- ./libavcodec/libx264.c.orig	2008-06-12 23:50:13.000000000 +0200
 +++ ./libavcodec/libx264.c	2008-10-13 15:47:05.000000000 +0200
 @@ -124,6 +124,8 @@
  {
      X264Context *x4 = avctx->priv_data;
  
 +    av_freep(&avctx->extradata);
 +
      if(x4->enc)
          x264_encoder_close(x4->enc);
  
 @@ -162,7 +164,7 @@
  
      x4->params.i_bframe = avctx->max_b_frames;
      x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
 -    x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
 +    x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
      x4->params.i_bframe_bias = avctx->bframebias;
      x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID;
      avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;
 @@ -227,8 +229,6 @@
      x4->params.analyse.i_me_range = avctx->me_range;
      x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality;
  
 -    x4->params.analyse.b_bidir_me = avctx->bidir_refine > 0;
 -    x4->params.analyse.b_bframe_rdo = avctx->flags2 & CODEC_FLAG2_BRDO;
      x4->params.analyse.b_mixed_references =
          avctx->flags2 & CODEC_FLAG2_MIXED_REFS;
      x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA;
 @@ -253,7 +253,6 @@
      x4->params.rc.f_ip_factor = 1/fabs(avctx->i_quant_factor);
      x4->params.rc.f_pb_factor = avctx->b_quant_factor;
      x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
 -    x4->params.rc.psz_rc_eq = avctx->rc_eq;
  
      x4->params.analyse.b_psnr = avctx->flags & CODEC_FLAG_PSNR;
      x4->params.i_log_level = X264_LOG_DEBUG;
 
 --X1bOJ3K7DJ5YkBrT--
State-Changed-From-To: feedback->open 
State-Changed-By: pav 
State-Changed-When: Tue Mar 31 11:54:29 UTC 2009 
State-Changed-Why:  
Patch received 

http://www.freebsd.org/cgi/query-pr.cgi?pr=132780 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Tue Mar 31 13:57:18 UTC 2009 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=132780 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/132780: commit references a PR
Date: Tue, 31 Mar 2009 13:58:33 +0000 (UTC)

 pav         2009-03-31 13:58:18 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia           Makefile 
     multimedia/ffmpeg    Makefile 
     multimedia/gstreamer-plugins Makefile.common 
     multimedia/gstreamer-plugins-x264 Makefile 
     multimedia/libquicktime Makefile distinfo 
     multimedia/lives     Makefile 
     multimedia/mpeg4ip   Makefile 
     multimedia/mplayer   Makefile.options 
     multimedia/vlc       Makefile 
     multimedia/x264      Makefile distinfo pkg-plist 
     multimedia/x264/files patch-Makefile 
   Added files:
     multimedia/ffmpeg/files patch-libavcodec_libx264.c 
   Removed files:
     multimedia/x264/files patch-configure patch-gtk_Makefile 
     multimedia/x264-gtk  Makefile pkg-plist 
   Log:
   - Update x264 to 0.0.20081218
   - Remove x264-gtk
   
   PR:             ports/132780
   Submitted by:   Bapt <baptiste.daroussin@gmail.com>
   
   - Update libquicktime to 1.1.1 to fix build with new x264
   
   Submitted by:   kwm
   
   - Chase x264 shlib bump
   
   Revision  Changes    Path
   1.313     +0 -1      ports/multimedia/Makefile
   1.94      +2 -2      ports/multimedia/ffmpeg/Makefile
   1.1       +37 -0     ports/multimedia/ffmpeg/files/patch-libavcodec_libx264.c (new)
   1.9       +1 -1      ports/multimedia/gstreamer-plugins-x264/Makefile
   1.84      +2 -2      ports/multimedia/gstreamer-plugins/Makefile.common
   1.64      +2 -3      ports/multimedia/libquicktime/Makefile
   1.17      +3 -3      ports/multimedia/libquicktime/distinfo
   1.23      +2 -2      ports/multimedia/lives/Makefile
   1.87      +2 -2      ports/multimedia/mpeg4ip/Makefile
   1.7       +1 -1      ports/multimedia/mplayer/Makefile.options
   1.186     +2 -2      ports/multimedia/vlc/Makefile
   1.3       +0 -17     ports/multimedia/x264-gtk/Makefile (dead)
   1.2       +0 -10     ports/multimedia/x264-gtk/pkg-plist (dead)
   1.68      +9 -21     ports/multimedia/x264/Makefile
   1.36      +3 -6      ports/multimedia/x264/distinfo
   1.15      +9 -12     ports/multimedia/x264/files/patch-Makefile
   1.12      +0 -29     ports/multimedia/x264/files/patch-configure (dead)
   1.2       +0 -20     ports/multimedia/x264/files/patch-gtk_Makefile (dead)
   1.6       +1 -1      ports/multimedia/x264/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
