Attachment #160337 for bug #200852




# $FreeBSD: head/multimedia/ffmpeg0/Makefile 395164 2015-08-24 10:03:14Z junovitch $

PORTNAME=	ffmpeg
PORTVERSION=	0.7.17
#PORTVERSION=	0.7.17
PORTEPOCH=	1
CATEGORIES=	multimedia audio ipv6 net
MASTER_SITES=	http://ffmpeg.org/releases/

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

CFLAGS+=	-no-integrated-as
.endif

DOC_FILES=	CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
# under doc subdirectory
DOC_DOCFILES=	APIchanges RELEASE_NOTES TODO *.txt *.html


CFLAGS+=	-O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
.endif

#aacplus
.if ${PORT_OPTIONS:MAACPLUS}
FFMPEG_NONFREE=	yes
LIB_DEPENDS+=	libaacplus.so:${PORTSDIR}/audio/libaacplus
CONFIGURE_ARGS+=	--enable-libaacplus
.else
CONFIGURE_ARGS+=	--disable-libaacplus
.endif

# Opencore AMR NB
.if ${PORT_OPTIONS:MAMR_NB}
FFMPEG_LICENSE_GPL3=	yes

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (ffmpeg-0.8.tar.bz2) = 3e26fdc317970386f96b27c9821890832ad2970b07e434a5bb27048d03e3fc0f	1	SHA256 (ffmpeg-0.7.17.tar.bz2) = 5ec57caa1bff7a528b8e58643dd550cdc69156f7b44c31a10920f1be68e2036a
2	SIZE (ffmpeg-0.8.tar.bz2) = 4551071	2	SIZE (ffmpeg-0.7.17.tar.bz2) = 4529540




Index: Makefile
===================================================================
--- Makefile	(.../..)	(working copy)
+++ Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD: head/multimedia/ffmpeg0/Makefile 395164 2015-08-24 10:03:14Z junovitch $
 
 PORTNAME=	ffmpeg
-PORTVERSION=	0.8
-#PORTVERSION=	0.7.17
+PORTVERSION=	0.7.17
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -63,7 +62,7 @@
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
-OPTIONS_DEFINE=		ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
+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
@@ -171,7 +170,7 @@
 CFLAGS+=	-no-integrated-as
 .endif
 
-dOC_FILES=	CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
+DOC_FILES=	CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
 # under doc subdirectory
 DOC_DOCFILES=	APIchanges RELEASE_NOTES TODO *.txt *.html
 
@@ -203,6 +202,15 @@
 CFLAGS+=	-O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
 .endif
 
+#aacplus
+.if ${PORT_OPTIONS:MAACPLUS}
+FFMPEG_NONFREE=	yes
+LIB_DEPENDS+=	libaacplus.so:${PORTSDIR}/audio/libaacplus
+CONFIGURE_ARGS+=	--enable-libaacplus
+.else
+CONFIGURE_ARGS+=	--disable-libaacplus
+.endif
+
 # Opencore AMR NB
 .if ${PORT_OPTIONS:MAMR_NB}
 FFMPEG_LICENSE_GPL3=	yes

Property changes on: Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: distinfo
===================================================================
--- distinfo	(.../..)	(working copy)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-0.8.tar.bz2) = 3e26fdc317970386f96b27c9821890832ad2970b07e434a5bb27048d03e3fc0f
-SIZE (ffmpeg-0.8.tar.bz2) = 4551071
+SHA256 (ffmpeg-0.7.17.tar.bz2) = 5ec57caa1bff7a528b8e58643dd550cdc69156f7b44c31a10920f1be68e2036a
+SIZE (ffmpeg-0.7.17.tar.bz2) = 4529540

Property changes on: distinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
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




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%%/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%%/developer.html
%%PORTDOCS%%%%DOCSDIR%%/faq.html
%%PORTDOCS%%%%DOCSDIR%%/fate.txt
%%PORTDOCS%%%%DOCSDIR%%/ffmpeg-mt-authorship.txt
%%PORTDOCS%%%%DOCSDIR%%/ffmpeg.html
%%PORTDOCS%%%%DOCSDIR%%/ffplay.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%%/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%%/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

Lines 1-10 Link Here

(-)files/_patch-libavfilter_vf__drawtext.c (-10 lines)
1	--- libavfilter/vf_drawtext.c.orig 2015-08-25 08:10:18 UTC
2	+++ libavfilter/vf_drawtext.c
3	@@ -41,7 +41,6 @@
4	#undef time
5
6	#include <ft2build.h>
7	-#include <freetype/config/ftheader.h>
8	#include FT_FREETYPE_H
9	#include FT_GLYPH_H
10




--- configure.orig	2011-06-21 21:29:25.000000000 +0200
+++ configure	2011-06-23 13:36:46.099381871 +0200
@@ -1657,7 +1657,7 @@
 nm_opts='-g'
 
 # machine

 cpu="generic"
 
 # OS
@@ -2966,8 +2966,8 @@
 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)"'
 
 CC_O='-o $@'
@@ -2435,13 +2435,13 @@ case $target_os in
         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 +2465,7 @@ case $target_os in
         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 +2487,7 @@ case $target_os in
         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 +2520,7 @@ case $target_os in
         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; \
@@ -2787,12 +2787,12 @@ if enabled asm; then
         $nogas "GNU assembler not found, install gas-preprocessor"
 fi
 
-check_ldflags -Wl,--as-needed
+
 
 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
@@ -2919,13 +2919,13 @@ enabled libdirac   && require_pkg_config
     "libdirac_decoder/dirac_parser.h libdirac_encoder/dirac_encoder.h"  \
     "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 libfreetype && require_pkg_config freetype2 "ft2build.h freetype.h" FT_Init_FreeType
+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
@@ -2946,7 +2946,7 @@ enabled libxavs    && require  libxavs x
 enabled libxvid    && require  libxvid xvid.h xvid_global -lxvidcore
 enabled mlib       && require  mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
 
-SDL_CONFIG="${cross_prefix}sdl-config"
+SDL_CONFIG="${cross_prefix}/usr/local/bin//usr/local/bin/sdl-config"
 if check_pkg_config sdl SDL_version.h SDL_Linked_Version; then
     check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
     enable sdl &&
@@ -2966,8 +2966,8 @@ enabled sdl && add_cflags $sdl_cflags &&
 texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
 
 check_header linux/fb.h

 check_header sys/videoio.h
 
 check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs"
@@ -3322,7 +3322,7 @@
 SRC_PATH="$source_path"
 SRC_PATH_BARE=$source_path
 CC_IDENT=$cc_ident

 CC=$cc
 AS=$as
 LD=$ld
@@ -3366,7 +3366,7 @@ TARGET_PATH=$target_path
 SDL_LIBS=$sdl_libs
 SDL_CFLAGS=$sdl_cflags
 LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
-EXTRALIBS=$extralibs
+EXTRALIBS=-L/usr/local/lib -L/usr/local/lib $extralibs
 INSTALL=$install
 LIBTARGET=${LIBTARGET}
 SLIBNAME=${SLIBNAME}

Lines 1-6 Link Here

(-)files/patch-doc-protocols.texi (-3 / +3 lines)
1	--- doc/protocols.texi.orig 2015-08-25 08:10:17 UTC	1	--- doc/protocols.texi.orig 2013-02-17 14:46:23.000000000 -0800
2	+++ doc/protocols.texi	2	+++ doc/protocols.texi 2013-10-08 12:00:38.375693236 -0700
3	@@ -155,8 +155,8 @@ be seekable, so they will fail with the	3	@@ -155,8 +155,8 @@
4		4
5	Real-Time Messaging Protocol.	5	Real-Time Messaging Protocol.
6		6




--- 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 @@
 # well.
 OBJS-$(!CONFIG_SMALL)                  += inverse.o
 
 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

Lines 1-5 Link Here

(-)files/patch-libavcodec-libgsm.c (-2 / +2 lines)
1	--- libavcodec/libgsm.c.orig 2015-08-25 08:10:18 UTC	1	--- libavcodec/libgsm.c.orig 2010-07-21 10:24:16.297810379 +0200
2	+++ libavcodec/libgsm.c	2	+++ libavcodec/libgsm.c 2010-07-21 10:24:22.915234561 +0200
3	@@ -28,7 +28,7 @@	3	@@ -28,7 +28,7 @@
4	// The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html	4	// The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
5		5

Lines 1-4 Link Here

(-)files/patch-libavcodec_arm_asm.S (-1 / +1 lines)
1	--- libavcodec/arm/asm.S.orig 2015-08-25 08:10:17 UTC	1	--- libavcodec/arm/asm.S.orig 2013-10-06 16:18:07 UTC
2	+++ libavcodec/arm/asm.S	2	+++ libavcodec/arm/asm.S
3	@@ -26,6 +26,22 @@	3	@@ -26,6 +26,22 @@
4	# define ELF @	4	# define ELF @

Lines 1-5 Link Here

(-)files/patch-libavdevice-bktr.c (-2 / +2 lines)
1	--- libavdevice/bktr.c.orig 2015-08-25 08:10:17 UTC	1	--- libavdevice/bktr.c.orig 2011-06-21 21:29:25.000000000 +0200
2	+++ libavdevice/bktr.c	2	+++ libavdevice/bktr.c 2011-06-23 13:39:44.160881669 +0200
3	@@ -24,6 +24,11 @@	3	@@ -24,6 +24,11 @@
4	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA	4	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
5	*/	5	*/

Lines 1-5 Link Here

(-)files/patch-libavdevice-oss_audio.c (-2 / +2 lines)
1	--- libavdevice/oss_audio.c.orig 2015-08-25 08:10:17 UTC	1	--- libavdevice/oss_audio.c.orig 2009-05-15 17:38:35.000000000 +0200
2	+++ libavdevice/oss_audio.c	2	+++ libavdevice/oss_audio.c 2009-05-15 17:41:27.000000000 +0200
3	@@ -19,6 +19,11 @@	3	@@ -19,6 +19,11 @@
4	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA	4	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
5	*/	5	*/

Lines 1-6 Link Here

(-)files/patch-libavfilter-Makefile (-3 / +3 lines)
1	--- libavfilter/Makefile.orig 2015-08-25 08:10:18 UTC	1	--- libavfilter/Makefile.orig 2011-06-23 16:22:46.163337772 +0200
2	+++ libavfilter/Makefile	2	+++ libavfilter/Makefile 2011-06-23 16:22:53.731245405 +0200
3	@@ -136,7 +136,7 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/	3	@@ -136,7 +136,7 @@
4	OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o	4	OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o
5		5
6		6

Lines 1-5 Link Here

(-)files/patch-libavfilter-vf_libopencv.c (-2 / +2 lines)
1	--- libavfilter/vf_libopencv.c.orig 2015-08-25 08:10:18 UTC	1	--- libavfilter/vf_libopencv.c.orig 2011-06-27 21:27:01.521012341 +0200
2	+++ libavfilter/vf_libopencv.c	2	+++ libavfilter/vf_libopencv.c 2011-06-27 21:27:16.839540294 +0200
3	@@ -25,8 +25,7 @@	3	@@ -25,8 +25,7 @@
4		4
5	/* #define DEBUG */	5	/* #define DEBUG */

Lines 1-7 Link Here

(-)files/patch-libavformat-udp.c (-4 / +4 lines)
1	--- libavformat/udp.c.orig 2015-08-25 08:10:18 UTC	1	--- libavformat/udp.c.orig 2009-05-15 17:24:45.000000000 +0200
2	+++ libavformat/udp.c	2	+++ libavformat/udp.c 2009-05-15 17:27:17.000000000 +0200
3	@@ -47,6 +47,8 @@	3	@@ -45,6 +45,8 @@
4	#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP	4	#define IN6_IS_ADDR_MULTICAST(a) (((uint8_t *) (a))[0] == 0xff)
5	#endif	5	#endif
6		6
7	+#define IPPROTO_IPV6 41	7	+#define IPPROTO_IPV6 41

Lines 1-8 Link Here

(-)files/patch-libavutil-common.h (-5 / +5 lines)
1	--- libavutil/common.h.orig 2015-08-25 08:10:17 UTC	1	--- libavutil/common.h.orig 2010-04-26 23:01:38.000000000 +0200
2	+++ libavutil/common.h	2	+++ libavutil/common.h 2010-07-10 16:06:27.038027901 +0200
3	@@ -43,6 +43,10 @@	3	@@ -36,6 +36,10 @@
4	# define AV_NE(be, le) (le)	4	#include <string.h>
5	#endif	5	#include "attributes.h"
6		6
7	+#ifndef UINT64_C	7	+#ifndef UINT64_C
8	+#define UINT64_C(c) (c ## UL)	8	+#define UINT64_C(c) (c ## UL)




# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
# $FreeBSD: head/multimedia/ffmpeg0/Makefile 395164 2015-08-24 10:03:14Z junovitch $

PORTNAME=	ffmpeg
PORTVERSION=	0.7.17
PORTEPOCH=	1
CATEGORIES=	multimedia audio ipv6 net
MASTER_SITES=	http://ffmpeg.org/releases/
PKGNAMESUFFIX=	0

MAINTAINER=	wg@FreeBSD.org
COMMENT=	Realtime audio/video encoder/converter and streaming server

LICENSE=		GPLv2 LGPL21
LICENSE_COMB=		multi
LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING.GPLv2
LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPLv2.1

BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
		${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \
		${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html

PORTSCOUT=	limit:^0\.7.*

USES=		cpe gmake perl5 pkgconfig tar:bzip2
USE_LDCONFIG=	${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
USE_PERL5=	build
WANT_SDL=	yes

FFMPEG_SUFFIX=	0
HAS_CONFIGURE=	yes
CONFIGURE_LOG=	config.err
CONFIGURE_ENV+=	EXESUF="${FFMPEG_SUFFIX}"
MAKE_ARGS+=	EXESUF="${FFMPEG_SUFFIX}"
PLIST_SUB+=	SUFF="${FFMPEG_SUFFIX}"
PROGS=		ffmpeg ffprobe

CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin

CONFIGURE_ARGS+=--prefix="${PREFIX}" \
		--mandir="${PREFIX}/man" \
		--incdir="${PREFIX}/include/ffmpeg${FFMPEG_SUFFIX}" \
		--libdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
		--shlibdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
		--datadir="${DATADIR}" \
		--build-suffix="${FFMPEG_SUFFIX}" \
		--enable-shared \
		--enable-gpl \
		--enable-postproc \
		--enable-avfilter \
		--enable-pthreads \
		--enable-runtime-cpudetect \
		--cc="${CC}" \
		--extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \
		--extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \
		--extra-libs="-lpthread"

SHLIB_VER=	1
PLIST_SUB+=	SHLIB_VER=${SHLIB_VER}

DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}

OPTIONS_DEFINE=		AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
			FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \
			OPTIMIZED_CFLAGS RTMP SCHROEDINGER SDL SPEEX THEORA VAAPI \
			VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID DOCS
OPTIONS_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 \
	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

.include <bsd.port.pre.mk>

.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000
CONFIGURE_ARGS+=	--enable-memalign-hack
.endif

.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

.if ${PORT_OPTIONS:MFFSERVER}
USE_RC_SUBR=	ffserver${FFMPEG_SUFFIX}
PROGS+=		ffserver
.endif

# sse hardware vector support
.if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64")
_BUILTIN_VECTOR=	yes
.else
CONFIGURE_ARGS+=	--disable-sse
.endif

# mmx support
.if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "" && ${MACHINE_CPU:Mamd64} == ""
CONFIGURE_ARGS+=	--disable-mmx
_NO_BUILTIN_VECTOR=	yes
.endif

# builtin vector, requires mmx and sse
.if !defined(_NO_BUILTIN_VECTOR) && defined(_BUILTIN_VECTOR)
CFLAGS+=	-msse
.endif

# optimizations
.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
CFLAGS+=	-O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
.endif

#aacplus
.if ${PORT_OPTIONS:MAACPLUS}
FFMPEG_NONFREE=	yes
LIB_DEPENDS+=	libaacplus.so:${PORTSDIR}/audio/libaacplus
CONFIGURE_ARGS+=	--enable-libaacplus
.else
CONFIGURE_ARGS+=	--disable-libaacplus
.endif

# Opencore AMR NB
.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
.endif

# Opencore AMR WB
.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

# faac
.if ${PORT_OPTIONS:MFAAC}
FFMPEG_NONFREE=	yes
LIB_DEPENDS+=	libfaac.so:${PORTSDIR}/audio/faac
CONFIGURE_ARGS+=	--enable-libfaac
.else
CONFIGURE_ARGS+=	--disable-libfaac
.endif

# rtmp
.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

# sdl
.if ${PORT_OPTIONS:MSDL}
USE_SDL+=	sdl
PLIST_FILES+=	bin/ffplay${FFMPEG_SUFFIX} man/man1/ffplay${FFMPEG_SUFFIX}.1.gz
PROGS+=		ffplay
.else
CONFIGURE_ARGS+=	--disable-ffplay
.endif

# vaapi
.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

# 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
.endif

# 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
.endif

# vorbis
.if ${PORT_OPTIONS:MVORBIS}
LIB_DEPENDS+=	libvorbisenc.so:${PORTSDIR}/audio/libvorbis
CONFIGURE_ARGS+=	--enable-libvorbis
FFMPEG_CFLAGS+=		-I${LOCALBASE}/include/vorbis
.else
CONFIGURE_ARGS+=	--disable-libvorbis
.endif

# License knobs
.if defined(FFMPEG_NONFREE)
RESTRICTED=	linking to libfaac or libaacplus restricts redistribution
CONFIGURE_ARGS+=	--enable-nonfree
.endif

.if defined(FFMPEG_LICENSE_GPL3)
LICENSE+=		GPLv3 LGPL3
LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING.GPLv3
LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LGPLv3
CONFIGURE_ARGS+=	--enable-version3
.endif

post-patch:
# {C,LD}FLAGS safeness
	@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|$$(DESTDIR)$$(prefix)/libdata/pkgconfig|' \
		${WRKSRC}/subdir.mak
	@${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|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|freetype/freetype.h|freetype.h|g' \
		-e 's|check_ldflags -Wl,--as-needed||' \
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
	@${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}
	@${FIND} ${WRKSRC} -type f | \
		${XARGS} -n 10 ${REINPLACE_CMD} -E \
		-e 's|#include <SDL|#include <SDL/SDL|'
.endif

post-configure:
.if empty(PORT_OPTIONS:MTHEORA)
	@${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 ${PORT_OPTIONS:MFFSERVER}
	${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${STAGEDIR}${PREFIX}/etc/ffserver${FFMPEG_SUFFIX}.conf-dist
.endif
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for FILE in ${DOC_FILES}
	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
.endfor
.for FILE in ${DOC_DOCFILES}
	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
.endfor
.for i in ${PROGS}
	${INSTALL_MAN} ${WRKSRC}/doc/${i}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${i}0.1
.endfor
	@${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>

Lines 1-2 Link Here

(-)ffmpeg0/distinfo (-2 lines)
1	SHA256 (ffmpeg-0.7.17.tar.bz2) = 5ec57caa1bff7a528b8e58643dd550cdc69156f7b44c31a10920f1be68e2036a
2	SIZE (ffmpeg-0.7.17.tar.bz2) = 4529540




Index: Makefile
===================================================================
--- Makefile	(.../..)	(working copy)
+++ Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD: head/multimedia/ffmpeg0/Makefile 395164 2015-08-24 10:03:14Z junovitch $
 
 PORTNAME=	ffmpeg
-PORTVERSION=	0.8
-#PORTVERSION=	0.7.17
+PORTVERSION=	0.7.17
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -63,7 +62,7 @@
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
-OPTIONS_DEFINE=		ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
+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
@@ -171,7 +170,7 @@
 CFLAGS+=	-no-integrated-as
 .endif
 
-dOC_FILES=	CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
+DOC_FILES=	CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
 # under doc subdirectory
 DOC_DOCFILES=	APIchanges RELEASE_NOTES TODO *.txt *.html
 
@@ -203,6 +202,15 @@
 CFLAGS+=	-O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
 .endif
 
+#aacplus
+.if ${PORT_OPTIONS:MAACPLUS}
+FFMPEG_NONFREE=	yes
+LIB_DEPENDS+=	libaacplus.so:${PORTSDIR}/audio/libaacplus
+CONFIGURE_ARGS+=	--enable-libaacplus
+.else
+CONFIGURE_ARGS+=	--disable-libaacplus
+.endif
+
 # Opencore AMR NB
 .if ${PORT_OPTIONS:MAMR_NB}
 FFMPEG_LICENSE_GPL3=	yes

Property changes on: Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: distinfo
===================================================================
--- distinfo	(.../..)	(working copy)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-0.8.tar.bz2) = 3e26fdc317970386f96b27c9821890832ad2970b07e434a5bb27048d03e3fc0f
-SIZE (ffmpeg-0.8.tar.bz2) = 4551071
+SHA256 (ffmpeg-0.7.17.tar.bz2) = 5ec57caa1bff7a528b8e58643dd550cdc69156f7b44c31a10920f1be68e2036a
+SIZE (ffmpeg-0.7.17.tar.bz2) = 4529540

Property changes on: distinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
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: ffmpeg0.diff
===================================================================
--- ffmpeg0.diff	(.../..)	(working copy)
+++ ffmpeg0.diff	(working copy)
@@ -0,0 +1,87 @@
+Index: Makefile
+===================================================================
+--- Makefile	(.../..)	(working copy)
++++ Makefile	(working copy)
+@@ -2,8 +2,7 @@
+ # $FreeBSD: head/multimedia/ffmpeg0/Makefile 395164 2015-08-24 10:03:14Z junovitch $
+ 
+ PORTNAME=	ffmpeg
+-PORTVERSION=	0.8
+-#PORTVERSION=	0.7.17
++PORTVERSION=	0.7.17
+ PORTEPOCH=	1
+ CATEGORIES=	multimedia audio ipv6 net
+ MASTER_SITES=	http://ffmpeg.org/releases/
+@@ -63,7 +62,7 @@
+ DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
+ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
+ 
+-OPTIONS_DEFINE=		ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
++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
+@@ -171,7 +170,7 @@
+ CFLAGS+=	-no-integrated-as
+ .endif
+ 
+-dOC_FILES=	CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
++DOC_FILES=	CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
+ # under doc subdirectory
+ DOC_DOCFILES=	APIchanges RELEASE_NOTES TODO *.txt *.html
+ 
+@@ -203,6 +202,15 @@
+ CFLAGS+=	-O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
+ .endif
+ 
++#aacplus
++.if ${PORT_OPTIONS:MAACPLUS}
++FFMPEG_NONFREE=	yes
++LIB_DEPENDS+=	libaacplus.so:${PORTSDIR}/audio/libaacplus
++CONFIGURE_ARGS+=	--enable-libaacplus
++.else
++CONFIGURE_ARGS+=	--disable-libaacplus
++.endif
++
+ # Opencore AMR NB
+ .if ${PORT_OPTIONS:MAMR_NB}
+ FFMPEG_LICENSE_GPL3=	yes
+
+Property changes on: Makefile
+___________________________________________________________________
+Added: svn:eol-style
+## -0,0 +1 ##
++native
+\ No newline at end of property
+Added: svn:keywords
+## -0,0 +1 ##
++FreeBSD=%H
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++text/plain
+\ No newline at end of property
+Index: distinfo
+===================================================================
+--- distinfo	(.../..)	(working copy)
++++ distinfo	(working copy)
+@@ -1,2 +1,2 @@
+-SHA256 (ffmpeg-0.8.tar.bz2) = 3e26fdc317970386f96b27c9821890832ad2970b07e434a5bb27048d03e3fc0f
+-SIZE (ffmpeg-0.8.tar.bz2) = 4551071
++SHA256 (ffmpeg-0.7.17.tar.bz2) = 5ec57caa1bff7a528b8e58643dd550cdc69156f7b44c31a10920f1be68e2036a
++SIZE (ffmpeg-0.7.17.tar.bz2) = 4529540
+
+Property changes on: distinfo
+___________________________________________________________________
+Added: fbsd:nokeywords
+## -0,0 +1 ##
++yes
+\ No newline at end of property
+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: pkg-descr
===================================================================
--- pkg-descr	(.../..)	(working copy)
+++ pkg-descr	(working copy)

Property changes on: pkg-descr
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
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: pkg-plist
===================================================================
--- pkg-plist	(.../..)	(working copy)
+++ pkg-plist	(working copy)
@@ -1,7 +1,9 @@
 bin/ffmpeg%%SUFF%%
 bin/ffprobe%%SUFF%%
-etc/ffserver%%SUFF%%.conf-dist
-etc/rc.d/ffserver%%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
@@ -54,47 +56,54 @@
 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%%/libavcodec%%SUFF%%.a
-lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so
-lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.1
-lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.53.7.%%SUFF%%
-lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.a
-lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so
-lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.1
-lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.53.1.1
-lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.a
-lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so
-lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.1
-lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.2.23.%%SUFF%%
-lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.a
-lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so
-lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.1
-lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.53.4.%%SUFF%%
-lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.a
-lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so
-lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.1
-lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51.9.1
-lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.a
-lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so
-lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.1
-lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.51.2.%%SUFF%%
-lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.a
-lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so
-lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.1
-lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2.%%SUFF%%.%%SUFF%%
-libdata/pkgconfig/libavcodec%%SUFF%%.pc
-libdata/pkgconfig/libavdevice%%SUFF%%.pc
-libdata/pkgconfig/libavfilter%%SUFF%%.pc
-libdata/pkgconfig/libavformat%%SUFF%%.pc
-libdata/pkgconfig/libavutil%%SUFF%%.pc
-libdata/pkgconfig/libpostproc%%SUFF%%.pc
-libdata/pkgconfig/libswscale%%SUFF%%.pc
+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
-man/man1/ffserver%%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
@@ -102,11 +111,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/developer.html
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/fate.txt
-%%PORTDOCS%%%%DOCSDIR%%/ffmpeg-mt-authorship.txt
 %%PORTDOCS%%%%DOCSDIR%%/ffmpeg.html
-%%PORTDOCS%%%%DOCSDIR%%/ffplay.html
 %%PORTDOCS%%%%DOCSDIR%%/ffprobe.html
-%%PORTDOCS%%%%DOCSDIR%%/ffserver.html
+%%FFSERVER%%%%PORTDOCS%%%%DOCSDIR%%/ffserver.html
 %%PORTDOCS%%%%DOCSDIR%%/general.html
 %%PORTDOCS%%%%DOCSDIR%%/git-howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/issue_tracker.txt
@@ -119,14 +126,14 @@
 %%PORTDOCS%%%%DOCSDIR%%/swscale.txt
 %%PORTDOCS%%%%DOCSDIR%%/tablegen.txt
 %%PORTDOCS%%%%DOCSDIR%%/viterbi.txt
-%%DATADIR%%/libvpx-1%%SUFF%%8%%SUFF%%p.ffpreset
-%%DATADIR%%/libvpx-1%%SUFF%%8%%SUFF%%p5%%SUFF%%_6%%SUFF%%.ffpreset
-%%DATADIR%%/libvpx-36%%SUFF%%p.ffpreset
-%%DATADIR%%/libvpx-72%%SUFF%%p.ffpreset
-%%DATADIR%%/libvpx-72%%SUFF%%p5%%SUFF%%_6%%SUFF%%.ffpreset
+%%DATADIR%%/libvpx-1080p.ffpreset
+%%DATADIR%%/libvpx-1080p50_60.ffpreset
+%%DATADIR%%/libvpx-360p.ffpreset
+%%DATADIR%%/libvpx-720p.ffpreset
+%%DATADIR%%/libvpx-720p50_60.ffpreset
 %%DATADIR%%/libx264-baseline.ffpreset
-%%DATADIR%%/libx264-ipod32%%SUFF%%.ffpreset
-%%DATADIR%%/libx264-ipod64%%SUFF%%.ffpreset
+%%DATADIR%%/libx264-ipod320.ffpreset
+%%DATADIR%%/libx264-ipod640.ffpreset
 %%DATADIR%%/libx264-lossless_fast.ffpreset
 %%DATADIR%%/libx264-lossless_max.ffpreset
 %%DATADIR%%/libx264-lossless_medium.ffpreset

Property changes on: pkg-plist
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
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: files/_patch-libavfilter_vf__drawtext.c
===================================================================
--- files/_patch-libavfilter_vf__drawtext.c	(.../..)	(working copy)
+++ files/_patch-libavfilter_vf__drawtext.c	(working copy)
@@ -1,10 +0,0 @@
---- libavfilter/vf_drawtext.c.orig	2015-08-25 08:10:18 UTC
-+++ libavfilter/vf_drawtext.c
-@@ -41,7 +41,6 @@
- #undef time
- 
- #include <ft2build.h>
--#include <freetype/config/ftheader.h>
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
- 
Index: files/ffserver0.in
===================================================================
--- files/ffserver0.in	(.../..)	(working copy)
+++ files/ffserver0.in	(working copy)

Property changes on: files/ffserver0.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-configure
===================================================================
--- files/patch-configure	(.../..)	(working copy)
+++ files/patch-configure	(working copy)
@@ -1,6 +1,6 @@
---- configure.orig	2015-08-25 08:10:18 UTC
-+++ configure
-@@ -1657,7 +1657,7 @@ nogas=":"
+--- configure.orig	2011-06-21 21:29:25.000000000 +0200
++++ configure	2011-06-23 13:36:46.099381871 +0200
+@@ -1657,7 +1657,7 @@
  nm_opts='-g'
  
  # machine
@@ -9,101 +9,7 @@
  cpu="generic"
  
  # OS
-@@ -1698,7 +1698,7 @@ SLIBPREF="lib"
- 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)"'
- 
- CC_O='-o $@'
-@@ -2435,13 +2435,13 @@ case $target_os in
-         enable malloc_aligned
-         gas="gas-preprocessor.pl $cc"
-         enabled ppc && add_asflags -force_cpusubtype_ALL




[ 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.

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.

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/




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%%/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




#!/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"




--- configure.orig	2011-06-21 21:29:25.000000000 +0200
+++ configure	2011-06-23 13:36:46.099381871 +0200
@@ -1657,7 +1657,7 @@
 nm_opts='-g'
 
 # machine
-arch_default=$(uname -m)
+arch_default=$(uname -p)
 cpu="generic"
 
 # OS
@@ -2966,8 +2966,8 @@
 texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
 
 check_header linux/fb.h
-check_header linux/videodev.h
-check_header linux/videodev2.h
+#check_header linux/videodev.h
+#check_header linux/videodev2.h
 check_header sys/videoio.h
 
 check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs"
@@ -3322,7 +3322,7 @@
 SRC_PATH="$source_path"
 SRC_PATH_BARE=$source_path
 CC_IDENT=$cc_ident
-ARCH=$arch
+FFMPEG_ARCH=$arch
 CC=$cc
 AS=$as
 LD=$ld




--- 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

Lines 1-11 Link Here

(-)ffmpeg0/files/patch-libavcodec-Makefile (-11 lines)
1	--- libavcodec/Makefile.orig 2010-08-01 20:33:53.484907333 +0200
2	+++ libavcodec/Makefile 2010-08-01 20:34:26.190893400 +0200
3	@@ -590,7 +590,7 @@
4
5	OBJS-$(CONFIG_MLIB) += mlib/dsputil_mlib.o \
6
7	--include $(SUBDIR)$(ARCH)/Makefile
8	+-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile
9
10	SKIPHEADERS = %_tablegen.h
11	SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h

Lines 1-11 Link Here

(-)ffmpeg0/files/patch-libavcodec-libgsm.c (-11 lines)
1	--- libavcodec/libgsm.c.orig 2010-07-21 10:24:16.297810379 +0200
2	+++ libavcodec/libgsm.c 2010-07-21 10:24:22.915234561 +0200
3	@@ -28,7 +28,7 @@
4	// The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
5
6	#include "avcodec.h"
7	-#include <gsm/gsm.h>
8	+#include <gsm.h>
9
10	// gsm.h misses some essential constants
11	#define GSM_BLOCK_SIZE 33




--- 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




--- libavdevice/bktr.c.orig	2011-06-21 21:29:25.000000000 +0200
+++ libavdevice/bktr.c	2011-06-23 13:39:44.160881669 +0200
@@ -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;
+
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"




--- libavdevice/oss_audio.c.orig	2009-05-15 17:38:35.000000000 +0200
+++ libavdevice/oss_audio.c	2009-05-15 17:41:27.000000000 +0200
@@ -19,6 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+typedef unsigned char	u_char;
+typedef unsigned short	u_short;
+typedef unsigned int	u_int;
+typedef unsigned long	u_long;
+
 #include "config.h"
 #include <stdlib.h>
 #include <stdio.h>

Lines 1-11 Link Here

(-)ffmpeg0/files/patch-libavfilter-Makefile (-11 lines)
1	--- libavfilter/Makefile.orig 2011-06-23 16:22:46.163337772 +0200
2	+++ libavfilter/Makefile 2011-06-23 16:22:53.731245405 +0200
3	@@ -136,7 +136,7 @@
4	OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o
5
6
7	--include $(SUBDIR)$(ARCH)/Makefile
8	+-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile
9
10	DIRS = x86 libmpcodecs
11




--- 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"

Lines 1-10 Link Here

(-)ffmpeg0/files/patch-libavfilter_vf-drawtext.c (-10 lines)
1	--- libavfilter/vf_drawtext.c.orig 2013-12-06 18:18:29.000000000 +0100
2	+++ libavfilter/vf_drawtext.c 2013-12-06 18:18:49.000000000 +0100
3	@@ -41,7 +41,6 @@
4	#undef time
5
6	#include <ft2build.h>
7	-#include <freetype/config/ftheader.h>
8	#include FT_FREETYPE_H
9	#include FT_GLYPH_H
10

Lines 1-11 Link Here

(-)ffmpeg0/files/patch-libavformat-udp.c (-11 lines)
1	--- libavformat/udp.c.orig 2009-05-15 17:24:45.000000000 +0200
2	+++ libavformat/udp.c 2009-05-15 17:27:17.000000000 +0200
3	@@ -45,6 +45,8 @@
4	#define IN6_IS_ADDR_MULTICAST(a) (((uint8_t *) (a))[0] == 0xff)
5	#endif
6
7	+#define IPPROTO_IPV6 41
8	+
9	typedef struct {
10	int udp_fd;
11	int ttl;

Lines 1-13 Link Here

(-)ffmpeg0/files/patch-libavutil-common.h (-13 lines)
1	--- libavutil/common.h.orig 2010-04-26 23:01:38.000000000 +0200
2	+++ libavutil/common.h 2010-07-10 16:06:27.038027901 +0200
3	@@ -36,6 +36,10 @@
4	#include <string.h>
5	#include "attributes.h"
6
7	+#ifndef UINT64_C
8	+#define UINT64_C(c) (c ## UL)
9	+#endif
10	+
11	//rounded division & shift
12	#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
13	/* assume b>0 */

Return to bug 200852

Lines 2-9 Link Here

(-)Makefile (-4 / +12 lines)
2	# $FreeBSD: head/multimedia/ffmpeg0/Makefile 395164 2015-08-24 10:03:14Z junovitch $	2	# $FreeBSD: head/multimedia/ffmpeg0/Makefile 395164 2015-08-24 10:03:14Z junovitch $
3		3
4	PORTNAME= ffmpeg	4	PORTNAME= ffmpeg
5	PORTVERSION= 0.8	5	PORTVERSION= 0.7.17
6	#PORTVERSION= 0.7.17
7	PORTEPOCH= 1	6	PORTEPOCH= 1
8	CATEGORIES= multimedia audio ipv6 net	7	CATEGORIES= multimedia audio ipv6 net
9	MASTER_SITES= http://ffmpeg.org/releases/	8	MASTER_SITES= http://ffmpeg.org/releases/
Lines 63-69 Link Here
63	DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}	62	DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
64	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}	63	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
65		64
66	OPTIONS_DEFINE= ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \	65	OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
67	FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \	66	FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \
68	OPTIMIZED_CFLAGS RTMP SCHROEDINGER SDL SPEEX THEORA VAAPI \	67	OPTIMIZED_CFLAGS RTMP SCHROEDINGER SDL SPEEX THEORA VAAPI \
69	VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID DOCS	68	VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID DOCS
Lines 171-177 Link Here
171	CFLAGS+= -no-integrated-as	170	CFLAGS+= -no-integrated-as
172	.endif	171	.endif
173		172
174	dOC_FILES= CREDITS INSTALL LICENSE MAINTAINERS README RELEASE	173	DOC_FILES= CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
175	# under doc subdirectory	174	# under doc subdirectory
176	DOC_DOCFILES= APIchanges RELEASE_NOTES TODO .txt .html	175	DOC_DOCFILES= APIchanges RELEASE_NOTES TODO .txt .html
177		176
Lines 203-208 Link Here
203	CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer	202	CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
204	.endif	203	.endif
205		204
		205	#aacplus
		206	.if ${PORT_OPTIONS:MAACPLUS}
		207	FFMPEG_NONFREE= yes
		208	LIB_DEPENDS+= libaacplus.so:${PORTSDIR}/audio/libaacplus
		209	CONFIGURE_ARGS+= --enable-libaacplus
		210	.else
		211	CONFIGURE_ARGS+= --disable-libaacplus
		212	.endif
		213
206	# Opencore AMR NB	214	# Opencore AMR NB
207	.if ${PORT_OPTIONS:MAMR_NB}	215	.if ${PORT_OPTIONS:MAMR_NB}
208	FFMPEG_LICENSE_GPL3= yes	216	FFMPEG_LICENSE_GPL3= yes

Line 0 Link Here

(-)ffmpeg0.diff (+87 lines)
		1	Index: Makefile
		2	===================================================================
		3	--- Makefile (.../..) (working copy)
		4	+++ Makefile (working copy)
		5	@@ -2,8 +2,7 @@
		6	# $FreeBSD: head/multimedia/ffmpeg0/Makefile 395164 2015-08-24 10:03:14Z junovitch $
		7
		8	PORTNAME= ffmpeg
		9	-PORTVERSION= 0.8
		10	-#PORTVERSION= 0.7.17
		11	+PORTVERSION= 0.7.17
		12	PORTEPOCH= 1
		13	CATEGORIES= multimedia audio ipv6 net
		14	MASTER_SITES= http://ffmpeg.org/releases/
		15	@@ -63,7 +62,7 @@
		16	DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
		17	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
		18
		19	-OPTIONS_DEFINE= ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
		20	+OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
		21	FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \
		22	OPTIMIZED_CFLAGS RTMP SCHROEDINGER SDL SPEEX THEORA VAAPI \
		23	VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID DOCS
		24	@@ -171,7 +170,7 @@
		25	CFLAGS+= -no-integrated-as
		26	.endif
		27
		28	-dOC_FILES= CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
		29	+DOC_FILES= CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
		30	# under doc subdirectory
		31	DOC_DOCFILES= APIchanges RELEASE_NOTES TODO .txt .html
		32
		33	@@ -203,6 +202,15 @@
		34	CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
		35	.endif
		36
		37	+#aacplus
		38	+.if ${PORT_OPTIONS:MAACPLUS}
		39	+FFMPEG_NONFREE= yes
		40	+LIB_DEPENDS+= libaacplus.so:${PORTSDIR}/audio/libaacplus
		41	+CONFIGURE_ARGS+= --enable-libaacplus
		42	+.else
		43	+CONFIGURE_ARGS+= --disable-libaacplus
		44	+.endif
		45	+
		46	# Opencore AMR NB
		47	.if ${PORT_OPTIONS:MAMR_NB}
		48	FFMPEG_LICENSE_GPL3= yes
		49
		50	Property changes on: Makefile
		51	___________________________________________________________________
		52	Added: svn:eol-style
		53	## -0,0 +1 ##
		54	+native
		55	\ No newline at end of property
		56	Added: svn:keywords
		57	## -0,0 +1 ##
		58	+FreeBSD=%H
		59	\ No newline at end of property
		60	Added: svn:mime-type
		61	## -0,0 +1 ##
		62	+text/plain
		63	\ No newline at end of property
		64	Index: distinfo
65	===================================================================
66	--- distinfo (.../..) (working copy)
67	+++ distinfo (working copy)
68	@@ -1,2 +1,2 @@
69	-SHA256 (ffmpeg-0.8.tar.bz2) = 3e26fdc317970386f96b27c9821890832ad2970b07e434a5bb27048d03e3fc0f
70	-SIZE (ffmpeg-0.8.tar.bz2) = 4551071
71	+SHA256 (ffmpeg-0.7.17.tar.bz2) = 5ec57caa1bff7a528b8e58643dd550cdc69156f7b44c31a10920f1be68e2036a
72	+SIZE (ffmpeg-0.7.17.tar.bz2) = 4529540
73
74	Property changes on: distinfo
75	___________________________________________________________________
76	Added: fbsd:nokeywords
77	## -0,0 +1 ##
78	+yes
79	\ No newline at end of property
80	Added: svn:eol-style
81	## -0,0 +1 ##
82	+native
83	\ No newline at end of property
84	Added: svn:mime-type
85	## -0,0 +1 ##
86	+text/plain
87	\ No newline at end of property

Lines 1-7 Link Here

(-)pkg-plist (-48 / +55 lines)
1	bin/ffmpeg%%SUFF%%	1	bin/ffmpeg%%SUFF%%
2	bin/ffprobe%%SUFF%%	2	bin/ffprobe%%SUFF%%
3	etc/ffserver%%SUFF%%.conf-dist	3	%%FFSERVER%%bin/ffserver%%SUFF%%
4	etc/rc.d/ffserver%%SUFF%%	4	%%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
		5	%%FFSERVER%%etc/ffserver%%SUFF%%.conf-dist
		6	%%FFSERVER%%@exec [ -f %B/ffserver%%SUFF%%.conf ] \|\| cp %B/%f %B/ffserver%%SUFF%%.conf
5	include/ffmpeg%%SUFF%%/libavcodec/avcodec.h	7	include/ffmpeg%%SUFF%%/libavcodec/avcodec.h
6	include/ffmpeg%%SUFF%%/libavcodec/avfft.h	8	include/ffmpeg%%SUFF%%/libavcodec/avfft.h
7	include/ffmpeg%%SUFF%%/libavcodec/dxva2.h	9	include/ffmpeg%%SUFF%%/libavcodec/dxva2.h
Lines 54-100 Link Here
54	include/ffmpeg%%SUFF%%/libavutil/rational.h	56	include/ffmpeg%%SUFF%%/libavutil/rational.h
55	include/ffmpeg%%SUFF%%/libavutil/samplefmt.h	57	include/ffmpeg%%SUFF%%/libavutil/samplefmt.h
56	include/ffmpeg%%SUFF%%/libavutil/sha.h	58	include/ffmpeg%%SUFF%%/libavutil/sha.h
		59	include/ffmpeg%%SUFF%%/libavutil/sha1.h
57	include/ffmpeg%%SUFF%%/libpostproc/postprocess.h	60	include/ffmpeg%%SUFF%%/libpostproc/postprocess.h
58	include/ffmpeg%%SUFF%%/libswscale/swscale.h	61	include/ffmpeg%%SUFF%%/libswscale/swscale.h
59	lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.a	62	lib/ffmpeg%%SUFF%%/libavcodec0.a
60	lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so	63	lib/ffmpeg%%SUFF%%/libavcodec0.so
61	lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.1	64	lib/ffmpeg%%SUFF%%/libavcodec0.so.1
62	lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.53.7.%%SUFF%%	65	lib/ffmpeg%%SUFF%%/libavcodec0.so.52.123.0
63	lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.a	66	lib/ffmpeg%%SUFF%%/libavdevice0.a
64	lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so	67	lib/ffmpeg%%SUFF%%/libavdevice0.so
65	lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.1	68	lib/ffmpeg%%SUFF%%/libavdevice0.so.1
66	lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.53.1.1	69	lib/ffmpeg%%SUFF%%/libavdevice0.so.52.5.0
67	lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.a	70	lib/ffmpeg%%SUFF%%/libavfilter0.a
68	lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so	71	lib/ffmpeg%%SUFF%%/libavfilter0.so
69	lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.1	72	lib/ffmpeg%%SUFF%%/libavfilter0.so.1
70	lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.2.23.%%SUFF%%	73	lib/ffmpeg%%SUFF%%/libavfilter0.so.1.80.0
71	lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.a	74	lib/ffmpeg%%SUFF%%/libavformat0.a
72	lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so	75	lib/ffmpeg%%SUFF%%/libavformat0.so
73	lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.1	76	lib/ffmpeg%%SUFF%%/libavformat0.so.1
74	lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.53.4.%%SUFF%%	77	lib/ffmpeg%%SUFF%%/libavformat0.so.52.111.0
75	lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.a	78	lib/ffmpeg%%SUFF%%/libavutil0.a
76	lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so	79	lib/ffmpeg%%SUFF%%/libavutil0.so
77	lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.1	80	lib/ffmpeg%%SUFF%%/libavutil0.so.1
78	lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51.9.1	81	lib/ffmpeg%%SUFF%%/libavutil0.so.50.43.0
79	lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.a	82	lib/ffmpeg%%SUFF%%/libpostproc0.a
80	lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so	83	lib/ffmpeg%%SUFF%%/libpostproc0.so
81	lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.1	84	lib/ffmpeg%%SUFF%%/libpostproc0.so.1
82	lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.51.2.%%SUFF%%	85	lib/ffmpeg%%SUFF%%/libpostproc0.so.51.2.0
83	lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.a	86	lib/ffmpeg%%SUFF%%/libswscale0.a
84	lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so	87	lib/ffmpeg%%SUFF%%/libswscale0.so
85	lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.1	88	lib/ffmpeg%%SUFF%%/libswscale0.so.0.14.1
86	lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2.%%SUFF%%.%%SUFF%%	89	lib/ffmpeg%%SUFF%%/libswscale0.so.1
87	libdata/pkgconfig/libavcodec%%SUFF%%.pc	90	libdata/pkgconfig/libavcodec0.pc
88	libdata/pkgconfig/libavdevice%%SUFF%%.pc	91	libdata/pkgconfig/libavdevice0.pc
89	libdata/pkgconfig/libavfilter%%SUFF%%.pc	92	libdata/pkgconfig/libavfilter0.pc
90	libdata/pkgconfig/libavformat%%SUFF%%.pc	93	libdata/pkgconfig/libavformat0.pc
91	libdata/pkgconfig/libavutil%%SUFF%%.pc	94	libdata/pkgconfig/libavutil0.pc
92	libdata/pkgconfig/libpostproc%%SUFF%%.pc	95	libdata/pkgconfig/libpostproc0.pc
93	libdata/pkgconfig/libswscale%%SUFF%%.pc	96	libdata/pkgconfig/libswscale0.pc
94	man/man1/ffmpeg%%SUFF%%.1.gz	97	man/man1/ffmpeg%%SUFF%%.1.gz
95	man/man1/ffprobe%%SUFF%%.1.gz	98	man/man1/ffprobe%%SUFF%%.1.gz
96	man/man1/ffserver%%SUFF%%.1.gz	99	%%FFSERVER%%man/man1/ffserver%%SUFF%%.1.gz
97	%%PORTDOCS%%%%DOCSDIR%%/APIchanges	100	%%PORTDOCS%%%%DOCSDIR%%/APIchanges
		101	%%PORTDOCS%%%%DOCSDIR%%/CREDITS
		102	%%PORTDOCS%%%%DOCSDIR%%/INSTALL
		103	%%PORTDOCS%%%%DOCSDIR%%/LICENSE
		104	%%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS
		105	%%PORTDOCS%%%%DOCSDIR%%/README
		106	%%PORTDOCS%%%%DOCSDIR%%/RELEASE
98	%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES	107	%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
99	%%PORTDOCS%%%%DOCSDIR%%/TODO	108	%%PORTDOCS%%%%DOCSDIR%%/TODO
100	%%PORTDOCS%%%%DOCSDIR%%/avutil.txt	109	%%PORTDOCS%%%%DOCSDIR%%/avutil.txt
Lines 102-112 Link Here
102	%%PORTDOCS%%%%DOCSDIR%%/developer.html	111	%%PORTDOCS%%%%DOCSDIR%%/developer.html
103	%%PORTDOCS%%%%DOCSDIR%%/faq.html	112	%%PORTDOCS%%%%DOCSDIR%%/faq.html
104	%%PORTDOCS%%%%DOCSDIR%%/fate.txt	113	%%PORTDOCS%%%%DOCSDIR%%/fate.txt
105	%%PORTDOCS%%%%DOCSDIR%%/ffmpeg-mt-authorship.txt
106	%%PORTDOCS%%%%DOCSDIR%%/ffmpeg.html	114	%%PORTDOCS%%%%DOCSDIR%%/ffmpeg.html
107	%%PORTDOCS%%%%DOCSDIR%%/ffplay.html
108	%%PORTDOCS%%%%DOCSDIR%%/ffprobe.html	115	%%PORTDOCS%%%%DOCSDIR%%/ffprobe.html
109	%%PORTDOCS%%%%DOCSDIR%%/ffserver.html	116	%%FFSERVER%%%%PORTDOCS%%%%DOCSDIR%%/ffserver.html
110	%%PORTDOCS%%%%DOCSDIR%%/general.html	117	%%PORTDOCS%%%%DOCSDIR%%/general.html
111	%%PORTDOCS%%%%DOCSDIR%%/git-howto.txt	118	%%PORTDOCS%%%%DOCSDIR%%/git-howto.txt
112	%%PORTDOCS%%%%DOCSDIR%%/issue_tracker.txt	119	%%PORTDOCS%%%%DOCSDIR%%/issue_tracker.txt
Lines 119-132 Link Here
119	%%PORTDOCS%%%%DOCSDIR%%/swscale.txt	126	%%PORTDOCS%%%%DOCSDIR%%/swscale.txt
120	%%PORTDOCS%%%%DOCSDIR%%/tablegen.txt	127	%%PORTDOCS%%%%DOCSDIR%%/tablegen.txt
121	%%PORTDOCS%%%%DOCSDIR%%/viterbi.txt	128	%%PORTDOCS%%%%DOCSDIR%%/viterbi.txt
122	%%DATADIR%%/libvpx-1%%SUFF%%8%%SUFF%%p.ffpreset	129	%%DATADIR%%/libvpx-1080p.ffpreset
123	%%DATADIR%%/libvpx-1%%SUFF%%8%%SUFF%%p5%%SUFF%%_6%%SUFF%%.ffpreset	130	%%DATADIR%%/libvpx-1080p50_60.ffpreset
124	%%DATADIR%%/libvpx-36%%SUFF%%p.ffpreset	131	%%DATADIR%%/libvpx-360p.ffpreset
125	%%DATADIR%%/libvpx-72%%SUFF%%p.ffpreset	132	%%DATADIR%%/libvpx-720p.ffpreset
126	%%DATADIR%%/libvpx-72%%SUFF%%p5%%SUFF%%_6%%SUFF%%.ffpreset	133	%%DATADIR%%/libvpx-720p50_60.ffpreset
127	%%DATADIR%%/libx264-baseline.ffpreset	134	%%DATADIR%%/libx264-baseline.ffpreset
128	%%DATADIR%%/libx264-ipod32%%SUFF%%.ffpreset	135	%%DATADIR%%/libx264-ipod320.ffpreset
129	%%DATADIR%%/libx264-ipod64%%SUFF%%.ffpreset	136	%%DATADIR%%/libx264-ipod640.ffpreset
130	%%DATADIR%%/libx264-lossless_fast.ffpreset	137	%%DATADIR%%/libx264-lossless_fast.ffpreset
131	%%DATADIR%%/libx264-lossless_max.ffpreset	138	%%DATADIR%%/libx264-lossless_max.ffpreset
132	%%DATADIR%%/libx264-lossless_medium.ffpreset	139	%%DATADIR%%/libx264-lossless_medium.ffpreset

Lines 1-6 Link Here

(-)files/patch-configure (-108 / +5 lines)
1	--- configure.orig 2015-08-25 08:10:18 UTC	1	--- configure.orig 2011-06-21 21:29:25.000000000 +0200
2	+++ configure	2	+++ configure 2011-06-23 13:36:46.099381871 +0200
3	@@ -1657,7 +1657,7 @@ nogas=":"	3	@@ -1657,7 +1657,7 @@
4	nm_opts='-g'	4	nm_opts='-g'
5		5
6	# machine	6	# machine
Lines 9-109 Link Here
9	cpu="generic"	9	cpu="generic"
10		10
11	# OS	11	# OS
12	@@ -1698,7 +1698,7 @@ SLIBPREF="lib"	12	@@ -2966,8 +2966,8 @@
13	SLIBSUF=".so"
14	SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF)'
15	SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
16	-SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
17	+SLIBNAME_WITH_MAJOR='$(SLIBNAME).1'
18	LIB_INSTALL_EXTRA_CMD='$$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
19
20	CC_O='-o $@'
21	@@ -2435,13 +2435,13 @@ case $target_os in
22	enable malloc_aligned
23	gas="gas-preprocessor.pl $cc"
24	enabled ppc && add_asflags -force_cpusubtype_ALL
25	- SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
26	+ SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,1'
27	enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress
28	strip="${strip} -x"
29	add_ldflags -Wl,-dynamic,-search_paths_first
30	SLIBSUF=".dylib"
31	SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)'
32	- SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)'
33	+ SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).1$(SLIBSUF)'
34	FFSERVERLDFLAGS=-Wl,-bind_at_load
35	objformat="macho"
36	enabled x86_64 && objformat="macho64"
37	@@ -2465,7 +2465,7 @@ case $target_os in
38	SLIBPREF=""
39	SLIBSUF=".dll"
40	SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
41	- SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)'
42	+ SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-1$(SLIBSUF)'
43	SLIB_EXTRA_CMD='-lib.exe /machine:$(LIBTARGET) /def:$$(@:$(SLIBSUF)=.def) /out:$(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)'
44	SLIB_INSTALL_EXTRA_CMD='-install -m 644 $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME:$(SLIBSUF)=.lib)"; \
45	install -m 644 $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)"; \
46	@@ -2487,7 +2487,7 @@ case $target_os in
47	SLIBPREF="cyg"
48	SLIBSUF=".dll"
49	SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
50	- SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)'
51	+ SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-1$(SLIBSUF)'
52	SHFLAGS='-shared -Wl,--enable-auto-image-base'
53	objformat="win32"
54	enable dos_paths
55	@@ -2520,7 +2520,7 @@ case $target_os in
56	SLIBPREF=""
57	SLIBSUF=".dll"
58	SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
59	- SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(shell echo $(NAME) \| cut -c1-6)$(LIBMAJOR)$(SLIBSUF)'
60	+ SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(shell echo $(NAME) \| cut -c1-6)1$(SLIBSUF)'
61	SLIB_CREATE_DEF_CMD='echo LIBRARY $(SLIBNAME_WITH_MAJOR) INITINSTANCE TERMINSTANCE > $(SUBDIR)$(NAME).def; \
62	echo PROTMODE >> $(SUBDIR)$(NAME).def; \
63	echo CODE PRELOAD MOVEABLE DISCARDABLE >> $(SUBDIR)$(NAME).def; \
64	@@ -2787,12 +2787,12 @@ if enabled asm; then
65	$nogas "GNU assembler not found, install gas-preprocessor"
66	fi
67
68	-check_ldflags -Wl,--as-needed
69	+
70
71	if check_func dlopen; then
72	ldl=
73	-elif check_func dlopen -ldl; then
74	- ldl=-ldl
75	+elif check_func dlopen ; then
76	+ ldl=
77	fi
78
79	if enabled network; then
80	@@ -2919,13 +2919,13 @@ enabled libdirac && require_pkg_config
81	"libdirac_decoder/dirac_parser.h libdirac_encoder/dirac_encoder.h" \
82	"dirac_decoder_init dirac_encoder_init"
83	enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
84	-enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
85	-enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm
86	+enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype.h" FT_Init_FreeType
87	+enabled libgsm && require libgsm gsm.h gsm_create -lgsm
88	enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
89	enabled libnut && require libnut libnut.h nut_demuxer_init -lnut
90	enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
91	enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
92	-enabled libopencv && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader
93	+enabled libopencv && require_pkg_config opencv-core opencv2/core/core_c.h cvCreateImageHeader
94	enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg
95	enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
96	enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init
97	@@ -2946,7 +2946,7 @@ enabled libxavs && require libxavs x
98	enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
99	enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
100
101	-SDL_CONFIG="${cross_prefix}sdl-config"
102	+SDL_CONFIG="${cross_prefix}/usr/local/bin//usr/local/bin/sdl-config"
103	if check_pkg_config sdl SDL_version.h SDL_Linked_Version; then
104	check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 \| SDL_MINOR_VERSION<<8 \| SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
105	enable sdl &&
106	@@ -2966,8 +2966,8 @@ enabled sdl && add_cflags $sdl_cflags &&
107	texi2html -version > /dev/null 2>&1 && enable texi2html \|\| disable texi2html	13	texi2html -version > /dev/null 2>&1 && enable texi2html \|\| disable texi2html
108		14
109	check_header linux/fb.h	15	check_header linux/fb.h
Lines 114-120 Link Here
114	check_header sys/videoio.h	20	check_header sys/videoio.h
115		21
116	check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs"	22	check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs"
117	@@ -3322,7 +3322,7 @@ MANDIR=\$(DESTDIR)$mandir	23	@@ -3322,7 +3322,7 @@
118	SRC_PATH="$source_path"	24	SRC_PATH="$source_path"
119	SRC_PATH_BARE=$source_path	25	SRC_PATH_BARE=$source_path
120	CC_IDENT=$cc_ident	26	CC_IDENT=$cc_ident
Lines 123-134 Link Here
123	CC=$cc	29	CC=$cc
124	AS=$as	30	AS=$as
125	LD=$ld	31	LD=$ld
126	@@ -3366,7 +3366,7 @@ TARGET_PATH=$target_path
127	SDL_LIBS=$sdl_libs
128	SDL_CFLAGS=$sdl_cflags
129	LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
130	-EXTRALIBS=$extralibs
131	+EXTRALIBS=-L/usr/local/lib -L/usr/local/lib $extralibs
132	INSTALL=$install
133	LIBTARGET=${LIBTARGET}
134	SLIBNAME=${SLIBNAME}

