ffmpeg: fix pkg-config utilization

Message ID 20170720115657.11406-1-nicolas.dechesne@linaro.org
State New
Headers show

Commit Message

Nicolas Dechesne July 20, 2017, 11:56 a.m.
in config.log we can see:
WARNING: aarch64-linaro-linux-pkg-config not found, library detection may fail.

ffmpeg configure script is not looking for pkg-config at the rigt place since it
is assuming cross compilation. let's force its value in the recipe.

This patches 'fixes' library detection and brings the following diff:

* RDEPENDS: ++libxcb (>= 1.12) libxcb-shape (>= 1.12) libxcb-shm (>= 1.12) libxcb-xfixes (>= 1.12)
* PKGSIZE : 79167 -> 87823

Which basically means that the following conf options were left dangling in EXTRA_OECONF:

--enable-libxcb
--enable-libxcb-shm
--enable-libxcb-xfixes
--enable-libxcb-shape

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>

---
 meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb | 1 +
 1 file changed, 1 insertion(+)

-- 
2.11.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Khem Raj July 20, 2017, 12:54 p.m. | #1
On Thu, Jul 20, 2017 at 7:56 AM, Nicolas Dechesne
<nicolas.dechesne@linaro.org> wrote:
> in config.log we can see:

> WARNING: aarch64-linaro-linux-pkg-config not found, library detection may fail.

>

> ffmpeg configure script is not looking for pkg-config at the rigt place since it

> is assuming cross compilation. let's force its value in the recipe.

>

> This patches 'fixes' library detection and brings the following diff:

>

> * RDEPENDS: ++libxcb (>= 1.12) libxcb-shape (>= 1.12) libxcb-shm (>= 1.12) libxcb-xfixes (>= 1.12)

> * PKGSIZE : 79167 -> 87823

>

> Which basically means that the following conf options were left dangling in EXTRA_OECONF:

>

> --enable-libxcb

> --enable-libxcb-shm

> --enable-libxcb-xfixes

> --enable-libxcb-shape

>

> Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>

> ---

>  meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb | 1 +

>  1 file changed, 1 insertion(+)

>

> diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb

> index f4bb2ba1f5..442d4f4532 100644

> --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb

> +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb

> @@ -107,6 +107,7 @@ EXTRA_OECONF = " \

>      --datadir=${datadir}/ffmpeg \

>      ${@bb.utils.contains('AVAILTUNES', 'mips32r2', '', '--disable-mipsdsp --disable-mipsdspr2', d)} \

>      --cpu=${@cpu(d)} \

> +    --pkg-config=pkg-config \


There is a proposal to repace pkgconfig with pkgconf, and I hope it
will create a symlink to provide pkg-config
but it would be interesting to check, otherwise this fix will be
voided with that change

>  "

>

>  EXTRA_OECONF_append_linux-gnux32 = " --disable-asm"

> --

> 2.11.0

>

> --

> _______________________________________________

> Openembedded-core mailing list

> Openembedded-core@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Nicolas Dechesne July 20, 2017, 12:58 p.m. | #2
On Thu, Jul 20, 2017 at 1:56 PM, Nicolas Dechesne
<nicolas.dechesne@linaro.org> wrote:
>

> in config.log we can see:

> WARNING: aarch64-linaro-linux-pkg-config not found, library detection may fail.

>

> ffmpeg configure script is not looking for pkg-config at the rigt place since it

> is assuming cross compilation. let's force its value in the recipe.

>

> This patches 'fixes' library detection and brings the following diff:

>

> * RDEPENDS: ++libxcb (>= 1.12) libxcb-shape (>= 1.12) libxcb-shm (>= 1.12) libxcb-xfixes (>= 1.12)

> * PKGSIZE : 79167 -> 87823


I should have mentioned that we could do the following:

and it would make this patch a no-op instead. the patch would only
'fix' the pkg-config mistmatch. and we can fixup the xcb dependencies
as a follow up patch instead. i am opened to suggestions..

>

> Which basically means that the following conf options were left dangling in EXTRA_OECONF:

>

> --enable-libxcb

> --enable-libxcb-shm

> --enable-libxcb-xfixes

> --enable-libxcb-shape

>

> Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>

> ---

>  meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb | 1 +

>  1 file changed, 1 insertion(+)

>

> diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb

> index f4bb2ba1f5..442d4f4532 100644

> --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb

> +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb

> @@ -107,6 +107,7 @@ EXTRA_OECONF = " \

>      --datadir=${datadir}/ffmpeg \

>      ${@bb.utils.contains('AVAILTUNES', 'mips32r2', '', '--disable-mipsdsp --disable-mipsdspr2', d)} \

>      --cpu=${@cpu(d)} \

> +    --pkg-config=pkg-config \

>  "

>

>  EXTRA_OECONF_append_linux-gnux32 = " --disable-asm"

> --

> 2.11.0

>

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb
@@ -87,6 +87,10 @@ EXTRA_OECONF = " \
     --enable-pic \
     --enable-shared \
     --enable-pthreads \
+    --disable-libxcb \
+    --disable-libxcb-shm \
+    --disable-libxcb-xfixes \
+    --disable-libxcb-shape \
     ${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \
     \


