svn commit: r390327 - head/multimedia/ffmpeg0

[Thomas Zander]

Author: riggs
Date: Mon Jun 22 20:32:33 2015
New Revision: 390327
URL: https://svnweb.freebsd.org/changeset/ports/390327

Log:
  - Use memalign hack only on supported systems that need it
    (FreeBSD on pre-10 systems)
  - Bump PORTREVISION

Modified:
  head/multimedia/ffmpeg0/Makefile

Modified: head/multimedia/ffmpeg0/Makefile
==============================================================================
--- head/multimedia/ffmpeg0/Makefile	Mon Jun 22 20:27:02 2015	(r390326)
+++ head/multimedia/ffmpeg0/Makefile	Mon Jun 22 20:32:33 2015	(r390327)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.7.16
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -41,20 +41,15 @@ DATADIR=	${PREFIX}/share/${PORTNAME}${PK
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
 OPTIONS_DEFINE=	AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
-		FFSERVER FREETYPE FREI0R GSM LAME MAH OPENCV OPENJPEG \
+		FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \
 		OPTIMIZED_CFLAGS RTMP SCHROEDINGER SDL SPEEX THEORA VAAPI \
 		VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID DOCS
 
-OPTIONS_DEFAULT=	FFSERVER FREETYPE FREI0R MAH OPENCV SCHROEDINGER \
+OPTIONS_DEFAULT=	FFSERVER FREETYPE FREI0R OPENCV SCHROEDINGER \
 			THEORA VORBIS VPX X264 XVID
 
 FFSERVER_DESC=	Build and install ffserver
 X11GRAB_DESC=	Enable x11 grabbing
-MAH_DESC=	Enable memalign hack
-
-MAH_CONFIGURE_ENABLE=	memalign-hack
-
-OPTIONS_EXCLUDE_DragonFly=	MAH
 
 COMPAT_HEADERS=libavcodec/avcodec.h \
 	libavcodec/opt.h \
@@ -98,6 +93,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
 CFLAGS=	-no-integrated-as