mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
Enable network streaming via https and other encrypted connections
- Introduce GNUTLS OPTION and make it default - Add extra patch for gnutls support from mplayer svn head While on it - Fix cflags/ldflags in mencoder: USES pkgconfig
This commit is contained in:
Thomas Zander
parent
9234af2077
commit
4d537e472d
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=372967
4 changed files with 83 additions and 8 deletions
|
|
@ -3,19 +3,19 @@
|
|||
|
||||
PORTNAME= mencoder
|
||||
PORTVERSION= ${MPLAYER_PORT_VERSION}
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
|
||||
COMMENT= Convenient video file and movie encoder
|
||||
|
||||
.include "${.CURDIR}/../mplayer/Makefile.shared"
|
||||
|
||||
OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO CDPARANOIA DEBUG DIRAC \
|
||||
DV FAAC FONTCONFIG FRIBIDI GIF GSM IPV6 JACK \
|
||||
DV FAAC FONTCONFIG FRIBIDI GIF GNUTLS GSM IPV6 JACK \
|
||||
LADSPA LIBMNG LZO MAD MEMALIGN NAS OCFLAGS OPENAL \
|
||||
OPENJPEG OPUS OTCHAIN PROFILE PULSEAUDIO REAL RTCPU RTMP \
|
||||
SCHROEDINGER SMB THEORA TWOLAME V4L VPX WIN32 X264 XVID
|
||||
|
||||
OPTIONS_DEFAULT=GIF IPV6 OCFLAGS RTCPU WIN32 X264 XVID
|
||||
OPTIONS_DEFAULT=GIF GNUTLS IPV6 OCFLAGS RTCPU WIN32 X264 XVID
|
||||
|
||||
BLURAY_DESC?= BluRay support
|
||||
LZO_DESC?= Enable external liblzo library
|
||||
|
|
@ -41,7 +41,7 @@ TOOLFILES= aconvert.sh binary_codecs.sh calcbpp.pl \
|
|||
subedit.pl subsearch.sh vobshift.py \
|
||||
w32codec_dl.pl wma2ogg.pl
|
||||
|
||||
USES+= alias iconv shebangfix
|
||||
USES+= alias iconv pkgconfig shebangfix
|
||||
SHEBANG_FILES= TOOLS/calcbpp.pl TOOLS/checktree.sh TOOLS/countquant.pl \
|
||||
TOOLS/divx2svcd.sh TOOLS/dvd2divxscript.pl TOOLS/mencvcd.sh \
|
||||
TOOLS/mphelp_check.py TOOLS/plotpsnr.pl TOOLS/psnr-video.sh \
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
|
||||
PORTNAME= mplayer
|
||||
PORTVERSION= ${MPLAYER_PORT_VERSION}
|
||||
PORTREVISION= 4
|
||||
PORTREVISION= 5
|
||||
|
||||
COMMENT= High performance media player supporting many formats
|
||||
|
||||
.include "${.CURDIR}/Makefile.shared"
|
||||
|
||||
OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA DEBUG DV \
|
||||
ENCA FONTCONFIG FRIBIDI GIF GSM GUI IPV6 JACK \
|
||||
ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \
|
||||
LADSPA LIBMNG LIRC LZO MEMALIGN NAS OCFLAGS \
|
||||
OPENAL OPENGL OPENJPEG OPUS OTCHAIN PROFILE \
|
||||
PULSEAUDIO REAL RTC RTCPU RTMP SCHROEDINGER SDL \
|
||||
|
|
@ -20,8 +20,8 @@ OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA DEBUG DV \
|
|||
OPTIONS_RADIO= RGCD
|
||||
OPTIONS_RADIO_RGCD= CDIO CDPARANOIA
|
||||
|
||||
OPTIONS_DEFAULT=FONTCONFIG FRIBIDI IPV6 OCFLAGS OPENGL RTCPU SKINS \
|
||||
WIN32 X11 X11DGA X11VM XINERAMA XVIDEO
|
||||
OPTIONS_DEFAULT=FONTCONFIG FRIBIDI GNUTLS IPV6 OCFLAGS OPENGL RTCPU \
|
||||
SKINS WIN32 X11 X11DGA X11VM XINERAMA XVIDEO
|
||||
|
||||
BLURAY_DESC?= BluRay support
|
||||
ENCA_DESC?= Charset conversion via enca
|
||||
|
|
|
|||
|
|
@ -48,6 +48,12 @@ DEFAULT_KERN_HZ=1024
|
|||
# Non-simplified OPTIONS handling
|
||||
# ===============================
|
||||
|
||||
.if ${PORT_OPTIONS:MGNUTLS}
|
||||
LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls
|
||||
CONFIGURE_ARGS+= --enable-gnutls
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gnutls
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MIPV6}
|
||||
CATEGORIES+= ipv6
|
||||
.else
|
||||
|
|
|
|||
69
multimedia/mplayer/files/extra-patch-gnutls
Normal file
69
multimedia/mplayer/files/extra-patch-gnutls
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
--- configure.orig 2014-08-23 15:59:32.000000000 +0200
|
||||
+++ configure 2014-11-20 20:21:23.123454188 +0100
|
||||
@@ -387,6 +387,7 @@
|
||||
--enable-ass-internal enable internal SSA/ASS subtitle support [autodetect]
|
||||
--disable-ass disable SSA/ASS subtitle support [autodetect]
|
||||
--enable-rpath enable runtime linker path for extra libs [disabled]
|
||||
+ --disable-gnutls disable GnuTLS [autodetect]
|
||||
|
||||
Codecs:
|
||||
--enable-gif enable GIF support [autodetect]
|
||||
@@ -851,6 +852,7 @@
|
||||
_inet6=auto
|
||||
_sctp=auto
|
||||
_gethostbyname2=auto
|
||||
+_gnutls=auto
|
||||
_ftp=auto
|
||||
_musepack=no
|
||||
_vstream=auto
|
||||
@@ -1360,6 +1362,8 @@
|
||||
--disable-ass-internal) ass_internal=no ;;
|
||||
--enable-rpath) _rpath=yes ;;
|
||||
--disable-rpath) _rpath=no ;;
|
||||
+ --enable-gnutls) _gnutls=yes ;;
|
||||
+ --disable-gnutls) _gnutls=no ;;
|
||||
|
||||
--enable-fribidi) _fribidi=yes ;;
|
||||
--disable-fribidi) _fribidi=no ;;
|
||||
@@ -4322,6 +4326,24 @@
|
||||
fi
|
||||
|
||||
|
||||
+echocheck "GnuTLS"
|
||||
+if test "$_gnutls" = auto ; then
|
||||
+ _gnutls=no
|
||||
+ if $_pkg_config --exists gnutls ; then
|
||||
+ statement_check gnutls/gnutls.h 'gnutls_global_init()' $($_pkg_config --libs --cflags gnutls) &&
|
||||
+ _gnutls=yes
|
||||
+ fi
|
||||
+fi
|
||||
+if test "$_gnutls" = yes ; then
|
||||
+ def_gnutls='#define CONFIG_GNUTLS 1'
|
||||
+ libavprotocols="$libavprotocols HTTPS_PROTOCOL TLS_PROTOCOL"
|
||||
+ extra_cflags="$extra_cflags $($_pkg_config --cflags gnutls)"
|
||||
+ extra_ldflags="$extra_ldflags $($_pkg_config --libs gnutls)"
|
||||
+else
|
||||
+ def_gnutls='#define CONFIG_GNUTLS 0'
|
||||
+fi
|
||||
+echores "$_gnutls"
|
||||
+
|
||||
echocheck "Samba support (libsmbclient)"
|
||||
if test "$_smb" = yes; then
|
||||
extra_ldflags="$extra_ldflags -lsmbclient"
|
||||
@@ -8714,6 +8736,7 @@
|
||||
CONFIG_BZLIB = $bzlib
|
||||
CONFIG_CRYSTALHD= $crystalhd
|
||||
CONFIG_ENCODERS = yes
|
||||
+CONFIG_GNUTLS = $_gnutls
|
||||
CONFIG_GPL = yes
|
||||
CONFIG_ICONV = $_iconv
|
||||
CONFIG_MLIB = $_mlib
|
||||
@@ -9249,7 +9272,7 @@
|
||||
#define CONFIG_FASTDIV 0
|
||||
#define CONFIG_FFSERVER 0
|
||||
#define CONFIG_FTRAPV 0
|
||||
-#define CONFIG_GNUTLS 0
|
||||
+$def_gnutls
|
||||
#define CONFIG_GPL 1
|
||||
#define CONFIG_GRAY 0
|
||||
#define CONFIG_LIBMODPLUG 0
|
||||
Loading…
Add table
Reference in a new issue