Lines 1-11 Link Here

(-)files/patch-libavcodec-Makefile (-7 / +7 lines)
1	--- libavcodec/Makefile.orig 2015-08-25 08:10:18 UTC	1	--- libavcodec/Makefile.orig 2010-08-01 20:33:53.484907333 +0200
2	+++ libavcodec/Makefile	2	+++ libavcodec/Makefile 2010-08-01 20:34:26.190893400 +0200
3	@@ -666,7 +666,7 @@ OBJS-$(CONFIG_MLIB) +	3	@@ -590,7 +590,7 @@
4	# well.
5	OBJS-$(!CONFIG_SMALL) += inverse.o
6		4
		5	OBJS-$(CONFIG_MLIB) += mlib/dsputil_mlib.o \
		6
7	--include $(SUBDIR)$(ARCH)/Makefile	7	--include $(SUBDIR)$(ARCH)/Makefile
8	+-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile	8	+-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile
9		9
10	SKIPHEADERS += %_tablegen.h \	10	SKIPHEADERS = %_tablegen.h
11	%_tables.h \	11	SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h

Lines 1-382 Link Here

(-)ffmpeg0/Makefile (-382 lines)
1	# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
2	# $FreeBSD: head/multimedia/ffmpeg0/Makefile 395164 2015-08-24 10:03:14Z junovitch $
3
4	PORTNAME= ffmpeg
5	PORTVERSION= 0.7.17
6	PORTEPOCH= 1
7	CATEGORIES= multimedia audio ipv6 net
8	MASTER_SITES= http://ffmpeg.org/releases/
9	PKGNAMESUFFIX= 0
10
11	MAINTAINER= wg@FreeBSD.org
12	COMMENT= Realtime audio/video encoder/converter and streaming server
13
14	LICENSE= GPLv2 LGPL21
15	LICENSE_COMB= multi
16	LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2
17	LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPLv2.1
18
19	BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \
20	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \
21	${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html
22
23	PORTSCOUT= limit:^0\.7.*
24
25	USES= cpe gmake perl5 pkgconfig tar:bzip2
26	USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
27	USE_PERL5= build
28	WANT_SDL= yes
29
30	FFMPEG_SUFFIX= 0
31	HAS_CONFIGURE= yes
32	CONFIGURE_LOG= config.err
33	CONFIGURE_ENV+= EXESUF="${FFMPEG_SUFFIX}"
34	MAKE_ARGS+= EXESUF="${FFMPEG_SUFFIX}"
35	PLIST_SUB+= SUFF="${FFMPEG_SUFFIX}"
36	PROGS= ffmpeg ffprobe
37
38	CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
39	MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
40
41	CONFIGURE_ARGS+=--prefix="${PREFIX}" \
42	--mandir="${PREFIX}/man" \
43	--incdir="${PREFIX}/include/ffmpeg${FFMPEG_SUFFIX}" \
44	--libdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
45	--shlibdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
46	--datadir="${DATADIR}" \
47	--build-suffix="${FFMPEG_SUFFIX}" \
48	--enable-shared \
49	--enable-gpl \
50	--enable-postproc \
51	--enable-avfilter \
52	--enable-pthreads \
53	--enable-runtime-cpudetect \
54	--cc="${CC}" \
55	--extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \
56	--extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \
57	--extra-libs="-lpthread"
58
59	SHLIB_VER= 1
60	PLIST_SUB+= SHLIB_VER=${SHLIB_VER}
61
62	DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
63	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
64
65	OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
66	FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \
67	OPTIMIZED_CFLAGS RTMP SCHROEDINGER SDL SPEEX THEORA VAAPI \
68	VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID DOCS
69	OPTIONS_DEFAULT= FFSERVER FREETYPE FREI0R OPENCV SCHROEDINGER \
70	THEORA VORBIS VPX X264 XVID
71	OPTIONS_SUB= yes
72
73	FFSERVER_DESC= Build and install ffserver
74	X11GRAB_DESC= Enable x11 grabbing
75
76	ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
77	ALSA_CONFIGURE_OFF= --disable-indev=alsa \
78	--disable-outdev=alsa
79
80	CELT_LIB_DEPENDS= libcelt0.so:${PORTSDIR}/audio/celt
81	CELT_CONFIGURE_ENABLE= libcelt
82
83	DIRAC_LIB_DEPENDS= libdirac_encoder.so:${PORTSDIR}/multimedia/dirac
84	DIRAC_CONFIGURE_ENABLE= libdirac
85
86	DEBUG_CONFIGURE_ON= --disable-stripping
87	DEBUG_CONFIGURE_OFF= --disable-debug
88
89	FFSERVER_CONFIGURE_OFF= --disable-ffserver
90
91	FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
92	FREETYPE_CONFIGURE_ENABLE= libfreetype
93
94	FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
95	FREI0R_CONFIGURE_ENABLE= frei0r
96
97	GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm
98	GSM_CONFIGURE_ENABLE= libgsm
99
100	LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame
101	LAME_CONFIGURE_ENABLE= libmp3lame
102
103	OPENCV_LIB_DEPENDS= libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core
104	OPENCV_CONFIGURE_ENABLE= libopencv
105
106	OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
107	OPENJPEG_CONFIGURE_ENABLE= libopenjpeg
108
109	RTMP_USE= OPENSSL=yes
110
111	SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
112	SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger
113
114	SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex
115	SPEEX_CONFIGURE_ENABLE= libspeex
116
117	THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora
118	THEORA_CONFIGURE_ENABLE= libtheora
119
120	X11GRAB_USE= XORG=x11,xext,xfixes
121	X11GRAB_CONFIGURE_ON= --enable-x11grab
122
123	X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264
124	X264_CONFIGURE_ENABLE= libx264
125
126	XVID_LIB_DEPENDS= libxvidcore.so:${PORTSDIR}/multimedia/xvid
127	XVID_CONFIGURE_ENABLE= libxvid
128
129	VDPAU_BUILD_DEPENDS= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau
130	VDPAU_CONFIGURE_ENABLE= vdpau
131
132	VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx
133	VPX_CONFIGURE_ENABLE= libvpx
134
135	COMPAT_HEADERS=libavcodec/avcodec.h \
136	libavcodec/opt.h \
137	libavcodec/vdpau.h \
138	libavcodec/xvmc.h \
139	libavdevice/avdevice.h \
140	libavfilter/avfilter.h \
141	libavformat/avformat.h \
142	libavformat/avio.h \
143	libavutil/adler32.h \
144	libavutil/avstring.h \
145	libavutil/avutil.h \
146	libavutil/base64.h \
147	libavutil/common.h \
148	libavutil/crc.h \
149	libavutil/fifo.h \
150	libavutil/intfloat_readwrite.h \
151	libavutil/log.h \
152	libavutil/lzo.h \
153	libavutil/mathematics.h \
154	libavutil/md5.h \
155	libavutil/mem.h \
156	libavutil/pixfmt.h \
157	libavutil/rational.h \
158	libavutil/sha1.h \
159	libpostproc/postprocess.h \
160	libswscale/swscale.h
161
162	.include <bsd.port.pre.mk>
163
164	.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000
165	CONFIGURE_ARGS+= --enable-memalign-hack
166	.endif
167
168	.if ${ARCH} == armv6
169	CONFIGURE_ENV+= ASFLAGS=-no-integrated-as
170	CFLAGS+= -no-integrated-as
171	.endif
172
173	DOC_FILES= CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
174	# under doc subdirectory
175	DOC_DOCFILES= APIchanges RELEASE_NOTES TODO .txt .html
176
177	.if ${PORT_OPTIONS:MFFSERVER}
178	USE_RC_SUBR= ffserver${FFMPEG_SUFFIX}
179	PROGS+= ffserver
180	.endif
181
182	# sse hardware vector support
183	.if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" \|\| ${MACHINE_CPU:Mamd64} == "amd64")
184	_BUILTIN_VECTOR= yes
185	.else
186	CONFIGURE_ARGS+= --disable-sse
187	.endif
188
189	# mmx support
190	.if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "" && ${MACHINE_CPU:Mamd64} == ""
191	CONFIGURE_ARGS+= --disable-mmx
192	_NO_BUILTIN_VECTOR= yes
193	.endif
194
195	# builtin vector, requires mmx and sse
196	.if !defined(_NO_BUILTIN_VECTOR) && defined(_BUILTIN_VECTOR)
197	CFLAGS+= -msse
198	.endif
199
200	# optimizations
201	.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
202	CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
203	.endif
204
205	#aacplus
206	.if ${PORT_OPTIONS:MAACPLUS}
207	FFMPEG_NONFREE= yes
208	LIB_DEPENDS+= libaacplus.so:${PORTSDIR}/audio/libaacplus
209	CONFIGURE_ARGS+= --enable-libaacplus
210	.else
211	CONFIGURE_ARGS+= --disable-libaacplus
212	.endif
213
214	# Opencore AMR NB
215	.if ${PORT_OPTIONS:MAMR_NB}
216	FFMPEG_LICENSE_GPL3= yes
217	LIB_DEPENDS+= libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
218	CONFIGURE_ARGS+= --enable-libopencore-amrnb
219	.else
220	CONFIGURE_ARGS+= --disable-libopencore-amrnb
221	.endif
222
223	# Opencore AMR WB
224	.if ${PORT_OPTIONS:MAMR_WB}
225	FFMPEG_LICENSE_GPL3= yes
226	LIB_DEPENDS+= libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr
227	CONFIGURE_ARGS+= --enable-libopencore-amrwb
228	.else
229	CONFIGURE_ARGS+= --disable-libopencore-amrwb
230	.endif
231
232	# faac
233	.if ${PORT_OPTIONS:MFAAC}
234	FFMPEG_NONFREE= yes
235	LIB_DEPENDS+= libfaac.so:${PORTSDIR}/audio/faac
236	CONFIGURE_ARGS+= --enable-libfaac
237	.else
238	CONFIGURE_ARGS+= --disable-libfaac
239	.endif
240
241	# rtmp
242	.if ${PORT_OPTIONS:MRTMP}
243	LIB_DEPENDS+= librtmp.so:${PORTSDIR}/multimedia/librtmp
244	CONFIGURE_ARGS+= --enable-librtmp
245	. if ${OPENSSLBASE} != "/usr"
246	FFMPEG_CFLAGS+= -I${OPENSSLINC}
247	FFMPEG_LDFLAGS+= -L${OPENSSLLIB}
248	. endif
249	.else
250	CONFIGURE_ARGS+= --disable-librtmp
251	.endif
252
253	# sdl
254	.if ${PORT_OPTIONS:MSDL}
255	USE_SDL+= sdl
256	PLIST_FILES+= bin/ffplay${FFMPEG_SUFFIX} man/man1/ffplay${FFMPEG_SUFFIX}.1.gz
257	PROGS+= ffplay
258	.else
259	CONFIGURE_ARGS+= --disable-ffplay
260	.endif
261
262	# vaapi
263	.if ${PORT_OPTIONS:MVAAPI}
264	FFMPEG_LICENSE_GPL3= yes
265	LIB_DEPENDS+= libva.so:${PORTSDIR}/multimedia/libva
266	CONFIGURE_ARGS+= --enable-vaapi
267	.else
268	CONFIGURE_ARGS+= --disable-vaapi
269	.endif
270
271	# vo-aacenc
272	.if ${PORT_OPTIONS:MVO_AACENC}
273	FFMPEG_LICENSE_GPL3= yes
274	LIB_DEPENDS+= libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc
275	CONFIGURE_ARGS+= --enable-libvo-aacenc
276	.else
277	CONFIGURE_ARGS+= --disable-libvo-aacenc
278	.endif
279
280	# vo-amrwbenc
281	.if ${PORT_OPTIONS:MVO_AMRWBENC}
282	FFMPEG_LICENSE_GPL3= yes
283	LIB_DEPENDS+= libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc
284	CONFIGURE_ARGS+= --enable-libvo-amrwbenc
285	.else
286	CONFIGURE_ARGS+= --disable-libvo-amrwbenc
287	.endif
288
289	# vorbis
290	.if ${PORT_OPTIONS:MVORBIS}
291	LIB_DEPENDS+= libvorbisenc.so:${PORTSDIR}/audio/libvorbis
292	CONFIGURE_ARGS+= --enable-libvorbis
293	FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis
294	.else
295	CONFIGURE_ARGS+= --disable-libvorbis
296	.endif
297
298	# License knobs
299	.if defined(FFMPEG_NONFREE)
300	RESTRICTED= linking to libfaac or libaacplus restricts redistribution
301	CONFIGURE_ARGS+= --enable-nonfree
302	.endif
303
304	.if defined(FFMPEG_LICENSE_GPL3)
305	LICENSE+= GPLv3 LGPL3
306	LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3
307	LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3
308	CONFIGURE_ARGS+= --enable-version3
309	.endif
310
311	post-patch:
312	# {C,LD}FLAGS safeness
313	@${REINPLACE_CMD} -e 's\|$$(LIBDIR)/pkgconfig\|$$(DESTDIR)$$(prefix)/libdata/pkgconfig\|' \
314	${WRKSRC}/subdir.mak
315	@${REINPLACE_CMD} -e 's\|/etc/ffserver.conf\|${PREFIX}/etc/ffserver${FFMPEG_SUFFIX}.conf\|' \
316	${WRKSRC}/ffserver.c
317	@${REINPLACE_CMD} -E \
318	-e "s\|(EXTRALIBS[[:space:]]*=)\|\1-L${LOCALBASE}/lib \|g; \
319	s\|%%LOCALBASE%%\|${LOCALBASE}\|g; \
320	s\|gsm/gsm.h\|gsm.h\|g" \
321	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
322	@${REINPLACE_CMD} -e 's\|-ldl\|\|; s\|$$(LIBMAJOR)\|${SHLIB_VER}\|g;' \
323	-e 's\|opencv opencv/cxcore.h\|opencv-core opencv2/core/core_c.h\|g' \
324	-e 's\|freetype/freetype.h\|freetype.h\|g' \
325	-e 's\|check_ldflags -Wl,--as-needed\|\|' \
326	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
327	@${REINPLACE_CMD} -e 's\|/usr/bin/perl\|${PERL5}\|g' \
328	${WRKSRC}/doc/texi2pod.pl
329	.if ${PORT_OPTIONS:MSDL}
330	@${REINPLACE_CMD} -E \
331	-e 's\|sdl-config\|${SDL_CONFIG}\|g' \
332	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
333	@${FIND} ${WRKSRC} -type f \| \
334	${XARGS} -n 10 ${REINPLACE_CMD} -E \
335	-e 's\|#include <SDL\|#include <SDL/SDL\|'
336	.endif
337
338	post-configure:
339	.if empty(PORT_OPTIONS:MTHEORA)
340	@${REINPLACE_CMD} -E \
341	-e 's\|^(CONFIG_LIBTHEORA).*$$\|\1=no\|' \
342	${WRKSRC}/config.mak
343	.endif
344	@${REINPLACE_CMD} -E \
345	-e 's\|\$$\(INSTALL\) -m 644 \$$\(MANPAGES\) "\$$\(MANDIR\)/man1"\|\|g' \
346	${WRKSRC}/Makefile
347	@${REINPLACE_CMD} -E \
348	-e 's\|\$$\$$\(INSTALL\) -m 644 \$$\$$\^ "\$$\(DESTDIR\)\$$\(prefix\)/libdata/pkgconfig"\|\$$\$$\(INSTALL\) -m 644 \$$\$$\^ "\$$\(DESTDIR\)\$$\(prefix\)/libdata/pkgconfig/lib\$$\(NAME\)0.pc"\|' \
349	${WRKSRC}/subdir.mak
350
351	post-install:
352	.if ${PORT_OPTIONS:MFFSERVER}
353	${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${STAGEDIR}${PREFIX}/etc/ffserver${FFMPEG_SUFFIX}.conf-dist
354	.endif
355	@${MKDIR} ${STAGEDIR}${DOCSDIR}
356	.for FILE in ${DOC_FILES}
357	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
358	.endfor
359	.for FILE in ${DOC_DOCFILES}
360	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
361	.endfor
362	.for i in ${PROGS}
363	${INSTALL_MAN} ${WRKSRC}/doc/${i}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${i}0.1
364	.endfor
365	@${REINPLACE_CMD} \
366	-e 's\|libavcodec\|libavcodec0\|' \
367	${STAGEDIR}${PREFIX}/libdata/pkgconfig/libavformat0.pc
368	@${REINPLACE_CMD} \
369	-e 's\|libavutil\|libavutil0\|' \
370	${STAGEDIR}${PREFIX}/libdata/pkgconfig/libavcodec0.pc \
371	${STAGEDIR}${PREFIX}/libdata/pkgconfig/libpostproc0.pc \
372	${STAGEDIR}${PREFIX}/libdata/pkgconfig/libswscale0.pc
373	@${REINPLACE_CMD} \
374	-e 's\|libavformat\|libavformat0\|' \
375	${STAGEDIR}${PREFIX}/libdata/pkgconfig/libavdevice0.pc
376	@${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libavcodec0.pc.bak \
377	${STAGEDIR}${PREFIX}/libdata/pkgconfig/libpostproc0.pc.bak \
378	${STAGEDIR}${PREFIX}/libdata/pkgconfig/libswscale0.pc.bak \
379	${STAGEDIR}${PREFIX}/libdata/pkgconfig/libavformat0.pc.bak \
380	${STAGEDIR}${PREFIX}/libdata/pkgconfig/libavdevice0.pc.bak
381
382	.include <bsd.port.post.mk>

Lines 1-1252 Link Here

(-)ffmpeg0/ffmpeg0.diff (-420 lines)
1	Index: Makefile
2	===================================================================
3	--- Makefile (.../..) (working copy)
4	+++ Makefile (working copy)
5	@@ -2,8 +2,7 @@
6	# $FreeBSD: head/multimedia/ffmpeg0/Makefile 395164 2015-08-24 10:03:14Z junovitch $
7
8	PORTNAME= ffmpeg
9	-PORTVERSION= 0.8
10	-#PORTVERSION= 0.7.17
11	+PORTVERSION= 0.7.17
12	PORTEPOCH= 1
13	CATEGORIES= multimedia audio ipv6 net
14	MASTER_SITES= http://ffmpeg.org/releases/
15	@@ -63,7 +62,7 @@
16	DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
17	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
18
19	-OPTIONS_DEFINE= ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
20	+OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
21	FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \
22	OPTIMIZED_CFLAGS RTMP SCHROEDINGER SDL SPEEX THEORA VAAPI \
23	VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID DOCS
24	@@ -171,7 +170,7 @@
25	CFLAGS+= -no-integrated-as
26	.endif
27
28	-dOC_FILES= CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
29	+DOC_FILES= CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
30	# under doc subdirectory
31	DOC_DOCFILES= APIchanges RELEASE_NOTES TODO .txt .html
32
33	@@ -203,6 +202,15 @@
34	CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
35	.endif
36
37	+#aacplus
38	+.if ${PORT_OPTIONS:MAACPLUS}
39	+FFMPEG_NONFREE= yes
40	+LIB_DEPENDS+= libaacplus.so:${PORTSDIR}/audio/libaacplus
41	+CONFIGURE_ARGS+= --enable-libaacplus
42	+.else
43	+CONFIGURE_ARGS+= --disable-libaacplus
44	+.endif
45	+
46	# Opencore AMR NB
47	.if ${PORT_OPTIONS:MAMR_NB}
48	FFMPEG_LICENSE_GPL3= yes
49
50	Property changes on: Makefile
51	___________________________________________________________________
52	Added: svn:eol-style
53	## -0,0 +1 ##
54	+native
55	\ No newline at end of property
56	Added: svn:keywords
57	## -0,0 +1 ##
58	+FreeBSD=%H
59	\ No newline at end of property
60	Added: svn:mime-type
61	## -0,0 +1 ##
62	+text/plain
63	\ No newline at end of property
64	Index: distinfo
65	===================================================================
66	--- distinfo (.../..) (working copy)
67	+++ distinfo (working copy)
68	@@ -1,2 +1,2 @@
69	-SHA256 (ffmpeg-0.8.tar.bz2) = 3e26fdc317970386f96b27c9821890832ad2970b07e434a5bb27048d03e3fc0f
70	-SIZE (ffmpeg-0.8.tar.bz2) = 4551071
71	+SHA256 (ffmpeg-0.7.17.tar.bz2) = 5ec57caa1bff7a528b8e58643dd550cdc69156f7b44c31a10920f1be68e2036a
72	+SIZE (ffmpeg-0.7.17.tar.bz2) = 4529540
73
74	Property changes on: distinfo
75	___________________________________________________________________
76	Added: fbsd:nokeywords
77	## -0,0 +1 ##
78	+yes
79	\ No newline at end of property
80	Added: svn:eol-style
81	## -0,0 +1 ##
82	+native
83	\ No newline at end of property
84	Added: svn:mime-type
85	## -0,0 +1 ##
86	+text/plain
87	\ No newline at end of property
88	Index: ffmpeg0.diff
89	===================================================================
90	--- ffmpeg0.diff (.../..) (working copy)
91	+++ ffmpeg0.diff (working copy)
92	@@ -0,0 +1,87 @@
93	+Index: Makefile
94	+===================================================================
95	+--- Makefile (.../..) (working copy)
96	++++ Makefile (working copy)
97	+@@ -2,8 +2,7 @@
98	+ # $FreeBSD: head/multimedia/ffmpeg0/Makefile 395164 2015-08-24 10:03:14Z junovitch $
99	+
100	+ PORTNAME= ffmpeg
101	+-PORTVERSION= 0.8
102	+-#PORTVERSION= 0.7.17
103	++PORTVERSION= 0.7.17
104	+ PORTEPOCH= 1
105	+ CATEGORIES= multimedia audio ipv6 net
106	+ MASTER_SITES= http://ffmpeg.org/releases/
107	+@@ -63,7 +62,7 @@
108	+ DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
109	+ DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
110	+
111	+-OPTIONS_DEFINE= ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
112	++OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
113	+ FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \
114	+ OPTIMIZED_CFLAGS RTMP SCHROEDINGER SDL SPEEX THEORA VAAPI \
115	+ VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID DOCS
116	+@@ -171,7 +170,7 @@
117	+ CFLAGS+= -no-integrated-as
118	+ .endif
119	+
120	+-dOC_FILES= CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
121	++DOC_FILES= CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
122	+ # under doc subdirectory
123	+ DOC_DOCFILES= APIchanges RELEASE_NOTES TODO .txt .html
124	+
125	+@@ -203,6 +202,15 @@
126	+ CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
127	+ .endif
128	+
129	++#aacplus
130	++.if ${PORT_OPTIONS:MAACPLUS}
131	++FFMPEG_NONFREE= yes
132	++LIB_DEPENDS+= libaacplus.so:${PORTSDIR}/audio/libaacplus
133	++CONFIGURE_ARGS+= --enable-libaacplus
134	++.else
135	++CONFIGURE_ARGS+= --disable-libaacplus
136	++.endif
137	++
138	+ # Opencore AMR NB
139	+ .if ${PORT_OPTIONS:MAMR_NB}
140	+ FFMPEG_LICENSE_GPL3= yes
141	+
142	+Property changes on: Makefile
143	+___________________________________________________________________
144	+Added: svn:eol-style
145	+## -0,0 +1 ##
146	++native
147	+\ No newline at end of property
148	+Added: svn:keywords
149	+## -0,0 +1 ##
150	++FreeBSD=%H
151	+\ No newline at end of property
152	+Added: svn:mime-type
153	+## -0,0 +1 ##
154	++text/plain
155	+\ No newline at end of property
156	+Index: distinfo
157	+===================================================================
158	+--- distinfo (.../..) (working copy)
159	++++ distinfo (working copy)
160	+@@ -1,2 +1,2 @@
161	+-SHA256 (ffmpeg-0.8.tar.bz2) = 3e26fdc317970386f96b27c9821890832ad2970b07e434a5bb27048d03e3fc0f
162	+-SIZE (ffmpeg-0.8.tar.bz2) = 4551071
163	++SHA256 (ffmpeg-0.7.17.tar.bz2) = 5ec57caa1bff7a528b8e58643dd550cdc69156f7b44c31a10920f1be68e2036a
164	++SIZE (ffmpeg-0.7.17.tar.bz2) = 4529540
165	+
166	+Property changes on: distinfo
167	+___________________________________________________________________
168	+Added: fbsd:nokeywords
169	+## -0,0 +1 ##
170	++yes
171	+\ No newline at end of property
172	+Added: svn:eol-style
173	+## -0,0 +1 ##
174	++native
175	+\ No newline at end of property
176	+Added: svn:mime-type
177	+## -0,0 +1 ##
178	++text/plain
179	+\ No newline at end of property
180	Index: pkg-descr
181	===================================================================
182	--- pkg-descr (.../..) (working copy)
183	+++ pkg-descr (working copy)
184
185	Property changes on: pkg-descr
186	___________________________________________________________________
187	Added: fbsd:nokeywords
188	## -0,0 +1 ##
189	+yes
190	\ No newline at end of property
191	Added: svn:eol-style
192	## -0,0 +1 ##
193	+native
194	\ No newline at end of property
195	Added: svn:mime-type
196	## -0,0 +1 ##
197	+text/plain
198	\ No newline at end of property
199	Index: pkg-plist
200	===================================================================
201	--- pkg-plist (.../..) (working copy)
202	+++ pkg-plist (working copy)
203	@@ -1,7 +1,9 @@
204	bin/ffmpeg%%SUFF%%
205	bin/ffprobe%%SUFF%%
206	-etc/ffserver%%SUFF%%.conf-dist
207	-etc/rc.d/ffserver%%SUFF%%
208	+%%FFSERVER%%bin/ffserver%%SUFF%%
209	+%%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
210	+%%FFSERVER%%etc/ffserver%%SUFF%%.conf-dist
211	+%%FFSERVER%%@exec [ -f %B/ffserver%%SUFF%%.conf ] \|\| cp %B/%f %B/ffserver%%SUFF%%.conf
212	include/ffmpeg%%SUFF%%/libavcodec/avcodec.h
213	include/ffmpeg%%SUFF%%/libavcodec/avfft.h
214	include/ffmpeg%%SUFF%%/libavcodec/dxva2.h
215	@@ -54,47 +56,54 @@
216	include/ffmpeg%%SUFF%%/libavutil/rational.h
217	include/ffmpeg%%SUFF%%/libavutil/samplefmt.h
218	include/ffmpeg%%SUFF%%/libavutil/sha.h
219	+include/ffmpeg%%SUFF%%/libavutil/sha1.h
220	include/ffmpeg%%SUFF%%/libpostproc/postprocess.h
221	include/ffmpeg%%SUFF%%/libswscale/swscale.h
222	-lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.a
223	-lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so
224	-lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.1
225	-lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.53.7.%%SUFF%%
226	-lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.a
227	-lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so
228	-lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.1
229	-lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.53.1.1
230	-lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.a
231	-lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so
232	-lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.1
233	-lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.2.23.%%SUFF%%
234	-lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.a
235	-lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so
236	-lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.1
237	-lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.53.4.%%SUFF%%
238	-lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.a
239	-lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so
240	-lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.1
241	-lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51.9.1
242	-lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.a
243	-lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so
244	-lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.1
245	-lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.51.2.%%SUFF%%
246	-lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.a
247	-lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so
248	-lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.1
249	-lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2.%%SUFF%%.%%SUFF%%
250	-libdata/pkgconfig/libavcodec%%SUFF%%.pc
251	-libdata/pkgconfig/libavdevice%%SUFF%%.pc
252	-libdata/pkgconfig/libavfilter%%SUFF%%.pc
253	-libdata/pkgconfig/libavformat%%SUFF%%.pc
254	-libdata/pkgconfig/libavutil%%SUFF%%.pc
255	-libdata/pkgconfig/libpostproc%%SUFF%%.pc
256	-libdata/pkgconfig/libswscale%%SUFF%%.pc
257	+lib/ffmpeg%%SUFF%%/libavcodec0.a
258	+lib/ffmpeg%%SUFF%%/libavcodec0.so
259	+lib/ffmpeg%%SUFF%%/libavcodec0.so.1
260	+lib/ffmpeg%%SUFF%%/libavcodec0.so.52.123.0
261	+lib/ffmpeg%%SUFF%%/libavdevice0.a
262	+lib/ffmpeg%%SUFF%%/libavdevice0.so
263	+lib/ffmpeg%%SUFF%%/libavdevice0.so.1
264	+lib/ffmpeg%%SUFF%%/libavdevice0.so.52.5.0
265	+lib/ffmpeg%%SUFF%%/libavfilter0.a
266	+lib/ffmpeg%%SUFF%%/libavfilter0.so
267	+lib/ffmpeg%%SUFF%%/libavfilter0.so.1
268	+lib/ffmpeg%%SUFF%%/libavfilter0.so.1.80.0
269	+lib/ffmpeg%%SUFF%%/libavformat0.a
270	+lib/ffmpeg%%SUFF%%/libavformat0.so
271	+lib/ffmpeg%%SUFF%%/libavformat0.so.1
272	+lib/ffmpeg%%SUFF%%/libavformat0.so.52.111.0
273	+lib/ffmpeg%%SUFF%%/libavutil0.a
274	+lib/ffmpeg%%SUFF%%/libavutil0.so
275	+lib/ffmpeg%%SUFF%%/libavutil0.so.1
276	+lib/ffmpeg%%SUFF%%/libavutil0.so.50.43.0
277	+lib/ffmpeg%%SUFF%%/libpostproc0.a
278	+lib/ffmpeg%%SUFF%%/libpostproc0.so
279	+lib/ffmpeg%%SUFF%%/libpostproc0.so.1
280	+lib/ffmpeg%%SUFF%%/libpostproc0.so.51.2.0
281	+lib/ffmpeg%%SUFF%%/libswscale0.a
282	+lib/ffmpeg%%SUFF%%/libswscale0.so
283	+lib/ffmpeg%%SUFF%%/libswscale0.so.0.14.1
284	+lib/ffmpeg%%SUFF%%/libswscale0.so.1
285	+libdata/pkgconfig/libavcodec0.pc
286	+libdata/pkgconfig/libavdevice0.pc
287	+libdata/pkgconfig/libavfilter0.pc
288	+libdata/pkgconfig/libavformat0.pc
289	+libdata/pkgconfig/libavutil0.pc
290	+libdata/pkgconfig/libpostproc0.pc
291	+libdata/pkgconfig/libswscale0.pc
292	man/man1/ffmpeg%%SUFF%%.1.gz
293	man/man1/ffprobe%%SUFF%%.1.gz
294	-man/man1/ffserver%%SUFF%%.1.gz
295	+%%FFSERVER%%man/man1/ffserver%%SUFF%%.1.gz
296	%%PORTDOCS%%%%DOCSDIR%%/APIchanges
297	+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
298	+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
299	+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
300	+%%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS
301	+%%PORTDOCS%%%%DOCSDIR%%/README
302	+%%PORTDOCS%%%%DOCSDIR%%/RELEASE
303	%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
304	%%PORTDOCS%%%%DOCSDIR%%/TODO
305	%%PORTDOCS%%%%DOCSDIR%%/avutil.txt
306	@@ -102,11 +111,9 @@
307	%%PORTDOCS%%%%DOCSDIR%%/developer.html
308	%%PORTDOCS%%%%DOCSDIR%%/faq.html
309	%%PORTDOCS%%%%DOCSDIR%%/fate.txt
310	-%%PORTDOCS%%%%DOCSDIR%%/ffmpeg-mt-authorship.txt
311	%%PORTDOCS%%%%DOCSDIR%%/ffmpeg.html
312	-%%PORTDOCS%%%%DOCSDIR%%/ffplay.html
313	%%PORTDOCS%%%%DOCSDIR%%/ffprobe.html
314	-%%PORTDOCS%%%%DOCSDIR%%/ffserver.html
315	+%%FFSERVER%%%%PORTDOCS%%%%DOCSDIR%%/ffserver.html
316	%%PORTDOCS%%%%DOCSDIR%%/general.html
317	%%PORTDOCS%%%%DOCSDIR%%/git-howto.txt
318	%%PORTDOCS%%%%DOCSDIR%%/issue_tracker.txt
319	@@ -119,14 +126,14 @@
320	%%PORTDOCS%%%%DOCSDIR%%/swscale.txt
321	%%PORTDOCS%%%%DOCSDIR%%/tablegen.txt
322	%%PORTDOCS%%%%DOCSDIR%%/viterbi.txt
323	-%%DATADIR%%/libvpx-1%%SUFF%%8%%SUFF%%p.ffpreset
324	-%%DATADIR%%/libvpx-1%%SUFF%%8%%SUFF%%p5%%SUFF%%_6%%SUFF%%.ffpreset
325	-%%DATADIR%%/libvpx-36%%SUFF%%p.ffpreset
326	-%%DATADIR%%/libvpx-72%%SUFF%%p.ffpreset
327	-%%DATADIR%%/libvpx-72%%SUFF%%p5%%SUFF%%_6%%SUFF%%.ffpreset
328	+%%DATADIR%%/libvpx-1080p.ffpreset
329	+%%DATADIR%%/libvpx-1080p50_60.ffpreset
330	+%%DATADIR%%/libvpx-360p.ffpreset
331	+%%DATADIR%%/libvpx-720p.ffpreset
332	+%%DATADIR%%/libvpx-720p50_60.ffpreset
333	%%DATADIR%%/libx264-baseline.ffpreset
334	-%%DATADIR%%/libx264-ipod32%%SUFF%%.ffpreset
335	-%%DATADIR%%/libx264-ipod64%%SUFF%%.ffpreset
336	+%%DATADIR%%/libx264-ipod320.ffpreset
337	+%%DATADIR%%/libx264-ipod640.ffpreset
338	%%DATADIR%%/libx264-lossless_fast.ffpreset
339	%%DATADIR%%/libx264-lossless_max.ffpreset
340	%%DATADIR%%/libx264-lossless_medium.ffpreset
341
342	Property changes on: pkg-plist
343	___________________________________________________________________
344	Added: fbsd:nokeywords
345	## -0,0 +1 ##
346	+yes
347	\ No newline at end of property
348	Added: svn:eol-style
349	## -0,0 +1 ##
350	+native
351	\ No newline at end of property
352	Added: svn:mime-type
353	## -0,0 +1 ##
354	+text/plain
355	\ No newline at end of property
356	Index: files/_patch-libavfilter_vf__drawtext.c
357	===================================================================
358	--- files/_patch-libavfilter_vf__drawtext.c (.../..) (working copy)
359	+++ files/_patch-libavfilter_vf__drawtext.c (working copy)
360	@@ -1,10 +0,0 @@
361	---- libavfilter/vf_drawtext.c.orig 2015-08-25 08:10:18 UTC
362	-+++ libavfilter/vf_drawtext.c
363	-@@ -41,7 +41,6 @@
364	- #undef time
365	-
366	- #include <ft2build.h>
367	--#include <freetype/config/ftheader.h>
368	- #include FT_FREETYPE_H
369	- #include FT_GLYPH_H
370	-
371	Index: files/ffserver0.in
372	===================================================================
373	--- files/ffserver0.in (.../..) (working copy)
374	+++ files/ffserver0.in (working copy)
375
376	Property changes on: files/ffserver0.in
377	___________________________________________________________________
378	Added: svn:eol-style
379	## -0,0 +1 ##
380	+native
381	\ No newline at end of property
382	Added: svn:keywords
383	## -0,0 +1 ##
384	+FreeBSD=%H
385	\ No newline at end of property
386	Added: svn:mime-type
387	## -0,0 +1 ##
388	+text/plain
389	\ No newline at end of property
390	Index: files/patch-configure
391	===================================================================
392	--- files/patch-configure (.../..) (working copy)
393	+++ files/patch-configure (working copy)
394	@@ -1,6 +1,6 @@
395	---- configure.orig 2015-08-25 08:10:18 UTC
396	-+++ configure
397	-@@ -1657,7 +1657,7 @@ nogas=":"
398	+--- configure.orig 2011-06-21 21:29:25.000000000 +0200
399	++++ configure 2011-06-23 13:36:46.099381871 +0200
400	+@@ -1657,7 +1657,7 @@
401	nm_opts='-g'
402
403	# machine
404	@@ -9,101 +9,7 @@
405	cpu="generic"
406
407	# OS
408	-@@ -1698,7 +1698,7 @@ SLIBPREF="lib"
409	- SLIBSUF=".so"
410	- SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF)'
411	- SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
412	--SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
413	-+SLIBNAME_WITH_MAJOR='$(SLIBNAME).1'
414	- LIB_INSTALL_EXTRA_CMD='$$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
415	-
416	- CC_O='-o $@'
417	-@@ -2435,13 +2435,13 @@ case $target_os in
418	- enable malloc_aligned
419	- gas="gas-preprocessor.pl $cc"
420	- enabled ppc && add_asflags -force_cpusubtype_ALL

Lines 1-24 Link Here

(-)ffmpeg0/pkg-descr (-24 lines)
1	[ excerpt (with adaptations) from developer's README ]
2	ffmpeg is a hyper fast realtime audio/video encoder, a streaming
3	server and a generic audio and video file converter.
4
5	It can convert a standard video source into several file formats
6	based on DCT/motion compensation encoding. Sound is compressed in
7	MPEG audio layer 2 or using an AC3 compatible stream.
8
9	What makes ffmpeg interesting ?
10	- Simple and efficient video encoder: outputs MPEG1, H263, Real
11	Video(tm), MPEG4, DIVX and MJPEG compatible bitstreams using the
12	same encoder core.
13	- Hyper fast MPEG audio layer 2 compression (50 times faster than
14	realtime on a K6 500).
15	[snip -> rest on website below]
16
17	ffmpeg is made of two programs:
18	* ffmpeg: soft VCR which encodes in real time to several formats.
19	It can also encode from any supported input file format to any
20	input supported format.
21	* ffserver: high performance live broadcast streaming server based
22	on the ffmpeg core encoders.
23
24	WWW: http://ffmpeg.mplayerhq.hu/

Lines 1-142 Link Here

(-)ffmpeg0/pkg-plist (-142 lines)
1	bin/ffmpeg%%SUFF%%
2	bin/ffprobe%%SUFF%%
3	%%FFSERVER%%bin/ffserver%%SUFF%%
4	%%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
5	%%FFSERVER%%etc/ffserver%%SUFF%%.conf-dist
6	%%FFSERVER%%@exec [ -f %B/ffserver%%SUFF%%.conf ] \|\| cp %B/%f %B/ffserver%%SUFF%%.conf
7	include/ffmpeg%%SUFF%%/libavcodec/avcodec.h
8	include/ffmpeg%%SUFF%%/libavcodec/avfft.h
9	include/ffmpeg%%SUFF%%/libavcodec/dxva2.h
10	include/ffmpeg%%SUFF%%/libavcodec/opt.h
11	include/ffmpeg%%SUFF%%/libavcodec/vaapi.h
12	include/ffmpeg%%SUFF%%/libavcodec/vdpau.h
13	include/ffmpeg%%SUFF%%/libavcodec/version.h
14	include/ffmpeg%%SUFF%%/libavcodec/xvmc.h
15	include/ffmpeg%%SUFF%%/libavdevice/avdevice.h
16	include/ffmpeg%%SUFF%%/libavfilter/avcodec.h
17	include/ffmpeg%%SUFF%%/libavfilter/avfilter.h
18	include/ffmpeg%%SUFF%%/libavfilter/avfiltergraph.h
19	include/ffmpeg%%SUFF%%/libavfilter/vsink_buffer.h
20	include/ffmpeg%%SUFF%%/libavfilter/vsrc_buffer.h
21	include/ffmpeg%%SUFF%%/libavformat/avformat.h
22	include/ffmpeg%%SUFF%%/libavformat/avio.h
23	include/ffmpeg%%SUFF%%/libavformat/version.h
24	include/ffmpeg%%SUFF%%/libavutil/adler32.h
25	include/ffmpeg%%SUFF%%/libavutil/aes.h
26	include/ffmpeg%%SUFF%%/libavutil/attributes.h
27	include/ffmpeg%%SUFF%%/libavutil/audioconvert.h
28	include/ffmpeg%%SUFF%%/libavutil/avassert.h
29	include/ffmpeg%%SUFF%%/libavutil/avconfig.h
30	include/ffmpeg%%SUFF%%/libavutil/avstring.h
31	include/ffmpeg%%SUFF%%/libavutil/avutil.h
32	include/ffmpeg%%SUFF%%/libavutil/base64.h
33	include/ffmpeg%%SUFF%%/libavutil/bswap.h
34	include/ffmpeg%%SUFF%%/libavutil/common.h
35	include/ffmpeg%%SUFF%%/libavutil/cpu.h
36	include/ffmpeg%%SUFF%%/libavutil/crc.h
37	include/ffmpeg%%SUFF%%/libavutil/dict.h
38	include/ffmpeg%%SUFF%%/libavutil/error.h
39	include/ffmpeg%%SUFF%%/libavutil/eval.h
40	include/ffmpeg%%SUFF%%/libavutil/fifo.h
41	include/ffmpeg%%SUFF%%/libavutil/file.h
42	include/ffmpeg%%SUFF%%/libavutil/imgutils.h
43	include/ffmpeg%%SUFF%%/libavutil/intfloat_readwrite.h
44	include/ffmpeg%%SUFF%%/libavutil/intreadwrite.h
45	include/ffmpeg%%SUFF%%/libavutil/lfg.h
46	include/ffmpeg%%SUFF%%/libavutil/log.h
47	include/ffmpeg%%SUFF%%/libavutil/lzo.h
48	include/ffmpeg%%SUFF%%/libavutil/mathematics.h
49	include/ffmpeg%%SUFF%%/libavutil/md5.h
50	include/ffmpeg%%SUFF%%/libavutil/mem.h
51	include/ffmpeg%%SUFF%%/libavutil/opt.h
52	include/ffmpeg%%SUFF%%/libavutil/parseutils.h
53	include/ffmpeg%%SUFF%%/libavutil/pixdesc.h
54	include/ffmpeg%%SUFF%%/libavutil/pixfmt.h
55	include/ffmpeg%%SUFF%%/libavutil/random_seed.h
56	include/ffmpeg%%SUFF%%/libavutil/rational.h
57	include/ffmpeg%%SUFF%%/libavutil/samplefmt.h
58	include/ffmpeg%%SUFF%%/libavutil/sha.h
59	include/ffmpeg%%SUFF%%/libavutil/sha1.h
60	include/ffmpeg%%SUFF%%/libpostproc/postprocess.h
61	include/ffmpeg%%SUFF%%/libswscale/swscale.h
62	lib/ffmpeg%%SUFF%%/libavcodec0.a
63	lib/ffmpeg%%SUFF%%/libavcodec0.so
64	lib/ffmpeg%%SUFF%%/libavcodec0.so.1
65	lib/ffmpeg%%SUFF%%/libavcodec0.so.52.123.0
66	lib/ffmpeg%%SUFF%%/libavdevice0.a
67	lib/ffmpeg%%SUFF%%/libavdevice0.so
68	lib/ffmpeg%%SUFF%%/libavdevice0.so.1
69	lib/ffmpeg%%SUFF%%/libavdevice0.so.52.5.0
70	lib/ffmpeg%%SUFF%%/libavfilter0.a
71	lib/ffmpeg%%SUFF%%/libavfilter0.so
72	lib/ffmpeg%%SUFF%%/libavfilter0.so.1
73	lib/ffmpeg%%SUFF%%/libavfilter0.so.1.80.0
74	lib/ffmpeg%%SUFF%%/libavformat0.a
75	lib/ffmpeg%%SUFF%%/libavformat0.so
76	lib/ffmpeg%%SUFF%%/libavformat0.so.1
77	lib/ffmpeg%%SUFF%%/libavformat0.so.52.111.0
78	lib/ffmpeg%%SUFF%%/libavutil0.a
79	lib/ffmpeg%%SUFF%%/libavutil0.so
80	lib/ffmpeg%%SUFF%%/libavutil0.so.1
81	lib/ffmpeg%%SUFF%%/libavutil0.so.50.43.0
82	lib/ffmpeg%%SUFF%%/libpostproc0.a
83	lib/ffmpeg%%SUFF%%/libpostproc0.so
84	lib/ffmpeg%%SUFF%%/libpostproc0.so.1
85	lib/ffmpeg%%SUFF%%/libpostproc0.so.51.2.0
86	lib/ffmpeg%%SUFF%%/libswscale0.a
87	lib/ffmpeg%%SUFF%%/libswscale0.so
88	lib/ffmpeg%%SUFF%%/libswscale0.so.0.14.1
89	lib/ffmpeg%%SUFF%%/libswscale0.so.1
90	libdata/pkgconfig/libavcodec0.pc
91	libdata/pkgconfig/libavdevice0.pc
92	libdata/pkgconfig/libavfilter0.pc
93	libdata/pkgconfig/libavformat0.pc
94	libdata/pkgconfig/libavutil0.pc
95	libdata/pkgconfig/libpostproc0.pc
96	libdata/pkgconfig/libswscale0.pc
97	man/man1/ffmpeg%%SUFF%%.1.gz
98	man/man1/ffprobe%%SUFF%%.1.gz
99	%%FFSERVER%%man/man1/ffserver%%SUFF%%.1.gz
100	%%PORTDOCS%%%%DOCSDIR%%/APIchanges
101	%%PORTDOCS%%%%DOCSDIR%%/CREDITS
102	%%PORTDOCS%%%%DOCSDIR%%/INSTALL
103	%%PORTDOCS%%%%DOCSDIR%%/LICENSE
104	%%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS
105	%%PORTDOCS%%%%DOCSDIR%%/README
106	%%PORTDOCS%%%%DOCSDIR%%/RELEASE
107	%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
108	%%PORTDOCS%%%%DOCSDIR%%/TODO
109	%%PORTDOCS%%%%DOCSDIR%%/avutil.txt
110	%%PORTDOCS%%%%DOCSDIR%%/build_system.txt
111	%%PORTDOCS%%%%DOCSDIR%%/developer.html
112	%%PORTDOCS%%%%DOCSDIR%%/faq.html
113	%%PORTDOCS%%%%DOCSDIR%%/fate.txt
114	%%PORTDOCS%%%%DOCSDIR%%/ffmpeg.html
115	%%PORTDOCS%%%%DOCSDIR%%/ffprobe.html
116	%%FFSERVER%%%%PORTDOCS%%%%DOCSDIR%%/ffserver.html
117	%%PORTDOCS%%%%DOCSDIR%%/general.html
118	%%PORTDOCS%%%%DOCSDIR%%/git-howto.txt
119	%%PORTDOCS%%%%DOCSDIR%%/issue_tracker.txt
120	%%PORTDOCS%%%%DOCSDIR%%/libavfilter.html
121	%%PORTDOCS%%%%DOCSDIR%%/multithreading.txt
122	%%PORTDOCS%%%%DOCSDIR%%/optimization.txt
123	%%PORTDOCS%%%%DOCSDIR%%/rate_distortion.txt
124	%%PORTDOCS%%%%DOCSDIR%%/snow.txt
125	%%PORTDOCS%%%%DOCSDIR%%/soc.txt
126	%%PORTDOCS%%%%DOCSDIR%%/swscale.txt
127	%%PORTDOCS%%%%DOCSDIR%%/tablegen.txt
128	%%PORTDOCS%%%%DOCSDIR%%/viterbi.txt
129	%%DATADIR%%/libvpx-1080p.ffpreset
130	%%DATADIR%%/libvpx-1080p50_60.ffpreset
131	%%DATADIR%%/libvpx-360p.ffpreset
132	%%DATADIR%%/libvpx-720p.ffpreset
133	%%DATADIR%%/libvpx-720p50_60.ffpreset
134	%%DATADIR%%/libx264-baseline.ffpreset
135	%%DATADIR%%/libx264-ipod320.ffpreset
136	%%DATADIR%%/libx264-ipod640.ffpreset
137	%%DATADIR%%/libx264-lossless_fast.ffpreset
138	%%DATADIR%%/libx264-lossless_max.ffpreset
139	%%DATADIR%%/libx264-lossless_medium.ffpreset
140	%%DATADIR%%/libx264-lossless_slow.ffpreset
141	%%DATADIR%%/libx264-lossless_slower.ffpreset
142	%%DATADIR%%/libx264-lossless_ultrafast.ffpreset

Lines 1-26 Link Here

(-)ffmpeg0/files/ffserver0.in (-26 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD: head/multimedia/ffmpeg0/files/ffserver0.in 329826 2013-10-08 19:24:30Z wg $
4	#
5
6	# PROVIDE: ffserver0
7	# REQUIRE: NETWORKING
8	# KEYWORD: shutdown
9
10	#
11	# Add the following lines to /etc/rc.conf to enable ffserver:
12	#
13	#ffserver0_enable="YES"
14	#
15	ffserver0_enable="${ffserver0_enable-NO}"
16
17	. /etc/rc.subr
18
19	name=ffserver0
20	rcvar=ffserver0_enable
21
22	command="%%PREFIX%%/bin/${name} &"
23	required_files=%%PREFIX%%/etc/ffserver0.conf
24
25	load_rc_config ${name}
26	run_rc_command "$1"

Lines 1-31 Link Here

(-)ffmpeg0/files/patch-configure (-31 lines)
1	--- configure.orig 2011-06-21 21:29:25.000000000 +0200
2	+++ configure 2011-06-23 13:36:46.099381871 +0200
3	@@ -1657,7 +1657,7 @@
4	nm_opts='-g'
5
6	# machine
7	-arch_default=$(uname -m)
8	+arch_default=$(uname -p)
9	cpu="generic"
10
11	# OS
12	@@ -2966,8 +2966,8 @@
13	texi2html -version > /dev/null 2>&1 && enable texi2html \|\| disable texi2html
14
15	check_header linux/fb.h
16	-check_header linux/videodev.h
17	-check_header linux/videodev2.h
18	+#check_header linux/videodev.h
19	+#check_header linux/videodev2.h
20	check_header sys/videoio.h
21
22	check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs"
23	@@ -3322,7 +3322,7 @@
24	SRC_PATH="$source_path"
25	SRC_PATH_BARE=$source_path
26	CC_IDENT=$cc_ident
27	-ARCH=$arch
28	+FFMPEG_ARCH=$arch
29	CC=$cc
30	AS=$as
31	LD=$ld

Lines 1-13 Link Here

(-)ffmpeg0/files/patch-doc-protocols.texi (-13 lines)
1	--- doc/protocols.texi.orig 2013-02-17 14:46:23.000000000 -0800
2	+++ doc/protocols.texi 2013-10-08 12:00:38.375693236 -0700
3	@@ -155,8 +155,8 @@
4
5	Real-Time Messaging Protocol.
6
7	-The Real-Time Messaging Protocol (RTMP) is used for streaming multime‐
8	-dia content across a TCP/IP network.
9	+The Real-Time Messaging Protocol (RTMP) is used for streaming multimedia
10	+content across a TCP/IP network.
11
12	The required syntax is:
13	@example

Lines 1-25 Link Here

(-)ffmpeg0/files/patch-libavcodec_arm_asm.S (-25 lines)
1	--- libavcodec/arm/asm.S.orig 2013-10-06 16:18:07 UTC
2	+++ libavcodec/arm/asm.S
3	@@ -26,6 +26,22 @@
4	# define ELF @
5	#endif
6
7	+#if HAVE_NEON
8	+ .arch armv7-a
9	+#elif HAVE_ARMV6T2
10	+ .arch armv6t2
11	+#elif HAVE_ARMV6
12	+ .arch armv6
13	+#elif HAVE_ARMV5TE
14	+ .arch armv5te
15	+#endif
16	+
17	+#if HAVE_NEON
18	+ .fpu neon
19	+#elif HAVE_ARMVFP
20	+ .fpu vfp
21	+#endif
22	+
23	.syntax unified
24
25	.macro require8 val=1

Lines 1-14 Link Here

(-)ffmpeg0/files/patch-libavdevice-bktr.c (-14 lines)
1	--- libavdevice/bktr.c.orig 2011-06-21 21:29:25.000000000 +0200
2	+++ libavdevice/bktr.c 2011-06-23 13:39:44.160881669 +0200
3	@@ -24,6 +24,11 @@
4	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
5	*/
6
7	+typedef unsigned char u_char;
8	+typedef unsigned short u_short;
9	+typedef unsigned int u_int;
10	+typedef unsigned long u_long;
11	+
12	#include "libavutil/log.h"
13	#include "libavutil/opt.h"
14	#include "libavutil/parseutils.h"

Lines 1-14 Link Here

(-)ffmpeg0/files/patch-libavdevice-oss_audio.c (-14 lines)
1	--- libavdevice/oss_audio.c.orig 2009-05-15 17:38:35.000000000 +0200
2	+++ libavdevice/oss_audio.c 2009-05-15 17:41:27.000000000 +0200
3	@@ -19,6 +19,11 @@
4	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
5	*/
6
7	+typedef unsigned char u_char;
8	+typedef unsigned short u_short;
9	+typedef unsigned int u_int;
10	+typedef unsigned long u_long;
11	+
12	#include "config.h"
13	#include <stdlib.h>
14	#include <stdio.h>

Lines 1-12 Link Here

(-)ffmpeg0/files/patch-libavfilter-vf_libopencv.c (-12 lines)
1	--- libavfilter/vf_libopencv.c.orig 2011-06-27 21:27:01.521012341 +0200
2	+++ libavfilter/vf_libopencv.c 2011-06-27 21:27:16.839540294 +0200
3	@@ -25,8 +25,7 @@
4
5	/* #define DEBUG */
6
7	-#include <opencv/cv.h>
8	-#include <opencv/cxcore.h>
9	+#include <opencv2/imgproc/imgproc_c.h>
10	#include "libavutil/avstring.h"
11	#include "libavutil/file.h"
12	#include "avfilter.h"