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 --#include - #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 -- 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 && +@@ -2966,8 +2966,8 @@ texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html check_header linux/fb.h @@ -114,7 +20,7 @@ check_header sys/videoio.h check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs" -@@ -3322,7 +3322,7 @@ MANDIR=\$(DESTDIR)$mandir +@@ -3322,7 +3322,7 @@ SRC_PATH="$source_path" SRC_PATH_BARE=$source_path CC_IDENT=$cc_ident @@ -123,12 +29,3 @@ 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} Property changes on: files/patch-configure ___________________________________________________________________ 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-doc-protocols.texi =================================================================== --- files/patch-doc-protocols.texi (.../..) (working copy) +++ files/patch-doc-protocols.texi (working copy) @@ -1,6 +1,6 @@ ---- doc/protocols.texi.orig 2015-08-25 08:10:17 UTC -+++ doc/protocols.texi -@@ -155,8 +155,8 @@ be seekable, so they will fail with the +--- 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. Property changes on: files/patch-doc-protocols.texi ___________________________________________________________________ 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-libavcodec-Makefile =================================================================== --- files/patch-libavcodec-Makefile (.../..) (working copy) +++ files/patch-libavcodec-Makefile (working copy) @@ -1,11 +1,11 @@ ---- libavcodec/Makefile.orig 2015-08-25 08:10:18 UTC -+++ libavcodec/Makefile -@@ -666,7 +666,7 @@ OBJS-$(CONFIG_MLIB) + - # well. - OBJS-$(!CONFIG_SMALL) += inverse.o +--- 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 @@ + OBJS-$(CONFIG_MLIB) += mlib/dsputil_mlib.o \ + --include $(SUBDIR)$(ARCH)/Makefile +-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile - SKIPHEADERS += %_tablegen.h \ - %_tables.h \ + SKIPHEADERS = %_tablegen.h + SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h Property changes on: files/patch-libavcodec-Makefile ___________________________________________________________________ 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-libavcodec-libgsm.c =================================================================== --- files/patch-libavcodec-libgsm.c (.../..) (working copy) +++ files/patch-libavcodec-libgsm.c (working copy) @@ -1,5 +1,5 @@ ---- libavcodec/libgsm.c.orig 2015-08-25 08:10:18 UTC -+++ libavcodec/libgsm.c +--- libavcodec/libgsm.c.orig 2010-07-21 10:24:16.297810379 +0200 ++++ libavcodec/libgsm.c 2010-07-21 10:24:22.915234561 +0200 @@ -28,7 +28,7 @@ // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html Property changes on: files/patch-libavcodec-libgsm.c ___________________________________________________________________ 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-libavcodec_arm_asm.S =================================================================== --- files/patch-libavcodec_arm_asm.S (.../..) (working copy) +++ files/patch-libavcodec_arm_asm.S (working copy) @@ -1,4 +1,4 @@ ---- libavcodec/arm/asm.S.orig 2015-08-25 08:10:17 UTC +--- libavcodec/arm/asm.S.orig 2013-10-06 16:18:07 UTC +++ libavcodec/arm/asm.S @@ -26,6 +26,22 @@ # define ELF @ Property changes on: files/patch-libavcodec_arm_asm.S ___________________________________________________________________ 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-libavdevice-bktr.c =================================================================== --- files/patch-libavdevice-bktr.c (.../..) (working copy) +++ files/patch-libavdevice-bktr.c (working copy) @@ -1,5 +1,5 @@ ---- libavdevice/bktr.c.orig 2015-08-25 08:10:17 UTC -+++ libavdevice/bktr.c +--- 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 */ Property changes on: files/patch-libavdevice-bktr.c ___________________________________________________________________ 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-libavdevice-oss_audio.c =================================================================== --- files/patch-libavdevice-oss_audio.c (.../..) (working copy) +++ files/patch-libavdevice-oss_audio.c (working copy) @@ -1,5 +1,5 @@ ---- libavdevice/oss_audio.c.orig 2015-08-25 08:10:17 UTC -+++ libavdevice/oss_audio.c +--- 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 */ Property changes on: files/patch-libavdevice-oss_audio.c ___________________________________________________________________ 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-Makefile =================================================================== --- files/patch-libavfilter-Makefile (.../..) (working copy) +++ files/patch-libavfilter-Makefile (working copy) @@ -1,6 +1,6 @@ ---- libavfilter/Makefile.orig 2015-08-25 08:10:18 UTC -+++ libavfilter/Makefile -@@ -136,7 +136,7 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/ +--- libavfilter/Makefile.orig 2011-06-23 16:22:46.163337772 +0200 ++++ libavfilter/Makefile 2011-06-23 16:22:53.731245405 +0200 +@@ -136,7 +136,7 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o Property changes on: files/patch-libavfilter-Makefile ___________________________________________________________________ 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_libopencv.c =================================================================== --- files/patch-libavfilter-vf_libopencv.c (.../..) (working copy) +++ files/patch-libavfilter-vf_libopencv.c (working copy) @@ -1,5 +1,5 @@ ---- libavfilter/vf_libopencv.c.orig 2015-08-25 08:10:18 UTC -+++ libavfilter/vf_libopencv.c +--- 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 */ Property changes on: files/patch-libavfilter-vf_libopencv.c ___________________________________________________________________ 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) Property changes on: files/patch-libavfilter_vf-drawtext.c ___________________________________________________________________ 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-libavformat-udp.c =================================================================== --- files/patch-libavformat-udp.c (.../..) (working copy) +++ files/patch-libavformat-udp.c (working copy) @@ -1,7 +1,7 @@ ---- libavformat/udp.c.orig 2015-08-25 08:10:18 UTC -+++ libavformat/udp.c -@@ -47,6 +47,8 @@ - #define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP +--- libavformat/udp.c.orig 2009-05-15 17:24:45.000000000 +0200 ++++ libavformat/udp.c 2009-05-15 17:27:17.000000000 +0200 +@@ -45,6 +45,8 @@ + #define IN6_IS_ADDR_MULTICAST(a) (((uint8_t *) (a))[0] == 0xff) #endif +#define IPPROTO_IPV6 41 Property changes on: files/patch-libavformat-udp.c ___________________________________________________________________ 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-libavutil-common.h =================================================================== --- files/patch-libavutil-common.h (.../..) (working copy) +++ files/patch-libavutil-common.h (working copy) @@ -1,8 +1,8 @@ ---- libavutil/common.h.orig 2015-08-25 08:10:17 UTC -+++ libavutil/common.h -@@ -43,6 +43,10 @@ - # define AV_NE(be, le) (le) - #endif +--- libavutil/common.h.orig 2010-04-26 23:01:38.000000000 +0200 ++++ libavutil/common.h 2010-07-10 16:06:27.038027901 +0200 +@@ -36,6 +36,10 @@ + #include + #include "attributes.h" +#ifndef UINT64_C +#define UINT64_C(c) (c ## UL) Property changes on: files/patch-libavutil-common.h ___________________________________________________________________ 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/Makefile =================================================================== --- ffmpeg0/Makefile (.../..) (working copy) +++ ffmpeg0/Makefile (working copy) @@ -1,382 +0,0 @@ -# Created by: Mario Sergio Fujikawa Ferreira -# $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 - -.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 Index: ffmpeg0/distinfo =================================================================== --- ffmpeg0/distinfo (.../..) (working copy) +++ ffmpeg0/distinfo (working copy) @@ -1,2 +0,0 @@ -SHA256 (ffmpeg-0.7.17.tar.bz2) = 5ec57caa1bff7a528b8e58643dd550cdc69156f7b44c31a10920f1be68e2036a -SIZE (ffmpeg-0.7.17.tar.bz2) = 4529540 Index: ffmpeg0/ffmpeg0.diff =================================================================== --- ffmpeg0/ffmpeg0.diff (.../..) (working copy) +++ ffmpeg0/ffmpeg0.diff (working copy) @@ -1,1252 +1,3 @@ -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 ---#include -- #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 --- 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 && -+@@ -2966,8 +2966,8 @@ - texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html - - check_header linux/fb.h -@@ -114,7 +20,7 @@ - check_header sys/videoio.h - - check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs" --@@ -3322,7 +3322,7 @@ MANDIR=\$(DESTDIR)$mandir -+@@ -3322,7 +3322,7 @@ - SRC_PATH="$source_path" - SRC_PATH_BARE=$source_path - CC_IDENT=$cc_ident -@@ -123,12 +29,3 @@ - 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} - -Property changes on: files/patch-configure -___________________________________________________________________ -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-doc-protocols.texi -=================================================================== ---- files/patch-doc-protocols.texi (.../..) (working copy) -+++ files/patch-doc-protocols.texi (working copy) -@@ -1,6 +1,6 @@ ----- doc/protocols.texi.orig 2015-08-25 08:10:17 UTC --+++ doc/protocols.texi --@@ -155,8 +155,8 @@ be seekable, so they will fail with the -+--- 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. - - -Property changes on: files/patch-doc-protocols.texi -___________________________________________________________________ -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-libavcodec-Makefile -=================================================================== ---- files/patch-libavcodec-Makefile (.../..) (working copy) -+++ files/patch-libavcodec-Makefile (working copy) -@@ -1,11 +1,11 @@ ----- libavcodec/Makefile.orig 2015-08-25 08:10:18 UTC --+++ libavcodec/Makefile --@@ -666,7 +666,7 @@ OBJS-$(CONFIG_MLIB) + -- # well. -- OBJS-$(!CONFIG_SMALL) += inverse.o -+--- 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 @@ - -+ OBJS-$(CONFIG_MLIB) += mlib/dsputil_mlib.o \ -+ - --include $(SUBDIR)$(ARCH)/Makefile - +-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile - -- SKIPHEADERS += %_tablegen.h \ -- %_tables.h \ -+ SKIPHEADERS = %_tablegen.h -+ SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h - -Property changes on: files/patch-libavcodec-Makefile -___________________________________________________________________ -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-libavcodec-libgsm.c -=================================================================== ---- files/patch-libavcodec-libgsm.c (.../..) (working copy) -+++ files/patch-libavcodec-libgsm.c (working copy) -@@ -1,5 +1,5 @@ ----- libavcodec/libgsm.c.orig 2015-08-25 08:10:18 UTC --+++ libavcodec/libgsm.c -+--- libavcodec/libgsm.c.orig 2010-07-21 10:24:16.297810379 +0200 -++++ libavcodec/libgsm.c 2010-07-21 10:24:22.915234561 +0200 - @@ -28,7 +28,7 @@ - // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html - - -Property changes on: files/patch-libavcodec-libgsm.c -___________________________________________________________________ -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-libavcodec_arm_asm.S -=================================================================== ---- files/patch-libavcodec_arm_asm.S (.../..) (working copy) -+++ files/patch-libavcodec_arm_asm.S (working copy) -@@ -1,4 +1,4 @@ ----- libavcodec/arm/asm.S.orig 2015-08-25 08:10:17 UTC -+--- libavcodec/arm/asm.S.orig 2013-10-06 16:18:07 UTC - +++ libavcodec/arm/asm.S - @@ -26,6 +26,22 @@ - # define ELF @ - -Property changes on: files/patch-libavcodec_arm_asm.S -___________________________________________________________________ -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-libavdevice-bktr.c -=================================================================== ---- files/patch-libavdevice-bktr.c (.../..) (working copy) -+++ files/patch-libavdevice-bktr.c (working copy) -@@ -1,5 +1,5 @@ ----- libavdevice/bktr.c.orig 2015-08-25 08:10:17 UTC --+++ libavdevice/bktr.c -+--- 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 - */ - -Property changes on: files/patch-libavdevice-bktr.c -___________________________________________________________________ -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-libavdevice-oss_audio.c -=================================================================== ---- files/patch-libavdevice-oss_audio.c (.../..) (working copy) -+++ files/patch-libavdevice-oss_audio.c (working copy) -@@ -1,5 +1,5 @@ ----- libavdevice/oss_audio.c.orig 2015-08-25 08:10:17 UTC --+++ libavdevice/oss_audio.c -+--- 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 - */ - -Property changes on: files/patch-libavdevice-oss_audio.c -___________________________________________________________________ -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-Makefile -=================================================================== ---- files/patch-libavfilter-Makefile (.../..) (working copy) -+++ files/patch-libavfilter-Makefile (working copy) -@@ -1,6 +1,6 @@ ----- libavfilter/Makefile.orig 2015-08-25 08:10:18 UTC --+++ libavfilter/Makefile --@@ -136,7 +136,7 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/ -+--- libavfilter/Makefile.orig 2011-06-23 16:22:46.163337772 +0200 -++++ libavfilter/Makefile 2011-06-23 16:22:53.731245405 +0200 -+@@ -136,7 +136,7 @@ - OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o - - - -Property changes on: files/patch-libavfilter-Makefile -___________________________________________________________________ -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_libopencv.c -=================================================================== ---- files/patch-libavfilter-vf_libopencv.c (.../..) (working copy) -+++ files/patch-libavfilter-vf_libopencv.c (working copy) -@@ -1,5 +1,5 @@ ----- libavfilter/vf_libopencv.c.orig 2015-08-25 08:10:18 UTC --+++ libavfilter/vf_libopencv.c -+--- 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 */ - -Property changes on: files/patch-libavfilter-vf_libopencv.c -___________________________________________________________________ -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) - -Property changes on: files/patch-libavfilter_vf-drawtext.c -___________________________________________________________________ -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-libavformat-udp.c -=================================================================== ---- files/patch-libavformat-udp.c (.../..) (working copy) -+++ files/patch-libavformat-udp.c (working copy) -@@ -1,7 +1,7 @@ ----- libavformat/udp.c.orig 2015-08-25 08:10:18 UTC --+++ libavformat/udp.c --@@ -47,6 +47,8 @@ -- #define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP -+--- libavformat/udp.c.orig 2009-05-15 17:24:45.000000000 +0200 -++++ libavformat/udp.c 2009-05-15 17:27:17.000000000 +0200 -+@@ -45,6 +45,8 @@ -+ #define IN6_IS_ADDR_MULTICAST(a) (((uint8_t *) (a))[0] == 0xff) - #endif - - +#define IPPROTO_IPV6 41 - -Property changes on: files/patch-libavformat-udp.c -___________________________________________________________________ -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-libavutil-common.h -=================================================================== ---- files/patch-libavutil-common.h (.../..) (working copy) -+++ files/patch-libavutil-common.h (working copy) -@@ -1,8 +1,8 @@ ----- libavutil/common.h.orig 2015-08-25 08:10:17 UTC --+++ libavutil/common.h --@@ -43,6 +43,10 @@ -- # define AV_NE(be, le) (le) -- #endif -+--- libavutil/common.h.orig 2010-04-26 23:01:38.000000000 +0200 -++++ libavutil/common.h 2010-07-10 16:06:27.038027901 +0200 -+@@ -36,6 +36,10 @@ -+ #include -+ #include "attributes.h" - - +#ifndef UINT64_C - +#define UINT64_C(c) (c ## UL) - -Property changes on: files/patch-libavutil-common.h -___________________________________________________________________ -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/Makefile -=================================================================== ---- ffmpeg0/Makefile (.../..) (working copy) -+++ ffmpeg0/Makefile (working copy) -@@ -1,382 +0,0 @@ --# Created by: Mario Sergio Fujikawa Ferreira --# $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 -- --.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 -Index: ffmpeg0/distinfo -=================================================================== ---- ffmpeg0/distinfo (.../..) (working copy) -+++ ffmpeg0/distinfo (working copy) -@@ -1,2 +0,0 @@ --SHA256 (ffmpeg-0.7.17.tar.bz2) = 5ec57caa1bff7a528b8e58643dd550cdc69156f7b44c31a10920f1be68e2036a --SIZE (ffmpeg-0.7.17.tar.bz2) = 4529540 Index: ffmpeg0/ffmpeg0.diff =================================================================== --- ffmpeg0/ffmpeg0.diff (.../..) (working copy) Index: ffmpeg0/pkg-descr =================================================================== --- ffmpeg0/pkg-descr (.../..) (working copy) +++ ffmpeg0/pkg-descr (working copy) @@ -1,24 +0,0 @@ -[ 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/ Index: ffmpeg0/pkg-plist =================================================================== --- ffmpeg0/pkg-plist (.../..) (working copy) +++ ffmpeg0/pkg-plist (working copy) @@ -1,142 +0,0 @@ -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 Index: ffmpeg0/files/ffserver0.in =================================================================== --- ffmpeg0/files/ffserver0.in (.../..) (working copy) +++ ffmpeg0/files/ffserver0.in (working copy) @@ -1,26 +0,0 @@ -#!/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" Index: ffmpeg0/files/patch-configure =================================================================== --- ffmpeg0/files/patch-configure (.../..) (working copy) +++ ffmpeg0/files/patch-configure (working copy) @@ -1,31 +0,0 @@ ---- 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 Index: ffmpeg0/files/patch-doc-protocols.texi =================================================================== --- ffmpeg0/files/patch-doc-protocols.texi (.../..) (working copy) +++ ffmpeg0/files/patch-doc-protocols.texi (working copy) @@ -1,13 +0,0 @@ ---- 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 Index: ffmpeg0/files/patch-libavcodec-Makefile =================================================================== --- ffmpeg0/files/patch-libavcodec-Makefile (.../..) (working copy) +++ ffmpeg0/files/patch-libavcodec-Makefile (working copy) @@ -1,11 +0,0 @@ ---- 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 @@ - - 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 Index: ffmpeg0/files/patch-libavcodec-libgsm.c =================================================================== --- ffmpeg0/files/patch-libavcodec-libgsm.c (.../..) (working copy) +++ ffmpeg0/files/patch-libavcodec-libgsm.c (working copy) @@ -1,11 +0,0 @@ ---- libavcodec/libgsm.c.orig 2010-07-21 10:24:16.297810379 +0200 -+++ libavcodec/libgsm.c 2010-07-21 10:24:22.915234561 +0200 -@@ -28,7 +28,7 @@ - // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html - - #include "avcodec.h" --#include -+#include - - // gsm.h misses some essential constants - #define GSM_BLOCK_SIZE 33 Index: ffmpeg0/files/patch-libavcodec_arm_asm.S =================================================================== --- ffmpeg0/files/patch-libavcodec_arm_asm.S (.../..) (working copy) +++ ffmpeg0/files/patch-libavcodec_arm_asm.S (working copy) @@ -1,25 +0,0 @@ ---- 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 Index: ffmpeg0/files/patch-libavdevice-bktr.c =================================================================== --- ffmpeg0/files/patch-libavdevice-bktr.c (.../..) (working copy) +++ ffmpeg0/files/patch-libavdevice-bktr.c (working copy) @@ -1,14 +0,0 @@ ---- 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" Index: ffmpeg0/files/patch-libavdevice-oss_audio.c =================================================================== --- ffmpeg0/files/patch-libavdevice-oss_audio.c (.../..) (working copy) +++ ffmpeg0/files/patch-libavdevice-oss_audio.c (working copy) @@ -1,14 +0,0 @@ ---- libavdevice/oss_audio.c.orig 2009-05-15 17:38:35.000000000 +0200 -+++ libavdevice/oss_audio.c 2009-05-15 17:41:27.000000000 +0200 -@@ -19,6 +19,11 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+typedef unsigned char u_char; -+typedef unsigned short u_short; -+typedef unsigned int u_int; -+typedef unsigned long u_long; -+ - #include "config.h" - #include - #include Index: ffmpeg0/files/patch-libavfilter-Makefile =================================================================== --- ffmpeg0/files/patch-libavfilter-Makefile (.../..) (working copy) +++ ffmpeg0/files/patch-libavfilter-Makefile (working copy) @@ -1,11 +0,0 @@ ---- libavfilter/Makefile.orig 2011-06-23 16:22:46.163337772 +0200 -+++ libavfilter/Makefile 2011-06-23 16:22:53.731245405 +0200 -@@ -136,7 +136,7 @@ - OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o - - ---include $(SUBDIR)$(ARCH)/Makefile -+-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile - - DIRS = x86 libmpcodecs - Index: ffmpeg0/files/patch-libavfilter-vf_libopencv.c =================================================================== --- ffmpeg0/files/patch-libavfilter-vf_libopencv.c (.../..) (working copy) +++ ffmpeg0/files/patch-libavfilter-vf_libopencv.c (working copy) @@ -1,12 +0,0 @@ ---- 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 --#include -+#include - #include "libavutil/avstring.h" - #include "libavutil/file.h" - #include "avfilter.h" Index: ffmpeg0/files/patch-libavfilter_vf-drawtext.c =================================================================== --- ffmpeg0/files/patch-libavfilter_vf-drawtext.c (.../..) (working copy) +++ ffmpeg0/files/patch-libavfilter_vf-drawtext.c (working copy) @@ -1,10 +0,0 @@ ---- libavfilter/vf_drawtext.c.orig 2013-12-06 18:18:29.000000000 +0100 -+++ libavfilter/vf_drawtext.c 2013-12-06 18:18:49.000000000 +0100 -@@ -41,7 +41,6 @@ - #undef time - - #include --#include - #include FT_FREETYPE_H - #include FT_GLYPH_H - Index: ffmpeg0/files/patch-libavformat-udp.c =================================================================== --- ffmpeg0/files/patch-libavformat-udp.c (.../..) (working copy) +++ ffmpeg0/files/patch-libavformat-udp.c (working copy) @@ -1,11 +0,0 @@ ---- libavformat/udp.c.orig 2009-05-15 17:24:45.000000000 +0200 -+++ libavformat/udp.c 2009-05-15 17:27:17.000000000 +0200 -@@ -45,6 +45,8 @@ - #define IN6_IS_ADDR_MULTICAST(a) (((uint8_t *) (a))[0] == 0xff) - #endif - -+#define IPPROTO_IPV6 41 -+ - typedef struct { - int udp_fd; - int ttl; Index: ffmpeg0/files/patch-libavutil-common.h =================================================================== --- ffmpeg0/files/patch-libavutil-common.h (.../..) (working copy) +++ ffmpeg0/files/patch-libavutil-common.h (working copy) @@ -1,13 +0,0 @@ ---- libavutil/common.h.orig 2010-04-26 23:01:38.000000000 +0200 -+++ libavutil/common.h 2010-07-10 16:06:27.038027901 +0200 -@@ -36,6 +36,10 @@ - #include - #include "attributes.h" - -+#ifndef UINT64_C -+#define UINT64_C(c) (c ## UL) -+#endif -+ - //rounded division & shift - #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) - /* assume b>0 */