[Midnightbsd-cvs] mports [15690] U trunk/multimedia/ffmpeg: ffmpeg 2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Dec 19 23:08:50 EST 2013
Revision: 15690
http://svnweb.midnightbsd.org/mports/?rev=15690
Author: laffer1
Date: 2013-12-19 23:08:49 -0500 (Thu, 19 Dec 2013)
Log Message:
-----------
ffmpeg 2
Modified Paths:
--------------
trunk/multimedia/ffmpeg/Makefile
trunk/multimedia/ffmpeg/distinfo
trunk/multimedia/ffmpeg/files/ffserver.in
trunk/multimedia/ffmpeg/files/patch-configure
trunk/multimedia/ffmpeg/files/patch-libavcodec-Makefile
trunk/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
trunk/multimedia/ffmpeg/files/patch-libavutil-common.h
trunk/multimedia/ffmpeg/pkg-descr
trunk/multimedia/ffmpeg/pkg-plist
Added Paths:
-----------
trunk/multimedia/ffmpeg/files/patch-Makefile
trunk/multimedia/ffmpeg/files/patch-doc-Makefile
trunk/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
trunk/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h
Removed Paths:
-------------
trunk/multimedia/ffmpeg/files/patch-libavcodec-libgsm.c
Property Changed:
----------------
trunk/multimedia/ffmpeg/distinfo
trunk/multimedia/ffmpeg/files/ffserver.in
trunk/multimedia/ffmpeg/files/patch-configure
trunk/multimedia/ffmpeg/files/patch-libavcodec-Makefile
trunk/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
trunk/multimedia/ffmpeg/files/patch-libavdevice-oss_audio.c
trunk/multimedia/ffmpeg/files/patch-libavformat-udp.c
trunk/multimedia/ffmpeg/files/patch-libavutil-common.h
trunk/multimedia/ffmpeg/pkg-descr
trunk/multimedia/ffmpeg/pkg-plist
Modified: trunk/multimedia/ffmpeg/Makefile
===================================================================
--- trunk/multimedia/ffmpeg/Makefile 2013-12-20 03:27:20 UTC (rev 15689)
+++ trunk/multimedia/ffmpeg/Makefile 2013-12-20 04:08:49 UTC (rev 15690)
@@ -2,7 +2,8 @@
# $FreeBSD: ports/multimedia/ffmpeg/Makefile,v 1.135 2011/08/22 21:14:34 mm Exp $
PORTNAME= ffmpeg
-PORTVERSION= 0.7.3
+PORTVERSION= 2.1.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
@@ -9,116 +10,269 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= Realtime audio/video encoder/converter and streaming server
-LICENSE= gpl3
+LICENSE= gpl2
+
+
BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \
- ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+ ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \
+ texi2html:${PORTSDIR}/textproc/texi2html
-CONFLICTS= ffmpeg-20*
-
HAS_CONFIGURE= yes
CONFIGURE_LOG= config.err
+USES= gmake pkgconfig perl5
+USE_PERL5= build
USE_BZIP2= yes
-USE_GMAKE= yes
-MAKE_JOBS_SAFE= yes
WANT_SDL= yes
-OPTIONS= ALSA "Enable alsa input/output device" off \
- AMR_NB "AMR Narrow Band audio encoder (opencore)" off \
- AMR_WB "AMR Wide Band audio decoder (opencore)" off \
- CELT "Enable CELT/Opus decoding via libcelt" off \
- DIRAC "Dirac codec via libdirac" off \
- FAAC "FAAC mp4/aac audio encoder" off \
- FFSERVER "Build and install ffserver" on \
- FREETYPE "Text on top of video frames (freetype2)" on \
- FREI0R "Frei0r wrapper filter" on \
- GSM "GSM audio codec" off \
- LAME "LAME MP3 encoder" off \
- OPENCV "OpenCV video filtering support" on \
- OPENJPEG "JPEG 2000 decoder" off \
- OPTIMIZED_CFLAGS "Additional optimizations" off \
- RTMP "RTMP[E] support via librtmp" off \
- SCHROEDINGER "Dirac codec via libschroedinger" on \
- SDL "SDL support (build ffplay)" off \
- SPEEX "Speex audio decoder" off \
- THEORA "Theora encoder (implies OGG)" on \
- VAAPI "GPU acceleration support (libva)" off \
- VDPAU "Nvidia vdpau support" off \
- VO_AACENC "AAC audio encoder (vo-aacenc)" off \
- VO_AMRWBENC "AMR Wide Band audio encoder (vo-amrwbenc)" off \
- VORBIS "Vorbis encoder via libvorbis (implies OGG)" on \
- VP8 "VP8 codec via libvpx" on \
- X264 "H.264 encoder" on \
- XVID "Xvid encoder via xvidcore" on
+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
-COMPAT_HEADERS=libavcodec/avcodec.h \
- libavcodec/opt.h \
- libavcodec/vdpau.h \
- libavcodec/xvmc.h \
- libavdevice/avdevice.h \
- libavfilter/avfilter.h \
- libavformat/avformat.h \
- libavformat/avio.h \
- libavutil/adler32.h \
- libavutil/avstring.h \
- libavutil/avutil.h \
- libavutil/base64.h \
- libavutil/common.h \
- libavutil/crc.h \
- libavutil/fifo.h \
- libavutil/intfloat_readwrite.h \
- libavutil/log.h \
- libavutil/lzo.h \
- libavutil/mathematics.h \
- libavutil/md5.h \
- libavutil/mem.h \
- libavutil/pixfmt.h \
- libavutil/rational.h \
- libavutil/sha1.h \
- libpostproc/postprocess.h \
- libswscale/swscale.h
+OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \
+ OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID
+ASS_DESC= Subtitles rendering via libass
+CDIO_DESC= Audio CD grabbing with libcdio
+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
+
+# aacplus
+AACPLUS_LIB_DEPENDS= libaacplus.so:${PORTSDIR}/audio/libaacplus
+AACPLUS_CONFIGURE_ENABLE= libaacplus
+
+# alsa
+ALSA_CONFIGURE_OFF= --disable-indev=alsa \
+ --disable-outdev=alsa
+ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
+
+# Opencore AMR NB
+AMR_NB_LIB_DEPENDS= libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
+AMR_NB_CONFIGURE_ENABLE= libopencore-amrnb
+
+# Opencore AMR WB
+AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr
+AMR_WB_CONFIGURE_ENABLE= libopencore-amrwb
+
+# ass
+ASS_LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass
+ASS_CONFIGURE_ENABLE= libass
+
+# cdio
+CDIO_LIB_DEPENDS= libcdio.so:${PORTSDIR}/sysutils/libcdio
+CDIO_CONFIGURE_ENABLE= libcdio
+
+# celt
+CELT_LIB_DEPENDS= libcelt0.so:${PORTSDIR}/audio/celt
+CELT_CONFIGURE_ENABLE= libcelt
+
+# faac
+FAAC_LIB_DEPENDS= libfaac.so:${PORTSDIR}/audio/faac
+FAAC_CONFIGURE_ENABLE= libfaac
+
+# fdk_aac
+FDK_AAC_LIB_DEPENDS= libfdk-aac.so:${PORTSDIR}/audio/fdk-aac
+FDK_AAC_CONFIGURE_ENABLE= libfdk-aac
+
+# ffserver
+FFSERVER_CONFIGURE_ENABLE= ffserver
+
+# fontconfig
+FONTCONFIG_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+FONTCONFIG_CONFIGURE_ENABLE= fontconfig
+
+# freetype
+FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_CONFIGURE_ENABLE= libfreetype
+
+# frei0r
+FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
+FREI0R_CONFIGURE_ENABLE= frei0r
+
+# gnutls
+GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_CONFIGURE_ENABLE= gnutls
+
+# gsm
+GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm
+GSM_CONFIGURE_ENABLE= libgsm
+
+# iconv
+ICONV_USES= iconv
+ICONV_CONFIGURE_ENABLE= iconv
+
+JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack
+JACK_CONFIGURE_OFF= --disable-indev=jack
+
+# lame
+LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame
+LAME_CONFIGURE_ENABLE= libmp3lame
+
+# libbluray
+LIBBLURAY_LIB_DEPENDS= libbluray.so:${PORTSDIR}/multimedia/libbluray
+LIBBLURAY_CONFIGURE_ENABLE= libbluray
+
+# libv4l
+LIBV4L_LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
+LIBV4L_CONFIGURE_ENABLE= libv4l2
+LIBV4L_CONFIGURE_OFF= --disable-indev=v4l2 \
+ --disable-outdev=v4l2
+
+# modplug
+MODPLUG_LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_CONFIGURE_ENABLE= libmodplug
+
+# OpenAL
+OPENAL_LIB_DEPENDS= libopenal.so:${PORTSDIR}/audio/openal-soft
+OPENAL_CONFIGURE_ENABLE= openal
+OPENAL_CONFIGURE_OFF= --disable-indev=openal
+
+# opencv
+OPENCV_LIB_DEPENDS= libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core
+OPENCV_CONFIGURE_ENABLE= libopencv
+
+# openjpeg
+OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg
+OPENJPEG_CONFIGURE_ENABLE= libopenjpeg
+
+# opus
+OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus
+OPUS_CONFIGURE_ENABLE= libopus
+
+# pulseaudio
+PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_CONFIGURE_ENABLE= libpulse
+PULSEAUDIO_CONFIGURE_OFF= --disable-indev=pulse \
+ --disable-outdev=pulse
+
+# rtmp
+RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp
+RTMP_CONFIGURE_ENABLE= librtmp
+
+# schroedinger
+SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
+SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger
+
+# speex
+SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_CONFIGURE_ENABLE= libspeex
+
+# theora
+THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora
+THEORA_CONFIGURE_ENABLE= libtheora
+
+# vaapi
+VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva
+VAAPI_CONFIGURE_ENABLE= vaapi
+
+# vdpau
+VDPAU_BUILD_DEPENDS= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau
+VDPAU_CONFIGURE_ENABLE= vdpau
+
+# vo-aacenc
+VO_AACENC_LIB_DEPENDS= libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc
+VO_AACENC_CONFIGURE_ENABLE= libvo-aacenc
+
+# vo-amrwbenc
+VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc
+VO_AMRWBENC_CONFIGURE_ENABLE= libvo-amrwbenc
+
+# vorbis
+VORBIS_LIB_DEPENDS= libvorbisenc.so:${PORTSDIR}/audio/libvorbis
+VORBIS_CONFIGURE_ENABLE= libvorbis
+
+# vp8
+VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx
+VPX_CONFIGURE_ENABLE= libvpx
+
+# x264
+X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/x264
+X264_CONFIGURE_ENABLE= libx264
+
+# 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}"
+
+#USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
+DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
+
+.include <bsd.mport.options.mk>
+
+# ssl
+.if ${PORT_OPTIONS:MOPENSSL} && empty(PORT_OPTIONS:MGNUTLS)
+USE_OPENSSL= yes
+FFMPEG_NONFREE= yes
+.endif
+
+.if ${PORT_OPTIONS:MAACPLUS} || ${PORT_OPTIONS:MFAAC} || ${PORT_OPTIONS:MFDK_AAC}
+FFMPEG_NONFREE= yes
+.endif
+
+.if ${PORT_OPTIONS:MAMR_NB} || ${PORT_OPTIONS:MAMR_WB} || \
+${PORT_OPTIONS:MVO_AACENC} || ${PORT_OPTIONS:MVO_AMRWBENC}
+FFMPEG_LICENSE_GPL3= yes
+.endif
+
+# x11grab
+.if ${PORT_OPTIONS:MX11GRAB}
+USE_XORG= x11 xext xfixes
+CONFIGURE_ARGS+= --enable-x11grab
+.endif
+
.include <bsd.port.pre.mk>
+DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
+DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
CONFIGURE_ARGS+=--prefix="${PREFIX}" \
--mandir="${PREFIX}/man" \
+ --datadir="${DATADIR}" \
--enable-shared \
--enable-gpl \
--enable-postproc \
--enable-avfilter \
+ --enable-avresample \
--enable-pthreads \
- --enable-x11grab \
--enable-memalign-hack \
- --enable-runtime-cpudetect \
+ --disable-libstagefright-h264 \
+ --disable-libutvideo \
+ --disable-libsoxr \
--cc="${CC}" \
--extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \
--extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \
--extra-libs="${PTHREAD_LIBS}"
-SHLIB_VER= 1
-PLIST_SUB= SHLIB_VER=${SHLIB_VER}
-USE_LDCONFIG= yes
-DOC_FILES= CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
+DOC_FILES= Changelog CREDITS INSTALL LICENSE MAINTAINERS README
# under doc subdirectory
-DOC_DOCFILES= APIchanges RELEASE_NOTES TODO *.txt *.html
+DOC_DOCFILES= APIchanges RELEASE_NOTES *.txt *.html
PORTDOCS= *
-.if !defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+= --disable-stripping
+.else
CONFIGURE_ARGS+= --disable-debug
-.else
-CONFIGURE_ARGS+= --disable-stripping
.endif
-.if !defined(WITHOUT_FFSERVER)
+.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")
-WITH_BUILTIN_VECTOR= yes
+_BUILTIN_VECTOR= yes
.else
CONFIGURE_ARGS+= --disable-sse
.endif
@@ -126,250 +280,65 @@
# mmx support
.if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "" && ${MACHINE_CPU:Mamd64} == ""
CONFIGURE_ARGS+= --disable-mmx
-WITHOUT_BUILTIN_VECTOR= yes
+_NO_BUILTIN_VECTOR= yes
.endif
# builtin vector, requires mmx and sse
-.if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)
+.if !defined(_NO_BUILTIN_VECTOR) && defined(_BUILTIN_VECTOR)
FFMPEG_CFLAGS+= -msse
.endif
-# PORTDOCS
-.if !defined(NOPORTDOCS)
-BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html
-MAN1+= ffmpeg.1 ffprobe.1
-. if !defined(WITHOUT_FFSERVER)
-MAN1+= ffserver.1
-. endif
-.endif
-
# optimizations
-.if defined(WITH_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
.endif
-#alsa
-.if defined(WITH_ALSA)
-LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib
-.else
-CONFIGURE_ARGS+= --disable-indev=alsa \
- --disable-outdev=alsa
-.endif
-
-# Opencore AMR NB
-.if defined(WITH_AMR_NB)
-LIB_DEPENDS+= opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr
-CONFIGURE_ARGS+= --enable-libopencore-amrnb
-.else
-CONFIGURE_ARGS+= --disable-libopencore-amrnb
-.endif
-
-# Opencore AMR WB
-.if defined(WITH_AMR_WB)
-LIB_DEPENDS+= opencore-amrwb.0:${PORTSDIR}/audio/opencore-amr
-CONFIGURE_ARGS+= --enable-libopencore-amrwb
-.else
-CONFIGURE_ARGS+= --disable-libopencore-amrwb
-.endif
-
-# celt
-.if defined(WITH_CELT)
-LIB_DEPENDS+= celt0.2:${PORTSDIR}/audio/celt
-CONFIGURE_ARGS+= --enable-libcelt
-.else
-CONFIGURE_ARGS+= --disable-libcelt
-.endif
-
-# dirac
-.if defined(WITH_DIRAC)
-LIB_DEPENDS+= dirac_encoder.1:${PORTSDIR}/multimedia/dirac
-CONFIGURE_ARGS+= --enable-libdirac
-.else
-CONFIGURE_ARGS+= --disable-libdirac
-.endif
-
-# faac
-.if defined(WITH_FAAC)
-RESTRICTED= linking to libfaac restricts redistribution
-LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac
-CONFIGURE_ARGS+= --enable-libfaac --enable-nonfree
-.else
-CONFIGURE_ARGS+= --disable-libfaac
-.endif
-
# ffserver
-.if !defined(WITHOUT_FFSERVER)
+.if ${PORT_OPTIONS:MFFSERVER}
PLIST_SUB+= FFSERVER=""
+PLIST_FILES+= man/man1/ffserver.1.gz
+FFPROGS+= ffserver
+. if ${PORT_OPTIONS:MDOCS}
+DOC_DOCFILES+= ffserver.html
+. endif
.else
PLIST_SUB+= FFSERVER="@comment "
-CONFIGURE_ARGS+= --disable-ffserver
.endif
-# freetype
-.if !defined(WITHOUT_FREETYPE)
-LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
-CONFIGURE_ARGS+= --enable-libfreetype
-.else
-CONFIGURE_ARGS+= --disable-libfreetype
-.endif
-
-# frei0r
-.if !defined(WITHOUT_FREI0R)
-BUILD_DEPENDS+= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
-CONFIGURE_ARGS+= --enable-frei0r
-.else
-CONFIGURE_ARGS+= --disable-frei0r
-.endif
-
-# gsm
-.if defined(WITH_GSM)
-LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm
-CONFIGURE_ARGS+= --enable-libgsm
-.else
-CONFIGURE_ARGS+= --disable-libgsm
-.endif
-
-# mp3
-.if defined(WITH_LAME)
-LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame
-CONFIGURE_ARGS+= --enable-libmp3lame
-.else
-CONFIGURE_ARGS+= --disable-libmp3lame
-.endif
-
-# opencv
-.if !defined(WITHOUT_OPENCV)
-LIB_DEPENDS+= opencv_imgproc.2:${PORTSDIR}/graphics/opencv-core
-CONFIGURE_ARGS+= --enable-libopencv
-.else
-CONFIGURE_ARGS+= --disable-libopencv
-.endif
-
-# openjpeg
-.if defined(WITH_OPENJPEG)
-LIB_DEPENDS+= openjpeg.2:${PORTSDIR}/graphics/openjpeg
-CONFIGURE_ARGS+= --enable-libopenjpeg
-.else
-CONFIGURE_ARGS+= --disable-libopenjpeg
-.endif
-
-# rtmp
-.if defined(WITH_RTMP)
-LIB_DEPENDS+= rtmp.0:${PORTSDIR}/multimedia/rtmpdump
-CONFIGURE_ARGS+= --enable-librtmp
-.else
-CONFIGURE_ARGS+= --disable-librtmp
-.endif
-
-# schroedinger
-.if !defined(WITHOUT_SCHROEDINGER)
-LIB_DEPENDS+= schroedinger-1.0.10:${PORTSDIR}/multimedia/schroedinger
-CONFIGURE_ARGS+= --enable-libschroedinger
-.else
-CONFIGURE_ARGS+= --disable-libschroedinger
-.endif
-
# sdl
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
USE_SDL+= sdl
-PLIST_FILES+= bin/ffplay
-.if !defined(NOPORTDOCS)
-MAN1+= ffplay.1
+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
+CONFIGURE_ARGS+= --disable-ffplay --disable-outdev=sdl
.endif
-# speex
-.if defined(WITH_SPEEX)
-LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex
-CONFIGURE_ARGS+= --enable-libspeex
-.else
-CONFIGURE_ARGS+= --disable-libspeex
-.endif
-
-# theora
-.if !defined(WITHOUT_THEORA)
-LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora
-CONFIGURE_ARGS+= --enable-libtheora
-.else
-CONFIGURE_ARGS+= --disable-libtheora
-.endif
-
-# vaapi
-.if !defined(WITHOUT_VAAPI)
-LIB_DEPENDS+= va.1:${PORTSDIR}/multimedia/libva
-CONFIGURE_ARGS+= --enable-vaapi
-.else
-CONFIGURE_ARGS+= --disable-vaapi
-.endif
-
-# vdpau
-.if !defined(WITHOUT_VDPAU)
-BUILD_DEPENDS+= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau
-CONFIGURE_ARGS+= --enable-vdpau
-.else
-CONFIGURE_ARGS+= --disable-vdpau
-.endif
-
-# vo-aacenc
-.if defined(WITH_VO_AACENC)
-LIB_DEPENDS+= vo-aacenc.0:${PORTSDIR}/audio/vo-aacenc
-CONFIGURE_ARGS+= --enable-libvo-aacenc
-.else
-CONFIGURE_ARGS+= --disable-libvo-aacenc
-.endif
-
-# vo-amrwbenc
-.if defined(WITH_VO_AMRWBENC)
-LIB_DEPENDS+= vo-amrwbenc.0:${PORTSDIR}/audio/vo-amrwbenc
-CONFIGURE_ARGS+= --enable-libvo-amrwbenc
-.else
-CONFIGURE_ARGS+= --disable-libvo-amrwbenc
-.endif
-
# vorbis
-.if !defined(WITHOUT_VORBIS)
-LIB_DEPENDS+= vorbisenc.2:${PORTSDIR}/audio/libvorbis
-CONFIGURE_ARGS+= --enable-libvorbis
+.if ${PORT_OPTIONS:MVORBIS}
FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis
-.else
-CONFIGURE_ARGS+= --disable-libvorbis
.endif
-# vp8
-.if !defined(WITHOUT_VP8)
-LIB_DEPENDS+= vpx.0:${PORTSDIR}/multimedia/libvpx
-CONFIGURE_ARGS+= --enable-libvpx
-.else
-CONFIGURE_ARGS+= --disable-libvpx
+# License knobs
+.if defined(FFMPEG_NONFREE)
+RESTRICTED= linking to libfaac or libaacplus restricts redistribution
+CONFIGURE_ARGS+= --enable-nonfree
.endif
-# x264
-.if !defined(WITHOUT_X264)
-LIB_DEPENDS+= x264.115:${PORTSDIR}/multimedia/x264
-CONFIGURE_ARGS+= --enable-libx264
-.else
-CONFIGURE_ARGS+= --disable-libx264
+.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
-# xvid
-.if !defined(WITHOUT_XVID)
-LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
-CONFIGURE_ARGS+= --enable-libxvid
-.else
-CONFIGURE_ARGS+= --disable-libxvid
-.endif
-
-pre-configure:
-.if defined(WITHOUT_OGG) && (!defined(WITHOUT_VORBIS) || !defined(WITHOUT_THEORA))
- @${ECHO_MSG} WITH_VORBIS or WITH_THEORA defined, libogg will be built
-.endif
-
post-patch:
# {C,LD}FLAGS safeness
- @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
- ${WRKSRC}/subdir.mak
+ @${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 \
@@ -378,10 +347,12 @@
s|-pthread|${PTHREAD_LIBS}|g; \
s|gsm/gsm.h|gsm.h|g" \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
- @${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \
+ @${REINPLACE_CMD} -e 's|-ldl||' \
-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-.if defined(WITH_SDL)
+ @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \
+ ${WRKSRC}/doc/texi2pod.pl
+.if ${PORT_OPTIONS:MSDL}
@${REINPLACE_CMD} -E \
-e 's|sdl-config|${SDL_CONFIG}|g' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@@ -391,7 +362,7 @@
.endif
post-configure:
-.if defined(WITHOUT_THEORA)
+.if empty(PORT_OPTIONS:MTHEORA)
@${REINPLACE_CMD} -E \
-e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \
${WRKSRC}/config.mak
@@ -398,27 +369,20 @@
.endif
post-install:
-.if !defined(WITHOUT_FFSERVER)
- ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${PREFIX}/etc/ffserver.conf-dist
- if [ ! -f ${PREFIX}/etc/ffserver.conf ]; then \
- ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${PREFIX}/etc; \
- fi
+.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}
+ ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
+ ${STAGEDIR}${PREFIX}/etc/ffserver.conf-dist
.endif
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
.for FILE in ${DOC_FILES}
- ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
.endfor
.for FILE in ${DOC_DOCFILES}
- ${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
.endfor
-.endif
- ${MKDIR} ${PREFIX}/include/ffmpeg
-.for FILE in ${COMPAT_HEADERS}
- ${CP} -f ${PREFIX}/include/${FILE} ${PREFIX}/include/ffmpeg/${FILE:C,^[^/]+/([^/]+).*,\1,}
-.endfor
- ${MKDIR} ${PREFIX}/include/postproc
- ${CP} -f ${PREFIX}/include/libpostproc/postprocess.h \
- ${PREFIX}/include/postproc/
.include <bsd.port.post.mk>
Modified: trunk/multimedia/ffmpeg/distinfo
===================================================================
--- trunk/multimedia/ffmpeg/distinfo 2013-12-20 03:27:20 UTC (rev 15689)
+++ trunk/multimedia/ffmpeg/distinfo 2013-12-20 04:08:49 UTC (rev 15690)
@@ -1,3 +1,2 @@
-SHA256 (ffmpeg-0.7.3.tar.bz2) = 58ee859d9c4f5c477ea5bd0dd8e6848ce3af8b6c0ffe3b556612d437e85abb17
-RMD160 (ffmpeg-0.7.3.tar.bz2) = 30da423b0a56efb6273a9a59b47a6cfe237278e2
-SIZE (ffmpeg-0.7.3.tar.bz2) = 4522604
+SHA256 (ffmpeg-2.1.1.tar.bz2) = bef95e5b9aac45adec7ef434537504a63b4bbc22a8ce6a96a68e19c5efbadae2
+SIZE (ffmpeg-2.1.1.tar.bz2) = 6641619
Property changes on: trunk/multimedia/ffmpeg/distinfo
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.6
\ No newline at end of property
Modified: trunk/multimedia/ffmpeg/files/ffserver.in
===================================================================
--- trunk/multimedia/ffmpeg/files/ffserver.in 2013-12-20 03:27:20 UTC (rev 15689)
+++ trunk/multimedia/ffmpeg/files/ffserver.in 2013-12-20 04:08:49 UTC (rev 15690)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: ports/multimedia/ffmpeg/files/ffserver.in,v 1.3 2010/03/27 00:13:31 dougb Exp $
+# $FreeBSD$
#
# PROVIDE: ffserver
@@ -17,7 +17,7 @@
. /etc/rc.subr
name=ffserver
-rcvar=`set_rcvar`
+rcvar=ffserver_enable
command="%%PREFIX%%/bin/${name} &"
required_files=%%PREFIX%%/etc/ffserver.conf
Property changes on: trunk/multimedia/ffmpeg/files/ffserver.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Added: trunk/multimedia/ffmpeg/files/patch-Makefile
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-Makefile (rev 0)
+++ trunk/multimedia/ffmpeg/files/patch-Makefile 2013-12-20 04:08:49 UTC (rev 15690)
@@ -0,0 +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 @@
+ $(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)/library.mak
+ endef
+
Modified: trunk/multimedia/ffmpeg/files/patch-configure
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-configure 2013-12-20 03:27:20 UTC (rev 15689)
+++ trunk/multimedia/ffmpeg/files/patch-configure 2013-12-20 04:08:49 UTC (rev 15690)
@@ -1,7 +1,7 @@
---- configure.orig 2011-08-10 08:16:41 -0400
-+++ configure 2011-09-17 23:36:08 -0400
-@@ -1657,7 +1657,7 @@
- nm_opts='-g'
+--- configure.orig
++++ configure
+@@ -2147,7 +2147,7 @@ yasmexe_default="yasm"
+ nogas=":"
# machine
-arch_default=$(uname -m)
@@ -9,120 +9,49 @@
cpu="generic"
# OS
-@@ -1698,7 +1698,7 @@
- SLIBSUF=".so"
- SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF)'
- SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
--SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
-+SLIBNAME_WITH_MAJOR='$(SLIBNAME).1'
- LIB_INSTALL_EXTRA_CMD='$$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
+@@ -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
- CC_O='-o $@'
-@@ -2427,6 +2427,9 @@
- freebsd)
- enable malloc_aligned
- ;;
-+ midnightbsd)
-+ enable malloc_aligned
-+ ;;
- bsd/os)
- add_extralibs -lpoll -lgnugetopt
- strip="strip -d"
-@@ -2435,13 +2438,13 @@
- enable malloc_aligned
- gas="gas-preprocessor.pl $cc"
- enabled ppc && add_asflags -force_cpusubtype_ALL
-- SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
-+ SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,1'
- enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress
- strip="${strip} -x"
- add_ldflags -Wl,-dynamic,-search_paths_first
- SLIBSUF=".dylib"
- SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)'
-- SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)'
-+ SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).1$(SLIBSUF)'
- FFSERVERLDFLAGS=-Wl,-bind_at_load
- objformat="macho"
- enabled x86_64 && objformat="macho64"
-@@ -2465,7 +2468,7 @@
- SLIBPREF=""
- SLIBSUF=".dll"
- SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
-- SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)'
-+ SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-1$(SLIBSUF)'
- SLIB_EXTRA_CMD='-lib.exe /machine:$(LIBTARGET) /def:$$(@:$(SLIBSUF)=.def) /out:$(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)'
- SLIB_INSTALL_EXTRA_CMD='-install -m 644 $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME:$(SLIBSUF)=.lib)"; \
- install -m 644 $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)"; \
-@@ -2487,7 +2490,7 @@
- SLIBPREF="cyg"
- SLIBSUF=".dll"
- SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
-- SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)'
-+ SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-1$(SLIBSUF)'
- SHFLAGS='-shared -Wl,--enable-auto-image-base'
- objformat="win32"
- enable dos_paths
-@@ -2520,7 +2523,7 @@
- SLIBPREF=""
- SLIBSUF=".dll"
- SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
-- SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(shell echo $(NAME) | cut -c1-6)$(LIBMAJOR)$(SLIBSUF)'
-+ SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(shell echo $(NAME) | cut -c1-6)1$(SLIBSUF)'
- SLIB_CREATE_DEF_CMD='echo LIBRARY $(SLIBNAME_WITH_MAJOR) INITINSTANCE TERMINSTANCE > $(SUBDIR)$(NAME).def; \
- echo PROTMODE >> $(SUBDIR)$(NAME).def; \
- echo CODE PRELOAD MOVEABLE DISCARDABLE >> $(SUBDIR)$(NAME).def; \
-@@ -2791,8 +2794,8 @@
-
- if check_func dlopen; then
- ldl=
--elif check_func dlopen -ldl; then
-- ldl=-ldl
-+elif check_func dlopen ; then
-+ ldl=
- fi
-
- if enabled network; then
-@@ -2920,12 +2923,12 @@
- "dirac_decoder_init dirac_encoder_init"
- enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
- enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
--enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm
-+enabled libgsm && require libgsm gsm.h gsm_create -lgsm
- enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
- enabled libnut && require libnut libnut.h nut_demuxer_init -lnut
- enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
- enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
--enabled libopencv && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader
-+enabled libopencv && require_pkg_config opencv-core opencv2/core/core_c.h cvCreateImageHeader
- enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg
- enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
- enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init
-@@ -2966,8 +2969,8 @@
- texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
-
- check_header linux/fb.h
+-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
- check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs"
-@@ -3326,7 +3329,7 @@
- SRC_PATH="$source_path"
- SRC_PATH_BARE=$source_path
+@@ -4373,7 +4373,7 @@ ifndef MAIN_MAKEFILE
+ SRC_PATH:=\$(SRC_PATH:.%=..%)
+ endif
CC_IDENT=$cc_ident
-ARCH=$arch
+FFMPEG_ARCH=$arch
CC=$cc
+ CXX=$cxx
AS=$as
- LD=$ld
-@@ -3370,7 +3373,7 @@
- SDL_LIBS=$sdl_libs
- SDL_CFLAGS=$sdl_cflags
- LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
--EXTRALIBS=$extralibs
-+EXTRALIBS=-L/usr/local/lib $extralibs
- INSTALL=$install
- LIBTARGET=${LIBTARGET}
- SLIBNAME=${SLIBNAME}
+@@ -4555,7 +4555,7 @@ exec_prefix=\${prefix}
+ libdir=$libdir
+ includedir=$incdir
+
+-Name: $name
++Name: ${name}${build_suffix}
+ Description: $comment
+ Version: $version
+ Requires: $(enabled shared || echo $requires)
+@@ -4569,10 +4569,10 @@ EOF
+ mkdir -p doc/examples/pc-uninstalled
+ includedir=${source_path}
+ [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
+- cat <<EOF > doc/examples/pc-uninstalled/$name.pc
++ cat <<EOF > doc/examples/pc-uninstalled/${name}${build_suffix}.pc
+ prefix=
+ exec_prefix=
+-libdir=\${pcfiledir}/../../../$name
++libdir=\${pcfiledir}/../../../${name}${build_suffix}
+ includedir=${includedir}
+
+ Name: $name
Property changes on: trunk/multimedia/ffmpeg/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Added: trunk/multimedia/ffmpeg/files/patch-doc-Makefile
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-doc-Makefile (rev 0)
+++ trunk/multimedia/ffmpeg/files/patch-doc-Makefile 2013-12-20 04:08:49 UTC (rev 15690)
@@ -0,0 +1,11 @@
+--- 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:
+
+ ifdef CONFIG_MANPAGES
+-install-progs-$(CONFIG_DOC): install-man
++#install-progs-$(CONFIG_DOC): install-man
+
+ install-man: $(MANPAGES)
+ $(Q)mkdir -p "$(MANDIR)/man1"
Modified: trunk/multimedia/ffmpeg/files/patch-libavcodec-Makefile
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavcodec-Makefile 2013-12-20 03:27:20 UTC (rev 15689)
+++ trunk/multimedia/ffmpeg/files/patch-libavcodec-Makefile 2013-12-20 04:08:49 UTC (rev 15690)
@@ -1,11 +1,11 @@
---- libavcodec/Makefile.orig 2010-08-01 20:33:53.484907333 +0200
-+++ libavcodec/Makefile 2010-08-01 20:34:26.190893400 +0200
-@@ -590,7 +590,7 @@
+--- 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 \
+ tableprint.h \
+- $(ARCH)/vp56_arith.h \
++ $(FFMPEG_ARCH)/vp56_arith.h \
- OBJS-$(CONFIG_MLIB) += mlib/dsputil_mlib.o \
-
---include $(SUBDIR)$(ARCH)/Makefile
-+-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile
-
- SKIPHEADERS = %_tablegen.h
SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h
+ SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h
Property changes on: trunk/multimedia/ffmpeg/files/patch-libavcodec-Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/multimedia/ffmpeg/files/patch-libavcodec-libgsm.c
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavcodec-libgsm.c 2013-12-20 03:27:20 UTC (rev 15689)
+++ trunk/multimedia/ffmpeg/files/patch-libavcodec-libgsm.c 2013-12-20 04:08:49 UTC (rev 15690)
@@ -1,11 +0,0 @@
---- libavcodec/libgsm.c.orig 2010-07-21 10:24:16.297810379 +0200
-+++ libavcodec/libgsm.c 2010-07-21 10:24:22.915234561 +0200
-@@ -28,7 +28,7 @@
- // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
-
- #include "avcodec.h"
--#include <gsm/gsm.h>
-+#include <gsm.h>
-
- // gsm.h misses some essential constants
- #define GSM_BLOCK_SIZE 33
Modified: trunk/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavdevice-bktr.c 2013-12-20 03:27:20 UTC (rev 15689)
+++ trunk/multimedia/ffmpeg/files/patch-libavdevice-bktr.c 2013-12-20 04:08:49 UTC (rev 15690)
@@ -1,14 +1,14 @@
---- libavdevice/bktr.c.orig 2011-06-21 21:29:25.000000000 +0200
-+++ libavdevice/bktr.c 2011-06-23 13:39:44.160881669 +0200
+--- libavdevice/bktr.c.orig 2012-01-22 14:41:15.000000000 +0100
++++ libavdevice/bktr.c 2012-01-22 16:07:07.873280412 +0100
@@ -24,6 +24,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;
++typedef unsigned char u_char;
++typedef unsigned short u_short;
++typedef unsigned int u_int;
++typedef unsigned long u_long;
+
+ #include "libavformat/internal.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
- #include "libavutil/parseutils.h"
Property changes on: trunk/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/multimedia/ffmpeg/files/patch-libavdevice-oss_audio.c
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavdevice-oss_audio.c 2013-12-20 03:27:20 UTC (rev 15689)
+++ trunk/multimedia/ffmpeg/files/patch-libavdevice-oss_audio.c 2013-12-20 04:08:49 UTC (rev 15690)
Property changes on: trunk/multimedia/ffmpeg/files/patch-libavdevice-oss_audio.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c (rev 0)
+++ trunk/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c 2013-12-20 04:08:49 UTC (rev 15690)
@@ -0,0 +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 @@
+
+ /* #define DEBUG */
+
+-#include <opencv/cv.h>
+-#include <opencv/cxcore.h>
++#include <opencv2/imgproc/imgproc_c.h>
+ #include "libavutil/avstring.h"
+ #include "libavutil/file.h"
+ #include "avfilter.h"
Index: trunk/multimedia/ffmpeg/files/patch-libavformat-udp.c
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavformat-udp.c 2013-12-20 03:27:20 UTC (rev 15689)
+++ trunk/multimedia/ffmpeg/files/patch-libavformat-udp.c 2013-12-20 04:08:49 UTC (rev 15690)
Property changes on: trunk/multimedia/ffmpeg/files/patch-libavformat-udp.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/multimedia/ffmpeg/files/patch-libavutil-common.h
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavutil-common.h 2013-12-20 03:27:20 UTC (rev 15689)
+++ trunk/multimedia/ffmpeg/files/patch-libavutil-common.h 2013-12-20 04:08:49 UTC (rev 15690)
@@ -1,11 +1,11 @@
---- libavutil/common.h.orig 2010-04-26 23:01:38.000000000 +0200
-+++ libavutil/common.h 2010-07-10 16:06:27.038027901 +0200
+--- 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"
+#ifndef UINT64_C
-+#define UINT64_C(c) (c ## UL)
++#define UINT64_C(c) (c ## UL)
+#endif
+
//rounded division & shift
Property changes on: trunk/multimedia/ffmpeg/files/patch-libavutil-common.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h (rev 0)
+++ trunk/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h 2013-12-20 04:08:49 UTC (rev 15690)
@@ -0,0 +1,11 @@
+--- ./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 @@
+ typedef int x86_reg;
+ #endif
+
+-#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
++#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE && !defined(__clang__)))
+ #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
+
+ #if ARCH_X86_64 && defined(PIC)
Modified: trunk/multimedia/ffmpeg/pkg-descr
===================================================================
--- trunk/multimedia/ffmpeg/pkg-descr 2013-12-20 03:27:20 UTC (rev 15689)
+++ trunk/multimedia/ffmpeg/pkg-descr 2013-12-20 04:08:49 UTC (rev 15690)
@@ -1,24 +1,7 @@
-[ excerpt (with adaptations) from developer's README ]
-ffmpeg is a hyper fast realtime audio/video encoder, a streaming
-server and a generic audio and video file converter.
+FFmpeg is a complete, cross-platform solution to record, convert and stream
+audio and video. It includes libavcodec - the leading audio/video codec
+library.
-It can convert a standard video source into several file formats
-based on DCT/motion compensation encoding. Sound is compressed in
-MPEG audio layer 2 or using an AC3 compatible stream.
+This version is from the 2.0 release branch.
-What makes ffmpeg interesting ?
-- Simple and efficient video encoder: outputs MPEG1, H263, Real
- Video(tm), MPEG4, DIVX and MJPEG compatible bitstreams using the
- same encoder core.
-- Hyper fast MPEG audio layer 2 compression (50 times faster than
- realtime on a K6 500).
-[snip -> rest on website below]
-
-ffmpeg is made of two programs:
-* ffmpeg: soft VCR which encodes in real time to several formats.
- It can also encode from any supported input file format to any
- input supported format.
-* ffserver: high performance live broadcast streaming server based
- on the ffmpeg core encoders.
-
-WWW: http://ffmpeg.mplayerhq.hu/
+WWW: http://ffmpeg.org/
Property changes on: trunk/multimedia/ffmpeg/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/multimedia/ffmpeg/pkg-plist
===================================================================
--- trunk/multimedia/ffmpeg/pkg-plist 2013-12-20 03:27:20 UTC (rev 15689)
+++ trunk/multimedia/ffmpeg/pkg-plist 2013-12-20 04:08:49 UTC (rev 15690)
@@ -4,52 +4,33 @@
%%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
-include/ffmpeg/adler32.h
-include/ffmpeg/avcodec.h
-include/ffmpeg/avdevice.h
-include/ffmpeg/avfilter.h
-include/ffmpeg/avformat.h
-include/ffmpeg/avio.h
-include/ffmpeg/avstring.h
-include/ffmpeg/avutil.h
-include/ffmpeg/base64.h
-include/ffmpeg/common.h
-include/ffmpeg/crc.h
-include/ffmpeg/fifo.h
-include/ffmpeg/intfloat_readwrite.h
-include/ffmpeg/log.h
-include/ffmpeg/lzo.h
-include/ffmpeg/mathematics.h
-include/ffmpeg/md5.h
-include/ffmpeg/mem.h
-include/ffmpeg/opt.h
-include/ffmpeg/pixfmt.h
-include/ffmpeg/postprocess.h
-include/ffmpeg/rational.h
-include/ffmpeg/sha1.h
-include/ffmpeg/swscale.h
-include/ffmpeg/vdpau.h
-include/ffmpeg/xvmc.h
include/libavcodec/avcodec.h
include/libavcodec/avfft.h
include/libavcodec/dxva2.h
-include/libavcodec/opt.h
+include/libavcodec/old_codec_ids.h
include/libavcodec/vaapi.h
+include/libavcodec/vda.h
include/libavcodec/vdpau.h
include/libavcodec/version.h
include/libavcodec/xvmc.h
include/libavdevice/avdevice.h
+include/libavdevice/version.h
+include/libavfilter/asrc_abuffer.h
include/libavfilter/avcodec.h
include/libavfilter/avfilter.h
include/libavfilter/avfiltergraph.h
-include/libavfilter/vsink_buffer.h
-include/libavfilter/vsrc_buffer.h
+include/libavfilter/buffersink.h
+include/libavfilter/buffersrc.h
+include/libavfilter/version.h
include/libavformat/avformat.h
include/libavformat/avio.h
include/libavformat/version.h
+include/libavresample/avresample.h
+include/libavresample/version.h
include/libavutil/adler32.h
include/libavutil/aes.h
include/libavutil/attributes.h
+include/libavutil/audio_fifo.h
include/libavutil/audioconvert.h
include/libavutil/avassert.h
include/libavutil/avconfig.h
@@ -56,16 +37,23 @@
include/libavutil/avstring.h
include/libavutil/avutil.h
include/libavutil/base64.h
+include/libavutil/blowfish.h
+include/libavutil/bprint.h
include/libavutil/bswap.h
+include/libavutil/buffer.h
+include/libavutil/channel_layout.h
include/libavutil/common.h
+include/libavutil/cpu.h
include/libavutil/crc.h
-include/libavutil/cpu.h
include/libavutil/dict.h
include/libavutil/error.h
include/libavutil/eval.h
include/libavutil/fifo.h
include/libavutil/file.h
+include/libavutil/frame.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
@@ -74,6 +62,8 @@
include/libavutil/mathematics.h
include/libavutil/md5.h
include/libavutil/mem.h
+include/libavutil/murmur3.h
+include/libavutil/old_pix_fmts.h
include/libavutil/opt.h
include/libavutil/parseutils.h
include/libavutil/pixdesc.h
@@ -80,68 +70,94 @@
include/libavutil/pixfmt.h
include/libavutil/random_seed.h
include/libavutil/rational.h
+include/libavutil/ripemd.h
include/libavutil/samplefmt.h
include/libavutil/sha.h
-include/libavutil/sha1.h
+include/libavutil/sha512.h
+include/libavutil/time.h
+include/libavutil/timecode.h
+include/libavutil/timestamp.h
+include/libavutil/version.h
+include/libavutil/xtea.h
include/libpostproc/postprocess.h
-include/postproc/postprocess.h
+include/libpostproc/version.h
+include/libswresample/swresample.h
+include/libswresample/version.h
include/libswscale/swscale.h
+include/libswscale/version.h
lib/libavcodec.a
lib/libavcodec.so
-lib/libavcodec.so.1
-lib/libavcodec.so.52.122.0
+lib/libavcodec.so.55
+lib/libavcodec.so.55.39.101
lib/libavdevice.a
lib/libavdevice.so
-lib/libavdevice.so.1
-lib/libavdevice.so.52.5.0
+lib/libavdevice.so.55
+lib/libavdevice.so.55.5.100
lib/libavfilter.a
lib/libavfilter.so
-lib/libavfilter.so.1.80.0
-lib/libavfilter.so.1
+lib/libavfilter.so.3
+lib/libavfilter.so.3.90.100
lib/libavformat.a
lib/libavformat.so
-lib/libavformat.so.1
-lib/libavformat.so.52.110.0
+lib/libavformat.so.55
+lib/libavformat.so.55.19.104
+lib/libavresample.a
+lib/libavresample.so
+lib/libavresample.so.1
+lib/libavresample.so.1.1.0
lib/libavutil.a
lib/libavutil.so
-lib/libavutil.so.1
-lib/libavutil.so.50.43.0
+lib/libavutil.so.52
+lib/libavutil.so.52.48.101
lib/libpostproc.a
lib/libpostproc.so
-lib/libpostproc.so.1
-lib/libpostproc.so.51.2.0
+lib/libpostproc.so.52
+lib/libpostproc.so.52.3.100
+lib/libswresample.a
+lib/libswresample.so
+lib/libswresample.so.0
+lib/libswresample.so.0.17.104
lib/libswscale.a
lib/libswscale.so
-lib/libswscale.so.0.14.1
-lib/libswscale.so.1
+lib/libswscale.so.2
+lib/libswscale.so.2.5.101
libdata/pkgconfig/libavcodec.pc
libdata/pkgconfig/libavdevice.pc
libdata/pkgconfig/libavfilter.pc
libdata/pkgconfig/libavformat.pc
+libdata/pkgconfig/libavresample.pc
libdata/pkgconfig/libavutil.pc
libdata/pkgconfig/libpostproc.pc
+libdata/pkgconfig/libswresample.pc
libdata/pkgconfig/libswscale.pc
+man/man1/ffmpeg.1.gz
+man/man1/ffprobe.1.gz
+%%DATADIR%%/examples/Makefile
+%%DATADIR%%/examples/README
+%%DATADIR%%/examples/decoding_encoding.c
+%%DATADIR%%/examples/demuxing.c
+%%DATADIR%%/examples/filtering_audio.c
+%%DATADIR%%/examples/filtering_video.c
+%%DATADIR%%/examples/metadata.c
+%%DATADIR%%/examples/muxing.c
+%%DATADIR%%/examples/resampling_audio.c
+%%DATADIR%%/examples/scaling_video.c
+%%DATADIR%%/ffprobe.xsd
+%%DATADIR%%/libvpx-1080p.ffpreset
+%%DATADIR%%/libvpx-1080p50_60.ffpreset
%%DATADIR%%/libvpx-360p.ffpreset
%%DATADIR%%/libvpx-720p.ffpreset
%%DATADIR%%/libvpx-720p50_60.ffpreset
-%%DATADIR%%/libvpx-1080p.ffpreset
-%%DATADIR%%/libvpx-1080p50_60.ffpreset
-%%DATADIR%%/libx264-baseline.ffpreset
%%DATADIR%%/libx264-ipod320.ffpreset
%%DATADIR%%/libx264-ipod640.ffpreset
-%%DATADIR%%/libx264-lossless_fast.ffpreset
-%%DATADIR%%/libx264-lossless_max.ffpreset
-%%DATADIR%%/libx264-lossless_medium.ffpreset
-%%DATADIR%%/libx264-lossless_slow.ffpreset
-%%DATADIR%%/libx264-lossless_slower.ffpreset
-%%DATADIR%%/libx264-lossless_ultrafast.ffpreset
- at dirrm %%DATADIR%%/
- at dirrm include/postproc
+ at dirrm %%DATADIR%%/examples
+ at dirrm %%DATADIR%%
@dirrm include/libswscale
+ at dirrm include/libswresample
@dirrm include/libpostproc
@dirrm include/libavutil
+ at dirrm include/libavresample
@dirrm include/libavformat
@dirrm include/libavfilter
@dirrm include/libavdevice
@dirrm include/libavcodec
- at dirrm include/ffmpeg
Property changes on: trunk/multimedia/ffmpeg/pkg-plist
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list