diff options
| author | riggs <riggs@FreeBSD.org> | 2015-06-23 03:55:51 +0800 |
|---|---|---|
| committer | riggs <riggs@FreeBSD.org> | 2015-06-23 03:55:51 +0800 |
| commit | 99d7a89b4b01a20b61f7db1e9290a81b14090f29 (patch) | |
| tree | 75094f45e420dbf45747543e781513bb177db415 | |
| parent | f1848f3cc053d08d3c31252ce90151beee91f8a6 (diff) | |
| download | freebsd-ports-gnome-99d7a89b4b01a20b61f7db1e9290a81b14090f29.tar.gz freebsd-ports-gnome-99d7a89b4b01a20b61f7db1e9290a81b14090f29.tar.zst freebsd-ports-gnome-99d7a89b4b01a20b61f7db1e9290a81b14090f29.zip | |
- Use memalign hack only on supported systems that need it
(FreeBSD on pre-10 systems)
- Bump PORTREVISION
| -rw-r--r-- | multimedia/ffmpeg26/Makefile | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/multimedia/ffmpeg26/Makefile b/multimedia/ffmpeg26/Makefile index 2191ab940290..591e7ce2aac6 100644 --- a/multimedia/ffmpeg26/Makefile +++ b/multimedia/ffmpeg26/Makefile @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 2.6.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ PKGNAMESUFFIX= 26 @@ -33,13 +33,13 @@ MAKE_ARGS+= EXESUF="${FFMPEG_SUFFIX}" OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG DOCS FAAC \ FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GSM ICONV \ - JACK LAME LIBBLURAY LIBV4L MAH MODPLUG OPENAL OPENCV OPENJPEG \ + JACK LAME LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG \ OPTIMIZED_CFLAGS OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX \ THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \ X11GRAB X264 X265 XVID OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \ - MAH OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID + OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= GNUTLS OPENSSL @@ -49,13 +49,10 @@ CDIO_DESC= Audio CD grabbing with libcdio FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK FFSERVER_DESC= Build and install ffserver LIBV4L_DESC= Video for Linux support -MAH_DESC= Enable memalign hack X11GRAB_DESC= Enable x11 grabbing OPTIONS_SUB= yes -OPTIONS_EXCLUDE_DragonFly= MAH - # aacplus AACPLUS_LIB_DEPENDS= libaacplus.so:${PORTSDIR}/audio/libaacplus AACPLUS_CONFIGURE_ENABLE= libaacplus @@ -138,9 +135,6 @@ LIBV4L_CONFIGURE_ENABLE= libv4l2 LIBV4L_CONFIGURE_OFF= --disable-indev=v4l2 \ --disable-outdev=v4l2 -# memalign-hack -MAH_CONFIGURE_ENABLE= memalign-hack - # modplug MODPLUG_LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug MODPLUG_CONFIGURE_ENABLE= libmodplug @@ -253,6 +247,10 @@ CONFIGURE_ARGS+= --enable-x11grab .include <bsd.port.pre.mk> +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000 +CONFIGURE_ARGS+= --enable-memalign-hack +.endif + .if ${ARCH} == "armv6" CONFIGURE_ENV+= ASFLAGS=-no-integrated-as .endif |