[SCM] libav/experimental: remove extraneous per-OS disabling of video4linux[2]

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:56:12 UTC 2013


The following commit has been merged in the experimental branch:
commit 77d3bfe216323362371a2ebb085d12aa24847cc4
Author: Måns Rullgård <mans at mansr.com>
Date:   Sat Feb 10 21:55:22 2007 +0000

    remove extraneous per-OS disabling of video4linux[2]
    
    Originally committed as revision 7910 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 93edde7..ed7048a 100755
--- a/configure
+++ b/configure
@@ -793,8 +793,6 @@ case $targetos in
     SHFLAGS=-nostart
     # disable Linux things
     audio_oss="no"
-    video4linux="no"
-    video4linux2="no"
     dv1394="no"
     # enable BeOS things
     audio_beos="yes"
@@ -808,8 +806,6 @@ case $targetos in
         extralibs="-lnet"
     fi ;;
   SunOS)
-    video4linux="no"
-    video4linux2="no"
     audio_oss="no"
     dv1394="no"
     make="gmake"
@@ -819,8 +815,6 @@ case $targetos in
     add_extralibs "-lsocket -lnsl"
     ;;
   NetBSD)
-    video4linux="no"
-    video4linux2="no"
     bktr="yes"
     audio_oss="yes"
     dv1394="no"
@@ -828,8 +822,6 @@ case $targetos in
     add_extralibs "-lossaudio"
     ;;
   OpenBSD)
-    video4linux="no"
-    video4linux2="no"
     bktr="yes"
     audio_oss="yes"
     dv1394="no"
@@ -844,8 +836,6 @@ case $targetos in
     add_extralibs "-lossaudio"
     ;;
   FreeBSD)
-    video4linux="no"
-    video4linux2="no"
     bktr="yes"
     audio_oss="yes"
     dv1394="no"
@@ -854,16 +844,12 @@ case $targetos in
     add_cflags "-pthread"
     ;;
   GNU/kFreeBSD)
-    video4linux="no"
-    video4linux2="no"
     bktr="yes"
     audio_oss="yes"
     dv1394="no"
     add_cflags "-pthread"
     ;;
   BSD/OS)
-    video4linux="no"
-    video4linux2="no"
     bktr="yes"
     audio_oss="yes"
     dv1394="no"
@@ -873,8 +859,6 @@ case $targetos in
     ;;
   Darwin)
     cc="cc"
-    video4linux="no"
-    video4linux2="no"
     audio_oss="no"
     dv1394="no"
     need_memalign="no"
@@ -896,8 +880,6 @@ case $targetos in
   CYGWIN*)
     targetos=CYGWIN
     shlibdir="$bindir"
-    video4linux="no"
-    video4linux2="no"
     audio_oss="yes"
     dv1394="no"
     VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
@@ -916,8 +898,6 @@ case $targetos in
   IRIX*)
     targetos=IRIX
     ranlib="echo ignoring ranlib"
-    video4linux="no"
-    video4linux2="no"
     audio_oss="no"
     make="gmake"
     ;;
@@ -937,8 +917,6 @@ case $targetos in
     EXESUF=".exe"
     extralibs=""
     pkg_requires=""
-    video4linux="no"
-    video4linux2="no"
     audio_oss="no"
     dv1394="no"
     ffserver="no"
@@ -1203,8 +1181,6 @@ you do not need to pass additional options.
 EOF
         exit 1
     fi
-    video4linux="no"
-    video4linux2="no"
     audio_oss="no"
     dv1394="no"
     dc1394="no"

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list