diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2016-01-06 16:11:02 -0600 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-17 09:40:16 +0700 |
| commit | 386736e9dbac2724c3cabf61311f368776f38733 (patch) | |
| tree | e5ac77014c908832b78bc8e8e3453fc527f5766b | |
| parent | 86725cd603634c8c507e5ea8e6cba7a248b3748a (diff) | |
| download | slackbuilds-386736e9dbac2724c3cabf61311f368776f38733.tar.gz | |
multimedia/ffmpeg: Enabled pulse and libvpx by default
This still needs work for openjpeg.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
| -rw-r--r-- | multimedia/ffmpeg/README | 1 | ||||
| -rw-r--r-- | multimedia/ffmpeg/ffmpeg.SlackBuild | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/multimedia/ffmpeg/README b/multimedia/ffmpeg/README index 4330c40bfa..dde67edae6 100644 --- a/multimedia/ffmpeg/README +++ b/multimedia/ffmpeg/README @@ -31,7 +31,6 @@ SCHROEDINGER=yes|no (default: no), requires schroedinger SPEEX=yes|no (default: no), requires speex TWOLAME=yes|no (default: no), requires twolame VIDSTAB=yes|no (default: no), requires vid.stab -VPX=yes|no (default: no), requires libvpx X264=yes|no (default: no), requires x264 X265=yes|no (default: no), requires x265 XVID=yes|no (default: no), requires xvidcore diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild index 2755afc99e..3788503710 100644 --- a/multimedia/ffmpeg/ffmpeg.SlackBuild +++ b/multimedia/ffmpeg/ffmpeg.SlackBuild @@ -84,7 +84,6 @@ libgsm="" ; [ "${GSM:-no}" != "no" ] && libgsm="--enable-libgsm" librtmp="" ; [ "${RTMP:-no}" != "no" ] && librtmp="--enable-librtmp" dirac_fast="" ; [ "${SCHROEDINGER:-no}" != "no" ] && dirac_fast="--enable-libschroedinger" libspeex="" ; [ "${SPEEX:-no}" != "no" ] && libspeex="--enable-libspeex" -libvpx="" ; [ "${VPX:-no}" != "no" ] && libvpx="--enable-libvpx" libxvid="" ; [ "${XVID:-no}" != "no" ] && libxvid="--enable-libxvid" libbluray="" ; [ "${BLURAY:-no}" != "no" ] && libbluray="--enable-libbluray" libass="" ; [ "${ASS:-no}" != "no" ] && libass="--enable-libass" @@ -95,7 +94,6 @@ libmodplug="" ; [ "${MODPLUG:-no}" != "no" ] && libmodplug="--enable-libmod libopus="" ; [ "${OPUS:-no}" != "no" ] && libopus="--enable-libopus" libtwolame="" ; [ "${TWOLAME:-no}" != "no" ] && libtwolame="--enable-libtwolame" ladspa="" ; [ "${LADSPA:-no}" != "no" ] && ladspa="--enable-ladspa" -pulse="" ; [ "${PULSEAUDIO:-no}" != "no" ] && pulse="--enable-libpulse" libflite="" ; [ "${FLITE:-no}" != "no" ] && libflite="--enable-libflite" libquvi="" ; [ "${QUVI:-no}" != "no" ] && libquvi="--enable-libquvi" libvidstab="" ; [ "${VIDSTAB:-no}" != "no" ] && libvidstab="--enable-libvidstab" @@ -170,6 +168,8 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-libcaca \ --enable-libsmbclient \ --enable-opengl \ + --enable-libvpx \ + --enable-libpulse \ --arch=$ARCH \ $openjpeg \ $libdc1394 \ @@ -181,7 +181,6 @@ CXXFLAGS="$SLKCFLAGS" \ $dirac_fast \ $non_free \ $libgsm \ - $libvpx \ $librtmp \ $opencore_amr \ $libfrei0r \ @@ -195,7 +194,6 @@ CXXFLAGS="$SLKCFLAGS" \ $libopus \ $libtwolame \ $ladspa \ - $pulse \ $fdk \ $libflite \ $libquvi \ |