svn commit: r395326 - branches/2015Q3/multimedia/ffmpeg0
Jason Unovitch
junovitch at FreeBSD.org
Tue Aug 25 23:58:20 UTC 2015
Author: junovitch
Date: Tue Aug 25 23:58:18 2015
New Revision: 395326
URL: https://svnweb.freebsd.org/changeset/ports/395326
Log:
MFH: r391234
multimedia/ffmpeg0: Use OPTIONS helpers, Honour CFLAGS
- Use OPTIONS helpers for as many as conditional blocks as possible.
Blocks with FFMPEG_* and other variables not supported by the helper
framework are not modified.
- Honour CFLAGS for armv6 (= -> ?=)
While I'm here:
- Sort and group common or related Makefile sections where it made sense
to do so and improved readability. Put global things up the top and
conditional blocks below.
- Improve whitespace alignment for readability.
Approved by: wg (maintainer)
Differential Revision: https://reviews.freebsd.org/D2981
MFH: r391234
multimedia/ffmpeg0: Fix X11GRAB dependency typo
Fix a typo (s/xent/xext) in the X11GRAB USE_XORG dependency assignment that was
introduced in r391234.
PR: 201321
Submitted by: Andrey Fesenko <andrey bsdnir info>
Approved by: pointyhat (koobs)
MFH: r395164
multimedia/ffmpeg0: security update 0.7.16 -> 0.7.17
PR: 200852
Security: 65b14d39-d01f-419c-b0b8-5df60b929973
Submitted by: John Hein <z7dr6ut7gs at snkmail.com>
Approved by: wg (maintainer), delphij (mentor)
Approved by: ports-secteam (delphij)
Modified:
branches/2015Q3/multimedia/ffmpeg0/Makefile
branches/2015Q3/multimedia/ffmpeg0/distinfo
Directory Properties:
branches/2015Q3/ (props changed)
Modified: branches/2015Q3/multimedia/ffmpeg0/Makefile
==============================================================================
--- branches/2015Q3/multimedia/ffmpeg0/Makefile Tue Aug 25 23:08:51 2015 (r395325)
+++ branches/2015Q3/multimedia/ffmpeg0/Makefile Tue Aug 25 23:58:18 2015 (r395326)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ffmpeg
-PORTVERSION= 0.7.16
-PORTREVISION= 8
+PORTVERSION= 0.7.17
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
@@ -23,33 +22,115 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/ya
PORTSCOUT= limit:^0\.7.*
-HAS_CONFIGURE= yes
-CONFIGURE_LOG= config.err
USES= cpe gmake perl5 pkgconfig tar:bzip2
-WANT_SDL= yes
USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
USE_PERL5= build
+WANT_SDL= yes
FFMPEG_SUFFIX= 0
-PLIST_SUB+= SUFF="${FFMPEG_SUFFIX}"
-
+HAS_CONFIGURE= yes
+CONFIGURE_LOG= config.err
CONFIGURE_ENV+= EXESUF="${FFMPEG_SUFFIX}"
MAKE_ARGS+= EXESUF="${FFMPEG_SUFFIX}"
+PLIST_SUB+= SUFF="${FFMPEG_SUFFIX}"
PROGS= ffmpeg ffprobe
+CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
+MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
+
+CONFIGURE_ARGS+=--prefix="${PREFIX}" \
+ --mandir="${PREFIX}/man" \
+ --incdir="${PREFIX}/include/ffmpeg${FFMPEG_SUFFIX}" \
+ --libdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
+ --shlibdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
+ --datadir="${DATADIR}" \
+ --build-suffix="${FFMPEG_SUFFIX}" \
+ --enable-shared \
+ --enable-gpl \
+ --enable-postproc \
+ --enable-avfilter \
+ --enable-pthreads \
+ --enable-runtime-cpudetect \
+ --cc="${CC}" \
+ --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \
+ --extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \
+ --extra-libs="-lpthread"
+
+SHLIB_VER= 1
+PLIST_SUB+= SHLIB_VER=${SHLIB_VER}
+
DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
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 \
- OPTIMIZED_CFLAGS RTMP SCHROEDINGER SDL SPEEX THEORA VAAPI \
- VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID DOCS
-
+OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
+ 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 OPENCV SCHROEDINGER \
THEORA VORBIS VPX X264 XVID
+OPTIONS_SUB= yes
-FFSERVER_DESC= Build and install ffserver
-X11GRAB_DESC= Enable x11 grabbing
+FFSERVER_DESC= Build and install ffserver
+X11GRAB_DESC= Enable x11 grabbing
+
+ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_CONFIGURE_OFF= --disable-indev=alsa \
+ --disable-outdev=alsa
+
+CELT_LIB_DEPENDS= libcelt0.so:${PORTSDIR}/audio/celt
+CELT_CONFIGURE_ENABLE= libcelt
+
+DIRAC_LIB_DEPENDS= libdirac_encoder.so:${PORTSDIR}/multimedia/dirac
+DIRAC_CONFIGURE_ENABLE= libdirac
+
+DEBUG_CONFIGURE_ON= --disable-stripping
+DEBUG_CONFIGURE_OFF= --disable-debug
+
+FFSERVER_CONFIGURE_OFF= --disable-ffserver
+
+FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_CONFIGURE_ENABLE= libfreetype
+
+FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
+FREI0R_CONFIGURE_ENABLE= frei0r
+
+GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm
+GSM_CONFIGURE_ENABLE= libgsm
+
+LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame
+LAME_CONFIGURE_ENABLE= libmp3lame
+
+OPENCV_LIB_DEPENDS= libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core
+OPENCV_CONFIGURE_ENABLE= libopencv
+
+OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+OPENJPEG_CONFIGURE_ENABLE= libopenjpeg
+
+RTMP_USE= OPENSSL=yes
+
+SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
+SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger
+
+SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_CONFIGURE_ENABLE= libspeex
+
+THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora
+THEORA_CONFIGURE_ENABLE= libtheora
+
+X11GRAB_USE= XORG=x11,xext,xfixes
+X11GRAB_CONFIGURE_ON= --enable-x11grab
+
+X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264
+X264_CONFIGURE_ENABLE= libx264
+
+XVID_LIB_DEPENDS= libxvidcore.so:${PORTSDIR}/multimedia/xvid
+XVID_CONFIGURE_ENABLE= libxvid
+
+VDPAU_BUILD_DEPENDS= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau
+VDPAU_CONFIGURE_ENABLE= vdpau
+
+VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx
+VPX_CONFIGURE_ENABLE= libvpx
COMPAT_HEADERS=libavcodec/avcodec.h \
libavcodec/opt.h \
@@ -78,19 +159,6 @@ COMPAT_HEADERS=libavcodec/avcodec.h \
libpostproc/postprocess.h \
libswscale/swscale.h
-.include <bsd.port.options.mk>
-
-# rtmp
-.if ${PORT_OPTIONS:MRTMP}
-USE_OPENSSL= yes
-.endif
-
-# x11grab
-.if ${PORT_OPTIONS:MX11GRAB}
-USE_XORG= x11 xext xfixes
-CONFIGURE_ARGS+= --enable-x11grab
-.endif
-
.include <bsd.port.pre.mk>
.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000
@@ -99,42 +167,13 @@ CONFIGURE_ARGS+= --enable-memalign-hack
.if ${ARCH} == armv6
CONFIGURE_ENV+= ASFLAGS=-no-integrated-as
-CFLAGS= -no-integrated-as
+CFLAGS+= -no-integrated-as
.endif
-CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
-MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
-
-CONFIGURE_ARGS+=--prefix="${PREFIX}" \
- --mandir="${PREFIX}/man" \
- --incdir="${PREFIX}/include/ffmpeg${FFMPEG_SUFFIX}" \
- --libdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
- --shlibdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
- --datadir="${DATADIR}" \
- --build-suffix="${FFMPEG_SUFFIX}" \
- --enable-shared \
- --enable-gpl \
- --enable-postproc \
- --enable-avfilter \
- --enable-pthreads \
- --enable-runtime-cpudetect \
- --cc="${CC}" \
- --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \
- --extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \
- --extra-libs="-lpthread"
-SHLIB_VER= 1
-PLIST_SUB+= SHLIB_VER=${SHLIB_VER}
-
DOC_FILES= CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
# under doc subdirectory
DOC_DOCFILES= APIchanges RELEASE_NOTES TODO *.txt *.html
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+= --disable-stripping
-.else
-CONFIGURE_ARGS+= --disable-debug
-.endif
-
.if ${PORT_OPTIONS:MFFSERVER}
USE_RC_SUBR= ffserver${FFMPEG_SUFFIX}
PROGS+= ffserver
@@ -172,14 +211,6 @@ CONFIGURE_ARGS+= --enable-libaacplus
CONFIGURE_ARGS+= --disable-libaacplus
.endif
-#alsa
-.if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib
-.else
-CONFIGURE_ARGS+= --disable-indev=alsa \
- --disable-outdev=alsa
-.endif
-
# Opencore AMR NB
.if ${PORT_OPTIONS:MAMR_NB}
FFMPEG_LICENSE_GPL3= yes
@@ -198,22 +229,6 @@ CONFIGURE_ARGS+= --enable-libopencore-am
CONFIGURE_ARGS+= --disable-libopencore-amrwb
.endif
-# celt
-.if ${PORT_OPTIONS:MCELT}
-LIB_DEPENDS+= libcelt0.so:${PORTSDIR}/audio/celt
-CONFIGURE_ARGS+= --enable-libcelt
-.else
-CONFIGURE_ARGS+= --disable-libcelt
-.endif
-
-# dirac
-.if ${PORT_OPTIONS:MDIRAC}
-LIB_DEPENDS+= libdirac_encoder.so:${PORTSDIR}/multimedia/dirac
-CONFIGURE_ARGS+= --enable-libdirac
-.else
-CONFIGURE_ARGS+= --disable-libdirac
-.endif
-
# faac
.if ${PORT_OPTIONS:MFAAC}
FFMPEG_NONFREE= yes
@@ -223,62 +238,6 @@ CONFIGURE_ARGS+= --enable-libfaac
CONFIGURE_ARGS+= --disable-libfaac
.endif
-# ffserver
-.if ${PORT_OPTIONS:MFFSERVER}
-PLIST_SUB+= FFSERVER=""
-.else
-PLIST_SUB+= FFSERVER="@comment "
-CONFIGURE_ARGS+= --disable-ffserver
-.endif
-
-# freetype
-.if ${PORT_OPTIONS:MFREETYPE}
-LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2
-CONFIGURE_ARGS+= --enable-libfreetype
-.else
-CONFIGURE_ARGS+= --disable-libfreetype
-.endif
-
-# frei0r
-.if ${PORT_OPTIONS:MFREI0R}
-BUILD_DEPENDS+= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
-CONFIGURE_ARGS+= --enable-frei0r
-.else
-CONFIGURE_ARGS+= --disable-frei0r
-.endif
-
-# gsm
-.if ${PORT_OPTIONS:MGSM}
-LIB_DEPENDS+= libgsm.so:${PORTSDIR}/audio/gsm
-CONFIGURE_ARGS+= --enable-libgsm
-.else
-CONFIGURE_ARGS+= --disable-libgsm
-.endif
-
-# mp3
-.if ${PORT_OPTIONS:MLAME}
-LIB_DEPENDS+= libmp3lame.so:${PORTSDIR}/audio/lame
-CONFIGURE_ARGS+= --enable-libmp3lame
-.else
-CONFIGURE_ARGS+= --disable-libmp3lame
-.endif
-
-# opencv
-.if ${PORT_OPTIONS:MOPENCV}
-LIB_DEPENDS+= libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core
-CONFIGURE_ARGS+= --enable-libopencv
-.else
-CONFIGURE_ARGS+= --disable-libopencv
-.endif
-
-# openjpeg
-.if ${PORT_OPTIONS:MOPENJPEG}
-LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
-CONFIGURE_ARGS+= --enable-libopenjpeg
-.else
-CONFIGURE_ARGS+= --disable-libopenjpeg
-.endif
-
# rtmp
.if ${PORT_OPTIONS:MRTMP}
LIB_DEPENDS+= librtmp.so:${PORTSDIR}/multimedia/librtmp
@@ -291,14 +250,6 @@ FFMPEG_LDFLAGS+= -L${OPENSSLLIB}
CONFIGURE_ARGS+= --disable-librtmp
.endif
-# schroedinger
-.if ${PORT_OPTIONS:MSCHROEDINGER}
-LIB_DEPENDS+= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
-CONFIGURE_ARGS+= --enable-libschroedinger
-.else
-CONFIGURE_ARGS+= --disable-libschroedinger
-.endif
-
# sdl
.if ${PORT_OPTIONS:MSDL}
USE_SDL+= sdl
@@ -308,22 +259,6 @@ PROGS+= ffplay
CONFIGURE_ARGS+= --disable-ffplay
.endif
-# speex
-.if ${PORT_OPTIONS:MSPEEX}
-LIB_DEPENDS+= libspeex.so:${PORTSDIR}/audio/speex
-CONFIGURE_ARGS+= --enable-libspeex
-.else
-CONFIGURE_ARGS+= --disable-libspeex
-.endif
-
-# theora
-.if ${PORT_OPTIONS:MTHEORA}
-LIB_DEPENDS+= libtheora.so:${PORTSDIR}/multimedia/libtheora
-CONFIGURE_ARGS+= --enable-libtheora
-.else
-CONFIGURE_ARGS+= --disable-libtheora
-.endif
-
# vaapi
.if ${PORT_OPTIONS:MVAAPI}
FFMPEG_LICENSE_GPL3= yes
@@ -333,14 +268,6 @@ CONFIGURE_ARGS+= --enable-vaapi
CONFIGURE_ARGS+= --disable-vaapi
.endif
-# vdpau
-.if ${PORT_OPTIONS:MVDPAU}
-BUILD_DEPENDS+= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau
-CONFIGURE_ARGS+= --enable-vdpau
-.else
-CONFIGURE_ARGS+= --disable-vdpau
-.endif
-
# vo-aacenc
.if ${PORT_OPTIONS:MVO_AACENC}
FFMPEG_LICENSE_GPL3= yes
@@ -368,30 +295,6 @@ FFMPEG_CFLAGS+= -I${LOCALBASE}/include/
CONFIGURE_ARGS+= --disable-libvorbis
.endif
-# vp8
-.if ${PORT_OPTIONS:MVPX}
-LIB_DEPENDS+= libvpx.so:${PORTSDIR}/multimedia/libvpx
-CONFIGURE_ARGS+= --enable-libvpx
-.else
-CONFIGURE_ARGS+= --disable-libvpx
-.endif
-
-# x264
-.if ${PORT_OPTIONS:MX264}
-LIB_DEPENDS+= libx264.so:${PORTSDIR}/multimedia/libx264
-CONFIGURE_ARGS+= --enable-libx264
-.else
-CONFIGURE_ARGS+= --disable-libx264
-.endif
-
-# xvid
-.if ${PORT_OPTIONS:MXVID}
-LIB_DEPENDS+= libxvidcore.so:${PORTSDIR}/multimedia/xvid
-CONFIGURE_ARGS+= --enable-libxvid
-.else
-CONFIGURE_ARGS+= --disable-libxvid
-.endif
-
# License knobs
.if defined(FFMPEG_NONFREE)
RESTRICTED= linking to libfaac or libaacplus restricts redistribution
Modified: branches/2015Q3/multimedia/ffmpeg0/distinfo
==============================================================================
--- branches/2015Q3/multimedia/ffmpeg0/distinfo Tue Aug 25 23:08:51 2015 (r395325)
+++ branches/2015Q3/multimedia/ffmpeg0/distinfo Tue Aug 25 23:58:18 2015 (r395326)
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-0.7.16.tar.bz2) = 118de39c5aed3c3f5696bde69d6a5c4524f2d5d8ec81bc3a7ffee080b82d3ea5
-SIZE (ffmpeg-0.7.16.tar.bz2) = 4529370
+SHA256 (ffmpeg-0.7.17.tar.bz2) = 5ec57caa1bff7a528b8e58643dd550cdc69156f7b44c31a10920f1be68e2036a
+SIZE (ffmpeg-0.7.17.tar.bz2) = 4529540
More information about the svn-ports-all
mailing list