diff mbox

[FFmpeg-devel] configure: add support for libnpp* from cuda sdk 9

Message ID 20170829123811.5714-1-timo@rothenpieler.org
State Accepted
Commit 1ac03c8dc0a9359cdd33e341303296862a0e5f84
Headers show

Commit Message

Timo Rothenpieler Aug. 29, 2017, 12:38 p.m. UTC 
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
---
 configure | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Ricardo Constantino Aug. 29, 2017, 4:19 p.m. UTC | #1 
On 29 August 2017 at 13:38, Timo Rothenpieler <timo@rothenpieler.org> wrote:

> Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
> ---
>  configure | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index 61d8160491..172ff3fc07 100755
> --- a/configure
> +++ b/configure
> @@ -5875,7 +5875,9 @@ enabled libmfx            && { use_pkg_config libmfx
> "mfx/mfxvideo.h" MFXInit ||
>  enabled libmodplug        && require_pkg_config 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
> -enabled libnpp            && require libnpp npp.h nppGetLibVersion -lnppi
> -lnppc
> +enabled libnpp            && { check_lib libnpp npp.h nppGetLibVersion
> -lnppig -lnppicc -lnppc ||
> +                               check_lib libnpp npp.h nppGetLibVersion
> -lnppi -lnppc ||
> +                               die "ERROR: libnpp not found"; }
>  enabled libopencore_amrnb && require libopencore_amrnb
> opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
>  enabled libopencore_amrwb && require libopencore_amrwb
> opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
>  enabled libopencv         && { check_header opencv2/core/core_c.h &&
> --
> 2.14.1
>
>
Tested on Windows with 64-bit MinGW, working fine.
Timo Rothenpieler Aug. 30, 2017, 9:27 a.m. UTC | #2 
applied
diff mbox

Patch

diff --git a/configure b/configure
index 61d8160491..172ff3fc07 100755
--- a/configure
+++ b/configure
@@ -5875,7 +5875,9 @@  enabled libmfx            && { use_pkg_config libmfx "mfx/mfxvideo.h" MFXInit ||
 enabled libmodplug        && require_pkg_config 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
-enabled libnpp            && require libnpp npp.h nppGetLibVersion -lnppi -lnppc
+enabled libnpp            && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc ||
+                               check_lib libnpp npp.h nppGetLibVersion -lnppi -lnppc ||
+                               die "ERROR: libnpp not found"; }
 enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
 enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
 enabled libopencv         && { check_header opencv2/core/core_c.h &&