Re: [FFmpeg-devel] [PATCH] configure: fix the non pkg-config libmfx check

[James Almer]

On 11/9/2017 2:51 PM, James Almer wrote:
> On 11/9/2017 2:31 PM, James Almer wrote:
>> Based on a patch by Aaron Levinson.
>>
>> Signed-off-by: James Almer 
>> ---
>> Untested
>>
>>  configure | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/configure b/configure
>> index f396abda5b..7dd540bad3 100755
>> --- a/configure
>> +++ b/configure
>> @@ -2772,6 +2772,7 @@ wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
>>  wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
>>  
>>  # hardware-accelerated codecs
>> +libmfx_suggest="advapi32"
> 
> OnN second thought, this line is probably superfluous. The changes to
> the require() call below should have the same effect.

Approved on IRC by Aaron Levinson with this line removed, so pushed.

> 
>>  omx_deps="libdl pthreads"
>>  omx_rpi_select="omx"
>>  qsv_deps="libmfx"
>> @@ -5824,6 +5825,7 @@ check_header asm/types.h
>>  # so we also check that atomics actually work here
>>  check_builtin stdatomic_h stdatomic.h "atomic_int foo, bar = 
>> ATOMIC_VAR_INIT(-1); atomic_store(, 0)"
>>  
>> +check_lib advapi32 "windows.h"RegQueryInfoKey  -ladvapi32
>>  check_lib ole32"windows.h"CoTaskMemFree-lole32
>>  check_lib shell32  "windows.h shellapi.h" CommandLineToArgvW   -lshell32
>>  check_lib wincrypt "windows.h wincrypt.h" CryptGenRandom   -ladvapi32
>> @@ -5981,7 +5983,7 @@ enabled libkvazaar&& require_pkg_config 
>> libkvazaar "kvazaar >= 0.8.1" kv
>>  # pkg-config support.  Instead, users should make sure that the build
>>  # can find the libraries and headers through other means.
>>  enabled libmfx&& { use_pkg_config libmfx libmfx 
>> "mfx/mfxvideo.h" MFXInit ||
>> -   { require libmfx "mfx/mfxvideo.h" MFXInit 
>> -llibmfx && warn "using libmfx without pkg-config"; } }
>> +   { require libmfx "mfx/mfxvideo.h" MFXInit 
>> "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } }
>>  enabled libmodplug&& require_pkg_config libmodplug libmodplug 
>> libmodplug/modplug.h ModPlug_Load
>>  enabled libmp3lame&& require "libmp3lame >= 3.98.3" lame/lame.h 
>> lame_set_VBR_quality -lmp3lame
>>  enabled libmysofa && require libmysofa "mysofa.h" mysofa_load 
>> -lmysofa $zlib_extralibs
>>
> 

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] configure: fix the non pkg-config libmfx check

[James Almer]

On 11/9/2017 2:31 PM, James Almer wrote:
> Based on a patch by Aaron Levinson.
> 
> Signed-off-by: James Almer 
> ---
> Untested
> 
>  configure | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index f396abda5b..7dd540bad3 100755
> --- a/configure
> +++ b/configure
> @@ -2772,6 +2772,7 @@ wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
>  wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
>  
>  # hardware-accelerated codecs
> +libmfx_suggest="advapi32"

OnN second thought, this line is probably superfluous. The changes to
the require() call below should have the same effect.

>  omx_deps="libdl pthreads"
>  omx_rpi_select="omx"
>  qsv_deps="libmfx"
> @@ -5824,6 +5825,7 @@ check_header asm/types.h
>  # so we also check that atomics actually work here
>  check_builtin stdatomic_h stdatomic.h "atomic_int foo, bar = 
> ATOMIC_VAR_INIT(-1); atomic_store(, 0)"
>  
> +check_lib advapi32 "windows.h"RegQueryInfoKey  -ladvapi32
>  check_lib ole32"windows.h"CoTaskMemFree-lole32
>  check_lib shell32  "windows.h shellapi.h" CommandLineToArgvW   -lshell32
>  check_lib wincrypt "windows.h wincrypt.h" CryptGenRandom   -ladvapi32
> @@ -5981,7 +5983,7 @@ enabled libkvazaar&& require_pkg_config 
> libkvazaar "kvazaar >= 0.8.1" kv
>  # pkg-config support.  Instead, users should make sure that the build
>  # can find the libraries and headers through other means.
>  enabled libmfx&& { use_pkg_config libmfx libmfx "mfx/mfxvideo.h" 
> MFXInit ||
> -   { require libmfx "mfx/mfxvideo.h" MFXInit 
> -llibmfx && warn "using libmfx without pkg-config"; } }
> +   { require libmfx "mfx/mfxvideo.h" MFXInit 
> "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } }
>  enabled libmodplug&& require_pkg_config libmodplug libmodplug 
> libmodplug/modplug.h ModPlug_Load
>  enabled libmp3lame&& require "libmp3lame >= 3.98.3" lame/lame.h 
> lame_set_VBR_quality -lmp3lame
>  enabled libmysofa && require libmysofa "mysofa.h" mysofa_load 
> -lmysofa $zlib_extralibs
> 

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] configure: fix the non pkg-config libmfx check

[James Almer]

Based on a patch by Aaron Levinson.

Signed-off-by: James Almer 
---
Untested

 configure | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index f396abda5b..7dd540bad3 100755
--- a/configure
+++ b/configure
@@ -2772,6 +2772,7 @@ wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
 wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
 
 # hardware-accelerated codecs
+libmfx_suggest="advapi32"
 omx_deps="libdl pthreads"
 omx_rpi_select="omx"
 qsv_deps="libmfx"
@@ -5824,6 +5825,7 @@ check_header asm/types.h
 # so we also check that atomics actually work here
 check_builtin stdatomic_h stdatomic.h "atomic_int foo, bar = 
ATOMIC_VAR_INIT(-1); atomic_store(, 0)"
 
+check_lib advapi32 "windows.h"RegQueryInfoKey  -ladvapi32
 check_lib ole32"windows.h"CoTaskMemFree-lole32
 check_lib shell32  "windows.h shellapi.h" CommandLineToArgvW   -lshell32
 check_lib wincrypt "windows.h wincrypt.h" CryptGenRandom   -ladvapi32
@@ -5981,7 +5983,7 @@ enabled libkvazaar&& require_pkg_config 
libkvazaar "kvazaar >= 0.8.1" kv
 # pkg-config support.  Instead, users should make sure that the build
 # can find the libraries and headers through other means.
 enabled libmfx&& { use_pkg_config libmfx libmfx "mfx/mfxvideo.h" 
MFXInit ||
-   { require libmfx "mfx/mfxvideo.h" MFXInit 
-llibmfx && warn "using libmfx without pkg-config"; } }
+   { require libmfx "mfx/mfxvideo.h" MFXInit 
"-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } }
 enabled libmodplug&& require_pkg_config libmodplug libmodplug 
libmodplug/modplug.h ModPlug_Load
 enabled libmp3lame&& require "libmp3lame >= 3.98.3" lame/lame.h 
lame_set_VBR_quality -lmp3lame
 enabled libmysofa && require libmysofa "mysofa.h" mysofa_load -lmysofa 
$zlib_extralibs
-- 
2.14.2

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel