ports/118237: Ports: multimedia/ffmpeg fix configure option and add supports

[Tatsuki Makino]

The following reply was made to PR ports/118237; it has been noted by GNATS.

From: "Tatsuki Makino" <tatsuki_makino at hotmail.com>
To: <bug-followup at FreeBSD.org>,
	<tatsuki_makino at hotmail.com>
Cc:  
Subject: Re: ports/118237: Ports: multimedia/ffmpeg fix configure option and add supports
Date: Fri, 9 May 2008 18:38:10 +0900

 This is a multi-part message in MIME format.
 
 ------=_NextPart_000_002B_01C8B203.D511D1E0
 Content-Type: text/plain;
 	format=flowed;
 	charset="iso-2022-jp";
 	reply-type=original
 Content-Transfer-Encoding: 7bit
 
 This is new patch for ffmpeg-2007.10.04_4.
 
 I think that Makefile needs more cleanup.
 May I clean up it? 
 ------=_NextPart_000_002B_01C8B203.D511D1E0
 Content-Type: text/plain;
 	format=flowed;
 	name="patch-ffmpeg-PR118237.diff.txt";
 	reply-type=original
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment;
 	filename="patch-ffmpeg-PR118237.diff.txt"
 
 diff -u -r -N ../ffmpeg.orig/Makefile ./Makefile=0A=
 --- ../ffmpeg.orig/Makefile	2008-04-27 10:22:56.000000000 +0000=0A=
 +++ ./Makefile	2008-05-09 09:14:49.000000000 +0000=0A=
 @@ -23,6 +23,7 @@=0A=
  =0A=
  OPTIONS=3D	AMR_NB	"AMR narrowband encoder" off \=0A=
  		AMR_WB	"AMR wideband encoder" off \=0A=
 +		BKTR	"bktr(4) demuxer" on \=0A=
  		FAAC	"FAAC mp4/aac audio encoder" off \=0A=
  		FAAD	"FAAD mp4/aac audio decoder" on \=0A=
  		GSM	"gsm audio codec" off \=0A=
 @@ -39,7 +40,9 @@=0A=
  		VHOOK_IMLIB2 "imlib2 support (implies VHOOK)" off \=0A=
  		VORBIS	"libvorbisenc support (implies OGG)" on \=0A=
  		X264	"X.264 codec" on \=0A=
 -		XVID	"XVID codec" off=0A=
 +		XVID	"XVID codec" off \=0A=
 +		GCC42PLUS	"Build with GCC 4.2+" off \=0A=
 +		CPU	"Each CPU optimization" off=0A=
  =0A=
  .include <bsd.port.pre.mk>=0A=
  =0A=
 @@ -90,6 +93,24 @@=0A=
  DEBUG_FLAGS+=3D		 -O2=0A=
  .endif=0A=
  =0A=
 +.ifdef(WITH_CPU)=0A=
 +. if ${WITH_CPU} =3D=3D "true" || ${WITH_CPU:L} =3D=3D "yes"=0A=
 +.  ifdef(CPUTYPE)=0A=
 +CONFIGURE_ARGS+=3D	--cpu=3D${CPUTYPE}=0A=
 +.  endif=0A=
 +. else=0A=
 +CONFIGURE_ARGS+=3D	--cpu=3D${WITH_CPU}=0A=
 +. endif=0A=
 +.elifdef(CPUTYPE)=0A=
 +CONFIGURE_ARGS+=3D	--cpu=3D${CPUTYPE}=0A=
 +.endif=0A=
 +=0A=
 +.if ${OSVERSION} < 700042=0A=
 +. ifdef WITH_GCC42PLUS=0A=
 +USE_GCC=3D	4.2+=0A=
 +. endif=0A=
 +.endif=0A=
 +=0A=
  ## a52=0A=
  .if !defined(WITHOUT_LIBA52) && !defined(WITHOUT_A52)=0A=
  LIB_DEPENDS+=3D	a52.0:${PORTSDIR}/audio/liba52=0A=
 @@ -138,6 +159,16 @@=0A=
  CONFIGURE_ARGS+=3D	--disable-libamr-wb=0A=
  .endif=0A=
  =0A=
 +## bktr=0A=
 +.ifdef(WITHOUT_BKTR)=0A=
 +CONFIGURE_ARGS+=3D	--disable-demuxer=3Dbktr=0A=
 +.else=0A=
 +. ifdef(WITH_BKTR_VIDEO_FORMAT)=0A=
 +# PAL, NTSC, NTSCM, SECAM, PALN, PALM or NTSCJ=0A=
 +FFMPEG_CFLAGS+=3D	-DVIDEO_FORMAT=3D${WITH_BKTR_VIDEO_FORMAT}=0A=
 +. endif=0A=
 +.endif=0A=
 +=0A=
  USE_RC_SUBR=3D		ffserver=0A=
  =0A=
  .if ${MACHINE_CPU:Mmmx}=3D=3D""=0A=
 
 ------=_NextPart_000_002B_01C8B203.D511D1E0--