diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2010-05-28 08:44:41 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2010-05-28 08:44:41 +0000 |
| commit | 324e24a488846d7ce4e8271bde2a9bf13c69602a (patch) | |
| tree | d5b2b0a522cb70315f8a7368f72e91f760919984 /multimedia/x264 | |
| parent | 8dbc888408840fedc4186197334a637abfb0c7e7 (diff) | |
Notes
Diffstat (limited to 'multimedia/x264')
| -rw-r--r-- | multimedia/x264/Makefile | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index 3a823f1f9b03..911eb31c4a66 100644 --- a/multimedia/x264/Makefile +++ b/multimedia/x264/Makefile @@ -6,7 +6,7 @@ PORTNAME= x264 PORTVERSION= 0.0.20100222 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/ \ http://samples.mplayerhq.hu/yuv4mpeg2/:pgo @@ -18,8 +18,7 @@ EXTRACT_ONLY= ${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245${EXTRACT_SUFX} MAINTAINER= mm@FreeBSD.org COMMENT?= Library and tool for encoding H.264/AVC video streams -BUILD_DEPENDS= yasm>=0.6.0:${PORTSDIR}/devel/yasm \ - ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils +BUILD_DEPENDS= yasm>=0.6.0:${PORTSDIR}/devel/yasm USE_BZIP2= yes EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude .svn @@ -29,25 +28,31 @@ USE_LDCONFIG= yes HAS_CONFIGURE= yes MAKE_JOBS_SAFE= yes -OPTIONS= DEBUG "Enable Debugging" Off \ +OPTIONS= ASM "Assembly optimizations (devel/binutils)" On \ + DEBUG "Enable Debugging" Off \ PGO "Enable Profile-Guided Optimization" Off \ - GCC44 "Use gcc 4.4+" Off \ + GCC44 "Use gcc 4.4+ (implies WITH_ASM)" 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" \ +CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include" \ + --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib" \ --enable-shared -CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin - .include <bsd.port.pre.mk> .if defined(WITH_GCC44) USE_GCC?= 4.4+ .endif +.if !defined(WITHOUT_ASM) || defined(WITH_GCC44) +BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils +CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin +MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin +.else +CONFIGURE_ARGS+= --disable-asm +.endif + # Around the time GCC stack protection (aka Propolice) for userland # was enabled on src/share/mk/bsd.sys.mk # SVN rev 180012 on 2008-06-25 21:33:28Z by ru |