[SCM] libav/experimental: mingw: don't check for minimum mingw runtime and w32api versions for mingw-w64

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:36:15 UTC 2013


The following commit has been merged in the experimental branch:
commit b1549d6113980d547c99817a496160742dbdf4fd
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date:   Tue Jan 27 20:03:22 2009 +0000

    mingw: don't check for minimum mingw runtime and w32api versions for mingw-w64
    
    there is no vfw in mingw-64, and it has different (not yet stable) version
    defines
    
    Originally committed as revision 16827 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index f8054cf..f3fc16e 100755
--- a/configure
+++ b/configure
@@ -1494,11 +1494,13 @@ case $target_os in
         SHFLAGS='-shared -Wl,--output-def,$$(@:$(SLIBSUF)=.def) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base'
         objformat="win32"
         enable dos_paths
+        if ! enabled x86_64; then
         check_cpp_condition _mingw.h "(__MINGW32_MAJOR_VERSION > 3) || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
             die "ERROR: MinGW runtime version must be >= 3.15."
         enabled_any avisynth vfwcap_demuxer &&
             { check_cpp_condition w32api.h "(__W32API_MAJOR_VERSION > 3) || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION >= 13)" ||
               die "ERROR: avisynth and vfwcap_demuxer require w32api version 3.13 or later."; }
+        fi
         ;;
     cygwin*)
         target_os=cygwin

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list