[Midnightbsd-cvs] mports [24602] trunk/multimedia/ffmpeg: update to ffmpeg 4.x
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Oct 30 09:11:39 EDT 2018
Revision: 24602
http://svnweb.midnightbsd.org/mports/?rev=24602
Author: laffer1
Date: 2018-10-30 09:11:38 -0400 (Tue, 30 Oct 2018)
Log Message:
-----------
update to ffmpeg 4.x
Modified Paths:
--------------
trunk/multimedia/ffmpeg/Makefile
trunk/multimedia/ffmpeg/distinfo
trunk/multimedia/ffmpeg/files/patch-configure
trunk/multimedia/ffmpeg/pkg-plist
Added Paths:
-----------
trunk/multimedia/ffmpeg/files/patch-libavcodec_libaomenc.c
trunk/multimedia/ffmpeg/files/patch-libavformat_rtsp.c
Removed Paths:
-------------
trunk/multimedia/ffmpeg/files/ffserver.in
trunk/multimedia/ffmpeg/files/patch-Makefile
trunk/multimedia/ffmpeg/files/patch-libavcodec-Makefile
trunk/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
trunk/multimedia/ffmpeg/files/patch-libavdevice-oss.c
trunk/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
trunk/multimedia/ffmpeg/files/patch-libavformat-udp.c
Modified: trunk/multimedia/ffmpeg/Makefile
===================================================================
--- trunk/multimedia/ffmpeg/Makefile 2018-10-30 13:05:20 UTC (rev 24601)
+++ trunk/multimedia/ffmpeg/Makefile 2018-10-30 13:11:38 UTC (rev 24602)
@@ -2,10 +2,11 @@
# $MidnightBSD$
PORTNAME= ffmpeg
-PORTVERSION= 2.8.15
+PORTVERSION= 4.0.2
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
-MASTER_SITES= http://ffmpeg.org/releases/
+MASTER_SITES= https://ffmpeg.org/releases/
MAINTAINER= ports at MidnightBSD.org
COMMENT= Realtime audio/video encoder/converter and streaming server
@@ -13,108 +14,136 @@
LICENSE= gpl2 lgpl2.1
LICENSE_COMB= multi
-BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \
- ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS= nasm:devel/nasm \
+ ${LOCALBASE}/bin/as:devel/binutils
HAS_CONFIGURE= yes
-USES= compiler cpe gmake perl5 pkgconfig tar:bzip2 shebangfix
+USES= compiler:c11 cpe gmake localbase:ldflags perl5 \
+ pkgconfig shebangfix tar:xz
USE_LDCONFIG= yes
USE_PERL5= build
-SHEBANG_FILES= doc/texi2pod.pl
+NOPRECIOUSMAKEVARS= yes # ARCH
-OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT DC1394 \
- DEBUG DOCS FAAC FDK_AAC FFSERVER FLITE FONTCONFIG \
- FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK LADSPA \
- LAME LIBBLURAY MODPLUG OPENAL OPENCL OPENCV OPENGL \
- OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO QUVI \
- RTCPU RTMP SCHROEDINGER SDL SMB SNAPPY SPEEX SSH \
- THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS VO_AACENC \
- VO_AMRWBENC VPX WAVPACK WEBP X11GRAB X264 X265 XCB XVID \
- XVIDEO ZMQ ZVBI
+OPTIONS_DEFINE= ALSA AMR_NB AMR_WB AOM ASS BEIGNET BS2B CACA CDIO CELT CHROMAPRINT CODEC2 DC1394 \
+ DEBUG DOCS DRM FDK_AAC FLITE FONTCONFIG \
+ FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK KVAZAAR LADSPA \
+ LAME LIBBLURAY LIBRSVG2 LIBXML2 LV2 MODPLUG MYSOFA OPENAL OPENCL OPENCV OPENGL \
+ OPENH264 OPENJPEG OPENMPT OPTIMIZED_CFLAGS OPUS PULSEAUDIO \
+ RUBBERBAND RTCPU SDL SMB SNAPPY SNDIO SOXR SPEEX SRT SSH \
+ TESSERACT THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS \
+ VO_AMRWBENC VPX WAVPACK WEBP X264 X265 XCB XVID \
+ XVIDEO ZIMG ZMQ ZVBI
-OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \
- OPENCV RTCPU SCHROEDINGER THEORA VORBIS VPX X264 XVID
+OPTIONS_DEFAULT= FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \
+ OPENCV OPTIMIZED_CFLAGS OPUS RTCPU THEORA V4L VAAPI VDPAU \
+ VORBIS VPX X264 X265 XCB XVID
-OPTIONS_SINGLE= SSL
-OPTIONS_SINGLE_SSL= GNUTLS OPENSSL
+.if !exists(${.CURDIR:H:H}/net/srt)
+# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/a2fc8dbae853
+OPTIONS_EXCLUDE+= SRT
+.endif
+
+OPTIONS_RADIO= RTMP SSL
+OPTIONS_RADIO_RTMP= GCRYPT GMP LIBRTMP
+OPTIONS_RADIO_SSL= GNUTLS OPENSSL
OPTIONS_GROUP= LICENSE
OPTIONS_GROUP_LICENSE= GPL3 NONFREE
-OPTIONS_DEFINE_amd64= MMX SSE
+OPTIONS_DEFINE_amd64= BEIGNET MMX SSE
OPTIONS_DEFINE_armv6= VFP NEON
-OPTIONS_DEFINE_armv6hf= VFP NEON
-OPTIONS_DEFINE_i386= MMX SSE
+OPTIONS_DEFINE_i386= BEIGNET MMX SSE
OPTIONS_DEFAULT_amd64= MMX SSE
-OPTIONS_DEFAULT_i386= ${MACHINE_CPU:tu:MMMX} ${MACHINE_CPU:tu:MSSE}
+OPTIONS_DEFAULT_i386= MMX SSE
ASS_DESC= Subtitles rendering via libass
+AOM_DESC= AV1 video encoding/decoding via libaom
+BEIGNET_DESC= DRM/VAAPI to OpenCL mapping for i965 + Beignet
BS2B_DESC= Bauer Stereophonic-to-Binaural filter
-CDIO_DESC= Audio CD grabbing with libcdio
+CHROMAPRINT_DESC= Audio fingerprinting with chromaprint
+CODEC2_DESC= Codec 2 audio encoding/decoding via libcodec2
DC1394_DESC= IIDC-1394 grabbing using libdc1394
+DRM_DESC= KMS grabbing using libdrm
FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK
-FFSERVER_DESC= Build and install ffserver
FLITE_DESC= Voice synthesis support via libflite
GME_DESC= Game Music Emu demuxer
GPL3_DESC= Allow (L)GPL version 3 code(cs)
ILBC_DESC= Internet Low Bit Rate codec
+KVAZAAR_DESC= H.265 video codec support via Kvazaar
LICENSE_DESC= Licensing options
-NEON_DESC= Enable Media Processing Engine instructions
+LV2_DESC= LV2 audio filtering
+MYSOFA_DESC= SOFAlizer binaural filter
+NEON_DESC= Media Processing Engine instructions
NONFREE_DESC= Allow use of nonfree code
-OPENCL_DESC= Heterogeneous computing via OpenCL
+OPENMPT_DESC= Decoding tracked files via libopenmpt
OPENH264_DESC= H.264 video codec support via OpenH264
-QUVI_DESC= Flash media stream URLs
+RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband
RTCPU_DESC= Detect CPU capabilities at runtime
-VFP_DESC= Enable Vector Floating Point instructions
+RTMP_DESC= RTMP(T)E protocol support
+SRT_DESC= Haivision SRT protocol via libsrt
+LIBRTMP_DESC= ${RTMP_DESC} via librtmp
+TESSERACT_DESC= Optical Character Recognition via Tesseract
+VFP_DESC= Vector Floating Point instructions
VIDSTAB_DESC= Video stabilization filter
-X11GRAB_DESC= X11 grabbing (legacy)
XCB_DESC= X11 grabbing using XCB
+ZIMG_DESC= "z" library video scaling filter
ZMQ_DESC= Message passing via libzmq${ZMQ_VERSION}
ZVBI_DESC= Teletext support via libzvbi
OPTIONS_SUB= yes
-# aacplus
-AACPLUS_LIB_DEPENDS= libaacplus.so:${PORTSDIR}/audio/libaacplus
-AACPLUS_CONFIGURE_ENABLE= libaacplus
-AACPLUS_IMPLIES= NONFREE
-
# alsa
-ALSA_CONFIGURE_OFF= --disable-indev=alsa \
- --disable-outdev=alsa
-ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
+ALSA_CONFIGURE_ENABLE= alsa
# Opencore AMR NB
-AMR_NB_LIB_DEPENDS= libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
+AMR_NB_LIB_DEPENDS= libopencore-amrnb.so:audio/opencore-amr
AMR_NB_CONFIGURE_ENABLE= libopencore-amrnb
AMR_NB_IMPLIES= GPL3
# Opencore AMR WB
-AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr
+AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr
AMR_WB_CONFIGURE_ENABLE= libopencore-amrwb
AMR_WB_IMPLIES= GPL3
+# aom
+AOM_LIB_DEPENDS= libaom.so:multimedia/aom
+AOM_CONFIGURE_ENABLE= libaom
+
# ass
-ASS_LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass
+ASS_LIB_DEPENDS= libass.so:multimedia/libass
ASS_CONFIGURE_ENABLE= libass
+# beignet
+BEIGNET_BUILD_DEPENDS= ${LOCALBASE}/include/CL/cl_intel.h:lang/beignet
+BEIGNET_IMPLIES= DRM OPENCL VAAPI
+
# bs2b
-BS2B_LIB_DEPENDS= libbs2b.so:${PORTSDIR}/audio/libbs2b
+BS2B_LIB_DEPENDS= libbs2b.so:audio/libbs2b
BS2B_CONFIGURE_ENABLE= libbs2b
# caca
-CACA_LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca
+CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca
CACA_CONFIGURE_ENABLE= libcaca
# cdio
-CDIO_LIB_DEPENDS= libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
+CDIO_LIB_DEPENDS= libcdio_paranoia.so:sysutils/libcdio-paranoia
CDIO_CONFIGURE_ENABLE= libcdio
# celt
-CELT_LIB_DEPENDS= libcelt0.so:${PORTSDIR}/audio/celt
+CELT_LIB_DEPENDS= libcelt0.so:audio/celt
CELT_CONFIGURE_ENABLE= libcelt
+# chromaprint
+CHROMAPRINT_BROKEN= Dependency loop
+CHROMAPRINT_LIB_DEPENDS= libchromaprint.so:audio/chromaprint
+CHROMAPRINT_CONFIGURE_ENABLE= chromaprint
+
+# codec2
+CODEC2_LIB_DEPENDS= libcodec2.so:audio/codec2
+CODEC2_CONFIGURE_ENABLE= libcodec2
+
# dc1394
-DC1394_LIB_DEPENDS= libdc1394.so:${PORTSDIR}/multimedia/libdc1394
+DC1394_LIB_DEPENDS= libdc1394.so:multimedia/libdc1394
DC1394_CONFIGURE_ENABLE= libdc1394
# debugging
@@ -122,53 +151,57 @@
DEBUG_CONFIGURE_OFF= --disable-debug
# docs
-DOCS_BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html
+DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html
DOCS_CONFIGURE_ENABLE= htmlpages
-# faac
-FAAC_LIB_DEPENDS= libfaac.so:${PORTSDIR}/audio/faac
-FAAC_CONFIGURE_ENABLE= libfaac
-FAAC_IMPLIES= NONFREE
+# drm
+DRM_LIB_DEPENDS= libdrm.so:graphics/libdrm
+DRM_CONFIGURE_ENABLE= libdrm
# fdk_aac
-FDK_AAC_LIB_DEPENDS= libfdk-aac.so:${PORTSDIR}/audio/fdk-aac
+FDK_AAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac
FDK_AAC_CONFIGURE_ENABLE= libfdk-aac
FDK_AAC_IMPLIES= NONFREE
-# ffserver
-FFSERVER_CONFIGURE_ENABLE= ffserver
-FFSERVER_VARS= USE_RC_SUBR+=ffserver
-
# flite
-FLITE_LIB_DEPENDS= libflite.so:${PORTSDIR}/audio/flite
+FLITE_LIB_DEPENDS= libflite.so:audio/flite
FLITE_CONFIGURE_ENABLE= libflite
# fontconfig
-FONTCONFIG_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+FONTCONFIG_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig
FONTCONFIG_CONFIGURE_ENABLE= fontconfig
# freetype
-FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2
FREETYPE_CONFIGURE_ENABLE= libfreetype
# frei0r
-FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
+FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:graphics/frei0r
FREI0R_CONFIGURE_ENABLE= frei0r
# fribidi
-FRIBIDI_LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi
FRIBIDI_CONFIGURE_ENABLE= libfribidi
+# gcrypt
+GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt
+GCRYPT_CONFIGURE_ENABLE= gcrypt
+
# gnutls
-GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
GNUTLS_CONFIGURE_ENABLE= gnutls
# gme
-GME_LIB_DEPENDS= libgme.so:${PORTSDIR}/audio/libgme
+GME_LIB_DEPENDS= libgme.so:audio/libgme
GME_CONFIGURE_ENABLE= libgme
+# gmp
+GMP_LIB_DEPENDS= libgmp.so:math/gmp
+GMP_CONFIGURE_ENABLE= gmp
+GMP_IMPLIES= GPL3
+
# gsm
-GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm
+GSM_LIB_DEPENDS= libgsm.so:audio/gsm
GSM_CONFIGURE_ENABLE= libgsm
# iconv
@@ -176,29 +209,46 @@
ICONV_CONFIGURE_ENABLE= iconv
# ilbc
-ILBC_LIB_DEPENDS= libilbc.so:${PORTSDIR}/net/libilbc
+ILBC_LIB_DEPENDS= libilbc.so:net/libilbc
ILBC_CONFIGURE_ENABLE= libilbc
# jack
-JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack
-JACK_CONFIGURE_OFF= --disable-indev=jack
+JACK_LIB_DEPENDS= libjack.so:audio/jack
+JACK_CONFIGURE_ENABLE= libjack
+# kvazaar
+KVAZAAR_LIB_DEPENDS= libkvazaar.so:multimedia/kvazaar
+KVAZAAR_CONFIGURE_ENABLE= libkvazaar
+
# ladspa
-LADSPA_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
+LADSPA_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa
+LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:audio/ladspa
LADSPA_CONFIGURE_ENABLE= ladspa
# lame
-LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame
+LAME_LIB_DEPENDS= libmp3lame.so:audio/lame
LAME_CONFIGURE_ENABLE= libmp3lame
# libbluray
-LIBBLURAY_LIB_DEPENDS= libbluray.so:${PORTSDIR}/multimedia/libbluray
+LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray
LIBBLURAY_CONFIGURE_ENABLE= libbluray
+# librsvg
+LIBRSVG2_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2
+LIBRSVG2_CONFIGURE_ENABLE= librsvg
+
+# libxml
+LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2
+LIBXML2_CONFIGURE_ENABLE= libxml2
+
+# lv2
+LV2_BUILD_DEPENDS= lv2>0:audio/lv2
+LV2_LIB_DEPENDS= liblilv-0.so:audio/lilv
+LV2_CONFIGURE_ENABLE= lv2
+
# libv4l
-V4L_BUILD_DEPENDS= v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
-V4L_LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
+V4L_BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat
+V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l
V4L_CONFIGURE_ENABLE= libv4l2
V4L_CONFIGURE_OFF= --disable-indev=v4l2 \
--disable-outdev=v4l2
@@ -207,21 +257,24 @@
MMX_CONFIGURE_ENABLE= mmx
# modplug
-MODPLUG_LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug
MODPLUG_CONFIGURE_ENABLE= libmodplug
+# mysofa
+MYSOFA_LIB_DEPENDS= libmysofa.so:audio/libmysofa
+MYSOFA_CONFIGURE_ENABLE= libmysofa
+
# OpenAL
-OPENAL_LIB_DEPENDS= libopenal.so:${PORTSDIR}/audio/openal-soft
+OPENAL_LIB_DEPENDS= libopenal.so:audio/openal-soft
OPENAL_CONFIGURE_ENABLE= openal
-OPENAL_CONFIGURE_OFF= --disable-indev=openal
# opencl
-OPENCL_BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:${PORTSDIR}/devel/opencl
-OPENCL_LIB_DEPENDS= libOpenCL.so:${PORTSDIR}/devel/ocl-icd
+OPENCL_BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl
+OPENCL_LIB_DEPENDS= libOpenCL.so:devel/ocl-icd
OPENCL_CONFIGURE_ENABLE= opencl
# opencv
-OPENCV_LIB_DEPENDS= libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core
+OPENCV_LIB_DEPENDS= libopencv_imgproc.so:graphics/opencv-core
OPENCV_CONFIGURE_ENABLE= libopencv
# opengl
@@ -229,135 +282,139 @@
OPENGL_CONFIGURE_ENABLE= opengl
# openh264
-OPENH264_LIB_DEPENDS= libopenh264.so:${PORTSDIR}/multimedia/openh264
+OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264
OPENH264_CONFIGURE_ENABLE= libopenh264
# openjpeg
-OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg
OPENJPEG_CONFIGURE_ENABLE= libopenjpeg
-# openssl
-OPENSSL_USE= OPENSSL=yes
-OPENSSL_CONFIGURE_ENABLE= openssl
+# openmpt
+OPENMPT_LIB_DEPENDS= libopenmpt.so:audio/libopenmpt
+OPENMPT_CONFIGURE_ENABLE= libopenmpt
+
+# openssl/libtls
+OPENSSL_USES= ssl
+OPENSSL_CONFIGURE_ENABLE= ${"${SSL_DEFAULT:Mlibressl*}"!="":?libtls:openssl}
OPENSSL_IMPLIES= NONFREE
# optimizations
-OPTIMIZED_CFLAGS_CFLAGS=-O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
+OPTIMIZED_CFLAGS_CONFIGURE_ENABLE= optimizations
# opus
-OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus
+OPUS_LIB_DEPENDS= libopus.so:audio/opus
OPUS_CONFIGURE_ENABLE= libopus
# pulseaudio
-PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
PULSEAUDIO_CONFIGURE_ENABLE= libpulse
-PULSEAUDIO_CONFIGURE_OFF= --disable-indev=pulse \
- --disable-outdev=pulse
-# quvi
-QUVI_LIB_DEPENDS= libquvi.so:${PORTSDIR}/multimedia/libquvi
-QUVI_CONFIGURE_ENABLE= libquvi
+# rubberband
+RUBBERBAND_LIB_DEPENDS= librubberband.so:audio/rubberband
+RUBBERBAND_CONFIGURE_ENABLE= librubberband
# rtcpu
RTCPU_CONFIGURE_ENABLE= runtime-cpudetect
# rtmp
-RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp
-RTMP_CONFIGURE_ENABLE= librtmp
+LIBRTMP_LIB_DEPENDS= librtmp.so:multimedia/librtmp
+LIBRTMP_CONFIGURE_ENABLE= librtmp
-# schroedinger
-SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
-SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger
-
# sdl
-SDL_USE= SDL=sdl
-SDL_CONFIGURE_ENABLE= ffplay
-SDL_CONFIGURE_OFF= --disable-outdev=sdl
+SDL_USE= SDL=sdl2
+SDL_CONFIGURE_ENABLE= sdl2
# smbclient
-SMB_LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SMB_USES= samba:lib
SMB_CONFIGURE_ENABLE= libsmbclient
SMB_IMPLIES= GPL3
# snappy
-SNAPPY_LIB_DEPENDS= libsnappy.so:${PORTSDIR}/archivers/snappy
+SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy
SNAPPY_CONFIGURE_ENABLE= libsnappy
+# sndio
+SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
+SNDIO_CONFIGURE_ENABLE= sndio
+
+# soxr
+SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr
+SOXR_CONFIGURE_ENABLE= libsoxr
+
# speex
-SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS= libspeex.so:audio/speex
SPEEX_CONFIGURE_ENABLE= libspeex
# sse support
SSE_CONFIGURE_ENABLE= sse
-SSE_VARS= FFMPEG_CFLAGS+="-msse"
SSE_IMPLIES= MMX
# ssh
-SSH_LIB_DEPENDS= libssh.so:${PORTSDIR}/security/libssh
+SSH_LIB_DEPENDS= libssh.so:security/libssh
SSH_CONFIGURE_ENABLE= libssh
+# srt
+SRT_LIB_DEPENDS= libsrt.so:net/srt
+SRT_CONFIGURE_ENABLE= libsrt
+
+# tesseract
+TESSERACT_LIB_DEPENDS= libtesseract.so:graphics/tesseract
+TESSERACT_CONFIGURE_ENABLE= libtesseract
+
# theora
-THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora
+THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora
THEORA_CONFIGURE_ENABLE= libtheora
# twolame
-TWOLAME_LIB_DEPENDS= libtwolame.so:${PORTSDIR}/audio/twolame
+TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame
TWOLAME_CONFIGURE_ENABLE= libtwolame
# vaapi
-VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva
+VAAPI_LIB_DEPENDS= libva.so:multimedia/libva
VAAPI_CONFIGURE_ENABLE= vaapi
# vdpau
-VDPAU_BUILD_DEPENDS= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau
+VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau
VDPAU_CONFIGURE_ENABLE= vdpau
-# armv6
+# armv6/armv7
VFP_CONFIGURE_ENABLE= vfp
NEON_CONFIGURE_ENABLE= neon
+.if ! ${CFLAGS:M-march*}
NEON_CONFIGURE_ON= --cpu=armv7-a
+.endif
-# vo-aacenc
-VO_AACENC_LIB_DEPENDS= libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc
-VO_AACENC_CONFIGURE_ENABLE= libvo-aacenc
-VO_AACENC_IMPLIES= GPL3
-
# vo-amrwbenc
-VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc
+VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:audio/vo-amrwbenc
VO_AMRWBENC_CONFIGURE_ENABLE= libvo-amrwbenc
VO_AMRWBENC_IMPLIES= GPL3
# vid.stab
-VIDSTAB_LIB_DEPENDS= libvidstab.so:${PORTSDIR}/multimedia/vid.stab
+VIDSTAB_LIB_DEPENDS= libvidstab.so:multimedia/vid.stab
VIDSTAB_CONFIGURE_ENABLE= libvidstab
# vorbis
-VORBIS_LIB_DEPENDS= libvorbisenc.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS= libvorbisenc.so:audio/libvorbis
VORBIS_CONFIGURE_ENABLE= libvorbis
-VORBIS_VARS= FFMPEG_CFLAGS+="-I${LOCALBASE}/include/vorbis"
# vp8
-VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx
+VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx
VPX_CONFIGURE_ENABLE= libvpx
# wavpack
-WAVPACK_LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack
WAVPACK_CONFIGURE_ENABLE= libwavpack
# webp
-WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
WEBP_CONFIGURE_ENABLE= libwebp
-# x11grab
-X11GRAB_USE= XORG=x11,xext,xfixes
-X11GRAB_CONFIGURE_ENABLE= x11grab
-
# x264
-X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264
+X264_LIB_DEPENDS= libx264.so:multimedia/libx264
X264_CONFIGURE_ENABLE= libx264
# x265
-X265_LIB_DEPENDS= libx265.so:${PORTSDIR}/multimedia/x265
+X265_LIB_DEPENDS= libx265.so:multimedia/x265
X265_CONFIGURE_ENABLE= libx265
# xcb
@@ -365,7 +422,7 @@
XCB_CONFIGURE_ENABLE= libxcb
# xvid
-XVID_LIB_DEPENDS= libxvidcore.so:${PORTSDIR}/multimedia/xvid
+XVID_LIB_DEPENDS= libxvidcore.so:multimedia/xvid
XVID_CONFIGURE_ENABLE= libxvid
# xv
@@ -372,26 +429,30 @@
XVIDEO_USE= XORG=xv
XVIDEO_CONFIGURE_OFF= --disable-outdev=xv
+# zimg
+ZIMG_LIB_DEPENDS= libzimg.so:graphics/sekrit-twc-zimg
+ZIMG_CONFIGURE_ENABLE= libzimg
+
# zmq
-ZMQ_LIB_DEPENDS= libzmq.so:${PORTSDIR}/net/libzmq${ZMQ_VERSION}
+ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq${ZMQ_VERSION}
ZMQ_CONFIGURE_ENABLE= libzmq
ZMQ_VERSION?= 4
# zvbi
-ZVBI_LIB_DEPENDS= libzvbi.so:${PORTSDIR}/devel/libzvbi
+ZVBI_LIB_DEPENDS= libzvbi.so:devel/libzvbi
ZVBI_CONFIGURE_ENABLE= libzvbi
# License knobs
GPL3_CONFIGURE_ENABLE= version3
-GPL3_VARS= LICENSE="gpl3 lgpl3"
-LICENSE_FILE_gpl3= ${WRKSRC}/COPYING.GPLv3
-LICENSE_FILE_lgpl3= ${WRKSRC}/COPYING.LGPLv3
+GPL3_VARS= LICENSE="GPLv3+ LGPL3+"
+LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3
+LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3
NONFREE_CONFIGURE_ENABLE=nonfree
-NONFREE_VARS= RESTRICTED="linking to libfaac or libaacplus restricts redistribution"
+NONFREE_VARS= RESTRICTED="enabling OPENSSL or FDK_AAC restricts redistribution"
INSTALL_TARGET= install-progs install-doc install-data \
- install-libs install-headers
+ install-libs install-headers install-examples
DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
@@ -398,7 +459,7 @@
DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
-MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
+MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin V=1
CONFIGURE_ARGS+=--prefix="${PREFIX}" \
--mandir="${PREFIX}/man" \
@@ -405,22 +466,18 @@
--datadir="${DATADIR}" \
--pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
--enable-shared \
+ --enable-pic \
--enable-gpl \
--enable-postproc \
--enable-avfilter \
--enable-avresample \
--enable-pthreads \
- --disable-libstagefright-h264 \
- --disable-libutvideo \
- --disable-libsoxr \
- --cc="${CC}" \
- --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \
- --extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \
- --extra-libs="-lpthread"
+ --cc="${CC}"
+CONFIGURE_ENV_aarch64_clang= ASFLAGS=-no-integrated-as
CONFIGURE_ENV_armv6_clang= ASFLAGS=-no-integrated-as
-CONFIGURE_ARGS_armv6= --disable-fast-unaligned
-CONFIGURE_ARGS_FreeBSD_9= --enable-memalign-hack
+CONFIGURE_ENV_armv7_clang= ASFLAGS=-no-integrated-as
+CONFIGURE_ARGS_armv6=--disable-fast-unaligned
DOC_FILES= Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \
README.md RELEASE_NOTES
@@ -430,42 +487,19 @@
# Custom helpers. FOO_${ARCH} style from bsd.port.mk
CONFIGURE_ENV+= ${CONFIGURE_ENV_${ARCH}_${CHOSEN_COMPILER_TYPE}}
-CONFIGURE_ARGS+=${CONFIGURE_ARGS_${ARCH}}
+CONFIGURE_ARGS+=${CONFIGURE_ARGS_${OPSYS}_${OSREL:R}_${ARCH}}
post-patch:
# {C,LD}FLAGS safeness
- @${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \
- ${WRKSRC}/ffserver.c
- @${REINPLACE_CMD} -E \
- -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \
- s|%%LOCALBASE%%|${LOCALBASE}|g; \
- s|gsm/gsm.h|gsm.h|g" \
- -e 's/freebsd/freebsd|midnightbsd/g' \
+ ${REINPLACE_CMD} -E \
+ -e 's|require_pkg_config opencv|require_pkg_config opencv-core|g' \
+ -e 's|freebsd|midnightbsd|g' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
- @${REINPLACE_CMD} -e 's|-ldl||' \
- -e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
- -e 's|freetype/freetype.h|freetype.h|g' \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-post-patch-SDL-on:
- @${REINPLACE_CMD} -E \
- -e 's|sdl-config|${SDL_CONFIG}|g' \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
- @${FIND} ${WRKSRC} -type f | \
- ${XARGS} -n 10 ${REINPLACE_CMD} -E \
- -e 's|#include <SDL|#include <SDL/SDL|'
-
-post-configure-THEORA-off:
- @${REINPLACE_CMD} -E \
- -e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \
- ${WRKSRC}/config.mak
-
post-install:
(cd ${WRKSRC} && ${COPYTREE_SHARE} \
"${DOC_FILES}" ${STAGEDIR}${DOCSDIR})
(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \
"${DOC_DOCFILES}" ${STAGEDIR}${DOCSDIR})
- ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
- ${PREFIX}/etc/ffserver.conf.sample
.include <bsd.port.mk>
Modified: trunk/multimedia/ffmpeg/distinfo
===================================================================
--- trunk/multimedia/ffmpeg/distinfo 2018-10-30 13:05:20 UTC (rev 24601)
+++ trunk/multimedia/ffmpeg/distinfo 2018-10-30 13:11:38 UTC (rev 24602)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1540904629
-SHA256 (ffmpeg-2.8.15.tar.bz2) = 35647f6c1f6d4a1719bc20b76bf4c26e4ccd665f46b5676c0e91c5a04622ee21
-SIZE (ffmpeg-2.8.15.tar.bz2) = 8597674
+TIMESTAMP = 1531921927
+SHA256 (ffmpeg-4.0.2.tar.xz) = a95c0cc9eb990e94031d2183f2e6e444cc61c99f6f182d1575c433d62afb2f97
+SIZE (ffmpeg-4.0.2.tar.xz) = 8662984
Deleted: trunk/multimedia/ffmpeg/files/ffserver.in
===================================================================
--- trunk/multimedia/ffmpeg/files/ffserver.in 2018-10-30 13:05:20 UTC (rev 24601)
+++ trunk/multimedia/ffmpeg/files/ffserver.in 2018-10-30 13:11:38 UTC (rev 24602)
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: head/multimedia/ffmpeg/files/ffserver.in 360599 2014-07-04 11:35:49Z wg $
-#
-
-# PROVIDE: ffserver
-# REQUIRE: NETWORKING
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable ffserver:
-#
-#ffserver_enable="YES"
-#
-ffserver_enable="${ffserver_enable-NO}"
-
-. /etc/rc.subr
-
-name=ffserver
-rcvar=ffserver_enable
-
-command="%%PREFIX%%/bin/${name}"
-command_args="&"
-required_files=%%PREFIX%%/etc/ffserver.conf
-
-load_rc_config ${name}
-run_rc_command "$1"
Deleted: trunk/multimedia/ffmpeg/files/patch-Makefile
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-Makefile 2018-10-30 13:05:20 UTC (rev 24601)
+++ trunk/multimedia/ffmpeg/files/patch-Makefile 2018-10-30 13:11:38 UTC (rev 24602)
@@ -1,11 +0,0 @@
---- Makefile.orig 2015-06-19 20:44:35 UTC
-+++ Makefile
-@@ -92,7 +92,7 @@ define DOSUBDIR
- $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
- SUBDIR := $(1)/
- include $(SRC_PATH)/$(1)/Makefile
---include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
-+-include $(SRC_PATH)/$(1)/$(FFMPEG_ARCH)/Makefile
- -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
- include $(SRC_PATH)/library.mak
- endef
Modified: trunk/multimedia/ffmpeg/files/patch-configure
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-configure 2018-10-30 13:05:20 UTC (rev 24601)
+++ trunk/multimedia/ffmpeg/files/patch-configure 2018-10-30 13:11:38 UTC (rev 24602)
@@ -1,6 +1,6 @@
---- configure.orig 2015-06-19 20:47:55 UTC
+--- configure.orig 2018-04-20 10:02:55 UTC
+++ configure
-@@ -2814,12 +2814,7 @@ target_os_default=$(tolower $(uname -s))
+@@ -3516,12 +3516,7 @@ target_os_default=$(tolower $(uname -s))
host_os=$target_os_default
# machine
@@ -14,34 +14,3 @@
cpu="generic"
intrinsics="none"
-@@ -5823,7 +5818,7 @@ ifndef MAIN_MAKEFILE
- SRC_PATH:=\$(SRC_PATH:.%=..%)
- endif
- CC_IDENT=$cc_ident
--ARCH=$arch
-+FFMPEG_ARCH=$arch
- INTRINSICS=$intrinsics
- CC=$cc
- CXX=$cxx
-@@ -6035,7 +6030,7 @@ exec_prefix=\${prefix}
- libdir=$libdir
- includedir=$incdir
-
--Name: $name
-+Name: ${name}${build_suffix}
- Description: $comment
- Version: $version
- Requires: $(enabled shared || echo $requires)
-@@ -6049,10 +6044,10 @@ EOF
- mkdir -p doc/examples/pc-uninstalled
- includedir=${source_path}
- [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
-- cat <<EOF > doc/examples/pc-uninstalled/$name.pc
-+ cat <<EOF > doc/examples/pc-uninstalled/${name}${build_suffix}.pc
- prefix=
- exec_prefix=
--libdir=\${pcfiledir}/../../../$name
-+libdir=\${pcfiledir}/../../../${name}${build_suffix}
- includedir=${includedir}
-
- Name: $name
Deleted: trunk/multimedia/ffmpeg/files/patch-libavcodec-Makefile
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavcodec-Makefile 2018-10-30 13:05:20 UTC (rev 24601)
+++ trunk/multimedia/ffmpeg/files/patch-libavcodec-Makefile 2018-10-30 13:11:38 UTC (rev 24602)
@@ -1,11 +0,0 @@
---- libavcodec/Makefile.orig 2015-06-19 20:44:36 UTC
-+++ libavcodec/Makefile
-@@ -877,7 +877,7 @@ SKIPHEADERS +
- old_codec_ids.h \
- tableprint.h \
- tableprint_vlc.h \
-- $(ARCH)/vp56_arith.h \
-+ $(FFMPEG_ARCH)/vp56_arith.h \
-
- SKIPHEADERS-$(CONFIG_D3D11VA) += d3d11va.h dxva2_internal.h
- SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h
Added: trunk/multimedia/ffmpeg/files/patch-libavcodec_libaomenc.c
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavcodec_libaomenc.c (rev 0)
+++ trunk/multimedia/ffmpeg/files/patch-libavcodec_libaomenc.c 2018-10-30 13:11:38 UTC (rev 24602)
@@ -0,0 +1,15 @@
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/b69ea742ab23
+
+--- libavcodec/libaomenc.c.orig 2018-07-18 13:52:00 UTC
++++ libavcodec/libaomenc.c
+@@ -697,10 +697,6 @@ static const AVOption options[] = {
+ "alternate reference frame selection", OFFSET(lag_in_frames), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, VE},
+ { "error-resilience", "Error resilience configuration", OFFSET(error_resilient), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, VE, "er"},
+ { "default", "Improve resiliency against losses of whole frames", 0, AV_OPT_TYPE_CONST, {.i64 = AOM_ERROR_RESILIENT_DEFAULT}, 0, 0, VE, "er"},
+- { "partitions", "The frame partitions are independently decodable "
+- "by the bool decoder, meaning that partitions can be decoded even "
+- "though earlier partitions have been lost. Note that intra predicition"
+- " is still done over the partition boundary.", 0, AV_OPT_TYPE_CONST, {.i64 = AOM_ERROR_RESILIENT_PARTITIONS}, 0, 0, VE, "er"},
+ { "crf", "Select the quality for constant quality mode", offsetof(AOMContext, crf), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 63, VE },
+ { "static-thresh", "A change threshold on blocks below which they will be skipped by the encoder", OFFSET(static_thresh), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
+ { "drop-threshold", "Frame drop threshold", offsetof(AOMContext, drop_threshold), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, VE },
Property changes on: trunk/multimedia/ffmpeg/files/patch-libavcodec_libaomenc.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavdevice-bktr.c 2018-10-30 13:05:20 UTC (rev 24601)
+++ trunk/multimedia/ffmpeg/files/patch-libavdevice-bktr.c 2018-10-30 13:11:38 UTC (rev 24602)
@@ -1,14 +0,0 @@
---- libavdevice/bktr.c.orig 2015-06-19 20:44:50 UTC
-+++ libavdevice/bktr.c
-@@ -24,6 +24,11 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-+typedef unsigned char u_char;
-+typedef unsigned short u_short;
-+typedef unsigned int u_int;
-+typedef unsigned long u_long;
-+
- #include "libavformat/internal.h"
- #include "libavutil/internal.h"
- #include "libavutil/log.h"
Deleted: trunk/multimedia/ffmpeg/files/patch-libavdevice-oss.c
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavdevice-oss.c 2018-10-30 13:05:20 UTC (rev 24601)
+++ trunk/multimedia/ffmpeg/files/patch-libavdevice-oss.c 2018-10-30 13:11:38 UTC (rev 24602)
@@ -1,14 +0,0 @@
---- libavdevice/oss.c.orig 2015-06-19 20:44:50 UTC
-+++ libavdevice/oss.c
-@@ -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 <string.h>
Deleted: trunk/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c 2018-10-30 13:05:20 UTC (rev 24601)
+++ trunk/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c 2018-10-30 13:11:38 UTC (rev 24602)
@@ -1,12 +0,0 @@
---- libavfilter/vf_libopencv.c.orig 2015-06-19 20:44:50 UTC
-+++ libavfilter/vf_libopencv.c
-@@ -23,8 +23,7 @@
- * libopencv wrapper functions
- */
-
--#include <opencv/cv.h>
--#include <opencv/cxcore.h>
-+#include <opencv2/imgproc/imgproc_c.h>
- #include "libavutil/avstring.h"
- #include "libavutil/common.h"
- #include "libavutil/file.h"
Deleted: trunk/multimedia/ffmpeg/files/patch-libavformat-udp.c
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavformat-udp.c 2018-10-30 13:05:20 UTC (rev 24601)
+++ trunk/multimedia/ffmpeg/files/patch-libavformat-udp.c 2018-10-30 13:11:38 UTC (rev 24602)
@@ -1,11 +0,0 @@
---- libavformat/udp.c.orig 2015-06-19 20:44:53 UTC
-+++ libavformat/udp.c
-@@ -71,6 +71,8 @@
- #define UDP_MAX_PKT_SIZE 65536
- #define UDP_HEADER_SIZE 8
-
-+#define IPPROTO_IPV6 41
-+
- typedef struct UDPContext {
- const AVClass *class;
- int udp_fd;
Added: trunk/multimedia/ffmpeg/files/patch-libavformat_rtsp.c
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavformat_rtsp.c (rev 0)
+++ trunk/multimedia/ffmpeg/files/patch-libavformat_rtsp.c 2018-10-30 13:11:38 UTC (rev 24602)
@@ -0,0 +1,44 @@
+--- libavformat/rtsp.c.orig 2016-10-27 16:17:40 UTC
++++ libavformat/rtsp.c
+@@ -1614,7 +1614,12 @@ int ff_rtsp_make_setup_request(AVFormatC
+ }
+ if (ttl > 0)
+ snprintf(optbuf, sizeof(optbuf), "?ttl=%d", ttl);
+- getnameinfo((struct sockaddr*) &addr, sizeof(addr),
++ getnameinfo((struct sockaddr*) &addr,
++#if HAVE_STRUCT_SOCKADDR_SA_LEN
++ ((struct sockaddr*) &addr)->sa_len,
++#else
++ sizeof(addr),
++#endif
+ namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
+ ff_url_join(url, sizeof(url), "rtp", NULL, namebuf,
+ port, "%s", optbuf);
+@@ -1830,8 +1835,13 @@ redirect:
+ goto fail;
+ }
+ if (!getpeername(tcp_fd, (struct sockaddr*) &peer, &peer_len)) {
+- getnameinfo((struct sockaddr*) &peer, peer_len, host, sizeof(host),
+- NULL, 0, NI_NUMERICHOST);
++ getnameinfo((struct sockaddr*) &peer,
++#if HAVE_STRUCT_SOCKADDR_SA_LEN
++ ((struct sockaddr*) &peer)->sa_len,
++#else
++ peer_len,
++#endif
++ host, sizeof(host), NULL, 0, NI_NUMERICHOST);
+ }
+
+ /* request options supported by the server; this also detects server
+@@ -2310,7 +2320,11 @@ static int sdp_read_header(AVFormatConte
+ AVDictionary *opts = map_to_opts(rt);
+
+ err = getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip,
++#if HAVE_STRUCT_SOCKADDR_SA_LEN
++ ((struct sockaddr*) &rtsp_st->sdp_ip)->sa_len,
++#else
+ sizeof(rtsp_st->sdp_ip),
++#endif
+ namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
+ if (err) {
+ av_log(s, AV_LOG_ERROR, "getnameinfo: %s\n", gai_strerror(err));
Property changes on: trunk/multimedia/ffmpeg/files/patch-libavformat_rtsp.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/multimedia/ffmpeg/pkg-plist
===================================================================
--- trunk/multimedia/ffmpeg/pkg-plist 2018-10-30 13:05:20 UTC (rev 24601)
+++ trunk/multimedia/ffmpeg/pkg-plist 2018-10-30 13:11:38 UTC (rev 24602)
@@ -1,17 +1,19 @@
bin/ffmpeg
%%SDL%%bin/ffplay
bin/ffprobe
-%%FFSERVER%%bin/ffserver
-%%FFSERVER%%@sample etc/ffserver.conf.sample
+include/libavcodec/ac3_parser.h
+include/libavcodec/adts_parser.h
include/libavcodec/avcodec.h
+include/libavcodec/avdct.h
include/libavcodec/avfft.h
include/libavcodec/d3d11va.h
+include/libavcodec/dirac.h
include/libavcodec/dv_profile.h
include/libavcodec/dxva2.h
-include/libavcodec/old_codec_ids.h
+include/libavcodec/jni.h
+include/libavcodec/mediacodec.h
include/libavcodec/qsv.h
include/libavcodec/vaapi.h
-include/libavcodec/vda.h
include/libavcodec/vdpau.h
include/libavcodec/version.h
include/libavcodec/videotoolbox.h
@@ -19,10 +21,7 @@
include/libavcodec/xvmc.h
include/libavdevice/avdevice.h
include/libavdevice/version.h
-include/libavfilter/asrc_abuffer.h
-include/libavfilter/avcodec.h
include/libavfilter/avfilter.h
-include/libavfilter/avfiltergraph.h
include/libavfilter/buffersink.h
include/libavfilter/buffersrc.h
include/libavfilter/version.h
@@ -33,9 +32,9 @@
include/libavresample/version.h
include/libavutil/adler32.h
include/libavutil/aes.h
+include/libavutil/aes_ctr.h
include/libavutil/attributes.h
include/libavutil/audio_fifo.h
-include/libavutil/audioconvert.h
include/libavutil/avassert.h
include/libavutil/avconfig.h
include/libavutil/avstring.h
@@ -51,9 +50,11 @@
include/libavutil/common.h
include/libavutil/cpu.h
include/libavutil/crc.h
+include/libavutil/des.h
include/libavutil/dict.h
include/libavutil/display.h
include/libavutil/downmix_info.h
+include/libavutil/encryption_info.h
include/libavutil/error.h
include/libavutil/eval.h
include/libavutil/ffversion.h
@@ -62,6 +63,16 @@
include/libavutil/frame.h
include/libavutil/hash.h
include/libavutil/hmac.h
+include/libavutil/hwcontext.h
+include/libavutil/hwcontext_cuda.h
+include/libavutil/hwcontext_d3d11va.h
+include/libavutil/hwcontext_drm.h
+include/libavutil/hwcontext_dxva2.h
+include/libavutil/hwcontext_mediacodec.h
+include/libavutil/hwcontext_qsv.h
+include/libavutil/hwcontext_vaapi.h
+include/libavutil/hwcontext_vdpau.h
+include/libavutil/hwcontext_videotoolbox.h
include/libavutil/imgutils.h
include/libavutil/intfloat.h
include/libavutil/intreadwrite.h
@@ -69,13 +80,12 @@
include/libavutil/log.h
include/libavutil/lzo.h
include/libavutil/macros.h
+include/libavutil/mastering_display_metadata.h
include/libavutil/mathematics.h
include/libavutil/md5.h
include/libavutil/mem.h
include/libavutil/motion_vector.h
include/libavutil/murmur3.h
-include/libavutil/old_pix_fmts.h
-%%OPENCL%%include/libavutil/opencl.h
include/libavutil/opt.h
include/libavutil/parseutils.h
include/libavutil/pixdesc.h
@@ -83,11 +93,13 @@
include/libavutil/pixfmt.h
include/libavutil/random_seed.h
include/libavutil/rational.h
+include/libavutil/rc4.h
include/libavutil/replaygain.h
include/libavutil/ripemd.h
include/libavutil/samplefmt.h
include/libavutil/sha.h
include/libavutil/sha512.h
+include/libavutil/spherical.h
include/libavutil/stereo3d.h
include/libavutil/tea.h
include/libavutil/threadmessage.h
@@ -94,6 +106,7 @@
include/libavutil/time.h
include/libavutil/timecode.h
include/libavutil/timestamp.h
+include/libavutil/tree.h
include/libavutil/twofish.h
include/libavutil/version.h
include/libavutil/xtea.h
@@ -105,40 +118,40 @@
include/libswscale/version.h
lib/libavcodec.a
lib/libavcodec.so
-lib/libavcodec.so.56
-lib/libavcodec.so.56.60.100
+lib/libavcodec.so.58
+lib/libavcodec.so.58.18.100
lib/libavdevice.a
lib/libavdevice.so
-lib/libavdevice.so.56
-lib/libavdevice.so.56.4.100
+lib/libavdevice.so.58
+lib/libavdevice.so.58.3.100
lib/libavfilter.a
lib/libavfilter.so
-lib/libavfilter.so.5
-lib/libavfilter.so.5.40.101
+lib/libavfilter.so.7
+lib/libavfilter.so.7.16.100
lib/libavformat.a
lib/libavformat.so
-lib/libavformat.so.56
-lib/libavformat.so.56.40.101
+lib/libavformat.so.58
+lib/libavformat.so.58.12.100
lib/libavresample.a
lib/libavresample.so
-lib/libavresample.so.2
-lib/libavresample.so.2.1.0
+lib/libavresample.so.4
+lib/libavresample.so.4.0.0
lib/libavutil.a
lib/libavutil.so
-lib/libavutil.so.54
-lib/libavutil.so.54.31.100
+lib/libavutil.so.56
+lib/libavutil.so.56.14.100
lib/libpostproc.a
lib/libpostproc.so
-lib/libpostproc.so.53
-lib/libpostproc.so.53.3.100
+lib/libpostproc.so.55
+lib/libpostproc.so.55.1.100
lib/libswresample.a
lib/libswresample.so
-lib/libswresample.so.1
-lib/libswresample.so.1.2.101
+lib/libswresample.so.3
+lib/libswresample.so.3.1.100
lib/libswscale.a
lib/libswscale.so
-lib/libswscale.so.3
-lib/libswscale.so.3.1.101
+lib/libswscale.so.5
+lib/libswscale.so.5.1.100
libdata/pkgconfig/libavcodec.pc
libdata/pkgconfig/libavdevice.pc
libdata/pkgconfig/libavfilter.pc
@@ -163,8 +176,6 @@
%%SDL%%man/man1/ffplay.1.gz
man/man1/ffprobe-all.1.gz
man/man1/ffprobe.1.gz
-%%FFSERVER%%man/man1/ffserver-all.1.gz
-%%FFSERVER%%man/man1/ffserver.1.gz
man/man3/libavcodec.3.gz
man/man3/libavdevice.3.gz
man/man3/libavfilter.3.gz
@@ -176,13 +187,17 @@
%%DATADIR%%/examples/README
%%DATADIR%%/examples/avio_dir_cmd.c
%%DATADIR%%/examples/avio_reading.c
-%%DATADIR%%/examples/decoding_encoding.c
+%%DATADIR%%/examples/decode_audio.c
+%%DATADIR%%/examples/decode_video.c
%%DATADIR%%/examples/demuxing_decoding.c
+%%DATADIR%%/examples/encode_audio.c
+%%DATADIR%%/examples/encode_video.c
%%DATADIR%%/examples/extract_mvs.c
%%DATADIR%%/examples/filter_audio.c
%%DATADIR%%/examples/filtering_audio.c
%%DATADIR%%/examples/filtering_video.c
%%DATADIR%%/examples/http_multiclient.c
+%%DATADIR%%/examples/hw_decode.c
%%DATADIR%%/examples/metadata.c
%%DATADIR%%/examples/muxing.c
%%DATADIR%%/examples/qsvdec.c
@@ -191,6 +206,8 @@
%%DATADIR%%/examples/scaling_video.c
%%DATADIR%%/examples/transcode_aac.c
%%DATADIR%%/examples/transcoding.c
+%%DATADIR%%/examples/vaapi_encode.c
+%%DATADIR%%/examples/vaapi_transcode.c
%%DATADIR%%/ffprobe.xsd
%%DATADIR%%/libvpx-1080p.ffpreset
%%DATADIR%%/libvpx-1080p50_60.ffpreset
More information about the Midnightbsd-cvs
mailing list