-----Original Message-----
From: openembedded-devel@... <openembedded-devel@...> On Behalf Of Markus Volk
Sent: den 22 oktober 2022 11:12
To: openembedded-devel@...
Cc: Markus Volk <f_l_k@...>
Subject: [oe] [meta-multimedia][PATCH] libcamera: upgrade -> 0.0.1
libcamera has recently received its first release.
Note: meta-raspberrypi needs to adjust the name of libcamera.bbappend
Signed-off-by: Markus Volk <f_l_k@...>
---
.../{libcamera.bb => libcamera_0.0.1.bb} | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
rename meta-multimedia/recipes-multimedia/libcamera/{libcamera.bb => libcamera_0.0.1.bb} (84%)
diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.0.1.bb
similarity index 84%
rename from meta-multimedia/recipes-multimedia/libcamera/libcamera.bb
rename to meta-multimedia/recipes-multimedia/libcamera/libcamera_0.0.1.bb
index 53cd94cbf..8329707b5 100644
--- a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb
+++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.0.1.bb
@@ -12,9 +12,9 @@ SRC_URI = " \
git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \
"
-SRCREV = "ed591e705c451d0ce14988ae96829a31a2ae2f9a"
+SRCREV = "a83aed77df1258e469c0eb42d9cb4f1938db53f2"
-PV = "202105+git${SRCPV}"
+PV = "0.0.1"
Remove PV. There is no need to set it here as it is now set in the filename.
Instead, you should add:
PE = "1"
to avoid the following warning when upgrading from the current version:
WARNING: libcamera-0.0.1-r0 do_packagedata: QA Issue: Package version for
package libcamera went backwards which would break package feeds (from
0:202105+git0+ed591e705c-r0.2 to 0:0.0.1-r0.0) [version-going-backwards]
S = "${WORKDIR}/git"
@@ -45,8 +45,8 @@ do_configure:prepend() {
}
do_install:append() {
- chrpath -d ${D}${libdir}/libcamera.so.0.0.0
- chrpath -d ${D}${libdir}/libcamera-base.so.0.0.0
+ chrpath -d ${D}${libdir}/libcamera.so.0.0.1
+ chrpath -d ${D}${libdir}/libcamera-base.so.0.0.1
Change to:
chrpath -d ${D}${libdir}/libcamera.so
chrpath -d ${D}${libdir}/v4l2-compat.so
so that it does not have to be updated every new version.
I dropped chrpath for libcamera-base.so because it has no rpath, so
no need to remove something that isn't there.
}
addtask do_recalculate_ipa_signatures_package after do_package before do_packagedata
@@ -64,11 +64,11 @@ do_recalculate_ipa_signatures_package() {
FILES:${PN}-dev = "${includedir} ${libdir}/pkgconfig"
FILES:${PN}-dev += " ${libdir}/libcamera.so"
-FILES:${PN} += " ${libdir}/libcamera.so.0"
-FILES:${PN} += " ${libdir}/libcamera.so.0.0.0"
+FILES:${PN} += " ${libdir}/libcamera.so"
+FILES:${PN} += " ${libdir}/libcamera.so.0.0.1"
FILES:${PN}-dev += " ${libdir}/libcamera-base.so"
-FILES:${PN} += " ${libdir}/libcamera-base.so.0"
-FILES:${PN} += " ${libdir}/libcamera-base.so.0.0.0"
+FILES:${PN} += " ${libdir}/libcamera-base.so"
+FILES:${PN} += " ${libdir}/libcamera-base.so.0.0.1"
FILES:${PN} += " ${libdir}/v4l2-compat.so"
FILES:${PN}-gst = "${libdir}/gstreamer-1.0/libgstlibcamera.so"
FILES:${PN} += " ${bindir}/cam"
Remove all the FILES variables above and replace them with:
FILES:${PN} += " ${libdir}/v4l2-compat.so"
FILES:${PN}-gst = "${libdir}/gstreamer-1.0"
--
2.34.1
//Peter
