aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2010-06-09 16:24:45 +0000
committerMartin Matuska <mm@FreeBSD.org>2010-06-09 16:24:45 +0000
commitbaa04f1b0deed25e733c41bd380f1678f219e0fc (patch)
treeb0fe381478880e314f052803b853f3294e02bcac
parenta601d33a957b5a2fda441c3fd2aa5ea981128a1c (diff)
downloadports-baa04f1b0deed25e733c41bd380f1678f219e0fc.tar.gz
ports-baa04f1b0deed25e733c41bd380f1678f219e0fc.zip
Notes
-rw-r--r--multimedia/ffmpeg/Makefile22
1 files changed, 10 insertions, 12 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 213ff58ba508..216e9d2e309c 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ffmpeg
PORTVERSION= 0.5.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
@@ -40,7 +40,7 @@ OPTIONS= AMR_NB "AMR Narrow Band encoder" off \
SCHROEDINGER "Dirac codec via libschroedinger" on \
SDL "SDL support (build ffplay)" off \
SPEEX "Speex audio decoder" off \
- SSSE3 "Enable ssse3 support (gcc 4.4+)" off \
+ SSSE3 "Enable ssse3 support" off \
THEORA "Theora encoder (implies OGG)" on \
VHOOK "Video hook support" off \
VORBIS "Vorbis encoder via libvorbis (implies OGG)" on \
@@ -107,13 +107,14 @@ DOC_DOCFILES= APIchanges avutil.txt faq.html ffmpeg-doc.html \
snow.txt soc.txt swscale.txt TODO
PORTDOCS= *
-.ifndef(WITHOUT_FFSERVER)
-USE_RC_SUBR= ffserver
+.if defined(WITH_SSSE3)
+BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
+MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
.endif
-.if defined(WITH_SSSE3)
-USE_GCC= 4.4+
-BUILD_DEPENDS+= as:${PORTSDIR}/devel/binutils
+.ifndef(WITHOUT_FFSERVER)
+USE_RC_SUBR= ffserver
.endif
# sse hardware vector support
@@ -144,11 +145,8 @@ MAN1+= ffserver.1
.endif
# optimizations
-.ifdef(WITH_OPTIMIZED_CFLAGS)
-CFLAGS:= ${CFLAGS:N-O*} -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
-.else
-CFLAGS:= ${CFLAGS:N-O0} -O2
-DEBUG_FLAGS+= -O2
+.if defined(WITH_OPTIMIZED_CFLAGS)
+CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
.endif
# amr