Date: Mon, 22 Jun 2015 19:55:51 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390322 - head/multimedia/ffmpeg26 Message-ID: <201506221955.t5MJtp01069600@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Mon Jun 22 19:55:51 2015 New Revision: 390322 URL: https://svnweb.freebsd.org/changeset/ports/390322 Log: - Use memalign hack only on supported systems that need it (FreeBSD on pre-10 systems) - Bump PORTREVISION Modified: head/multimedia/ffmpeg26/Makefile Modified: head/multimedia/ffmpeg26/Makefile ============================================================================== --- head/multimedia/ffmpeg26/Makefile Mon Jun 22 19:55:44 2015 (r390321) +++ head/multimedia/ffmpeg26/Makefile Mon Jun 22 19:55:51 2015 (r390322) @@ -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 libcdi 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506221955.t5MJtp01069600>