svn commit: r389907 - head/multimedia/ffmpeg
John Marino
marino at FreeBSD.org
Wed Jun 17 12:43:09 UTC 2015
Author: marino
Date: Wed Jun 17 11:39:56 2015
New Revision: 389907
URL: https://svnweb.freebsd.org/changeset/ports/389907
Log:
multimedia/ffmpeg: Convert memalign-hack into an option
DragonFly already has an aligned malloc (posix_memalign) and the hack
in ffmpeg is tripping an assertion. M.Dillon thinks the hack is stale.
In the spirit of no-op changes for FreeBSD, this changeset converts
the "--enable-memalign-hack" into an on-by-default option, and then
excludes the option for DragonFly.
It does incur a revbump though.
The last changes were made to multimedia/ffmpeg(0|26)
I'm doing this under "non-invasive DragonFly support" flag
P.S. I wouldn't be surprised if --enable-memalign-hack is wrong for
recent FreeBSD releases as well, so maybe the maintainers should take
a look at this new option.
Modified:
head/multimedia/ffmpeg/Makefile
Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile Wed Jun 17 11:24:19 2015 (r389906)
+++ head/multimedia/ffmpeg/Makefile Wed Jun 17 11:39:56 2015 (r389907)
@@ -3,7 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 2.3.6
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
@@ -26,13 +26,13 @@ WANT_SDL= yes
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 MODPLUG OPENAL OPENCV OPENJPEG \
+ JACK LAME LIBBLURAY LIBV4L MAH 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 \
- OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID
+ MAH OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID
OPTIONS_SINGLE= SSL
OPTIONS_SINGLE_SSL= GNUTLS OPENSSL
@@ -42,10 +42,13 @@ 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
@@ -128,6 +131,9 @@ 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
@@ -258,7 +264,6 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \
--enable-avfilter \
--enable-avresample \
--enable-pthreads \
- --enable-memalign-hack \
--disable-libstagefright-h264 \
--disable-libutvideo \
--disable-libsoxr \
More information about the svn-ports-head
mailing list