From ae70403685d984519e670f5a71e0211a88058212 Mon Sep 17 00:00:00 2001
From: Heinz Wiesinger <pprkut@slackbuilds.org>
Date: Sun, 2 Sep 2012 15:43:45 +0200
Subject: [PATCH] multimedia/ffmpeg: Make building with openssl optional.

Linking against openssl creates a non redistributable binary,
and thus requires --enable-nonfree passed to configure.
Make building with support for openssl optional because of that.

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
---
 multimedia/ffmpeg/README            | 1 +
 multimedia/ffmpeg/ffmpeg.SlackBuild | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/multimedia/ffmpeg/README b/multimedia/ffmpeg/README
index 26d6b5dd6b..be1d53bf9c 100644
--- a/multimedia/ffmpeg/README
+++ b/multimedia/ffmpeg/README
@@ -16,6 +16,7 @@ JP2=yes|no (default: no), requires openjpeg
 LAME=yes|no (default: yes), requires lame
 OPENAL=yes|no (default: no), requires OpenAL
 OPENCORE=yes|no (default: no), requires opencore-amr
+OPENSSL=yes|no (default: no), creates non-redistributable binary
 RTMP=yes|no (default: no), requires rtmpdump
 SCHROEDINGER=yes|no (default: no), requires schroedinger
 SPEEX=yes|no (default: no), requires speex
diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild
index f64058375f..77523e7b5c 100644
--- a/multimedia/ffmpeg/ffmpeg.SlackBuild
+++ b/multimedia/ffmpeg/ffmpeg.SlackBuild
@@ -8,7 +8,7 @@
 
 PRGNAM=ffmpeg
 VERSION=${VERSION:-0.11.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -74,6 +74,8 @@ opencore_amr="" ; [ "${OPENCORE:-no}" != "no" ] && \
   opencore_amr="--enable-libopencore-amrnb --enable-libopencore-amrwb"
 libfaac=""      ; [ "${FAAC:-no}" != "no" ]     && \
   { libfaac="--enable-libfaac" ; non_free="--enable-nonfree" ; }
+ssl=""      ; [ "${OPENSSL:-no}" != "no" ]     && \
+  { ssl="--enable-openssl" ; non_free="--enable-nonfree" ; }
 openjpeg=""     ; [ "${JP2:-no}" != "no" ]      && \
   { openjpeg="--enable-libopenjpeg" ; \
     SLKCFLAGS="$SLKCFLAGS -I/usr/include/openjpeg-1.5" ; }
@@ -115,7 +117,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-x11grab \
   --enable-avfilter \
   --enable-gnutls \
-  --enable-openssl \
   --enable-libcdio \
   --arch=$ARCH \
   $openjpeg \
@@ -136,7 +137,8 @@ CXXFLAGS="$SLKCFLAGS" \
   $libcelt \
   $libbluray \
   $libass \
-  $libopenal
+  $libopenal \
+  $ssl
 
 make
 make install DESTDIR=$PKG