[Midnightbsd-cvs] mports [21346] trunk/multimedia/ffmpeg: ffmpeg 2.8.6
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Mar 27 19:28:54 EDT 2016
Revision: 21346
http://svnweb.midnightbsd.org/mports/?rev=21346
Author: laffer1
Date: 2016-03-27 19:28:53 -0400 (Sun, 27 Mar 2016)
Log Message:
-----------
ffmpeg 2.8.6
Modified Paths:
--------------
trunk/multimedia/ffmpeg/Makefile
trunk/multimedia/ffmpeg/distinfo
trunk/multimedia/ffmpeg/files/ffserver.in
trunk/multimedia/ffmpeg/files/patch-Makefile
trunk/multimedia/ffmpeg/files/patch-configure
trunk/multimedia/ffmpeg/files/patch-doc-Makefile
trunk/multimedia/ffmpeg/files/patch-libavcodec-Makefile
trunk/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
trunk/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
trunk/multimedia/ffmpeg/files/patch-libavformat-udp.c
trunk/multimedia/ffmpeg/files/patch-libavutil-common.h
trunk/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h
trunk/multimedia/ffmpeg/pkg-descr
trunk/multimedia/ffmpeg/pkg-plist
Removed Paths:
-------------
trunk/multimedia/ffmpeg/files/patch-libavdevice-oss_audio.c
trunk/multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c
Modified: trunk/multimedia/ffmpeg/Makefile
===================================================================
--- trunk/multimedia/ffmpeg/Makefile 2016-03-27 23:05:51 UTC (rev 21345)
+++ trunk/multimedia/ffmpeg/Makefile 2016-03-27 23:28:53 UTC (rev 21346)
@@ -1,9 +1,8 @@
+# $FreeBSD: head/multimedia/ffmpeg/Makefile 408791 2016-02-13 12:31:58Z riggs $
# $MidnightBSD$
-# $FreeBSD: ports/multimedia/ffmpeg/Makefile,v 1.135 2011/08/22 21:14:34 mm Exp $
PORTNAME= ffmpeg
-PORTVERSION= 2.1.1
-PORTREVISION= 3
+PORTVERSION= 2.8.6
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
@@ -11,41 +10,73 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= Realtime audio/video encoder/converter and streaming server
-LICENSE= gpl2
+LICENSE= gpl2 lgpl2.1
+LICENSE_COMB= multi
-
BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \
- ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \
- texi2html:${PORTSDIR}/textproc/texi2html
+ ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
HAS_CONFIGURE= yes
-CONFIGURE_LOG= config.err
-CONFIGURE_ARGS+= --host-os=freebsd --target-os=freebsd
-USES= gmake pkgconfig perl5 tar:bzip2
+USES= compiler cpe gmake perl5 pkgconfig tar:bzip2 shebangfix
+USE_LDCONFIG= yes
USE_PERL5= build
-WANT_SDL= yes
+SHEBANG_FILES= doc/texi2pod.pl
-OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG FAAC \
- FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS GSM ICONV \
- JACK LAME LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG OPENSSL \
- OPTIMIZED_CFLAGS OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX \
- THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \
- X11GRAB X264 XVID
+OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT DC1394 \
+ DEBUG DOCS FAAC FDK_AAC FFSERVER FLITE FONTCONFIG \
+ FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK LADSPA \
+ LAME LIBBLURAY MODPLUG OPENAL OPENCL OPENCV OPENGL \
+ OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO QUVI \
+ RTCPU RTMP SCHROEDINGER SDL SMB SNAPPY SPEEX SSH \
+ THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS VO_AACENC \
+ VO_AMRWBENC VPX WAVPACK WEBP X11GRAB X264 X265 XCB XVID \
+ XVIDEO ZMQ ZVBI
OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \
- OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID
+ OPENCV RTCPU SCHROEDINGER THEORA VORBIS VPX X264 XVID
+OPTIONS_SINGLE= SSL
+OPTIONS_SINGLE_SSL= GNUTLS OPENSSL
+OPTIONS_GROUP= LICENSE
+OPTIONS_GROUP_LICENSE= GPL3 NONFREE
+
+OPTIONS_DEFINE_amd64= MMX SSE
+OPTIONS_DEFINE_armv6= VFP NEON
+OPTIONS_DEFINE_armv6hf= VFP NEON
+OPTIONS_DEFINE_i386= MMX SSE
+OPTIONS_DEFAULT_amd64= MMX SSE
+OPTIONS_DEFAULT_i386= ${MACHINE_CPU:tu:MMMX} ${MACHINE_CPU:tu:MSSE}
+
ASS_DESC= Subtitles rendering via libass
+BS2B_DESC= Bauer Stereophonic-to-Binaural filter
CDIO_DESC= Audio CD grabbing with libcdio
+DC1394_DESC= IIDC-1394 grabbing using libdc1394
FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK
FFSERVER_DESC= Build and install ffserver
-LIBV4L_DESC= Video for Linux support
-OPUS_DESC= Opus decoding with libopus
-X11GRAB_DESC= Enable x11 grabbing
+FLITE_DESC= Voice synthesis support via libflite
+GME_DESC= Game Music Emu demuxer
+GPL3_DESC= Allow (L)GPL version 3 code(cs)
+ILBC_DESC= Internet Low Bit Rate codec
+LICENSE_DESC= Licensing options
+NEON_DESC= Enable Media Processing Engine instructions
+NONFREE_DESC= Allow use of nonfree code
+OPENCL_DESC= Heterogeneous computing via OpenCL
+OPENH264_DESC= H.264 video codec support via OpenH264
+QUVI_DESC= Flash media stream URLs
+RTCPU_DESC= Detect CPU capabilities at runtime
+VFP_DESC= Enable Vector Floating Point instructions
+VIDSTAB_DESC= Video stabilization filter
+X11GRAB_DESC= X11 grabbing (legacy)
+XCB_DESC= X11 grabbing using XCB
+ZMQ_DESC= Message passing via libzmq${ZMQ_VERSION}
+ZVBI_DESC= Teletext support via libzvbi
+OPTIONS_SUB= yes
+
# aacplus
AACPLUS_LIB_DEPENDS= libaacplus.so:${PORTSDIR}/audio/libaacplus
AACPLUS_CONFIGURE_ENABLE= libaacplus
+AACPLUS_IMPLIES= NONFREE
# alsa
ALSA_CONFIGURE_OFF= --disable-indev=alsa \
@@ -55,17 +86,27 @@
# Opencore AMR NB
AMR_NB_LIB_DEPENDS= libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
AMR_NB_CONFIGURE_ENABLE= libopencore-amrnb
+AMR_NB_IMPLIES= GPL3
# Opencore AMR WB
AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr
AMR_WB_CONFIGURE_ENABLE= libopencore-amrwb
+AMR_WB_IMPLIES= GPL3
# ass
ASS_LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass
ASS_CONFIGURE_ENABLE= libass
+# bs2b
+BS2B_LIB_DEPENDS= libbs2b.so:${PORTSDIR}/audio/libbs2b
+BS2B_CONFIGURE_ENABLE= libbs2b
+
+# caca
+CACA_LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca
+CACA_CONFIGURE_ENABLE= libcaca
+
# cdio
-CDIO_LIB_DEPENDS= libcdio.so:${PORTSDIR}/sysutils/libcdio
+CDIO_LIB_DEPENDS= libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
CDIO_CONFIGURE_ENABLE= libcdio
# celt
@@ -72,17 +113,36 @@
CELT_LIB_DEPENDS= libcelt0.so:${PORTSDIR}/audio/celt
CELT_CONFIGURE_ENABLE= libcelt
+# dc1394
+DC1394_LIB_DEPENDS= libdc1394.so:${PORTSDIR}/multimedia/libdc1394
+DC1394_CONFIGURE_ENABLE= libdc1394
+
+# debugging
+DEBUG_CONFIGURE_ON= --disable-stripping
+DEBUG_CONFIGURE_OFF= --disable-debug
+
+# docs
+DOCS_BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html
+DOCS_CONFIGURE_ENABLE= htmlpages
+
# faac
FAAC_LIB_DEPENDS= libfaac.so:${PORTSDIR}/audio/faac
FAAC_CONFIGURE_ENABLE= libfaac
+FAAC_IMPLIES= NONFREE
# fdk_aac
FDK_AAC_LIB_DEPENDS= libfdk-aac.so:${PORTSDIR}/audio/fdk-aac
FDK_AAC_CONFIGURE_ENABLE= libfdk-aac
+FDK_AAC_IMPLIES= NONFREE
# ffserver
FFSERVER_CONFIGURE_ENABLE= ffserver
+FFSERVER_VARS= USE_RC_SUBR+=ffserver
+# flite
+FLITE_LIB_DEPENDS= libflite.so:${PORTSDIR}/audio/flite
+FLITE_CONFIGURE_ENABLE= libflite
+
# fontconfig
FONTCONFIG_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
FONTCONFIG_CONFIGURE_ENABLE= fontconfig
@@ -95,10 +155,18 @@
FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
FREI0R_CONFIGURE_ENABLE= frei0r
+# fribidi
+FRIBIDI_LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_CONFIGURE_ENABLE= libfribidi
+
# gnutls
GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
GNUTLS_CONFIGURE_ENABLE= gnutls
+# gme
+GME_LIB_DEPENDS= libgme.so:${PORTSDIR}/audio/libgme
+GME_CONFIGURE_ENABLE= libgme
+
# gsm
GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm
GSM_CONFIGURE_ENABLE= libgsm
@@ -107,9 +175,19 @@
ICONV_USES= iconv
ICONV_CONFIGURE_ENABLE= iconv
+# ilbc
+ILBC_LIB_DEPENDS= libilbc.so:${PORTSDIR}/net/libilbc
+ILBC_CONFIGURE_ENABLE= libilbc
+
+# jack
JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack
JACK_CONFIGURE_OFF= --disable-indev=jack
+# ladspa
+LADSPA_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
+LADSPA_CONFIGURE_ENABLE= ladspa
+
# lame
LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame
LAME_CONFIGURE_ENABLE= libmp3lame
@@ -119,11 +197,15 @@
LIBBLURAY_CONFIGURE_ENABLE= libbluray
# libv4l
-LIBV4L_LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
-LIBV4L_CONFIGURE_ENABLE= libv4l2
-LIBV4L_CONFIGURE_OFF= --disable-indev=v4l2 \
+V4L_BUILD_DEPENDS= v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
+V4L_LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
+V4L_CONFIGURE_ENABLE= libv4l2
+V4L_CONFIGURE_OFF= --disable-indev=v4l2 \
--disable-outdev=v4l2
+# mmx support
+MMX_CONFIGURE_ENABLE= mmx
+
# modplug
MODPLUG_LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug
MODPLUG_CONFIGURE_ENABLE= libmodplug
@@ -133,14 +215,35 @@
OPENAL_CONFIGURE_ENABLE= openal
OPENAL_CONFIGURE_OFF= --disable-indev=openal
+# opencl
+OPENCL_BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:${PORTSDIR}/devel/opencl
+OPENCL_LIB_DEPENDS= libOpenCL.so:${PORTSDIR}/devel/ocl-icd
+OPENCL_CONFIGURE_ENABLE= opencl
+
# opencv
OPENCV_LIB_DEPENDS= libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core
OPENCV_CONFIGURE_ENABLE= libopencv
+# opengl
+OPENGL_USE= GL=gl
+OPENGL_CONFIGURE_ENABLE= opengl
+
+# openh264
+OPENH264_LIB_DEPENDS= libopenh264.so:${PORTSDIR}/multimedia/openh264
+OPENH264_CONFIGURE_ENABLE= libopenh264
+
# openjpeg
-OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg
+OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
OPENJPEG_CONFIGURE_ENABLE= libopenjpeg
+# openssl
+OPENSSL_USE= OPENSSL=yes
+OPENSSL_CONFIGURE_ENABLE= openssl
+OPENSSL_IMPLIES= NONFREE
+
+# optimizations
+OPTIMIZED_CFLAGS_CFLAGS=-O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
+
# opus
OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus
OPUS_CONFIGURE_ENABLE= libopus
@@ -151,6 +254,13 @@
PULSEAUDIO_CONFIGURE_OFF= --disable-indev=pulse \
--disable-outdev=pulse
+# quvi
+QUVI_LIB_DEPENDS= libquvi.so:${PORTSDIR}/multimedia/libquvi
+QUVI_CONFIGURE_ENABLE= libquvi
+
+# rtcpu
+RTCPU_CONFIGURE_ENABLE= runtime-cpudetect
+
# rtmp
RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp
RTMP_CONFIGURE_ENABLE= librtmp
@@ -159,14 +269,41 @@
SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger
+# sdl
+SDL_USE= SDL=sdl
+SDL_CONFIGURE_ENABLE= ffplay
+SDL_CONFIGURE_OFF= --disable-outdev=sdl
+
+# smbclient
+SMB_LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SMB_CONFIGURE_ENABLE= libsmbclient
+SMB_IMPLIES= GPL3
+
+# snappy
+SNAPPY_LIB_DEPENDS= libsnappy.so:${PORTSDIR}/archivers/snappy
+SNAPPY_CONFIGURE_ENABLE= libsnappy
+
# speex
SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex
SPEEX_CONFIGURE_ENABLE= libspeex
+# sse support
+SSE_CONFIGURE_ENABLE= sse
+SSE_VARS= FFMPEG_CFLAGS+="-msse"
+SSE_IMPLIES= MMX
+
+# ssh
+SSH_LIB_DEPENDS= libssh.so:${PORTSDIR}/security/libssh
+SSH_CONFIGURE_ENABLE= libssh
+
# theora
THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora
THEORA_CONFIGURE_ENABLE= libtheora
+# twolame
+TWOLAME_LIB_DEPENDS= libtwolame.so:${PORTSDIR}/audio/twolame
+TWOLAME_CONFIGURE_ENABLE= libtwolame
+
# vaapi
VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva
VAAPI_CONFIGURE_ENABLE= vaapi
@@ -175,63 +312,89 @@
VDPAU_BUILD_DEPENDS= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau
VDPAU_CONFIGURE_ENABLE= vdpau
+# armv6
+VFP_CONFIGURE_ENABLE= vfp
+NEON_CONFIGURE_ENABLE= neon
+NEON_CONFIGURE_ON= --cpu=armv7-a
+
# vo-aacenc
VO_AACENC_LIB_DEPENDS= libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc
VO_AACENC_CONFIGURE_ENABLE= libvo-aacenc
+VO_AACENC_IMPLIES= GPL3
# vo-amrwbenc
VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc
VO_AMRWBENC_CONFIGURE_ENABLE= libvo-amrwbenc
+VO_AMRWBENC_IMPLIES= GPL3
+# vid.stab
+VIDSTAB_LIB_DEPENDS= libvidstab.so:${PORTSDIR}/multimedia/vid.stab
+VIDSTAB_CONFIGURE_ENABLE= libvidstab
+
# vorbis
VORBIS_LIB_DEPENDS= libvorbisenc.so:${PORTSDIR}/audio/libvorbis
VORBIS_CONFIGURE_ENABLE= libvorbis
+VORBIS_VARS= FFMPEG_CFLAGS+="-I${LOCALBASE}/include/vorbis"
# vp8
VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx
VPX_CONFIGURE_ENABLE= libvpx
+# wavpack
+WAVPACK_LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_CONFIGURE_ENABLE= libwavpack
+
+# webp
+WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_CONFIGURE_ENABLE= libwebp
+
+# x11grab
+X11GRAB_USE= XORG=x11,xext,xfixes
+X11GRAB_CONFIGURE_ENABLE= x11grab
+
# x264
-X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/x264
+X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264
X264_CONFIGURE_ENABLE= libx264
+# x265
+X265_LIB_DEPENDS= libx265.so:${PORTSDIR}/multimedia/x265
+X265_CONFIGURE_ENABLE= libx265
+
+# xcb
+XCB_USE= XORG=xcb
+XCB_CONFIGURE_ENABLE= libxcb
+
# xvid
XVID_LIB_DEPENDS= libxvidcore.so:${PORTSDIR}/multimedia/xvid
XVID_CONFIGURE_ENABLE= libxvid
-FFPROGS= ffmpeg ffprobe
-INSTALL_TARGET= install-progs install-data install-libs install-headers
-#FFMPEG_SUFFIX= 2
-#PLIST_SUB+= SUFF="${FFMPEG_SUFFIX}"
+# xv
+XVIDEO_USE= XORG=xv
+XVIDEO_CONFIGURE_OFF= --disable-outdev=xv
-#USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
-DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
+# zmq
+ZMQ_LIB_DEPENDS= libzmq.so:${PORTSDIR}/net/libzmq${ZMQ_VERSION}
+ZMQ_CONFIGURE_ENABLE= libzmq
+ZMQ_VERSION?= 4
-.include <bsd.mport.options.mk>
+# zvbi
+ZVBI_LIB_DEPENDS= libzvbi.so:${PORTSDIR}/devel/libzvbi
+ZVBI_CONFIGURE_ENABLE= libzvbi
-# ssl
-.if ${PORT_OPTIONS:MOPENSSL} && empty(PORT_OPTIONS:MGNUTLS)
-USE_OPENSSL= yes
-FFMPEG_NONFREE= yes
-.endif
+# License knobs
+GPL3_CONFIGURE_ENABLE= version3
+GPL3_VARS= LICENSE="GPLv3 LGPL3"
+LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3
+LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3
-.if ${PORT_OPTIONS:MAACPLUS} || ${PORT_OPTIONS:MFAAC} || ${PORT_OPTIONS:MFDK_AAC}
-FFMPEG_NONFREE= yes
-.endif
+NONFREE_CONFIGURE_ENABLE=nonfree
+NONFREE_VARS= RESTRICTED="linking to libfaac or libaacplus restricts redistribution"
-.if ${PORT_OPTIONS:MAMR_NB} || ${PORT_OPTIONS:MAMR_WB} || \
-${PORT_OPTIONS:MVO_AACENC} || ${PORT_OPTIONS:MVO_AMRWBENC}
-FFMPEG_LICENSE_GPL3= yes
-.endif
+INSTALL_TARGET= install-progs install-doc install-data \
+ install-libs install-headers
-# x11grab
-.if ${PORT_OPTIONS:MX11GRAB}
-USE_XORG= x11 xext xfixes
-CONFIGURE_ARGS+= --enable-x11grab
-.endif
+DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
-.include <bsd.port.pre.mk>
-
DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
@@ -240,6 +403,7 @@
CONFIGURE_ARGS+=--prefix="${PREFIX}" \
--mandir="${PREFIX}/man" \
--datadir="${DATADIR}" \
+ --pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
--enable-shared \
--enable-gpl \
--enable-postproc \
@@ -246,7 +410,6 @@
--enable-avfilter \
--enable-avresample \
--enable-pthreads \
- --enable-memalign-hack \
--disable-libstagefright-h264 \
--disable-libutvideo \
--disable-libsoxr \
@@ -253,106 +416,38 @@
--cc="${CC}" \
--extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \
--extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \
- --extra-libs="${PTHREAD_LIBS}"
+ --extra-libs="-lpthread"
-DOC_FILES= Changelog CREDITS INSTALL LICENSE MAINTAINERS README
+CONFIGURE_ENV_armv6_clang= ASFLAGS=-no-integrated-as
+CONFIGURE_ARGS_armv6= --disable-fast-unaligned
+CONFIGURE_ARGS_FreeBSD_9= --enable-memalign-hack
+
+DOC_FILES= Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \
+ README.md RELEASE_NOTES
# under doc subdirectory
-DOC_DOCFILES= APIchanges RELEASE_NOTES *.txt *.html
+DOC_DOCFILES= APIchanges *.txt
PORTDOCS= *
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+= --disable-stripping
-.else
-CONFIGURE_ARGS+= --disable-debug
-.endif
+# Custom helpers. FOO_${ARCH} style from bsd.port.mk
+CONFIGURE_ENV+= ${CONFIGURE_ENV_${ARCH}_${CHOSEN_COMPILER_TYPE}}
+CONFIGURE_ARGS+=${CONFIGURE_ARGS_${ARCH}}
-.if ${PORT_OPTIONS:MFFSERVER}
-USE_RC_SUBR= ffserver
-.endif
-
-# sse hardware vector support
-.if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64")
-_BUILTIN_VECTOR= yes
-.else
-CONFIGURE_ARGS+= --disable-sse
-.endif
-
-# mmx support
-.if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "" && ${MACHINE_CPU:Mamd64} == ""
-CONFIGURE_ARGS+= --disable-mmx
-_NO_BUILTIN_VECTOR= yes
-.endif
-
-# builtin vector, requires mmx and sse
-.if !defined(_NO_BUILTIN_VECTOR) && defined(_BUILTIN_VECTOR)
-FFMPEG_CFLAGS+= -msse
-.endif
-
-# optimizations
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
-.endif
-
-# ffserver
-.if ${PORT_OPTIONS:MFFSERVER}
-PLIST_SUB+= FFSERVER=""
-FFPROGS+= ffserver
-. if ${PORT_OPTIONS:MDOCS}
-DOC_DOCFILES+= ffserver.html
-. endif
-.else
-PLIST_SUB+= FFSERVER="@comment "
-.endif
-
-# sdl
-.if ${PORT_OPTIONS:MSDL}
-USE_SDL+= sdl
-PLIST_FILES+= bin/ffplay man/man1/ffplay.1.gz
-FFPROGS+= ffplay
-.if ${PORT_OPTIONS:MDOCS}
-DOC_DOCFILES+= ffplay.html
-.endif
-.else
-CONFIGURE_ARGS+= --disable-ffplay --disable-outdev=sdl
-.endif
-
-# vorbis
-.if ${PORT_OPTIONS:MVORBIS}
-FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis
-.endif
-
-# License knobs
-.if defined(FFMPEG_NONFREE)
-RESTRICTED= linking to libfaac or libaacplus restricts redistribution
-CONFIGURE_ARGS+= --enable-nonfree
-.endif
-
-.if defined(FFMPEG_LICENSE_GPL3)
-CONFIGURE_ARGS+= --enable-version3
-LICENSE= GPLv3 LGPL3
-LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3
-LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3
-.endif
-
post-patch:
# {C,LD}FLAGS safeness
- @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|$$(DESTDIR)$$(prefix)/libdata/pkgconfig|' \
- ${WRKSRC}/library.mak
@${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \
${WRKSRC}/ffserver.c
@${REINPLACE_CMD} -E \
-e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \
s|%%LOCALBASE%%|${LOCALBASE}|g; \
- s|-pthread|${PTHREAD_LIBS}|g; \
s|gsm/gsm.h|gsm.h|g" \
+ -e 's/freebsd/freebsd|midnightbsd/g' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@${REINPLACE_CMD} -e 's|-ldl||' \
-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
-e 's|freetype/freetype.h|freetype.h|g' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
- @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \
- ${WRKSRC}/doc/texi2pod.pl
-.if ${PORT_OPTIONS:MSDL}
+
+post-patch-SDL-on:
@${REINPLACE_CMD} -E \
-e 's|sdl-config|${SDL_CONFIG}|g' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@@ -359,30 +454,18 @@
@${FIND} ${WRKSRC} -type f | \
${XARGS} -n 10 ${REINPLACE_CMD} -E \
-e 's|#include <SDL|#include <SDL/SDL|'
-.endif
-post-configure:
-.if empty(PORT_OPTIONS:MTHEORA)
+post-configure-THEORA-off:
@${REINPLACE_CMD} -E \
-e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \
${WRKSRC}/config.mak
-.endif
post-install:
-.for PROG in ${FFPROGS}
- @${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/doc/${PROG}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/${PROG}.1
-.endfor
-.if ${PORT_OPTIONS:MFFSERVER}
+ (cd ${WRKSRC} && ${COPYTREE_SHARE} \
+ "${DOC_FILES}" ${STAGEDIR}${DOCSDIR})
+ (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \
+ "${DOC_DOCFILES}" ${STAGEDIR}${DOCSDIR})
${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
- ${STAGEDIR}${PREFIX}/etc/ffserver.conf-dist
-.endif
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for FILE in ${DOC_FILES}
- ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
-.endfor
-.for FILE in ${DOC_DOCFILES}
- ${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
-.endfor
+ ${PREFIX}/etc/ffserver.conf.sample
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/multimedia/ffmpeg/distinfo
===================================================================
--- trunk/multimedia/ffmpeg/distinfo 2016-03-27 23:05:51 UTC (rev 21345)
+++ trunk/multimedia/ffmpeg/distinfo 2016-03-27 23:28:53 UTC (rev 21346)
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-2.1.1.tar.bz2) = bef95e5b9aac45adec7ef434537504a63b4bbc22a8ce6a96a68e19c5efbadae2
-SIZE (ffmpeg-2.1.1.tar.bz2) = 6641619
+SHA256 (ffmpeg-2.8.6.tar.bz2) = 40611e329bc354592c6f8f1deb033c31b91f80e91f5707ca4f9afceca78d8e62
+SIZE (ffmpeg-2.8.6.tar.bz2) = 8582420
Modified: trunk/multimedia/ffmpeg/files/ffserver.in
===================================================================
--- trunk/multimedia/ffmpeg/files/ffserver.in 2016-03-27 23:05:51 UTC (rev 21345)
+++ trunk/multimedia/ffmpeg/files/ffserver.in 2016-03-27 23:28:53 UTC (rev 21346)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD$
+# $FreeBSD: head/multimedia/ffmpeg/files/ffserver.in 360599 2014-07-04 11:35:49Z wg $
#
# PROVIDE: ffserver
@@ -19,7 +19,8 @@
name=ffserver
rcvar=ffserver_enable
-command="%%PREFIX%%/bin/${name} &"
+command="%%PREFIX%%/bin/${name}"
+command_args="&"
required_files=%%PREFIX%%/etc/ffserver.conf
load_rc_config ${name}
Modified: trunk/multimedia/ffmpeg/files/patch-Makefile
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-Makefile 2016-03-27 23:05:51 UTC (rev 21345)
+++ trunk/multimedia/ffmpeg/files/patch-Makefile 2016-03-27 23:28:53 UTC (rev 21346)
@@ -1,11 +1,11 @@
---- Makefile.orig 2012-05-04 12:24:34.447846798 +0200
-+++ Makefile 2012-05-04 12:24:42.471850113 +0200
-@@ -79,7 +79,7 @@
+--- Makefile.orig 2015-06-19 20:44:35 UTC
++++ Makefile
+@@ -92,7 +92,7 @@ define DOSUBDIR
$(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
SUBDIR := $(1)/
include $(SRC_PATH)/$(1)/Makefile
--include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
+-include $(SRC_PATH)/$(1)/$(FFMPEG_ARCH)/Makefile
+ -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
include $(SRC_PATH)/library.mak
endef
-
Modified: trunk/multimedia/ffmpeg/files/patch-configure
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-configure 2016-03-27 23:05:51 UTC (rev 21345)
+++ trunk/multimedia/ffmpeg/files/patch-configure 2016-03-27 23:28:53 UTC (rev 21346)
@@ -1,39 +1,29 @@
---- configure.orig
+--- configure.orig 2015-06-19 20:47:55 UTC
+++ configure
-@@ -2147,7 +2147,7 @@ yasmexe_default="yasm"
- nogas=":"
+@@ -2814,12 +2814,7 @@ target_os_default=$(tolower $(uname -s))
+ host_os=$target_os_default
# machine
--arch_default=$(uname -m)
+-if test "$target_os_default" = aix; then
+- arch_default=$(uname -p)
+- strip_default="strip -X32_64"
+-else
+- arch_default=$(uname -m)
+-fi
+arch_default=$(uname -p)
cpu="generic"
+ intrinsics="none"
- # OS
-@@ -3991,10 +3991,10 @@ perl --version > /dev/null 2>&1 && enabl
- pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
- rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
-
--check_header linux/fb.h
--check_header linux/videodev.h
--check_header linux/videodev2.h
--check_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete
-+#check_header linux/fb.h
-+#check_header linux/videodev.h
-+#check_header linux/videodev2.h
-+#check_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete
-
- check_header sys/videoio.h
-
-@@ -4373,7 +4373,7 @@ ifndef MAIN_MAKEFILE
+@@ -5823,7 +5818,7 @@ ifndef MAIN_MAKEFILE
SRC_PATH:=\$(SRC_PATH:.%=..%)
endif
CC_IDENT=$cc_ident
-ARCH=$arch
+FFMPEG_ARCH=$arch
+ INTRINSICS=$intrinsics
CC=$cc
CXX=$cxx
- AS=$as
-@@ -4555,7 +4555,7 @@ exec_prefix=\${prefix}
+@@ -6035,7 +6030,7 @@ exec_prefix=\${prefix}
libdir=$libdir
includedir=$incdir
@@ -42,7 +32,7 @@
Description: $comment
Version: $version
Requires: $(enabled shared || echo $requires)
-@@ -4569,10 +4569,10 @@ EOF
+@@ -6049,10 +6044,10 @@ EOF
mkdir -p doc/examples/pc-uninstalled
includedir=${source_path}
[ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
Modified: trunk/multimedia/ffmpeg/files/patch-doc-Makefile
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-doc-Makefile 2016-03-27 23:05:51 UTC (rev 21345)
+++ trunk/multimedia/ffmpeg/files/patch-doc-Makefile 2016-03-27 23:28:53 UTC (rev 21346)
@@ -1,7 +1,7 @@
---- doc/Makefile.orig 2012-09-28 03:37:35.000000000 +0200
-+++ doc/Makefile 2012-10-12 21:36:56.461440175 +0200
-@@ -57,7 +57,7 @@
- install-man:
+--- doc/Makefile.orig 2015-06-19 20:44:35 UTC
++++ doc/Makefile
+@@ -145,7 +145,7 @@ install-html: $(HTMLPAGES)
+ endif
ifdef CONFIG_MANPAGES
-install-progs-$(CONFIG_DOC): install-man
Modified: trunk/multimedia/ffmpeg/files/patch-libavcodec-Makefile
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavcodec-Makefile 2016-03-27 23:05:51 UTC (rev 21345)
+++ trunk/multimedia/ffmpeg/files/patch-libavcodec-Makefile 2016-03-27 23:28:53 UTC (rev 21346)
@@ -1,11 +1,11 @@
---- libavcodec/Makefile.orig 2012-08-06 10:06:26.000000000 +0200
-+++ libavcodec/Makefile 2012-08-06 10:36:33.478505808 +0200
-@@ -793,7 +793,7 @@
- codec_names.h \
- fft-internal.h \
+--- libavcodec/Makefile.orig 2015-06-19 20:44:36 UTC
++++ libavcodec/Makefile
+@@ -877,7 +877,7 @@ SKIPHEADERS +
+ old_codec_ids.h \
tableprint.h \
+ tableprint_vlc.h \
- $(ARCH)/vp56_arith.h \
-+ $(FFMPEG_ARCH)/vp56_arith.h \
++ $(FFMPEG_ARCH)/vp56_arith.h \
+ SKIPHEADERS-$(CONFIG_D3D11VA) += d3d11va.h dxva2_internal.h
SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h
- SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h
Modified: trunk/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavdevice-bktr.c 2016-03-27 23:05:51 UTC (rev 21345)
+++ trunk/multimedia/ffmpeg/files/patch-libavdevice-bktr.c 2016-03-27 23:28:53 UTC (rev 21346)
@@ -1,5 +1,5 @@
---- libavdevice/bktr.c.orig 2012-01-22 14:41:15.000000000 +0100
-+++ libavdevice/bktr.c 2012-01-22 16:07:07.873280412 +0100
+--- libavdevice/bktr.c.orig 2015-06-19 20:44:50 UTC
++++ libavdevice/bktr.c
@@ -24,6 +24,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
@@ -10,5 +10,5 @@
+typedef unsigned long u_long;
+
#include "libavformat/internal.h"
+ #include "libavutil/internal.h"
#include "libavutil/log.h"
- #include "libavutil/opt.h"
Deleted: trunk/multimedia/ffmpeg/files/patch-libavdevice-oss_audio.c
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavdevice-oss_audio.c 2016-03-27 23:05:51 UTC (rev 21345)
+++ trunk/multimedia/ffmpeg/files/patch-libavdevice-oss_audio.c 2016-03-27 23:28:53 UTC (rev 21346)
@@ -1,14 +0,0 @@
---- libavdevice/oss_audio.c.orig 2009-05-15 17:38:35.000000000 +0200
-+++ libavdevice/oss_audio.c 2009-05-15 17:41:27.000000000 +0200
-@@ -19,6 +19,11 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-+typedef unsigned char u_char;
-+typedef unsigned short u_short;
-+typedef unsigned int u_int;
-+typedef unsigned long u_long;
-+
- #include "config.h"
- #include <stdlib.h>
- #include <stdio.h>
Modified: trunk/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c 2016-03-27 23:05:51 UTC (rev 21345)
+++ trunk/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c 2016-03-27 23:28:53 UTC (rev 21346)
@@ -1,12 +1,12 @@
---- libavfilter/vf_libopencv.c.orig 2012-08-05 14:09:37.882506740 +0200
-+++ libavfilter/vf_libopencv.c 2012-08-05 14:10:24.508510133 +0200
-@@ -25,8 +25,7 @@
+--- libavfilter/vf_libopencv.c.orig 2015-06-19 20:44:50 UTC
++++ libavfilter/vf_libopencv.c
+@@ -23,8 +23,7 @@
+ * libopencv wrapper functions
+ */
- /* #define DEBUG */
-
-#include <opencv/cv.h>
-#include <opencv/cxcore.h>
+#include <opencv2/imgproc/imgproc_c.h>
#include "libavutil/avstring.h"
+ #include "libavutil/common.h"
#include "libavutil/file.h"
- #include "avfilter.h"
Deleted: trunk/multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c 2016-03-27 23:05:51 UTC (rev 21345)
+++ trunk/multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c 2016-03-27 23:28:53 UTC (rev 21346)
@@ -1,10 +0,0 @@
---- libavfilter/vf_drawtext.c.orig 2013-11-20 03:28:56.000000000 +0100
-+++ libavfilter/vf_drawtext.c 2013-12-06 18:26:57.000000000 +0100
-@@ -48,7 +48,6 @@
- #include "video.h"
-
- #include <ft2build.h>
--#include <freetype/config/ftheader.h>
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
- #if CONFIG_FONTCONFIG
Modified: trunk/multimedia/ffmpeg/files/patch-libavformat-udp.c
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavformat-udp.c 2016-03-27 23:05:51 UTC (rev 21345)
+++ trunk/multimedia/ffmpeg/files/patch-libavformat-udp.c 2016-03-27 23:28:53 UTC (rev 21346)
@@ -1,11 +1,11 @@
---- libavformat/udp.c.orig 2009-05-15 17:24:45.000000000 +0200
-+++ libavformat/udp.c 2009-05-15 17:27:17.000000000 +0200
-@@ -45,6 +45,8 @@
- #define IN6_IS_ADDR_MULTICAST(a) (((uint8_t *) (a))[0] == 0xff)
- #endif
+--- libavformat/udp.c.orig 2015-06-19 20:44:53 UTC
++++ libavformat/udp.c
+@@ -71,6 +71,8 @@
+ #define UDP_MAX_PKT_SIZE 65536
+ #define UDP_HEADER_SIZE 8
+#define IPPROTO_IPV6 41
+
- typedef struct {
+ typedef struct UDPContext {
+ const AVClass *class;
int udp_fd;
- int ttl;
Modified: trunk/multimedia/ffmpeg/files/patch-libavutil-common.h
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavutil-common.h 2016-03-27 23:05:51 UTC (rev 21345)
+++ trunk/multimedia/ffmpeg/files/patch-libavutil-common.h 2016-03-27 23:28:53 UTC (rev 21346)
@@ -1,8 +1,8 @@
---- libavutil/common.h.orig 2010-07-07 19:27:45.000000000 +0200
-+++ libavutil/common.h 2010-08-01 22:27:42.964629491 +0200
-@@ -36,6 +36,10 @@
- #include <string.h>
- #include "attributes.h"
+--- libavutil/common.h.orig 2015-06-19 20:44:53 UTC
++++ libavutil/common.h
+@@ -49,6 +49,10 @@
+ # define AV_NE(be, le) (le)
+ #endif
+#ifndef UINT64_C
+#define UINT64_C(c) (c ## UL)
Modified: trunk/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h 2016-03-27 23:05:51 UTC (rev 21345)
+++ trunk/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h 2016-03-27 23:28:53 UTC (rev 21346)
@@ -1,6 +1,6 @@
---- ./libavutil/x86/asm.h.orig 2013-11-01 13:02:26.000000000 -0400
-+++ ./libavutil/x86/asm.h 2013-11-01 13:03:00.000000000 -0400
-@@ -70,7 +70,7 @@
+--- libavutil/x86/asm.h.orig 2015-06-19 20:44:54 UTC
++++ libavutil/x86/asm.h
+@@ -71,7 +71,7 @@ typedef int32_t x86_reg;
typedef int x86_reg;
#endif
Modified: trunk/multimedia/ffmpeg/pkg-descr
===================================================================
--- trunk/multimedia/ffmpeg/pkg-descr 2016-03-27 23:05:51 UTC (rev 21345)
+++ trunk/multimedia/ffmpeg/pkg-descr 2016-03-27 23:28:53 UTC (rev 21346)
@@ -2,6 +2,4 @@
audio and video. It includes libavcodec - the leading audio/video codec
library.
-This version is from the 2.0 release branch.
-
WWW: http://ffmpeg.org/
Modified: trunk/multimedia/ffmpeg/pkg-plist
===================================================================
--- trunk/multimedia/ffmpeg/pkg-plist 2016-03-27 23:05:51 UTC (rev 21345)
+++ trunk/multimedia/ffmpeg/pkg-plist 2016-03-27 23:28:53 UTC (rev 21346)
@@ -1,17 +1,21 @@
bin/ffmpeg
+%%SDL%%bin/ffplay
bin/ffprobe
%%FFSERVER%%bin/ffserver
-%%FFSERVER%%@unexec if cmp -s %D/etc/ffserver.conf %D/etc/ffserver.conf-dist; then rm -f %D/etc/ffserver.conf; fi
-%%FFSERVER%%etc/ffserver.conf-dist
-%%FFSERVER%%@exec [ -f %B/ffserver.conf ] || cp %B/%f %B/ffserver.conf
+%%FFSERVER%%@sample etc/ffserver.conf.sample
include/libavcodec/avcodec.h
include/libavcodec/avfft.h
+include/libavcodec/d3d11va.h
+include/libavcodec/dv_profile.h
include/libavcodec/dxva2.h
include/libavcodec/old_codec_ids.h
+include/libavcodec/qsv.h
include/libavcodec/vaapi.h
include/libavcodec/vda.h
include/libavcodec/vdpau.h
include/libavcodec/version.h
+include/libavcodec/videotoolbox.h
+include/libavcodec/vorbis_parser.h
include/libavcodec/xvmc.h
include/libavdevice/avdevice.h
include/libavdevice/version.h
@@ -41,42 +45,56 @@
include/libavutil/bprint.h
include/libavutil/bswap.h
include/libavutil/buffer.h
+include/libavutil/camellia.h
+include/libavutil/cast5.h
include/libavutil/channel_layout.h
include/libavutil/common.h
include/libavutil/cpu.h
include/libavutil/crc.h
include/libavutil/dict.h
+include/libavutil/display.h
+include/libavutil/downmix_info.h
include/libavutil/error.h
include/libavutil/eval.h
+include/libavutil/ffversion.h
include/libavutil/fifo.h
include/libavutil/file.h
include/libavutil/frame.h
+include/libavutil/hash.h
include/libavutil/hmac.h
include/libavutil/imgutils.h
include/libavutil/intfloat.h
-include/libavutil/intfloat_readwrite.h
include/libavutil/intreadwrite.h
include/libavutil/lfg.h
include/libavutil/log.h
include/libavutil/lzo.h
+include/libavutil/macros.h
include/libavutil/mathematics.h
include/libavutil/md5.h
include/libavutil/mem.h
+include/libavutil/motion_vector.h
include/libavutil/murmur3.h
include/libavutil/old_pix_fmts.h
+%%OPENCL%%include/libavutil/opencl.h
include/libavutil/opt.h
include/libavutil/parseutils.h
include/libavutil/pixdesc.h
+include/libavutil/pixelutils.h
include/libavutil/pixfmt.h
include/libavutil/random_seed.h
include/libavutil/rational.h
+include/libavutil/replaygain.h
include/libavutil/ripemd.h
include/libavutil/samplefmt.h
include/libavutil/sha.h
include/libavutil/sha512.h
+include/libavutil/stereo3d.h
+include/libavutil/tea.h
+include/libavutil/threadmessage.h
include/libavutil/time.h
include/libavutil/timecode.h
include/libavutil/timestamp.h
+include/libavutil/twofish.h
include/libavutil/version.h
include/libavutil/xtea.h
include/libpostproc/postprocess.h
@@ -87,40 +105,40 @@
include/libswscale/version.h
lib/libavcodec.a
lib/libavcodec.so
-lib/libavcodec.so.55
-lib/libavcodec.so.55.39.101
+lib/libavcodec.so.56
+lib/libavcodec.so.56.60.100
lib/libavdevice.a
lib/libavdevice.so
-lib/libavdevice.so.55
-lib/libavdevice.so.55.5.100
+lib/libavdevice.so.56
+lib/libavdevice.so.56.4.100
lib/libavfilter.a
lib/libavfilter.so
-lib/libavfilter.so.3
-lib/libavfilter.so.3.90.100
+lib/libavfilter.so.5
+lib/libavfilter.so.5.40.101
lib/libavformat.a
lib/libavformat.so
-lib/libavformat.so.55
-lib/libavformat.so.55.19.104
+lib/libavformat.so.56
+lib/libavformat.so.56.40.101
lib/libavresample.a
lib/libavresample.so
-lib/libavresample.so.1
-lib/libavresample.so.1.1.0
+lib/libavresample.so.2
+lib/libavresample.so.2.1.0
lib/libavutil.a
lib/libavutil.so
-lib/libavutil.so.52
-lib/libavutil.so.52.48.101
+lib/libavutil.so.54
+lib/libavutil.so.54.31.100
lib/libpostproc.a
lib/libpostproc.so
-lib/libpostproc.so.52
-lib/libpostproc.so.52.3.100
+lib/libpostproc.so.53
+lib/libpostproc.so.53.3.100
lib/libswresample.a
lib/libswresample.so
-lib/libswresample.so.0
-lib/libswresample.so.0.17.104
+lib/libswresample.so.1
+lib/libswresample.so.1.2.101
lib/libswscale.a
lib/libswscale.so
-lib/libswscale.so.2
-lib/libswscale.so.2.5.101
+lib/libswscale.so.3
+lib/libswscale.so.3.1.101
libdata/pkgconfig/libavcodec.pc
libdata/pkgconfig/libavdevice.pc
libdata/pkgconfig/libavfilter.pc
@@ -130,16 +148,49 @@
libdata/pkgconfig/libpostproc.pc
libdata/pkgconfig/libswresample.pc
libdata/pkgconfig/libswscale.pc
+man/man1/ffmpeg-all.1.gz
+man/man1/ffmpeg-bitstream-filters.1.gz
+man/man1/ffmpeg-codecs.1.gz
+man/man1/ffmpeg-devices.1.gz
+man/man1/ffmpeg-filters.1.gz
+man/man1/ffmpeg-formats.1.gz
+man/man1/ffmpeg-protocols.1.gz
+man/man1/ffmpeg-resampler.1.gz
+man/man1/ffmpeg-scaler.1.gz
+man/man1/ffmpeg-utils.1.gz
+man/man1/ffmpeg.1.gz
+%%SDL%%man/man1/ffplay-all.1.gz
+%%SDL%%man/man1/ffplay.1.gz
+man/man1/ffprobe-all.1.gz
+man/man1/ffprobe.1.gz
+%%FFSERVER%%man/man1/ffserver-all.1.gz
+%%FFSERVER%%man/man1/ffserver.1.gz
+man/man3/libavcodec.3.gz
+man/man3/libavdevice.3.gz
+man/man3/libavfilter.3.gz
+man/man3/libavformat.3.gz
+man/man3/libavutil.3.gz
+man/man3/libswresample.3.gz
+man/man3/libswscale.3.gz
%%DATADIR%%/examples/Makefile
%%DATADIR%%/examples/README
+%%DATADIR%%/examples/avio_dir_cmd.c
+%%DATADIR%%/examples/avio_reading.c
%%DATADIR%%/examples/decoding_encoding.c
-%%DATADIR%%/examples/demuxing.c
+%%DATADIR%%/examples/demuxing_decoding.c
+%%DATADIR%%/examples/extract_mvs.c
+%%DATADIR%%/examples/filter_audio.c
%%DATADIR%%/examples/filtering_audio.c
%%DATADIR%%/examples/filtering_video.c
+%%DATADIR%%/examples/http_multiclient.c
%%DATADIR%%/examples/metadata.c
%%DATADIR%%/examples/muxing.c
+%%DATADIR%%/examples/qsvdec.c
+%%DATADIR%%/examples/remuxing.c
%%DATADIR%%/examples/resampling_audio.c
%%DATADIR%%/examples/scaling_video.c
+%%DATADIR%%/examples/transcode_aac.c
+%%DATADIR%%/examples/transcoding.c
%%DATADIR%%/ffprobe.xsd
%%DATADIR%%/libvpx-1080p.ffpreset
%%DATADIR%%/libvpx-1080p50_60.ffpreset
@@ -146,16 +197,3 @@
%%DATADIR%%/libvpx-360p.ffpreset
%%DATADIR%%/libvpx-720p.ffpreset
%%DATADIR%%/libvpx-720p50_60.ffpreset
-%%DATADIR%%/libx264-ipod320.ffpreset
-%%DATADIR%%/libx264-ipod640.ffpreset
- at dirrm %%DATADIR%%/examples
- at dirrm %%DATADIR%%
- at dirrm include/libswscale
- at dirrm include/libswresample
- at dirrm include/libpostproc
- at dirrm include/libavutil
- at dirrm include/libavresample
- at dirrm include/libavformat
- at dirrm include/libavfilter
- at dirrm include/libavdevice
- at dirrm include/libavcodec
More information about the Midnightbsd-cvs
mailing list