Re: [FFmpeg-devel] [PATCH] configure: add direct detection of libopencv

2016-02-27 Thread Michael Niedermayer 
On Mon, Feb 15, 2016 at 06:25:01PM -0300, James Almer wrote:
> On 2/7/2016 8:24 PM, wm4 wrote:
> > On Sun, 7 Feb 2016 23:25:53 +0100
> > Andreas Cadhalpun  wrote:
> > 
> >> The pkg-config file contains all opencv libraries, not only the
> >> neccessary ones.
> >>
> >> This change makes it possible to use the libopencv-imgproc-dev Debian
> >> package instead of libopencv-dev, saving about 200 MB of useless
> >> build-dependencies.
> >>
> >> In particular one doesn't need to install the parts of opencv that
> >> depend on ffmpeg libraries.
> >>
> >> Signed-off-by: Andreas Cadhalpun 
> >> ---
> >>  configure | 3 ++-
> >>  1 file changed, 2 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/configure b/configure
> >> index 1000cb1..36ab7e5 100755
> >> --- a/configure
> >> +++ b/configure
> >> @@ -5488,7 +5488,8 @@ enabled libnut&& require libnut libnut.h 
> >> nut_demuxer_init -lnut
> >>  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 &&
> >> -   require_pkg_config opencv 
> >> opencv2/core/core_c.h cvCreateImageHeader ||
> >> +   { use_pkg_config opencv 
> >> opencv2/core/core_c.h cvCreateImageHeader ||
> >> + require opencv opencv2/core/core_c.h 
> >> cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
> >> require_pkg_config opencv opencv/cxcore.h 
> >> cvCreateImageHeader; }
> >>  enabled libopenh264   && require_pkg_config openh264 wels/codec_api.h 
> >> WelsGetCodecVersion
> >>  enabled libopenjpeg   && { check_lib openjpeg-2.1/openjpeg.h 
> >> opj_version -lopenjp2 -DOPJ_STATIC ||
> > 
> > Why not send a patch to opencv?
> 

> Doesn't hurt adding this in the meantime.

applied

thanks

[...]

-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Its not that you shouldnt use gotos but rather that you should write
readable code and code with gotos often but not always is less readable


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] configure: add direct detection of libopencv

2016-02-15 Thread James Almer 
On 2/7/2016 8:24 PM, wm4 wrote:
> On Sun, 7 Feb 2016 23:25:53 +0100
> Andreas Cadhalpun  wrote:
> 
>> The pkg-config file contains all opencv libraries, not only the
>> neccessary ones.
>>
>> This change makes it possible to use the libopencv-imgproc-dev Debian
>> package instead of libopencv-dev, saving about 200 MB of useless
>> build-dependencies.
>>
>> In particular one doesn't need to install the parts of opencv that
>> depend on ffmpeg libraries.
>>
>> Signed-off-by: Andreas Cadhalpun 
>> ---
>>  configure | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/configure b/configure
>> index 1000cb1..36ab7e5 100755
>> --- a/configure
>> +++ b/configure
>> @@ -5488,7 +5488,8 @@ enabled libnut&& require libnut libnut.h 
>> nut_demuxer_init -lnut
>>  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 &&
>> -   require_pkg_config opencv 
>> opencv2/core/core_c.h cvCreateImageHeader ||
>> +   { use_pkg_config opencv 
>> opencv2/core/core_c.h cvCreateImageHeader ||
>> + require opencv opencv2/core/core_c.h 
>> cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
>> require_pkg_config opencv opencv/cxcore.h 
>> cvCreateImageHeader; }
>>  enabled libopenh264   && require_pkg_config openh264 wels/codec_api.h 
>> WelsGetCodecVersion
>>  enabled libopenjpeg   && { check_lib openjpeg-2.1/openjpeg.h 
>> opj_version -lopenjp2 -DOPJ_STATIC ||
> 
> Why not send a patch to opencv?

Doesn't hurt adding this in the meantime.

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

Re: [FFmpeg-devel] [PATCH] configure: add direct detection of libopencv

2016-02-07 Thread wm4 
On Sun, 7 Feb 2016 23:25:53 +0100
Andreas Cadhalpun  wrote:

> The pkg-config file contains all opencv libraries, not only the
> neccessary ones.
> 
> This change makes it possible to use the libopencv-imgproc-dev Debian
> package instead of libopencv-dev, saving about 200 MB of useless
> build-dependencies.
> 
> In particular one doesn't need to install the parts of opencv that
> depend on ffmpeg libraries.
> 
> Signed-off-by: Andreas Cadhalpun 
> ---
>  configure | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index 1000cb1..36ab7e5 100755
> --- a/configure
> +++ b/configure
> @@ -5488,7 +5488,8 @@ enabled libnut&& require libnut libnut.h 
> nut_demuxer_init -lnut
>  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 &&
> -   require_pkg_config opencv 
> opencv2/core/core_c.h cvCreateImageHeader ||
> +   { use_pkg_config opencv opencv2/core/core_c.h 
> cvCreateImageHeader ||
> + require opencv opencv2/core/core_c.h 
> cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
> require_pkg_config opencv opencv/cxcore.h 
> cvCreateImageHeader; }
>  enabled libopenh264   && require_pkg_config openh264 wels/codec_api.h 
> WelsGetCodecVersion
>  enabled libopenjpeg   && { check_lib openjpeg-2.1/openjpeg.h opj_version 
> -lopenjp2 -DOPJ_STATIC ||

Why not send a patch to opencv?
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] configure: add direct detection of libopencv

2016-02-07 Thread Andreas Cadhalpun 
The pkg-config file contains all opencv libraries, not only the
neccessary ones.

This change makes it possible to use the libopencv-imgproc-dev Debian
package instead of libopencv-dev, saving about 200 MB of useless
build-dependencies.

In particular one doesn't need to install the parts of opencv that
depend on ffmpeg libraries.

Signed-off-by: Andreas Cadhalpun 
---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 1000cb1..36ab7e5 100755
--- a/configure
+++ b/configure
@@ -5488,7 +5488,8 @@ enabled libnut&& require libnut libnut.h 
nut_demuxer_init -lnut
 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 &&
-   require_pkg_config opencv opencv2/core/core_c.h 
cvCreateImageHeader ||
+   { use_pkg_config opencv opencv2/core/core_c.h 
cvCreateImageHeader ||
+ require opencv opencv2/core/core_c.h 
cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
require_pkg_config opencv opencv/cxcore.h 
cvCreateImageHeader; }
 enabled libopenh264   && require_pkg_config openh264 wels/codec_api.h 
WelsGetCodecVersion
 enabled libopenjpeg   && { check_lib openjpeg-2.1/openjpeg.h opj_version 
-lopenjp2 -DOPJ_STATIC ||
-- 
2.7.0
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel