From owner-svn-ports-all@FreeBSD.ORG Wed May 13 17:36:56 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2F1743E0; Wed, 13 May 2015 17:36:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 03B001CE2; Wed, 13 May 2015 17:36:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4DHat7P007449; Wed, 13 May 2015 17:36:55 GMT (envelope-from xmj@FreeBSD.org) Received: (from xmj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4DHataL007447; Wed, 13 May 2015 17:36:55 GMT (envelope-from xmj@FreeBSD.org) Message-Id: <201505131736.t4DHataL007447@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: xmj set sender to xmj@FreeBSD.org using -f From: Johannes Jost Meixner Date: Wed, 13 May 2015 17:36:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386232 - in head/multimedia: ffmpeg ffmpeg26 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 May 2015 17:36:56 -0000 Author: xmj Date: Wed May 13 17:36:54 2015 New Revision: 386232 URL: https://svnweb.freebsd.org/changeset/ports/386232 Log: multimedia/ffmpeg{,26}: make GNUTLS and OPENSSL mutually exclusive - make GNUTLS and OPENSSL mutually exclusive Differential Revision: https://reviews.freebsd.org/D2533 Reviewed by: riggs Modified: head/multimedia/ffmpeg/Makefile head/multimedia/ffmpeg26/Makefile Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Wed May 13 17:34:09 2015 (r386231) +++ head/multimedia/ffmpeg/Makefile Wed May 13 17:36:54 2015 (r386232) @@ -25,8 +25,8 @@ USE_PERL5= build 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_DEFINE= AACPLUS ALSA AMR_NB AMR_ 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 Modified: head/multimedia/ffmpeg26/Makefile ============================================================================== --- head/multimedia/ffmpeg26/Makefile Wed May 13 17:34:09 2015 (r386231) +++ head/multimedia/ffmpeg26/Makefile Wed May 13 17:36:54 2015 (r386232) @@ -32,8 +32,8 @@ CONFIGURE_ENV+= EXESUF="${FFMPEG_SUFFIX} 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_DEFINE= AACPLUS ALSA AMR_NB AMR_ 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