Attachment 169412 Details for Bug 208457 – v1

[patch] v1

ffmpeg30_options.diff (text/plain), 5.11 KB, created by Jan Beich on 2016-04-18 00:46:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-04-18 00:46:07 UTC

Size: 5.11 KB

patch

obsolete

>diff --git multimedia/ffmpeg/Makefile multimedia/ffmpeg/Makefile
>index d4e7904..f8eef7f 100644
>--- multimedia/ffmpeg/Makefile
>+++ multimedia/ffmpeg/Makefile
>@@ -24,21 +24,22 @@ SHEBANG_FILES=	doc/texi2pod.pl
> 
> PORTSCOUT=	limit:^2\.
> 
>-OPTIONS_DEFINE= ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT DC1394 \
>+OPTIONS_DEFINE= ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT CHROMAPRINT 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 \
>+		LAME LIBBLURAY MODPLUG NETCDF OPENAL OPENCL OPENCV OPENGL \
> 		OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO \
>-		RTCPU RTMP SCHROEDINGER SDL SMB SNAPPY SPEEX SSH \
>-		THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS \
>+		RUBBERBAND RTCPU SCHROEDINGER SDL SMB SNAPPY SPEEX SSH \
>+		TESSERACT THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS \
> 		VO_AMRWBENC VPX WAVPACK WEBP X11GRAB X264 X265 XCB XVID \
>-		XVIDEO ZMQ ZVBI
>+		XVIDEO ZIMG ZMQ ZVBI
> 
> OPTIONS_DEFAULT=	FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \
> 			OPENCV RTCPU SCHROEDINGER THEORA V4L VORBIS VPX \
> 			X264 XVID
> 
>-OPTIONS_RADIO=	SSL
>+OPTIONS_RADIO=	RTMP SSL
>+OPTIONS_RADIO_RTMP=	GCRYPT GMP LIBRTMP OPENSSL
> OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
> OPTIONS_GROUP=	LICENSE
> OPTIONS_GROUP_LICENSE=	GPL3 NONFREE
>@@ -53,6 +54,7 @@ OPTIONS_DEFAULT_i386=	${MACHINE_CPU:tu:MMMX} ${MACHINE_CPU:tu:MSSE}
> ASS_DESC=	Subtitles rendering via libass
> BS2B_DESC=	Bauer Stereophonic-to-Binaural filter
> CDIO_DESC=	Audio CD grabbing with libcdio
>+CHROMAPRINT_DESC=	Audio fingerprinting with chromaprint
> DC1394_DESC=	IIDC-1394 grabbing using libdc1394
> FDK_AAC_DESC=	AAC audio encoding via Fraunhofer FDK
> FFSERVER_DESC=	Build and install ffserver
>@@ -62,14 +64,20 @@ GPL3_DESC=	Allow (L)GPL version 3 code(cs)
> ILBC_DESC=	Internet Low Bit Rate codec
> LICENSE_DESC=	Licensing options
> NEON_DESC=	Enable Media Processing Engine instructions
>+NETCDF_DESC=	SOFAlizer binaural filter
> NONFREE_DESC=	Allow use of nonfree code
> OPENCL_DESC=	Heterogeneous computing via OpenCL
> OPENH264_DESC=	H.264 video codec support via OpenH264
>+RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband
> RTCPU_DESC=	Detect CPU capabilities at runtime
>+RTMP_DESC=	RTMP protocol support
>+LIBRTMP_DESC=	${RTMP_DESC} via librtmp
>+TESSERACT_DESC=	Optical Character Recognition via Tesseract
> VFP_DESC=	Enable 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
> 
>@@ -110,6 +118,10 @@ CDIO_CONFIGURE_ENABLE=	libcdio
> CELT_LIB_DEPENDS=	libcelt0.so:audio/celt
> CELT_CONFIGURE_ENABLE=	libcelt
> 
>+# chromaprint
>+CHROMAPRINT_LIB_DEPENDS=	libchromaprint.so:audio/chromaprint
>+CHROMAPRINT_CONFIGURE_ENABLE=	chromaprint
>+
> # dc1394
> DC1394_LIB_DEPENDS=	libdc1394.so:multimedia/libdc1394
> DC1394_CONFIGURE_ENABLE=	libdc1394
>@@ -156,6 +168,10 @@ FREI0R_CONFIGURE_ENABLE=	frei0r
> 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:security/gnutls
> GNUTLS_CONFIGURE_ENABLE=	gnutls
>@@ -164,6 +180,11 @@ GNUTLS_CONFIGURE_ENABLE=	gnutls
> 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:audio/gsm
> GSM_CONFIGURE_ENABLE=	libgsm
>@@ -207,6 +228,10 @@ MMX_CONFIGURE_ENABLE=	mmx
> MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
> MODPLUG_CONFIGURE_ENABLE=	libmodplug
> 
>+# netcdf
>+NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
>+NETCDF_CONFIGURE_ENABLE=	netcdf
>+
> # OpenAL
> OPENAL_LIB_DEPENDS=	libopenal.so:audio/openal-soft
> OPENAL_CONFIGURE_ENABLE=	openal
>@@ -251,12 +276,16 @@ PULSEAUDIO_CONFIGURE_ENABLE=	libpulse
> PULSEAUDIO_CONFIGURE_OFF=	--disable-indev=pulse \
> 				--disable-outdev=pulse
> 
>+# rubberband
>+RUBBERBAND_LIB_DEPENDS=	librubberband.so:audio/rubberband
>+RUBBERBAND_CONFIGURE_ENABLE=	librubberband
>+
> # rtcpu
> RTCPU_CONFIGURE_ENABLE=	runtime-cpudetect
> 
> # rtmp
>-RTMP_LIB_DEPENDS=	librtmp.so: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:multimedia/schroedinger
>@@ -289,6 +318,10 @@ SSE_IMPLIES=		MMX
> SSH_LIB_DEPENDS=	libssh.so:security/libssh
> SSH_CONFIGURE_ENABLE=	libssh
> 
>+# tesseract
>+TESSERACT_LIB_DEPENDS=	libtesseract.so:graphics/tesseract
>+TESSERACT_CONFIGURE_ENABLE=	libtesseract
>+
> # theora
> THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
> THEORA_CONFIGURE_ENABLE=	libtheora
>@@ -360,6 +393,10 @@ XVID_CONFIGURE_ENABLE=	libxvid
> 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:net/libzmq${ZMQ_VERSION}
> ZMQ_CONFIGURE_ENABLE=	libzmq

Flags:

jbeich: maintainer-approval? (multimedia)

Actions: View | Diff

Attachments on bug 208457: 168876 | 168877 | 169412 | 169413