From 0beaaf7f95866304a9cde8f279ad0b0b25335e63 Mon Sep 17 00:00:00 2001
From: brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 15 Jul 2015 21:51:27 +0000
Subject: Add support for ffmpeg 2.7
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3116 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
configure | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 file changed, 41 insertions(+), 13 deletions(-)
(limited to 'configure')
diff --git a/configure b/configure
index cb7278b6..18cb99fd 100755
--- a/configure
+++ b/configure
@@ -4528,7 +4528,9 @@ eof
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5
$as_echo_n "checking version of ffmpeg... " >&6; }
if test $libpng_VERSION_INT -le 60000000; then
- if test $libpng_VERSION_INT -ge 54020100; then
+ if test $libpng_VERSION_INT -ge 54027100; then
+ FFMPEG_VERSION="2.7"
+ elif test $libpng_VERSION_INT -ge 54020100; then
FFMPEG_VERSION="2.6"
elif test $libpng_VERSION_INT -ge 54015100; then
FFMPEG_VERSION="2.5"
@@ -4750,7 +4752,9 @@ eof
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5
$as_echo_n "checking version of ffmpeg... " >&6; }
if test $libpng_VERSION_INT -le 60000000; then
- if test $libpng_VERSION_INT -ge 54020100; then
+ if test $libpng_VERSION_INT -ge 54027100; then
+ FFMPEG_VERSION="2.7"
+ elif test $libpng_VERSION_INT -ge 54020100; then
FFMPEG_VERSION="2.6"
elif test $libpng_VERSION_INT -ge 54015100; then
FFMPEG_VERSION="2.5"
@@ -5019,6 +5023,8 @@ See the pkg-config man page for more details.
# find lua 5.3, 5.2 or 5.11
# (K)Ubuntu uses lua5.2.pc and lua5.1.pc,
# Mac OS X and other linux distributions use lua.pc
+# Archlinux aur package for 5.3 use lua5.3.pc in order
+# to make it work alongside the 5.2 version.
have_lib="no"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua5.3" >&5
@@ -5166,7 +5172,9 @@ eof
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5
$as_echo_n "checking version of ffmpeg... " >&6; }
if test $lua_VERSION_INT -le 60000000; then
- if test $lua_VERSION_INT -ge 54020100; then
+ if test $lua_VERSION_INT -ge 54027100; then
+ FFMPEG_VERSION="2.7"
+ elif test $lua_VERSION_INT -ge 54020100; then
FFMPEG_VERSION="2.6"
elif test $lua_VERSION_INT -ge 54015100; then
FFMPEG_VERSION="2.5"
@@ -5389,7 +5397,9 @@ eof
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5
$as_echo_n "checking version of ffmpeg... " >&6; }
if test $lua_VERSION_INT -le 60000000; then
- if test $lua_VERSION_INT -ge 54020100; then
+ if test $lua_VERSION_INT -ge 54027100; then
+ FFMPEG_VERSION="2.7"
+ elif test $lua_VERSION_INT -ge 54020100; then
FFMPEG_VERSION="2.6"
elif test $lua_VERSION_INT -ge 54015100; then
FFMPEG_VERSION="2.5"
@@ -5612,7 +5622,9 @@ eof
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5
$as_echo_n "checking version of ffmpeg... " >&6; }
if test $lua_VERSION_INT -le 60000000; then
- if test $lua_VERSION_INT -ge 54020100; then
+ if test $lua_VERSION_INT -ge 54027100; then
+ FFMPEG_VERSION="2.7"
+ elif test $lua_VERSION_INT -ge 54020100; then
FFMPEG_VERSION="2.6"
elif test $lua_VERSION_INT -ge 54015100; then
FFMPEG_VERSION="2.5"
@@ -5834,7 +5846,9 @@ eof
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5
$as_echo_n "checking version of ffmpeg... " >&6; }
if test $lua_VERSION_INT -le 60000000; then
- if test $lua_VERSION_INT -ge 54020100; then
+ if test $lua_VERSION_INT -ge 54027100; then
+ FFMPEG_VERSION="2.7"
+ elif test $lua_VERSION_INT -ge 54020100; then
FFMPEG_VERSION="2.6"
elif test $lua_VERSION_INT -ge 54015100; then
FFMPEG_VERSION="2.5"
@@ -6134,7 +6148,9 @@ eof
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5
$as_echo_n "checking version of ffmpeg... " >&6; }
if test $libavcodec_VERSION_INT -le 60000000; then
- if test $libavcodec_VERSION_INT -ge 54020100; then
+ if test $libavcodec_VERSION_INT -ge 54027100; then
+ FFMPEG_VERSION="2.7"
+ elif test $libavcodec_VERSION_INT -ge 54020100; then
FFMPEG_VERSION="2.6"
elif test $libavcodec_VERSION_INT -ge 54015100; then
FFMPEG_VERSION="2.5"
@@ -6475,7 +6491,9 @@ eof
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5
$as_echo_n "checking version of ffmpeg... " >&6; }
if test $libavformat_VERSION_INT -le 60000000; then
- if test $libavformat_VERSION_INT -ge 54020100; then
+ if test $libavformat_VERSION_INT -ge 54027100; then
+ FFMPEG_VERSION="2.7"
+ elif test $libavformat_VERSION_INT -ge 54020100; then
FFMPEG_VERSION="2.6"
elif test $libavformat_VERSION_INT -ge 54015100; then
FFMPEG_VERSION="2.5"
@@ -6695,7 +6713,9 @@ eof
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5
$as_echo_n "checking version of ffmpeg... " >&6; }
if test $libavutil_VERSION_INT -le 60000000; then
- if test $libavutil_VERSION_INT -ge 54020100; then
+ if test $libavutil_VERSION_INT -ge 54027100; then
+ FFMPEG_VERSION="2.7"
+ elif test $libavutil_VERSION_INT -ge 54020100; then
FFMPEG_VERSION="2.6"
elif test $libavutil_VERSION_INT -ge 54015100; then
FFMPEG_VERSION="2.5"
@@ -6930,7 +6950,9 @@ eof
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5
$as_echo_n "checking version of ffmpeg... " >&6; }
if test $libswscale_VERSION_INT -le 60000000; then
- if test $libswscale_VERSION_INT -ge 54020100; then
+ if test $libswscale_VERSION_INT -ge 54027100; then
+ FFMPEG_VERSION="2.7"
+ elif test $libswscale_VERSION_INT -ge 54020100; then
FFMPEG_VERSION="2.6"
elif test $libswscale_VERSION_INT -ge 54015100; then
FFMPEG_VERSION="2.5"
@@ -7161,7 +7183,9 @@ eof
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5
$as_echo_n "checking version of ffmpeg... " >&6; }
if test $libprojectM_VERSION_INT -le 60000000; then
- if test $libprojectM_VERSION_INT -ge 54020100; then
+ if test $libprojectM_VERSION_INT -ge 54027100; then
+ FFMPEG_VERSION="2.7"
+ elif test $libprojectM_VERSION_INT -ge 54020100; then
FFMPEG_VERSION="2.6"
elif test $libprojectM_VERSION_INT -ge 54015100; then
FFMPEG_VERSION="2.5"
@@ -7467,7 +7491,9 @@ eof
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5
$as_echo_n "checking version of ffmpeg... " >&6; }
if test $portaudio_VERSION_INT -le 60000000; then
- if test $portaudio_VERSION_INT -ge 54020100; then
+ if test $portaudio_VERSION_INT -ge 54027100; then
+ FFMPEG_VERSION="2.7"
+ elif test $portaudio_VERSION_INT -ge 54020100; then
FFMPEG_VERSION="2.6"
elif test $portaudio_VERSION_INT -ge 54015100; then
FFMPEG_VERSION="2.5"
@@ -7698,7 +7724,9 @@ eof
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5
$as_echo_n "checking version of ffmpeg... " >&6; }
if test $libpcre_VERSION_INT -le 60000000; then
- if test $libpcre_VERSION_INT -ge 54020100; then
+ if test $libpcre_VERSION_INT -ge 54027100; then
+ FFMPEG_VERSION="2.7"
+ elif test $libpcre_VERSION_INT -ge 54020100; then
FFMPEG_VERSION="2.6"
elif test $libpcre_VERSION_INT -ge 54015100; then
FFMPEG_VERSION="2.5"
--
cgit v1.2.3