| Message ID | 20251208-upgrade-libcamera-v1-1-2dca4e4c9e5c@schnwalter.eu |
|---|---|
| State | New |
| Headers | show |
| Series | libcamera: upgrade 0.5.2 -> 0.6.0 | expand |
Quoting Walter Werner SCHNEIDER (2025-12-08 08:44:21) > Signed-off-by: Walter Werner SCHNEIDER <contact@schnwalter.eu> > --- > .../libcamera/0001-libcamera-Do-not-assume-libc-with-clang.patch | 8 ++++---- > .../libcamera/{libcamera_0.5.2.bb => libcamera_0.6.0.bb} | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-libcamera-Do-not-assume-libc-with-clang.patch b/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-libcamera-Do-not-assume-libc-with-clang.patch > index 74952050413a9a824712e37f00f1167305a60d0e..25d88cfff432b2ce2d032d778bfec1671c1d903c 100644 > --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-libcamera-Do-not-assume-libc-with-clang.patch > +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-libcamera-Do-not-assume-libc-with-clang.patch > @@ -1,4 +1,4 @@ > -From 82e9d391d312d65e7a62252e9e153b93c06ad37b Mon Sep 17 00:00:00 2001 > +From 0c68347365ec4c0bd3f84e1d2f9f51eb3c2405c8 Mon Sep 17 00:00:00 2001 > From: Khem Raj <raj.khem@gmail.com> > Date: Fri, 24 Oct 2025 11:10:59 -0700 > Subject: [PATCH] libcamera: Do not assume libc++ with clang > @@ -17,13 +17,13 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> > 1 file changed, 21 insertions(+), 11 deletions(-) > > diff --git a/meson.build b/meson.build > -index fd508fd7..5707f850 100644 > +index fa6487f6..89294936 100644 Is there a need to change this patch? (0001-libcamera-Do-not-assume-libc-with-clang.patch) > --- a/meson.build > +++ b/meson.build > @@ -118,7 +118,24 @@ cpp_arguments = [ > '-Wnon-virtual-dtor', > ] > - > + I think you can drop this whitespace change > -cxx_stdlib = 'libstdc++' > +# Try to detect libc++ > +libcxx_ver = cxx.get_define('_LIBCPP_VERSION', > @@ -43,7 +43,7 @@ index fd508fd7..5707f850 100644 > +endif > + > +message('Detected C++ standard library: ' + cxx_stdlib) > - > + And this one. > if cc.get_id() == 'clang' > if cc.version().version_compare('<9') > @@ -138,16 +155,9 @@ if cc.get_id() == 'clang' > diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.5.2.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.6.0.bb > similarity index 98% > rename from meta-multimedia/recipes-multimedia/libcamera/libcamera_0.5.2.bb > rename to meta-multimedia/recipes-multimedia/libcamera/libcamera_0.6.0.bb > index 0c6941213be2b4b2ffc07042e1fe086834e485dc..3b9e4e3fd4ef3dc2e8120f5e3ea22ae6cbb69340 100644 > --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.5.2.bb > +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.6.0.bb > @@ -13,7 +13,7 @@ SRC_URI = " \ > file://0001-libcamera-Do-not-assume-libc-with-clang.patch \ > " > > -SRCREV = "096c50ca881f72d858aca19757a5e73b4775a7cc" > +SRCREV = "3c17d1fbb2bd93f221afee788ebf0d7394032e4d" But this is indeed v0.6.0. > > PE = "1" > > > --- > base-commit: 31a08525bedd960c21214f84c256f67c6090bb5a > change-id: 20251203-upgrade-libcamera-9970beda88ca > > Best regards, > -- > Walter Werner SCHNEIDER <contact@schnwalter.eu> > >
> Is there a need to change this patch? > (0001-libcamera-Do-not-assume-libc-with-clang.patch) I didn't change the patch, it's "devtool upgrade" that made the changes, I can drop them if you want, but I'm thinking that on the next "devtool upgrade" we will see the same change done by devtool and it's better to just get it in. I've reverted the patch change and ran devtool multiple time, just to make sure that the change is consistent. As for the white-spaces, I believe the original patch had the white-space removed by an editor/IDE after it was generated by git.
diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-libcamera-Do-not-assume-libc-with-clang.patch b/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-libcamera-Do-not-assume-libc-with-clang.patch index 74952050413a9a824712e37f00f1167305a60d0e..25d88cfff432b2ce2d032d778bfec1671c1d903c 100644 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-libcamera-Do-not-assume-libc-with-clang.patch +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-libcamera-Do-not-assume-libc-with-clang.patch @@ -1,4 +1,4 @@ -From 82e9d391d312d65e7a62252e9e153b93c06ad37b Mon Sep 17 00:00:00 2001 +From 0c68347365ec4c0bd3f84e1d2f9f51eb3c2405c8 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 24 Oct 2025 11:10:59 -0700 Subject: [PATCH] libcamera: Do not assume libc++ with clang @@ -17,13 +17,13 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build -index fd508fd7..5707f850 100644 +index fa6487f6..89294936 100644 --- a/meson.build +++ b/meson.build @@ -118,7 +118,24 @@ cpp_arguments = [ '-Wnon-virtual-dtor', ] - + -cxx_stdlib = 'libstdc++' +# Try to detect libc++ +libcxx_ver = cxx.get_define('_LIBCPP_VERSION', @@ -43,7 +43,7 @@ index fd508fd7..5707f850 100644 +endif + +message('Detected C++ standard library: ' + cxx_stdlib) - + if cc.get_id() == 'clang' if cc.version().version_compare('<9') @@ -138,16 +155,9 @@ if cc.get_id() == 'clang' diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.5.2.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.6.0.bb similarity index 98% rename from meta-multimedia/recipes-multimedia/libcamera/libcamera_0.5.2.bb rename to meta-multimedia/recipes-multimedia/libcamera/libcamera_0.6.0.bb index 0c6941213be2b4b2ffc07042e1fe086834e485dc..3b9e4e3fd4ef3dc2e8120f5e3ea22ae6cbb69340 100644 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.5.2.bb +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.6.0.bb @@ -13,7 +13,7 @@ SRC_URI = " \ file://0001-libcamera-Do-not-assume-libc-with-clang.patch \ " -SRCREV = "096c50ca881f72d858aca19757a5e73b4775a7cc" +SRCREV = "3c17d1fbb2bd93f221afee788ebf0d7394032e4d" PE = "1"
Signed-off-by: Walter Werner SCHNEIDER <contact@schnwalter.eu> --- .../libcamera/0001-libcamera-Do-not-assume-libc-with-clang.patch | 8 ++++---- .../libcamera/{libcamera_0.5.2.bb => libcamera_0.6.0.bb} | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) --- base-commit: 31a08525bedd960c21214f84c256f67c6090bb5a change-id: 20251203-upgrade-libcamera-9970beda88ca Best regards,