Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F135836406
D2533.id5367.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
2 KB
Referenced Files
None
Subscribers
None
D2533.id5367.diff
View Options
Index: head/multimedia/ffmpeg/Makefile
===================================================================
--- head/multimedia/ffmpeg/Makefile
+++ head/multimedia/ffmpeg/Makefile
@@ -25,8 +25,8 @@
WANT_SDL= yes
OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG DOCS FAAC \
- FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS GSM ICONV \
- JACK LAME LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG OPENSSL \
+ FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GSM ICONV \
+ JACK LAME LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG \
OPTIMIZED_CFLAGS OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX \
THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \
X11GRAB X264 X265 XVID
@@ -34,6 +34,9 @@
OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \
OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID
+OPTIONS_SINGLE= SSL
+OPTIONS_SINGLE_SSL= GNUTLS OPENSSL
+
ASS_DESC= Subtitles rendering via libass
CDIO_DESC= Audio CD grabbing with libcdio
FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK
Index: head/multimedia/ffmpeg26/Makefile
===================================================================
--- head/multimedia/ffmpeg26/Makefile
+++ head/multimedia/ffmpeg26/Makefile
@@ -32,8 +32,8 @@
MAKE_ARGS+= EXESUF="${FFMPEG_SUFFIX}"
OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG DOCS FAAC \
- FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS GSM ICONV \
- JACK LAME LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG OPENSSL \
+ FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GSM ICONV \
+ JACK LAME LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG \
OPTIMIZED_CFLAGS OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX \
THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \
X11GRAB X264 X265 XVID
@@ -41,6 +41,9 @@
OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \
OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID
+OPTIONS_SINGLE= SSL
+OPTIONS_SINGLE_SSL= GNUTLS OPENSSL
+
ASS_DESC= Subtitles rendering via libass
CDIO_DESC= Audio CD grabbing with libcdio
FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Nov 14, 9:22 AM (18 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25277519
Default Alt Text
D2533.id5367.diff (2 KB)
Attached To
Mode
D2533: multimedia/ffmpeg{,26}: make GNUTLS and OPENSSL mutually exclusive
Attached
Detach File
Event Timeline
Log In to Comment