diff mbox

[FFmpeg-devel,v2,3/4] configure: fix check for opencl

Message ID 1527994692-23104-4-git-send-email-mypopydev@gmail.com
State Superseded
Headers show

Commit Message

Jun Zhao June 3, 2018, 2:58 a.m. UTC 
add pkg-config support for opencl check.

Signed-off-by: Jun Zhao <mypopydev@gmail.com>
---
 configure | 1 +
 1 file changed, 1 insertion(+)

Comments

James Almer June 3, 2018, 3:04 a.m. UTC | #1 
On 6/2/2018 11:58 PM, Jun Zhao wrote:
> add pkg-config support for opencl check.
> 
> Signed-off-by: Jun Zhao <mypopydev@gmail.com>
> ---
>  configure | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/configure b/configure
> index 22eeca2..69b8827 100755
> --- a/configure
> +++ b/configure
> @@ -6130,6 +6130,7 @@ enabled openal            && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal"
>                                 die "ERROR: openal must be installed and version must be 1.1 or compatible"; }
>  enabled opencl            && { check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL ||
>                                 check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL ||
> +                               check_pkg_config opencl OpenCL CL/cl.h clEnqueueNDRangeKernel -lOpenCL ||

Seeing this is exactly the same as last time and judging by your comment
in 0/4, I assume you sent the wrong patch.

>                                 die "ERROR: opencl not found"; } &&
>                               { test_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" ||
>                                 test_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" ||
>
Jun Zhao June 4, 2018, 1:47 a.m. UTC | #2 
2018-06-03 11:04 GMT+08:00 James Almer <jamrial@gmail.com>:
> On 6/2/2018 11:58 PM, Jun Zhao wrote:
>> add pkg-config support for opencl check.
>>
>> Signed-off-by: Jun Zhao <mypopydev@gmail.com>
>> ---
>>  configure | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/configure b/configure
>> index 22eeca2..69b8827 100755
>> --- a/configure
>> +++ b/configure
>> @@ -6130,6 +6130,7 @@ enabled openal            && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal"
>>                                 die "ERROR: openal must be installed and version must be 1.1 or compatible"; }
>>  enabled opencl            && { check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL ||
>>                                 check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL ||
>> +                               check_pkg_config opencl OpenCL CL/cl.h clEnqueueNDRangeKernel -lOpenCL ||
>
> Seeing this is exactly the same as last time and judging by your comment
> in 0/4, I assume you sent the wrong patch.
Yes, have updated the fix in the V3 patchsets
>
>>                                 die "ERROR: opencl not found"; } &&
>>                               { test_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" ||
>>                                 test_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" ||
>>
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
diff mbox

Patch

diff --git a/configure b/configure
index 22eeca2..69b8827 100755
--- a/configure
+++ b/configure
@@ -6130,6 +6130,7 @@  enabled openal            && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal"
                                die "ERROR: openal must be installed and version must be 1.1 or compatible"; }
 enabled opencl            && { check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL ||
                                check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL ||
+                               check_pkg_config opencl OpenCL CL/cl.h clEnqueueNDRangeKernel -lOpenCL ||
                                die "ERROR: opencl not found"; } &&
                              { test_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" ||
                                test_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" ||