[Lunar-commits] <moonbase-other> ffmpeg: Version bump to 1.0. Adding to the CONFIGURE to help skirt around

[stumbles]

commit 0edf92b7839d0ab2fa2ea49b8b4701e75ffe2c39
Author: stumbles <stumbles at lunar-linux.org>
Date: Sat, 13 Oct 2012 06:17:48 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/0edf92b7839d0ab2fa2ea49b8b4701e75ffe2c39

ffmpeg: Version bump to 1.0. Adding to the CONFIGURE to help skirt around

potential depends loops and adding some additional optional_depends.
---
  video/ffmpeg/CONFIGURE | +12/-0    
  video/ffmpeg/DEPENDS   | +17/-1    
  video/ffmpeg/DETAILS   | +3/-3     
  3 files changed, 32 insertions(+), 4 deletions(-)

--- a/video/ffmpeg/CONFIGURE
+++ b/video/ffmpeg/CONFIGURE
@@ -4,3 +4,15 @@ if module_installed opencv ; then
    mquery USE_OPENCV "Enable OpenCV library support? " y "--enable-libopencv" "--disable-libopencv"
 fi
 
+if module_installed frei0r ; then
+   mquery USE_FREI0R "Enable frei0r library support" y "--enable-frei0r" "--disable-frei0r"
+fi
+
+if module_installed openal ; then
+   mquery USE_OPENAL "Enable openal library support?" y "--enable-openal" "--disable-openal"
+fi
+
+if module_installed pulseaudio ; then
+   mquery USE_PULSE "Enable pulseaudio support?" y "--enable-libpulse" "--disable-libpulse"
+fi
+
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -12,12 +12,28 @@ optional_depends "speex"         "--enable-libspeex"        "--disable-libspeex"
 optional_depends "openjpeg"      "--enable-libopenjpeg"     "--disable-libopenjpeg"     "for JPEG 2000 decoding support"
 optional_depends "freetype2"     "--enable-libfreetype"     "--disable-libfreetype"     "for truetype fonts support"
 optional_depends "schroedinger"  "--enable-libschroedinger" "--disable-libschroedinger" "for Dirac support"
-optional_depends "x264-snapshot" "--enable-libx264"         "--disable-libx264"         "for H.264 encoding support"
 optional_depends "libdc1394"     "--enable-libdc1394"       "--disable-libdc1394"       "for IIDC-1394 grabbing (firewire) support"
 optional_depends "rtmpdump"      "--enable-librtmp"         "--disable-librtmp"         "for RTMP[E] support"
 optional_depends "libva"         "--enable-vaapi"           "--disable-vaapi"           "for hardware-accelerated video"
 optional_depends "SDL"           "--enable-ffplay"          "--disable-ffplay"          "for the ffplay media player"
 optional_depends "yasm"          "--enable-yasm"            "--disable-yasm"            "for yasm assembly support"
+optional_depends "libiec61883"   "--enable-libiec61883"     "--disable-libiec61883"     "for media reception and transmission for DV, MPEG2-TS, and AMDTP support"
+optional_depends "twolame"       "--enable-libtwolame"      "--disable-libtwolame"      "for optimised MPEG Audio Layer 2 encoder support"
+optional_depends "v4l-utils"     "--enable-libv4l2"         "--disable-libv4l2"         "for video4linux2 device support"
+optional_depends "openssl"       "--enable-openssl"         "--disable-openssl"         "for openssl support"
+optional_depends "libaacplus"    "--enable-libaacplus"      "--disable-libaacplus"      "for AAC+ High Efficiency Advanced Audio Code support"
+optional_depends "libmodplug"    "--enable-libmodplug"      "--disable-libmodplug"      "for decoding mod audio file support"
+optional_depends "libass"        "--enable-libass"          "--disable-libass"          "for SAA/ASS subtitles rendering support"
+optional_depends "libblueray"    "--enable-libbluray"       "--disable-libbluray"       "for Blueray reading support"
+optional_depends "libcaca"       "--enable-libcaca"         "--disable-libcaca"         "for output represented with ASCII text support"
+optional_depends "libcdio"       "--enable-libcdio"         "--disable-libcdio"         "for CD Input and Control support"
+optional_depends "vo-aacenc"     "--enable-libvo-aacenc"    "--disable-libvo-aacenc"    "for AAC audio encoding support"
+optional_depends "vo-amrwbenc"   "--enable-libvo-amrwbenc"  "--disable-libvo-amrwbenc"  "for AMR-WB audio encoding support"
+optional_depends "opus"          "--enable-libopus"         "--disable-libopus"         "for interactive speech and audio transmission via Internet"
+
+optional_depends "x264-snapshot" "--enable-libx264 --extra-libs=-lx264" \
+                                 "--disable-libx264"                    \
+                                 "for H.264 encoding support"
 
 optional_depends "opencore-amr"                                   \
                  "--enable-libopencore-amrwb --enable-version3    \
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,11 +1,11 @@
           MODULE=ffmpeg
-         VERSION=0.7.13
+         VERSION=1.0
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=http://www.ffmpeg.org/releases
-      SOURCE_VFY=sha1:f55f553520373e2de644fd05a7feb7a9ce25f797
+      SOURCE_VFY=sha1:bf1f917c4fa26cf225616f2063e60c33cac546be
         WEB_SITE=http://www.ffmpeg.org
          ENTERED=20020327
-         UPDATED=20120612
+         UPDATED=20121212
       MAINTAINER=stumbles at lunar-linux.org
            SHORT="ffmpeg is an avi decoder"