[PATCH] mprove checking for default external ffmpeg

[Matthias Ringwald]

# HG changeset patch
# User Matthias Ringwald <mringwal@...>
# Date 1216204586 -7200
# Node ID 40e6a6791d7515edc345ebeb9206e481c239066a
# Parent  bba451e00d42a0a1f32439f041974aebfcb479cb
mprove checking for default external ffmpeg

Stop if --with-external-ffmpeg and (libavcode or libpostroc) not found
Check for libpostproc before automatically accepting external ffmpeg

diff -r bba451e00d42 -r 40e6a6791d75 configure.ac
--- a/configure.ac Sun Jul 13 11:36:23 2008 +0100
+++ b/configure.ac Wed Jul 16 12:36:26 2008 +0200
@@ -322,16 +322,18 @@ case "x$with_external_ffmpeg" in
    xno)
       ;;
    xyes)
-      PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.20.0])
+      PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.20.0], [],
+          [AC_MSG_ERROR([--with-external-ffmpeg=yes but libavcodec missing or to older than 51.20.0])])
+      PKG_CHECK_MODULES([FFMPEG_POSTPROC], [libpostproc], [],
+          [AC_MSG_ERROR([--with-external-ffmpeg=yes but libpostproc missing])])
       ;;
    *)
       with_external_ffmpeg=yes
-      PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.20.0], [],
- [AC_MSG_RESULT(no); with_external_ffmpeg=no])
+      PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.20.0], [], [with_external_ffmpeg=no])
+      PKG_CHECK_MODULES([FFMPEG_POSTPROC], [libpostproc],  [], [with_external_ffmpeg=no])
       ;;
 esac
 if test "x$with_external_ffmpeg" != "xno"; then
-   PKG_CHECK_MODULES([FFMPEG_POSTPROC], [libpostproc])
    AC_SUBST([FFMPEG_CFLAGS])
    AC_SUBST([FFMPEG_LIBS])
    AC_SUBST([FFMPEG_POSTPROC_CFLAGS])

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
xine-devel mailing list
xine-devel@...
https://lists.sourceforge.net/lists/listinfo/xine-devel

[Darren Salt]

I demand that Matthias Ringwald may or may not have written...

[snip]
> [Improve] checking for default external ffmpeg
>
> Stop if --with-external-ffmpeg and (libavcode or libpostroc) not found
> Check for libpostproc before automatically accepting external ffmpeg
[snip]
> -      PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.20.0])
> +      PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.20.0], [],

It may be worth using a shell variable or m4 macro for the version no.

> +          [AC_MSG_ERROR([--with-external-ffmpeg=yes but libavcodec missing
or to older than 51.20.0])])

s/to //; alternatively, "... or too old (< 51.20.0)"

[snip]
--
| Darren Salt    | linux or ds at              | nr. Ashington, | Toon
| RISC OS, Linux | youmustbejoking,demon,co,uk | Northumberland | Army
| + Use more efficient products. Use less.          BE MORE ENERGY EFFICIENT.

Confucius say: He who post large binary, get flamed.

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
xine-devel mailing list
xine-devel@...
https://lists.sourceforge.net/lists/listinfo/xine-devel

[Matthias Ringwald]

On 16.07.2008, at 19:46, Darren Salt wrote:

> I demand that Matthias Ringwald may or may not have written...
>
> [snip]
>> [Improve] checking for default external ffmpeg
>>
>> Stop if --with-external-ffmpeg and (libavcode or libpostroc) not  
>> found
>> Check for libpostproc before automatically accepting external ffmpeg
> [snip]
>> -      PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.20.0])
>> +      PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.20.0], [],
>
> It may be worth using a shell variable or m4 macro for the version no.

Yeah, I've thought about it, but then, as the version number is only  
used in a
very narrow scope and the second use is just an error msg, I didn't go  
for that.
Should I use one and resubmit another patch, or can you do this on-the-
fly?

>> +          [AC_MSG_ERROR([--with-external-ffmpeg=yes but libavcodec  
>> missing
> or to older than 51.20.0])])
>
> s/to //; alternatively, "... or too old (< 51.20.0)"

I don't mind better wording. Yours is more short/precise.

matthias

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
xine-devel mailing list
xine-devel@...
https://lists.sourceforge.net/lists/listinfo/xine-devel