aboutsummaryrefslogtreecommitdiff
path: root/multimedia/x264
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2010-04-18 09:32:09 +0000
committerMartin Matuska <mm@FreeBSD.org>2010-04-18 09:32:09 +0000
commit0b0f43eda3d41ef4e2bd1f77f361c71902364f26 (patch)
tree32776789f5b8476ef2d5b90a3adf7fb0d942c999 /multimedia/x264
parent3bae06fc056d4f623328821934d52f9a861f4284 (diff)
downloadports-0b0f43eda3d41ef4e2bd1f77f361c71902364f26.tar.gz
ports-0b0f43eda3d41ef4e2bd1f77f361c71902364f26.zip
Notes
Diffstat (limited to 'multimedia/x264')
-rw-r--r--multimedia/x264/Makefile13
1 files changed, 6 insertions, 7 deletions
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 71e6005a0a40..76dfbd48ddc4 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -7,7 +7,7 @@
PORTNAME= x264
PORTVERSION= 0.0.20090119
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/ \
http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
@@ -17,7 +17,9 @@ DIST_SUBDIR= x264
EXTRACT_ONLY= ${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245${EXTRACT_SUFX}
MAINTAINER= mm@FreeBSD.org
-COMMENT?= Multimedia library and tool for encoding H.264/AVC video streams
+COMMENT?= Library and tool for encoding H.264/AVC video streams
+
+CONFLICTS= x264-2010*
BUILD_DEPENDS= yasm>=0.6.0:${PORTSDIR}/devel/yasm
@@ -30,7 +32,6 @@ HAS_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
OPTIONS= DEBUG "Enable Debugging" Off \
- OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off \
PGO "Enable Profile-Guided Optimization" Off \
GPAC "Enable MPEG-4 Output" On \
X11_OUTPUT "Enable X11 Output" Off
@@ -73,14 +74,12 @@ RESTRICTED= ${Y4M_VIDEO_DISTFILE} file may not be mirrored
RESTRICTED_FILES= ${Y4M_VIDEO_DISTFILE}
.endif
-.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+= -O2 -funroll-loops -ffast-math
-.endif
-
.if !defined(WITHOUT_GPAC)
BUILD_DEPENDS+= gpac-libgpac>=0.4.2.r2,1:${PORTSDIR}/multimedia/gpac-libgpac
LIB_DEPENDS+= gpac.1:${PORTSDIR}/multimedia/gpac-libgpac
CONFIGURE_ARGS+= --enable-mp4-output
+.else
+CONFIGURE_ARGS+= --disable-mp4-output
.endif
.if defined(WITH_X11_OUTPUT)