[PATCH] ffmpeg: Package example files in ffmpeg-examples

[PATCH] ffmpeg: Package example files in ffmpeg-examples

[olani]

From: Ola x Nilsson <olani@axis.com>

The most future proof way to not always ship the example files is to
package them separately.

Signed-off-by: Ola x Nilsson <olani@axis.com>
---
 meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb
index fe34b87ccf..55313cc583 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb
@@ -170,7 +170,8 @@ PACKAGES =+ "libavcodec \
              libavutil \
              libpostproc \
              libswresample \
-             libswscale"
+             libswscale \
+             ${PN}-examples"
 
 FILES:libavcodec = "${libdir}/libavcodec${SOLIBS}"
 FILES:libavdevice = "${libdir}/libavdevice${SOLIBS}"
@@ -180,6 +181,7 @@ FILES:libavutil = "${libdir}/libavutil${SOLIBS}"
 FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}"
 FILES:libswresample = "${libdir}/libswresample${SOLIBS}"
 FILES:libswscale = "${libdir}/libswscale${SOLIBS}"
+FILES:${PN}-examples = "${datadir}/${PN}/examples"
 
 # ffmpeg disables PIC on some platforms (e.g. x86-32)
 INSANE_SKIP:${MLPREFIX}libavcodec = "textrel"
-- 
2.39.2

Re: [OE-core] [PATCH] ffmpeg: Package example files in ffmpeg-examples

[Martin Jansa]

Wasn't very future proof for multilib :) please review:
https://lists.openembedded.org/g/openembedded-core/message/206410

On Tue, Aug 27, 2024 at 11:02 AM Ola x Nilsson via
lists.openembedded.org <olani=axis.com@lists.openembedded.org> wrote:
>
> From: Ola x Nilsson <olani@axis.com>
>
> The most future proof way to not always ship the example files is to
> package them separately.
>
> Signed-off-by: Ola x Nilsson <olani@axis.com>
> ---
>  meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb
> index fe34b87ccf..55313cc583 100644
> --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb
> +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb
> @@ -170,7 +170,8 @@ PACKAGES =+ "libavcodec \
>               libavutil \
>               libpostproc \
>               libswresample \
> -             libswscale"
> +             libswscale \
> +             ${PN}-examples"
>
>  FILES:libavcodec = "${libdir}/libavcodec${SOLIBS}"
>  FILES:libavdevice = "${libdir}/libavdevice${SOLIBS}"
> @@ -180,6 +181,7 @@ FILES:libavutil = "${libdir}/libavutil${SOLIBS}"
>  FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}"
>  FILES:libswresample = "${libdir}/libswresample${SOLIBS}"
>  FILES:libswscale = "${libdir}/libswscale${SOLIBS}"
> +FILES:${PN}-examples = "${datadir}/${PN}/examples"
>
>  # ffmpeg disables PIC on some platforms (e.g. x86-32)
>  INSANE_SKIP:${MLPREFIX}libavcodec = "textrel"
> --
> 2.39.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#203818): https://lists.openembedded.org/g/openembedded-core/message/203818
> Mute This Topic: https://lists.openembedded.org/mt/108120002/3617156
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [OE-core] [PATCH] ffmpeg: Package example files in ffmpeg-examples

[Ola x Nilsson]

Looks good to me.

/Ola

On Sun, Oct 27 2024, Martin Jansa wrote:

> Wasn't very future proof for multilib :) please review:
> https://lists.openembedded.org/g/openembedded-core/message/206410
>
> On Tue, Aug 27, 2024 at 11:02 AM Ola x Nilsson via
> lists.openembedded.org <olani=axis.com@lists.openembedded.org> wrote:
>>
>> From: Ola x Nilsson <olani@axis.com>
>>
>> The most future proof way to not always ship the example files is to
>> package them separately.
>>
>> Signed-off-by: Ola x Nilsson <olani@axis.com>
>> ---
>>  meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb
>> index fe34b87ccf..55313cc583 100644
>> --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb
>> +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb
>> @@ -170,7 +170,8 @@ PACKAGES =+ "libavcodec \
>>               libavutil \
>>               libpostproc \
>>               libswresample \
>> -             libswscale"
>> +             libswscale \
>> +             ${PN}-examples"
>>
>>  FILES:libavcodec = "${libdir}/libavcodec${SOLIBS}"
>>  FILES:libavdevice = "${libdir}/libavdevice${SOLIBS}"
>> @@ -180,6 +181,7 @@ FILES:libavutil = "${libdir}/libavutil${SOLIBS}"
>>  FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}"
>>  FILES:libswresample = "${libdir}/libswresample${SOLIBS}"
>>  FILES:libswscale = "${libdir}/libswscale${SOLIBS}"
>> +FILES:${PN}-examples = "${datadir}/${PN}/examples"
>>
>>  # ffmpeg disables PIC on some platforms (e.g. x86-32)
>>  INSANE_SKIP:${MLPREFIX}libavcodec = "textrel"
>> --
>> 2.39.2
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#203818): https://lists.openembedded.org/g/openembedded-core/message/203818
>> Mute This Topic: https://lists.openembedded.org/mt/108120002/3617156
>> Group Owner: openembedded-core+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [martin.jansa@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>