[ports-multimedia commit] r75 - trunk/ports-multimedia/multimedia/ffmpeg

[codesite-noreply at google.com]

Author: buhnux
Date: Thu Apr 10 05:47:22 2008
New Revision: 75

Modified:
   trunk/ports-multimedia/multimedia/ffmpeg/Makefile

Log:
Switch to OPTIONS


Modified: trunk/ports-multimedia/multimedia/ffmpeg/Makefile
==============================================================================
--- trunk/ports-multimedia/multimedia/ffmpeg/Makefile	(original)
+++ trunk/ports-multimedia/multimedia/ffmpeg/Makefile	Thu Apr 10 
05:47:22 2008
@@ -21,6 +21,14 @@
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WANT_SDL=	yes
+OPTIONS=	A52 "ATSC A/52 audio decoding" On \
+		FAAC "FAAC AAC and MP4 audio encoder support" Off \
+		FAAD "FAAD AAC and MP4 audio decoder support" On \
+		LAME "LAME MP3 audio encoder support" Off \
+		THEORA "Theora video codec support" On \
+		VORBIS "OGG/Vorbis audio support" On \
+		X264 "H.264/AVC (MPEG4 part 10) multimedia codec" On \
+		OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off

 .include <bsd.port.pre.mk>

@@ -81,11 +89,6 @@
 .else
 CONFIGURE_ARGS+=	--disable-liba52
 .endif
-## dts
-#.ifdef(WITH_DTS) || exists(${LOCALBASE}/lib/libdca.a)
-#LIB_DEPENDS+=		dca.0:${PORTSDIR}/multimedia/libdca
-#CONFIGURE_ARGS+=	--enable-libdts
-#.endif
 ## faac
 .ifdef(WITH_FAAC) || exists(${LOCALBASE}/lib/libfaac.so)
 LIB_DEPENDS+=		faac.0:${PORTSDIR}/audio/faac
@@ -112,11 +115,6 @@
 .endif
 USE_RC_SUBR=		ffserver

-.if ${MACHINE_CPU:Mmmx}==""
-CONFIGURE_ARGS+=	--disable-mmx
-
-WITHOUT_BUILTIN_VECTOR=	yes
-.endif
 ## gsm
 .ifdef(WITH_GSM) || exists(${LOCALBASE}/lib/libgsm.so)
 LIB_DEPENDS+=		gsm.1:${PORTSDIR}/audio/gsm
@@ -181,54 +179,6 @@
 WITHOUT_IMLIB2=	yes
 . endif # imlib2

-pre-everything::
-.ifndef(WITHOUT_A52)
-	@${ECHO_MSG} 'You can disable liba52 support by defining WITHOUT_LIBA52'
-	@${ECHO_MSG}
-.endif
-#.ifndef(WITH_DTS)
-#	@${ECHO_MSG} 'Define WITH_DTS to enable DTS codec'
-#	@${ECHO_MSG}
-#.endif
-.ifndef(WITH_FAAC)
-	@${ECHO_MSG} 'Define WITH_FAAC to enable FAAC mp4/aac audio encoder'
-	@${ECHO_MSG}
-.endif
-.ifndef(WITHOUT_FAAD)
-	@${ECHO_MSG} 'Define WITHOUT_FAAD to disable FAAD mp4/aac audio decoder'
-	@${ECHO_MSG}
-.endif
-.ifndef(WITH_FREETYPE2)
-	@${ECHO_MSG} 'Define WITH_FREETYPE2 to enable VHOOK drawtext 
FREETYPE2 codec'
-	@${ECHO_MSG}
-.endif
-.ifndef(WITHOUT_IPV6)
-	@${ECHO_MSG} 'Define WITHOUT_IPV6 to disable IPV6 network support'
-	@${ECHO_MSG}
-.endif
-.ifndef(WITH_LAME)
-	@${ECHO_MSG} 'Define WITH_LAME to enable lame MP3 codec'
-	@${ECHO_MSG}
-.endif
-.ifndef(WITH_OPTIMIZED_CFLAGS)
-	@${ECHO_MSG} 'You can enable additional compilation optimizations'
-	@${ECHO_MSG} 'by defining WITH_OPTIMIZED_CFLAGS'
-	@${ECHO_MSG}
-.endif
-.ifndef(WITH_SWSCALER)
-	@${ECHO_MSG} 'Define WITH_SWSCALER to enable software scaler support'
-	@${ECHO_MSG} 'Warning: swscaler does not work with VLC!'
-	@${ECHO_MSG}
-.endif
-.ifndef(WITHOUT_THEORA)
-	@${ECHO_MSG} 'Define WITHOUT_THEORA to disable libtheora support'
-	@${ECHO_MSG}
-.endif
-.ifndef(WITHOUT_X264)
-	@${ECHO_MSG} 'Define WITHOUT_X264 to disable X264 codec'
-	@${ECHO_MSG}
-.endif
-
 post-patch:
 # Faad compat
 	@${REINPLACE_CMD} -e 's|faacD|NeAACD|' ${WRKSRC}/libavcodec/libfaad.c
@@ -287,13 +237,6 @@
 		${WRKSRC}/common.mak

 post-configure:
-#.ifdef(WITH_DTS)
-#	@${REINPLACE_CMD} -E \
-#		-e 's|-ldts|${LOCALBASE}/lib/libdts_pic.a|' \
-#		-e 's|(-lx264)|-L${LOCALBASE}/lib \1|' \
-#			${WRKSRC}/config.mak \
-#			${WRKSRC}/libavcodec/Makefile
-#.endif
 .ifdef(WITHOUT_THEORA)
 	@${REINPLACE_CMD} -E \
 		-e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \