Skip to contentSkip to conversation

ffmpeg: Package example files in ffmpeg-examples

PATCH In review [email protected] 3 participants 3 messages Aug 27, 2024 – Oct 28, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ffmpeg: Package example files in ffmpeg-examples

From: Ola x Nilsson <[email protected]>

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

---
 meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb +3 -1
index fe34b87ccf..55313cc583 100644
@@ -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"
Signature · 1 line
2.39.2
#1 lore raw

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

Quoted 45 lines · Ola x Nilsson via lists.openembedded.org

From: Ola x Nilsson <[email protected]>

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

---
 meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb +3 -2
index fe34b87ccf..55313cc583 100644
@@ -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: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#2 lore raw

Looks good to me.

/Ola

Quoted 50 lines · Martin Jansa

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

Quoted 45 lines · Ola x Nilsson via lists.openembedded.org

From: Ola x Nilsson <[email protected]>

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

---
 meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb +3 -2
index fe34b87ccf..55313cc583 100644
@@ -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: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-