[FFmpeg-devel] [PATCH] configure: Add workaround for qtkit detection using ICC, compiler.

Michael Niedermayer michaelni at gmx.at
Sun Apr 6 15:52:22 CEST 2014


On Sun, Apr 06, 2014 at 03:02:16PM +0200, Thilo Borgmann wrote:
> Like Reimar suggested on log, this works for me for proper detection of qtkit using:
> 
> Mac OS X 10.9 with clang
> Linux with gcc
> Linux with icc
> 
> -Thilo

>  configure |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 96f5a6cf4915a1b8139050b48e08e1cc673871f4  0001-configure-Add-workaround-for-qtkit-detection-using-I.patch
> From d9a1e4177d2bc55410c747576f8bc5820d4938ab Mon Sep 17 00:00:00 2001
> From: Thilo Borgmann <thilo.borgmann at mail.de>
> Date: Sun, 6 Apr 2014 14:57:24 +0200
> Subject: [PATCH] configure: Add workaround for qtkit detection using ICC
>  compiler.
> 
> ---
>  configure | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index f238276..945c847 100755
> --- a/configure
> +++ b/configure
> @@ -4671,7 +4671,7 @@ enabled openssl           && { check_lib openssl/ssl.h SSL_library_init -lssl -l
>                                 check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
>                                 check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
>                                 die "ERROR: openssl not found"; }
> -enabled qtkit_indev      && { check_header_oc QTKit/QTKit.h || disable qtkit_indev; }
> +enabled qtkit_indev      && { { check_header QTKit/QTKit.h && check_header_oc QTKit/QTKit.h; } || disable qtkit_indev; }

applied

though if someone can fix check_header_oc that would probably be
better

maybe by checking if a output file has been created or something like
that (dont forget to make sure the output file doesnt exist before
the test)

but for now this patch is better than nothing, build should not be
broken while the best solution is discussed

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Democracy is the form of government in which you can choose your dictator
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140406/ebd7d55f/attachment.asc>


More information about the ffmpeg-devel mailing list