[Midnightbsd-cvs] mports [21344] ffmpeg 0.7.17
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Mar 27 18:50:44 EDT 2016
Revision: 21344
http://svnweb.midnightbsd.org/mports/?rev=21344
Author: laffer1
Date: 2016-03-27 18:50:43 -0400 (Sun, 27 Mar 2016)
Log Message:
-----------
ffmpeg 0.7.17
Modified Paths:
--------------
trunk/multimedia/ffmpeg0/Makefile
trunk/multimedia/ffmpeg0/distinfo
trunk/multimedia/ffmpeg0/files/patch-configure
trunk/multimedia/ffmpeg0/pkg-plist
Added Paths:
-----------
trunk/multimedia/ffmpeg0/files/ffserver0.in
trunk/multimedia/ffmpeg0/files/patch-doc-protocols.texi
trunk/multimedia/ffmpeg0/files/patch-libavcodec-libvpxenc.c
trunk/multimedia/ffmpeg0/files/patch-libavcodec_arm_asm.S
trunk/multimedia/ffmpeg0/files/patch-libavfilter-Makefile
trunk/multimedia/ffmpeg0/files/patch-libavfilter-vf_libopencv.c
trunk/multimedia/ffmpeg0/files/patch-libavfilter_vf-drawtext.c
Removed Paths:
-------------
trunk/multimedia/ffmpeg0/files/ffserver.in
Property Changed:
----------------
trunk/multimedia/ffmpeg0/files/patch-configure
trunk/multimedia/ffmpeg0/files/patch-libavcodec-Makefile
trunk/multimedia/ffmpeg0/files/patch-libavcodec-libgsm.c
trunk/multimedia/ffmpeg0/files/patch-libavdevice-bktr.c
trunk/multimedia/ffmpeg0/files/patch-libavdevice-oss_audio.c
trunk/multimedia/ffmpeg0/files/patch-libavformat-udp.c
trunk/multimedia/ffmpeg0/files/patch-libavutil-common.h
Modified: trunk/multimedia/ffmpeg0/Makefile
===================================================================
--- trunk/multimedia/ffmpeg0/Makefile 2016-03-27 21:45:49 UTC (rev 21343)
+++ trunk/multimedia/ffmpeg0/Makefile 2016-03-27 22:50:43 UTC (rev 21344)
@@ -2,8 +2,8 @@
# $FreeBSD: ports/multimedia/ffmpeg/Makefile,v 1.135 2011/08/22 21:14:34 mm Exp $
PORTNAME= ffmpeg
-PORTVERSION= 0.7.3
-PORTREVISION= 1
+PORTVERSION= 0.7.17
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
@@ -12,46 +12,127 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= Realtime audio/video encoder/converter and streaming server
-LICENSE= gpl3
+LICENSE= gpl2 lgpl2.1
+LICENSE_COMB= multi
+LICENSE_FILE_gpl2= ${WRKSRC}/COPYING.GPLv2
+LICENSE_FILE_lgpl2.1= ${WRKSRC}/COPYING.LGPLv2.1
BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \
- ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+ ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \
+ ${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html
-CONFLICTS= ffmpeg-20*
+PORTSCOUT= limit:^0\.7.*
+USES= cpe gmake perl5 pkgconfig tar:bzip2 shebangfix
+USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
+USE_PERL5= build
+SHEBANG_FILES= doc/texi2pod.pl
+
+FFMPEG_SUFFIX= 0
HAS_CONFIGURE= yes
CONFIGURE_LOG= config.err
-USES= gmake pkgconfig tar:bzip2
-WANT_SDL= yes
+CONFIGURE_ENV+= EXESUF="${FFMPEG_SUFFIX}"
+MAKE_ARGS+= EXESUF="${FFMPEG_SUFFIX}"
+PLIST_SUB+= SUFF="${FFMPEG_SUFFIX}"
+PROGS= ffmpeg ffprobe
-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
+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_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
+
+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 \
libavcodec/vdpau.h \
@@ -81,45 +162,27 @@
.include <bsd.port.pre.mk>
-CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
-MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
+.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000
+CONFIGURE_ARGS+= --enable-memalign-hack
+.endif
-CONFIGURE_ARGS+=--prefix="${PREFIX}" \
- --mandir="${PREFIX}/man" \
- --enable-shared \
- --enable-gpl \
- --enable-postproc \
- --enable-avfilter \
- --enable-pthreads \
- --enable-x11grab \
- --enable-memalign-hack \
- --enable-runtime-cpudetect \
- --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
+.if ${ARCH} == armv6
+CONFIGURE_ENV+= ASFLAGS=-no-integrated-as
+CFLAGS+= -no-integrated-as
+.endif
DOC_FILES= CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
# under doc subdirectory
DOC_DOCFILES= APIchanges RELEASE_NOTES TODO *.txt *.html
-PORTDOCS= *
-.if !defined(WITH_DEBUG)
-CONFIGURE_ARGS+= --disable-debug
-.else
-CONFIGURE_ARGS+= --disable-stripping
+.if ${PORT_OPTIONS:MFFSERVER}
+USE_RC_SUBR= ffserver${FFMPEG_SUFFIX}
+PROGS+= ffserver
.endif
-.if !defined(WITHOUT_FFSERVER)
-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
@@ -127,39 +190,32 @@
# 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)
-FFMPEG_CFLAGS+= -msse
+.if !defined(_NO_BUILTIN_VECTOR) && defined(_BUILTIN_VECTOR)
+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
+#aacplus
+.if ${PORT_OPTIONS:MAACPLUS}
+FFMPEG_NONFREE= yes
+LIB_DEPENDS+= libaacplus.so:${PORTSDIR}/audio/libaacplus
+CONFIGURE_ARGS+= --enable-libaacplus
.else
-CONFIGURE_ARGS+= --disable-indev=alsa \
- --disable-outdev=alsa
+CONFIGURE_ARGS+= --disable-libaacplus
.endif
# Opencore AMR NB
-.if defined(WITH_AMR_NB)
-LIB_DEPENDS+= opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr
+.if ${PORT_OPTIONS:MAMR_NB}
+FFMPEG_LICENSE_GPL3= yes
+LIB_DEPENDS+= libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
CONFIGURE_ARGS+= --enable-libopencore-amrnb
.else
CONFIGURE_ARGS+= --disable-libopencore-amrnb
@@ -166,156 +222,57 @@
.endif
# Opencore AMR WB
-.if defined(WITH_AMR_WB)
-LIB_DEPENDS+= opencore-amrwb.0:${PORTSDIR}/audio/opencore-amr
+.if ${PORT_OPTIONS:MAMR_WB}
+FFMPEG_LICENSE_GPL3= yes
+LIB_DEPENDS+= libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr
CONFIGURE_ARGS+= --enable-libopencore-amrwb
.else
CONFIGURE_ARGS+= --disable-libopencore-amrwb
.endif
-# celt
-.if defined(WITH_CELT)
-LIB_DEPENDS+= libcelt0.so:${PORTSDIR}/audio/celt
-CONFIGURE_ARGS+= --enable-libcelt
-.else
-CONFIGURE_ARGS+= --disable-libcelt
-.endif
-
-# dirac
-.if defined(WITH_DIRAC)
-LIB_DEPENDS+= libdirac_encoder.so:${PORTSDIR}/multimedia/dirac
-CONFIGURE_ARGS+= --enable-libdirac
-.else
-CONFIGURE_ARGS+= --disable-libdirac
-.endif
-
# faac
-.if defined(WITH_FAAC)
-RESTRICTED= linking to libfaac restricts redistribution
+.if ${PORT_OPTIONS:MFAAC}
+FFMPEG_NONFREE= yes
LIB_DEPENDS+= libfaac.so:${PORTSDIR}/audio/faac
-CONFIGURE_ARGS+= --enable-libfaac --enable-nonfree
+CONFIGURE_ARGS+= --enable-libfaac
.else
CONFIGURE_ARGS+= --disable-libfaac
.endif
-# ffserver
-.if !defined(WITHOUT_FFSERVER)
-PLIST_SUB+= FFSERVER=""
-.else
-PLIST_SUB+= FFSERVER="@comment "
-CONFIGURE_ARGS+= --disable-ffserver
-.endif
-
-# freetype
-.if !defined(WITHOUT_FREETYPE)
-LIB_DEPENDS+= libfreetype.so:${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+= libgsm.so:${PORTSDIR}/audio/gsm
-CONFIGURE_ARGS+= --enable-libgsm
-.else
-CONFIGURE_ARGS+= --disable-libgsm
-.endif
-
-# mp3
-.if defined(WITH_LAME)
-LIB_DEPENDS+= libmp3lame.so:${PORTSDIR}/audio/lame
-CONFIGURE_ARGS+= --enable-libmp3lame
-.else
-CONFIGURE_ARGS+= --disable-libmp3lame
-.endif
-
-# opencv
-.if !defined(WITHOUT_OPENCV)
-LIB_DEPENDS+= libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core
-CONFIGURE_ARGS+= --enable-libopencv
-.else
-CONFIGURE_ARGS+= --disable-libopencv
-.endif
-
-# openjpeg
-.if defined(WITH_OPENJPEG)
-LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg
-CONFIGURE_ARGS+= --enable-libopenjpeg
-.else
-CONFIGURE_ARGS+= --disable-libopenjpeg
-.endif
-
# rtmp
-.if defined(WITH_RTMP)
-LIB_DEPENDS+= librtmp.so:${PORTSDIR}/multimedia/rtmpdump
+.if ${PORT_OPTIONS:MRTMP}
+LIB_DEPENDS+= librtmp.so:${PORTSDIR}/multimedia/librtmp
CONFIGURE_ARGS+= --enable-librtmp
+. if ${OPENSSLBASE} != "/usr"
+FFMPEG_CFLAGS+= -I${OPENSSLINC}
+FFMPEG_LDFLAGS+= -L${OPENSSLLIB}
+. endif
.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
-.endif
+PLIST_FILES+= bin/ffplay${FFMPEG_SUFFIX} man/man1/ffplay${FFMPEG_SUFFIX}.1.gz
+PROGS+= ffplay
.else
CONFIGURE_ARGS+= --disable-ffplay
.endif
-# speex
-.if defined(WITH_SPEEX)
-LIB_DEPENDS+= libspeex.so:${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
+.if ${PORT_OPTIONS:MVAAPI}
+FFMPEG_LICENSE_GPL3= yes
+LIB_DEPENDS+= libva.so:${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
+.if ${PORT_OPTIONS:MVO_AACENC}
+FFMPEG_LICENSE_GPL3= yes
+LIB_DEPENDS+= libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc
CONFIGURE_ARGS+= --enable-libvo-aacenc
.else
CONFIGURE_ARGS+= --disable-libvo-aacenc
@@ -322,8 +279,9 @@
.endif
# vo-amrwbenc
-.if defined(WITH_VO_AMRWBENC)
-LIB_DEPENDS+= vo-amrwbenc.0:${PORTSDIR}/audio/vo-amrwbenc
+.if ${PORT_OPTIONS:MVO_AMRWBENC}
+FFMPEG_LICENSE_GPL3= yes
+LIB_DEPENDS+= libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc
CONFIGURE_ARGS+= --enable-libvo-amrwbenc
.else
CONFIGURE_ARGS+= --disable-libvo-amrwbenc
@@ -330,8 +288,8 @@
.endif
# vorbis
-.if !defined(WITHOUT_VORBIS)
-LIB_DEPENDS+= vorbisenc.2:${PORTSDIR}/audio/libvorbis
+.if ${PORT_OPTIONS:MVORBIS}
+LIB_DEPENDS+= libvorbisenc.so:${PORTSDIR}/audio/libvorbis
CONFIGURE_ARGS+= --enable-libvorbis
FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis
.else
@@ -338,51 +296,35 @@
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+= libx264.so:${PORTSDIR}/multimedia/libx264
-CONFIGURE_ARGS+= --enable-libx264
-.else
-CONFIGURE_ARGS+= --disable-libx264
+.if defined(FFMPEG_LICENSE_GPL3)
+LICENSE+= GPLv3 LGPL3
+LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3
+LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3
+CONFIGURE_ARGS+= --enable-version3
.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|' \
+ @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|$$(DESTDIR)$$(prefix)/libdata/pkgconfig|' \
${WRKSRC}/subdir.mak
- @${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \
+ @${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver${FFMPEG_SUFFIX}.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" \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \
-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
+ -e 's|check_ldflags -Wl,--as-needed||' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
@${REINPLACE_CMD} -E \
-e 's|sdl-config|${SDL_CONFIG}|g' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@@ -392,34 +334,47 @@
.endif
post-configure:
-.if defined(WITHOUT_THEORA)
+.if empty(PORT_OPTIONS:MTHEORA)
@${REINPLACE_CMD} -E \
-e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \
${WRKSRC}/config.mak
.endif
+ @${REINPLACE_CMD} -E \
+ -e 's|\$$\(INSTALL\) -m 644 \$$\(MANPAGES\) "\$$\(MANDIR\)/man1"||g' \
+ ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -E \
+ -e 's|\$$\$$\(INSTALL\) -m 644 \$$\$$\^ "\$$\(DESTDIR\)\$$\(prefix\)/libdata/pkgconfig"|\$$\$$\(INSTALL\) -m 644 \$$\$$\^ "\$$\(DESTDIR\)\$$\(prefix\)/libdata/pkgconfig/lib\$$\(NAME\)0.pc"|' \
+ ${WRKSRC}/subdir.mak
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
+.if ${PORT_OPTIONS:MFFSERVER}
+ ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${STAGEDIR}${PREFIX}/etc/ffserver${FFMPEG_SUFFIX}.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,}
+.for i in ${PROGS}
+ ${INSTALL_MAN} ${WRKSRC}/doc/${i}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${i}0.1
.endfor
- ${MKDIR} ${PREFIX}/include/postproc
- ${CP} -f ${PREFIX}/include/libpostproc/postprocess.h \
- ${PREFIX}/include/postproc/
+ @${REINPLACE_CMD} \
+ -e 's|libavcodec|libavcodec0|' \
+ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libavformat0.pc
+ @${REINPLACE_CMD} \
+ -e 's|libavutil|libavutil0|' \
+ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libavcodec0.pc \
+ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libpostproc0.pc \
+ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libswscale0.pc
+ @${REINPLACE_CMD} \
+ -e 's|libavformat|libavformat0|' \
+ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libavdevice0.pc
+ @${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libavcodec0.pc.bak \
+ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libpostproc0.pc.bak \
+ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libswscale0.pc.bak \
+ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libavformat0.pc.bak \
+ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libavdevice0.pc.bak
.include <bsd.port.post.mk>
Modified: trunk/multimedia/ffmpeg0/distinfo
===================================================================
--- trunk/multimedia/ffmpeg0/distinfo 2016-03-27 21:45:49 UTC (rev 21343)
+++ trunk/multimedia/ffmpeg0/distinfo 2016-03-27 22:50:43 UTC (rev 21344)
@@ -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-0.7.17.tar.bz2) = 5ec57caa1bff7a528b8e58643dd550cdc69156f7b44c31a10920f1be68e2036a
+SIZE (ffmpeg-0.7.17.tar.bz2) = 4529540
Deleted: trunk/multimedia/ffmpeg0/files/ffserver.in
===================================================================
--- trunk/multimedia/ffmpeg0/files/ffserver.in 2016-03-27 21:45:49 UTC (rev 21343)
+++ trunk/multimedia/ffmpeg0/files/ffserver.in 2016-03-27 22:50:43 UTC (rev 21344)
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/multimedia/ffmpeg/files/ffserver.in,v 1.3 2010/03/27 00:13:31 dougb Exp $
-#
-
-# PROVIDE: ffserver
-# REQUIRE: NETWORKING
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable ffserver:
-#
-#ffserver_enable="YES"
-#
-ffserver_enable="${ffserver_enable-NO}"
-
-. /etc/rc.subr
-
-name=ffserver
-rcvar=`set_rcvar`
-
-command="%%PREFIX%%/bin/${name} &"
-required_files=%%PREFIX%%/etc/ffserver.conf
-
-load_rc_config ${name}
-run_rc_command "$1"
Added: trunk/multimedia/ffmpeg0/files/ffserver0.in
===================================================================
--- trunk/multimedia/ffmpeg0/files/ffserver0.in (rev 0)
+++ trunk/multimedia/ffmpeg0/files/ffserver0.in 2016-03-27 22:50:43 UTC (rev 21344)
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $FreeBSD: head/multimedia/ffmpeg0/files/ffserver0.in 329826 2013-10-08 19:24:30Z wg $
+#
+
+# PROVIDE: ffserver0
+# REQUIRE: NETWORKING
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable ffserver:
+#
+#ffserver0_enable="YES"
+#
+ffserver0_enable="${ffserver0_enable-NO}"
+
+. /etc/rc.subr
+
+name=ffserver0
+rcvar=ffserver0_enable
+
+command="%%PREFIX%%/bin/${name} &"
+required_files=%%PREFIX%%/etc/ffserver0.conf
+
+load_rc_config ${name}
+run_rc_command "$1"
Property changes on: trunk/multimedia/ffmpeg0/files/ffserver0.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/multimedia/ffmpeg0/files/patch-configure
===================================================================
--- trunk/multimedia/ffmpeg0/files/patch-configure 2016-03-27 21:45:49 UTC (rev 21343)
+++ trunk/multimedia/ffmpeg0/files/patch-configure 2016-03-27 22:50:43 UTC (rev 21344)
@@ -1,6 +1,6 @@
---- configure.orig 2011-08-10 08:16:41 -0400
-+++ configure 2011-09-17 23:36:08 -0400
-@@ -1657,7 +1657,7 @@
+--- configure.orig 2015-03-11 20:05:42.000000000 -0400
++++ configure 2016-03-27 18:48:51.257550545 -0400
+@@ -1666,7 +1666,7 @@
nm_opts='-g'
# machine
@@ -9,7 +9,7 @@
cpu="generic"
# OS
-@@ -1698,7 +1698,7 @@
+@@ -1707,7 +1707,7 @@
SLIBSUF=".so"
SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF)'
SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
@@ -18,17 +18,17 @@
LIB_INSTALL_EXTRA_CMD='$$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
CC_O='-o $@'
-@@ -2427,6 +2427,9 @@
+@@ -2434,6 +2434,9 @@
+ disable symver
+ ;;
freebsd)
++ enable malloc_aligned
++ ;;
++ midnightbsd)
enable malloc_aligned
;;
-+ midnightbsd)
-+ enable malloc_aligned
-+ ;;
bsd/os)
- add_extralibs -lpoll -lgnugetopt
- strip="strip -d"
-@@ -2435,13 +2438,13 @@
+@@ -2444,13 +2447,13 @@
enable malloc_aligned
gas="gas-preprocessor.pl $cc"
enabled ppc && add_asflags -force_cpusubtype_ALL
@@ -44,7 +44,7 @@
FFSERVERLDFLAGS=-Wl,-bind_at_load
objformat="macho"
enabled x86_64 && objformat="macho64"
-@@ -2465,7 +2468,7 @@
+@@ -2474,7 +2477,7 @@
SLIBPREF=""
SLIBSUF=".dll"
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
@@ -53,7 +53,7 @@
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 @@
+@@ -2496,7 +2499,7 @@
SLIBPREF="cyg"
SLIBSUF=".dll"
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
@@ -62,7 +62,7 @@
SHFLAGS='-shared -Wl,--enable-auto-image-base'
objformat="win32"
enable dos_paths
-@@ -2520,7 +2523,7 @@
+@@ -2529,7 +2532,7 @@
SLIBPREF=""
SLIBSUF=".dll"
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
@@ -71,8 +71,14 @@
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 @@
+@@ -2798,13 +2801,13 @@
+ $nogas "GNU assembler not found, install gas-preprocessor"
+ fi
+-check_ldflags -Wl,--as-needed
++
+ check_ldflags -Wl,-z,noexecstack
+
if check_func dlopen; then
ldl=
-elif check_func dlopen -ldl; then
@@ -82,7 +88,7 @@
fi
if enabled network; then
-@@ -2920,12 +2923,12 @@
+@@ -2934,12 +2937,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
@@ -97,7 +103,7 @@
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 @@
+@@ -2980,8 +2983,8 @@
texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
check_header linux/fb.h
@@ -108,7 +114,7 @@
check_header sys/videoio.h
check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs"
-@@ -3326,7 +3329,7 @@
+@@ -3345,7 +3348,7 @@
SRC_PATH="$source_path"
SRC_PATH_BARE=$source_path
CC_IDENT=$cc_ident
@@ -117,7 +123,7 @@
CC=$cc
AS=$as
LD=$ld
-@@ -3370,7 +3373,7 @@
+@@ -3389,7 +3392,7 @@
SDL_LIBS=$sdl_libs
SDL_CFLAGS=$sdl_cflags
LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
Property changes on: trunk/multimedia/ffmpeg0/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Added: trunk/multimedia/ffmpeg0/files/patch-doc-protocols.texi
===================================================================
--- trunk/multimedia/ffmpeg0/files/patch-doc-protocols.texi (rev 0)
+++ trunk/multimedia/ffmpeg0/files/patch-doc-protocols.texi 2016-03-27 22:50:43 UTC (rev 21344)
@@ -0,0 +1,13 @@
+--- doc/protocols.texi.orig 2013-02-17 14:46:23.000000000 -0800
++++ doc/protocols.texi 2013-10-08 12:00:38.375693236 -0700
+@@ -155,8 +155,8 @@
+
+ Real-Time Messaging Protocol.
+
+-The Real-Time Messaging Protocol (RTMP) is used for streaming multime‐
+-dia content across a TCP/IP network.
++The Real-Time Messaging Protocol (RTMP) is used for streaming multimedia
++content across a TCP/IP network.
+
+ The required syntax is:
+ @example
Property changes on: trunk/multimedia/ffmpeg0/files/patch-doc-protocols.texi
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/multimedia/ffmpeg0/files/patch-libavcodec-Makefile
===================================================================
--- trunk/multimedia/ffmpeg0/files/patch-libavcodec-Makefile 2016-03-27 21:45:49 UTC (rev 21343)
+++ trunk/multimedia/ffmpeg0/files/patch-libavcodec-Makefile 2016-03-27 22:50:43 UTC (rev 21344)
Property changes on: trunk/multimedia/ffmpeg0/files/patch-libavcodec-Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/multimedia/ffmpeg0/files/patch-libavcodec-libgsm.c
===================================================================
--- trunk/multimedia/ffmpeg0/files/patch-libavcodec-libgsm.c 2016-03-27 21:45:49 UTC (rev 21343)
+++ trunk/multimedia/ffmpeg0/files/patch-libavcodec-libgsm.c 2016-03-27 22:50:43 UTC (rev 21344)
Property changes on: trunk/multimedia/ffmpeg0/files/patch-libavcodec-libgsm.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/multimedia/ffmpeg0/files/patch-libavcodec-libvpxenc.c
===================================================================
--- trunk/multimedia/ffmpeg0/files/patch-libavcodec-libvpxenc.c (rev 0)
+++ trunk/multimedia/ffmpeg0/files/patch-libavcodec-libvpxenc.c 2016-03-27 22:50:43 UTC (rev 21344)
@@ -0,0 +1,39 @@
+commit 6540fe0
+Author: James Zern <jzern at google.com>
+Date: Mon Oct 19 22:44:11 2015 -0700
+
+ libvpxenc: remove some unused ctrl id mappings
+
+ VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
+ from libvpx and the remaining values were never used here
+
+ Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
+ Signed-off-by: James Zern <jzern at google.com>
+---
+ libavcodec/libvpxenc.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git libavcodec/libvpxenc.c libavcodec/libvpxenc.c
+index 5f39783..992122c 100644
+--- libavcodec/libvpxenc.c
++++ libavcodec/libvpxenc.c
+@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext {
+
+ /** String mappings for enum vp8e_enc_control_id */
+ static const char *ctlidstr[] = {
+- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY",
+- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE",
+- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE",
+- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP",
+- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP",
+- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE",
+ [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED",
+ [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF",
+ [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
+- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS",
+ [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD",
+ [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS",
+- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER",
+ [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES",
+ [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH",
+ [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE",
Property changes on: trunk/multimedia/ffmpeg0/files/patch-libavcodec-libvpxenc.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/ffmpeg0/files/patch-libavcodec_arm_asm.S
===================================================================
--- trunk/multimedia/ffmpeg0/files/patch-libavcodec_arm_asm.S (rev 0)
+++ trunk/multimedia/ffmpeg0/files/patch-libavcodec_arm_asm.S 2016-03-27 22:50:43 UTC (rev 21344)
@@ -0,0 +1,25 @@
+--- libavcodec/arm/asm.S.orig 2013-10-06 16:18:07 UTC
++++ libavcodec/arm/asm.S
+@@ -26,6 +26,22 @@
+ # define ELF @
+ #endif
+
++#if HAVE_NEON
++ .arch armv7-a
++#elif HAVE_ARMV6T2
++ .arch armv6t2
++#elif HAVE_ARMV6
++ .arch armv6
++#elif HAVE_ARMV5TE
++ .arch armv5te
++#endif
++
++#if HAVE_NEON
++ .fpu neon
++#elif HAVE_ARMVFP
++ .fpu vfp
++#endif
++
+ .syntax unified
+
+ .macro require8 val=1
Property changes on: trunk/multimedia/ffmpeg0/files/patch-libavcodec_arm_asm.S
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/multimedia/ffmpeg0/files/patch-libavdevice-bktr.c
===================================================================
--- trunk/multimedia/ffmpeg0/files/patch-libavdevice-bktr.c 2016-03-27 21:45:49 UTC (rev 21343)
+++ trunk/multimedia/ffmpeg0/files/patch-libavdevice-bktr.c 2016-03-27 22:50:43 UTC (rev 21344)
Property changes on: trunk/multimedia/ffmpeg0/files/patch-libavdevice-bktr.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/multimedia/ffmpeg0/files/patch-libavdevice-oss_audio.c
===================================================================
--- trunk/multimedia/ffmpeg0/files/patch-libavdevice-oss_audio.c 2016-03-27 21:45:49 UTC (rev 21343)
+++ trunk/multimedia/ffmpeg0/files/patch-libavdevice-oss_audio.c 2016-03-27 22:50:43 UTC (rev 21344)
Property changes on: trunk/multimedia/ffmpeg0/files/patch-libavdevice-oss_audio.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/multimedia/ffmpeg0/files/patch-libavfilter-Makefile
===================================================================
--- trunk/multimedia/ffmpeg0/files/patch-libavfilter-Makefile (rev 0)
+++ trunk/multimedia/ffmpeg0/files/patch-libavfilter-Makefile 2016-03-27 22:50:43 UTC (rev 21344)
@@ -0,0 +1,11 @@
+--- libavfilter/Makefile.orig 2011-06-23 16:22:46.163337772 +0200
++++ libavfilter/Makefile 2011-06-23 16:22:53.731245405 +0200
+@@ -136,7 +136,7 @@
+ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o
+
+
+--include $(SUBDIR)$(ARCH)/Makefile
++-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile
+
+ DIRS = x86 libmpcodecs
+
Property changes on: trunk/multimedia/ffmpeg0/files/patch-libavfilter-Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/ffmpeg0/files/patch-libavfilter-vf_libopencv.c
===================================================================
--- trunk/multimedia/ffmpeg0/files/patch-libavfilter-vf_libopencv.c (rev 0)
+++ trunk/multimedia/ffmpeg0/files/patch-libavfilter-vf_libopencv.c 2016-03-27 22:50:43 UTC (rev 21344)
@@ -0,0 +1,12 @@
+--- libavfilter/vf_libopencv.c.orig 2011-06-27 21:27:01.521012341 +0200
++++ libavfilter/vf_libopencv.c 2011-06-27 21:27:16.839540294 +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"
Property changes on: trunk/multimedia/ffmpeg0/files/patch-libavfilter-vf_libopencv.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/ffmpeg0/files/patch-libavfilter_vf-drawtext.c
===================================================================
--- trunk/multimedia/ffmpeg0/files/patch-libavfilter_vf-drawtext.c (rev 0)
+++ trunk/multimedia/ffmpeg0/files/patch-libavfilter_vf-drawtext.c 2016-03-27 22:50:43 UTC (rev 21344)
@@ -0,0 +1,10 @@
+--- libavfilter/vf_drawtext.c.orig 2013-12-06 18:18:29.000000000 +0100
++++ libavfilter/vf_drawtext.c 2013-12-06 18:18:49.000000000 +0100
+@@ -41,7 +41,6 @@
+ #undef time
+
+ #include <ft2build.h>
+-#include <freetype/config/ftheader.h>
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+
Property changes on: trunk/multimedia/ffmpeg0/files/patch-libavfilter_vf-drawtext.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/multimedia/ffmpeg0/files/patch-libavformat-udp.c
===================================================================
--- trunk/multimedia/ffmpeg0/files/patch-libavformat-udp.c 2016-03-27 21:45:49 UTC (rev 21343)
+++ trunk/multimedia/ffmpeg0/files/patch-libavformat-udp.c 2016-03-27 22:50:43 UTC (rev 21344)
Property changes on: trunk/multimedia/ffmpeg0/files/patch-libavformat-udp.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/multimedia/ffmpeg0/files/patch-libavutil-common.h
===================================================================
--- trunk/multimedia/ffmpeg0/files/patch-libavutil-common.h 2016-03-27 21:45:49 UTC (rev 21343)
+++ trunk/multimedia/ffmpeg0/files/patch-libavutil-common.h 2016-03-27 22:50:43 UTC (rev 21344)
Property changes on: trunk/multimedia/ffmpeg0/files/patch-libavutil-common.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/multimedia/ffmpeg0/pkg-plist
===================================================================
--- trunk/multimedia/ffmpeg0/pkg-plist 2016-03-27 21:45:49 UTC (rev 21343)
+++ trunk/multimedia/ffmpeg0/pkg-plist 2016-03-27 22:50:43 UTC (rev 21344)
@@ -1,131 +1,136 @@
-bin/ffmpeg
-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
-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/vaapi.h
-include/libavcodec/vdpau.h
-include/libavcodec/version.h
-include/libavcodec/xvmc.h
-include/libavdevice/avdevice.h
-include/libavfilter/avcodec.h
-include/libavfilter/avfilter.h
-include/libavfilter/avfiltergraph.h
-include/libavfilter/vsink_buffer.h
-include/libavfilter/vsrc_buffer.h
-include/libavformat/avformat.h
-include/libavformat/avio.h
-include/libavformat/version.h
-include/libavutil/adler32.h
-include/libavutil/aes.h
-include/libavutil/attributes.h
-include/libavutil/audioconvert.h
-include/libavutil/avassert.h
-include/libavutil/avconfig.h
-include/libavutil/avstring.h
-include/libavutil/avutil.h
-include/libavutil/base64.h
-include/libavutil/bswap.h
-include/libavutil/common.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/imgutils.h
-include/libavutil/intfloat_readwrite.h
-include/libavutil/intreadwrite.h
-include/libavutil/lfg.h
-include/libavutil/log.h
-include/libavutil/lzo.h
-include/libavutil/mathematics.h
-include/libavutil/md5.h
-include/libavutil/mem.h
-include/libavutil/opt.h
-include/libavutil/parseutils.h
-include/libavutil/pixdesc.h
-include/libavutil/pixfmt.h
-include/libavutil/random_seed.h
-include/libavutil/rational.h
-include/libavutil/samplefmt.h
-include/libavutil/sha.h
-include/libavutil/sha1.h
-include/libpostproc/postprocess.h
-include/postproc/postprocess.h
-include/libswscale/swscale.h
-lib/libavcodec.a
-lib/libavcodec.so
-lib/libavcodec.so.1
-lib/libavcodec.so.52.122.0
-lib/libavdevice.a
-lib/libavdevice.so
-lib/libavdevice.so.1
-lib/libavdevice.so.52.5.0
-lib/libavfilter.a
-lib/libavfilter.so
-lib/libavfilter.so.1.80.0
-lib/libavfilter.so.1
-lib/libavformat.a
-lib/libavformat.so
-lib/libavformat.so.1
-lib/libavformat.so.52.110.0
-lib/libavutil.a
-lib/libavutil.so
-lib/libavutil.so.1
-lib/libavutil.so.50.43.0
-lib/libpostproc.a
-lib/libpostproc.so
-lib/libpostproc.so.1
-lib/libpostproc.so.51.2.0
-lib/libswscale.a
-lib/libswscale.so
-lib/libswscale.so.0.14.1
-lib/libswscale.so.1
-libdata/pkgconfig/libavcodec.pc
-libdata/pkgconfig/libavdevice.pc
-libdata/pkgconfig/libavfilter.pc
-libdata/pkgconfig/libavformat.pc
-libdata/pkgconfig/libavutil.pc
-libdata/pkgconfig/libpostproc.pc
-libdata/pkgconfig/libswscale.pc
+bin/ffmpeg%%SUFF%%
+bin/ffprobe%%SUFF%%
+%%FFSERVER%%bin/ffserver%%SUFF%%
+%%FFSERVER%%@unexec if cmp -s %D/etc/ffserver%%SUFF%%.conf %D/etc/ffserver%%SUFF%%.conf-dist; then rm -f %D/etc/ffserver%%SUFF%%.conf; fi
+%%FFSERVER%%etc/ffserver%%SUFF%%.conf-dist
+%%FFSERVER%%@exec [ -f %B/ffserver%%SUFF%%.conf ] || cp %B/%f %B/ffserver%%SUFF%%.conf
+include/ffmpeg%%SUFF%%/libavcodec/avcodec.h
+include/ffmpeg%%SUFF%%/libavcodec/avfft.h
+include/ffmpeg%%SUFF%%/libavcodec/dxva2.h
+include/ffmpeg%%SUFF%%/libavcodec/opt.h
+include/ffmpeg%%SUFF%%/libavcodec/vaapi.h
+include/ffmpeg%%SUFF%%/libavcodec/vdpau.h
+include/ffmpeg%%SUFF%%/libavcodec/version.h
+include/ffmpeg%%SUFF%%/libavcodec/xvmc.h
+include/ffmpeg%%SUFF%%/libavdevice/avdevice.h
+include/ffmpeg%%SUFF%%/libavfilter/avcodec.h
+include/ffmpeg%%SUFF%%/libavfilter/avfilter.h
+include/ffmpeg%%SUFF%%/libavfilter/avfiltergraph.h
+include/ffmpeg%%SUFF%%/libavfilter/vsink_buffer.h
+include/ffmpeg%%SUFF%%/libavfilter/vsrc_buffer.h
+include/ffmpeg%%SUFF%%/libavformat/avformat.h
+include/ffmpeg%%SUFF%%/libavformat/avio.h
+include/ffmpeg%%SUFF%%/libavformat/version.h
+include/ffmpeg%%SUFF%%/libavutil/adler32.h
+include/ffmpeg%%SUFF%%/libavutil/aes.h
+include/ffmpeg%%SUFF%%/libavutil/attributes.h
+include/ffmpeg%%SUFF%%/libavutil/audioconvert.h
+include/ffmpeg%%SUFF%%/libavutil/avassert.h
+include/ffmpeg%%SUFF%%/libavutil/avconfig.h
+include/ffmpeg%%SUFF%%/libavutil/avstring.h
+include/ffmpeg%%SUFF%%/libavutil/avutil.h
+include/ffmpeg%%SUFF%%/libavutil/base64.h
+include/ffmpeg%%SUFF%%/libavutil/bswap.h
+include/ffmpeg%%SUFF%%/libavutil/common.h
+include/ffmpeg%%SUFF%%/libavutil/cpu.h
+include/ffmpeg%%SUFF%%/libavutil/crc.h
+include/ffmpeg%%SUFF%%/libavutil/dict.h
+include/ffmpeg%%SUFF%%/libavutil/error.h
+include/ffmpeg%%SUFF%%/libavutil/eval.h
+include/ffmpeg%%SUFF%%/libavutil/fifo.h
+include/ffmpeg%%SUFF%%/libavutil/file.h
+include/ffmpeg%%SUFF%%/libavutil/imgutils.h
+include/ffmpeg%%SUFF%%/libavutil/intfloat_readwrite.h
+include/ffmpeg%%SUFF%%/libavutil/intreadwrite.h
+include/ffmpeg%%SUFF%%/libavutil/lfg.h
+include/ffmpeg%%SUFF%%/libavutil/log.h
+include/ffmpeg%%SUFF%%/libavutil/lzo.h
+include/ffmpeg%%SUFF%%/libavutil/mathematics.h
+include/ffmpeg%%SUFF%%/libavutil/md5.h
+include/ffmpeg%%SUFF%%/libavutil/mem.h
+include/ffmpeg%%SUFF%%/libavutil/opt.h
+include/ffmpeg%%SUFF%%/libavutil/parseutils.h
+include/ffmpeg%%SUFF%%/libavutil/pixdesc.h
+include/ffmpeg%%SUFF%%/libavutil/pixfmt.h
+include/ffmpeg%%SUFF%%/libavutil/random_seed.h
+include/ffmpeg%%SUFF%%/libavutil/rational.h
+include/ffmpeg%%SUFF%%/libavutil/samplefmt.h
+include/ffmpeg%%SUFF%%/libavutil/sha.h
+include/ffmpeg%%SUFF%%/libavutil/sha1.h
+include/ffmpeg%%SUFF%%/libpostproc/postprocess.h
+include/ffmpeg%%SUFF%%/libswscale/swscale.h
+lib/ffmpeg%%SUFF%%/libavcodec0.a
+lib/ffmpeg%%SUFF%%/libavcodec0.so
+lib/ffmpeg%%SUFF%%/libavcodec0.so.1
+lib/ffmpeg%%SUFF%%/libavcodec0.so.52.123.0
+lib/ffmpeg%%SUFF%%/libavdevice0.a
+lib/ffmpeg%%SUFF%%/libavdevice0.so
+lib/ffmpeg%%SUFF%%/libavdevice0.so.1
+lib/ffmpeg%%SUFF%%/libavdevice0.so.52.5.0
+lib/ffmpeg%%SUFF%%/libavfilter0.a
+lib/ffmpeg%%SUFF%%/libavfilter0.so
+lib/ffmpeg%%SUFF%%/libavfilter0.so.1
+lib/ffmpeg%%SUFF%%/libavfilter0.so.1.80.0
+lib/ffmpeg%%SUFF%%/libavformat0.a
+lib/ffmpeg%%SUFF%%/libavformat0.so
+lib/ffmpeg%%SUFF%%/libavformat0.so.1
+lib/ffmpeg%%SUFF%%/libavformat0.so.52.111.0
+lib/ffmpeg%%SUFF%%/libavutil0.a
+lib/ffmpeg%%SUFF%%/libavutil0.so
+lib/ffmpeg%%SUFF%%/libavutil0.so.1
+lib/ffmpeg%%SUFF%%/libavutil0.so.50.43.0
+lib/ffmpeg%%SUFF%%/libpostproc0.a
+lib/ffmpeg%%SUFF%%/libpostproc0.so
+lib/ffmpeg%%SUFF%%/libpostproc0.so.1
+lib/ffmpeg%%SUFF%%/libpostproc0.so.51.2.0
+lib/ffmpeg%%SUFF%%/libswscale0.a
+lib/ffmpeg%%SUFF%%/libswscale0.so
+lib/ffmpeg%%SUFF%%/libswscale0.so.0.14.1
+lib/ffmpeg%%SUFF%%/libswscale0.so.1
+libdata/pkgconfig/libavcodec0.pc
+libdata/pkgconfig/libavdevice0.pc
+libdata/pkgconfig/libavfilter0.pc
+libdata/pkgconfig/libavformat0.pc
+libdata/pkgconfig/libavutil0.pc
+libdata/pkgconfig/libpostproc0.pc
+libdata/pkgconfig/libswscale0.pc
+man/man1/ffmpeg%%SUFF%%.1.gz
+man/man1/ffprobe%%SUFF%%.1.gz
+%%FFSERVER%%man/man1/ffserver%%SUFF%%.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/APIchanges
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/avutil.txt
+%%PORTDOCS%%%%DOCSDIR%%/build_system.txt
+%%PORTDOCS%%%%DOCSDIR%%/developer.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/fate.txt
+%%PORTDOCS%%%%DOCSDIR%%/ffmpeg.html
+%%PORTDOCS%%%%DOCSDIR%%/ffprobe.html
+%%FFSERVER%%%%PORTDOCS%%%%DOCSDIR%%/ffserver.html
+%%PORTDOCS%%%%DOCSDIR%%/general.html
+%%PORTDOCS%%%%DOCSDIR%%/git-howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/issue_tracker.txt
+%%PORTDOCS%%%%DOCSDIR%%/libavfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/multithreading.txt
+%%PORTDOCS%%%%DOCSDIR%%/optimization.txt
+%%PORTDOCS%%%%DOCSDIR%%/rate_distortion.txt
+%%PORTDOCS%%%%DOCSDIR%%/snow.txt
+%%PORTDOCS%%%%DOCSDIR%%/soc.txt
+%%PORTDOCS%%%%DOCSDIR%%/swscale.txt
+%%PORTDOCS%%%%DOCSDIR%%/tablegen.txt
+%%PORTDOCS%%%%DOCSDIR%%/viterbi.txt
+%%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
@@ -135,13 +140,3 @@
%%DATADIR%%/libx264-lossless_slow.ffpreset
%%DATADIR%%/libx264-lossless_slower.ffpreset
%%DATADIR%%/libx264-lossless_ultrafast.ffpreset
- at dirrm %%DATADIR%%/
- at dirrm include/postproc
- at dirrm include/libswscale
- at dirrm include/libpostproc
- at dirrm include/libavutil
- at dirrm include/libavformat
- at dirrm include/libavfilter
- at dirrm include/libavdevice
- at dirrm include/libavcodec
- at dirrm include/ffmpeg
More information about the Midnightbsd-cvs
mailing list