Date: Wed, 17 Jun 2015 07:18:17 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r389899 - in head/multimedia: ffmpeg0 ffmpeg26 Message-ID: <201506170718.t5H7IHBM007308@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Wed Jun 17 07:18:16 2015 New Revision: 389899 URL: https://svnweb.freebsd.org/changeset/ports/389899 Log: multimedia/ffmpeg(0|26): 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. 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/ffmpeg0/Makefile head/multimedia/ffmpeg26/Makefile Modified: head/multimedia/ffmpeg0/Makefile ============================================================================== --- head/multimedia/ffmpeg0/Makefile Wed Jun 17 06:27:27 2015 (r389898) +++ head/multimedia/ffmpeg0/Makefile Wed Jun 17 07:18:16 2015 (r389899) @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 0.7.16 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -41,15 +41,20 @@ 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 OPENCV OPENJPEG \ + FFSERVER FREETYPE FREI0R GSM LAME MAH 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 OPENCV SCHROEDINGER THEORA \ - VORBIS VPX X264 XVID +OPTIONS_DEFAULT= FFSERVER FREETYPE FREI0R MAH 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 \ @@ -113,7 +118,6 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --enable-postproc \ --enable-avfilter \ --enable-pthreads \ - --enable-memalign-hack \ --enable-runtime-cpudetect \ --cc="${CC}" \ --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \ Modified: head/multimedia/ffmpeg26/Makefile ============================================================================== --- head/multimedia/ffmpeg26/Makefile Wed Jun 17 06:27:27 2015 (r389898) +++ head/multimedia/ffmpeg26/Makefile Wed Jun 17 07:18:16 2015 (r389899) @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 2.6.3 -PORTREVISION= 1 +PORTREVISION= 2 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 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 @@ -49,10 +49,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 @@ -135,6 +138,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 @@ -270,7 +276,6 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --enable-avfilter \ --enable-avresample \ --enable-pthreads \ - --enable-memalign-hack \ --disable-libmfx \ --disable-libstagefright-h264 \ --disable-libutvideo \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506170718.t5H7IHBM007308>