Ross Burton July 20, 2017, 1:03 p.m. | #3
On 20 July 2017 at 13:58, Nicolas Dechesne <nicolas.dechesne@linaro.org>
wrote:

> and it would make this patch a no-op instead. the patch would only

> 'fix' the pkg-config mistmatch. and we can fixup the xcb dependencies

> as a follow up patch instead. i am opened to suggestions..

>


Enabling those is good, although there should be a packageconfig so ffmpeg
still builds without x11.

Ross
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Nicolas Dechesne July 20, 2017, 1:37 p.m. | #4
On Thu, Jul 20, 2017 at 3:03 PM, Burton, Ross <ross.burton@intel.com> wrote:
>

> On 20 July 2017 at 13:58, Nicolas Dechesne <nicolas.dechesne@linaro.org>

> wrote:

>>

>> and it would make this patch a no-op instead. the patch would only

>> 'fix' the pkg-config mistmatch. and we can fixup the xcb dependencies

>> as a follow up patch instead. i am opened to suggestions..

>

>

> Enabling those is good, although there should be a packageconfig so ffmpeg

> still builds without x11.


but do we want to make these changes as 1 patch with the pkg-config
fix, or as a follow up patch? I have other patches to fix sdl -> sdl2
and add ffplay support.

>

> Ross

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Ross Burton July 20, 2017, 1:39 p.m. | #5
On 20 July 2017 at 14:37, Nicolas Dechesne <nicolas.dechesne@linaro.org>
wrote:

> but do we want to make these changes as 1 patch with the pkg-config

> fix, or as a follow up patch? I have other patches to fix sdl -> sdl2

> and add ffplay support.

>


Followup is fine, imho.

Ross
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Nicolas Dechesne July 20, 2017, 2:06 p.m. | #6
On Thu, Jul 20, 2017 at 2:54 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On Thu, Jul 20, 2017 at 7:56 AM, Nicolas Dechesne

> <nicolas.dechesne@linaro.org> wrote:

>> in config.log we can see:

>> WARNING: aarch64-linaro-linux-pkg-config not found, library detection may fail.

>>

>> ffmpeg configure script is not looking for pkg-config at the rigt place since it

>> is assuming cross compilation. let's force its value in the recipe.

>>

>> This patches 'fixes' library detection and brings the following diff:

>>

>> * RDEPENDS: ++libxcb (>= 1.12) libxcb-shape (>= 1.12) libxcb-shm (>= 1.12) libxcb-xfixes (>= 1.12)

>> * PKGSIZE : 79167 -> 87823

>>

>> Which basically means that the following conf options were left dangling in EXTRA_OECONF:

>>

>> --enable-libxcb

>> --enable-libxcb-shm

>> --enable-libxcb-xfixes

>> --enable-libxcb-shape

>>

>> Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>

>> ---

>>  meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb | 1 +

>>  1 file changed, 1 insertion(+)

>>

>> diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb

>> index f4bb2ba1f5..442d4f4532 100644

>> --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb

>> +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb

>> @@ -107,6 +107,7 @@ EXTRA_OECONF = " \

>>      --datadir=${datadir}/ffmpeg \

>>      ${@bb.utils.contains('AVAILTUNES', 'mips32r2', '', '--disable-mipsdsp --disable-mipsdspr2', d)} \

>>      --cpu=${@cpu(d)} \

>> +    --pkg-config=pkg-config \

>

> There is a proposal to repace pkgconfig with pkgconf, and I hope it


do you have a link?

> will create a symlink to provide pkg-config

> but it would be interesting to check, otherwise this fix will be

> voided with that change


what do you mean?

>

>>  "

>>

>>  EXTRA_OECONF_append_linux-gnux32 = " --disable-asm"

>> --

>> 2.11.0

>>

>> --

>> _______________________________________________

>> Openembedded-core mailing list

>> Openembedded-core@lists.openembedded.org

>> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Ross Burton July 20, 2017, 2:30 p.m. | #7
On 20 July 2017 at 13:54, Khem Raj <raj.khem@gmail.com> wrote:

> There is a proposal to repace pkgconfig with pkgconf, and I hope it

> will create a symlink to provide pkg-config

>


Yes, it does.

Ross
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Nicolas Dechesne July 20, 2017, 2:50 p.m. | #8
On Thu, Jul 20, 2017 at 4:30 PM, Burton, Ross <ross.burton@intel.com> wrote:
>

> On 20 July 2017 at 13:54, Khem Raj <raj.khem@gmail.com> wrote:

>>

>> There is a proposal to repace pkgconfig with pkgconf, and I hope it

>> will create a symlink to provide pkg-config

>

>

> Yes, it does.


ok.. sorry, i had missed the pkgconf discussion.. i will send a v2
with the --disable-xxx and then i will send one patch to enable the
xcb flag under x11 and add support ffplay/sdl2

>

> Ross

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb
index f4bb2ba1f5..442d4f4532 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb
@@ -107,6 +107,7 @@  EXTRA_OECONF = " \
     --datadir=${datadir}/ffmpeg \
     ${@bb.utils.contains('AVAILTUNES', 'mips32r2', '', '--disable-mipsdsp --disable-mipsdspr2', d)} \
     --cpu=${@cpu(d)} \
+    --pkg-config=pkg-config \
 "
 
 EXTRA_OECONF_append_linux-gnux32 = " --disable-asm"