[Buildroot] [PATCH 1/2] Revert "package/libcamera: fix build on sparc v8"

[Buildroot] [PATCH 1/2] Revert "package/libcamera: fix build on sparc v8"

[Fabrice Fontaine]

This reverts commit dc34fa5c6cd99ae748a18e2ce0467ac6e117f8eb following
upsteam review:
https://lists.libcamera.org/pipermail/libcamera-devel/2021-June/021065.html

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...ra-add-dependencies-to-libcamera_dep.patch | 37 -------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 package/libcamera/0001-libcamera-add-dependencies-to-libcamera_dep.patch

diff --git a/package/libcamera/0001-libcamera-add-dependencies-to-libcamera_dep.patch b/package/libcamera/0001-libcamera-add-dependencies-to-libcamera_dep.patch
deleted file mode 100644
index aa8d659cf3..0000000000
--- a/package/libcamera/0001-libcamera-add-dependencies-to-libcamera_dep.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1a2fd4526e0858827f47a7e9359df34f0d0e3108 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Thu, 27 May 2021 21:00:21 +0200
-Subject: [PATCH] libcamera: add dependencies to libcamera_dep
-
-Add dependencies to libcamera_dep to avoid the following build failure
-with qcam on sparc v8 which is raised since commit
-a8310248fc26cc1e1b791af5e9394c1d20bee269:
-
-FAILED: src/qcam/qcam
-/srv/storage/autobuild/run/instance-0/output-1/host/bin/sparc-linux-g++  -o src/qcam/qcam src/qcam/qcam.p/meson-generated_.._qt5-feathericons_qrc.cpp.o src/qcam/qcam.p/meson-generated_moc_main_window.cpp.o src/qcam/qcam.p/meson-generated_moc_viewfinder_qt.cpp.o src/qcam/qcam.p/.._cam_options.cpp.o src/qcam/qcam.p/.._cam_stream_options.cpp.o src/qcam/qcam.p/format_converter.cpp.o src/qcam/qcam.p/main.cpp.o src/qcam/qcam.p/main_window.cpp.o src/qcam/qcam.p/message_handler.cpp.o src/qcam/qcam.p/viewfinder_qt.cpp.o src/qcam/qcam.p/dng_writer.cpp.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wshadow -include config.h '-Wl,-rpath,$ORIGIN/../libcamera' -Wl,-rpath-link,/srv/storage/autobuild/run/instance-0/output-1/build/libcamera-3a1f67a8031ac5ad96a11d5dc8b2e8976290497b/build/src/libcamera -Wl,--start-group src/libcamera/libcamera.so /srv/storage/autobuild/run/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libQt5Core.so /srv/storage/autobuild/run/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libQt5Gui.so /srv/storage/autobuild/run/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libQt5Widgets.so /srv/storage/autobuild/run/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libtiff.so -Wl,--end-group
-/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/9.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: src/qcam/qcam.p/main_window.cpp.o: undefined reference to symbol '__atomic_fetch_add_4@@LIBATOMIC_1.0'
-/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/9.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /srv/storage/autobuild/run/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/lib/libatomic.so.1: error adding symbols: DSO missing from command line
-
-Fixes:
- - http://autobuild.buildroot.org/results/d0726b2253f1f3d006e057f3b32c646c4b9b5f7a
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://bugs.libcamera.org/show_bug.cgi?id=39]
----
- src/libcamera/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
-index cc2b8669..af3533ad 100644
---- a/src/libcamera/meson.build
-+++ b/src/libcamera/meson.build
-@@ -160,6 +160,7 @@ libcamera_dep = declare_dependency(sources : [
-                                        libcamera_public_headers,
-                                    ],
-                                    include_directories : libcamera_includes,
-+                                   dependencies : libcamera_deps,
-                                    link_with : libcamera)
- 
- subdir('proxy/worker')
--- 
-2.30.2
-- 
2.30.2

[Buildroot] [PATCH 2/2] package/libcamera: fix atomic linking with qcam

[Fabrice Fontaine]

Fix build failure with sparc v8 which is raised since commit
bd9b7b092cf34dc065a4b40268c18a9fe319f5e4 due to
https://git.linuxtv.org/libcamera.git/commit/?id=97e8b3a2eb321884fe1e15fb584f41a38cc33d51

Fixes:
 - http://autobuild.buildroot.org/results/d0726b2253f1f3d006e057f3b32c646c4b9b5f7a

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .../0001-qcam-Add-libatomic-dependency        | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 package/libcamera/0001-qcam-Add-libatomic-dependency

diff --git a/package/libcamera/0001-qcam-Add-libatomic-dependency b/package/libcamera/0001-qcam-Add-libatomic-dependency
new file mode 100644
index 0000000000..72e4b1aee3
--- /dev/null
+++ b/package/libcamera/0001-qcam-Add-libatomic-dependency
@@ -0,0 +1,40 @@
+From 59de56f42a0fda1b8e778fb237b7bce494dc0584 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Wed, 2 Jun 2021 22:56:49 +0200
+Subject: qcam: Add libatomic dependency
+
+Add libatomic dependency due to std::shared_ptr which is used by qcam
+since its addition in commit 97e8b3a2eb321884fe1e15fb584f41a38cc33d51:
+https://en.cppreference.com/w/cpp/memory/shared_ptr.
+
+This will avoid the following build failure:
+
+/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/9.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: src/qcam/qcam.p/main_window.cpp.o: undefined reference to symbol '__atomic_fetch_add_4@@LIBATOMIC_1.0'
+
+Fixes:
+ - http://autobuild.buildroot.org/results/d0726b2253f1f3d006e057f3b32c646c4b9b5f7a
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+[Retrieved from:
+https://git.linuxtv.org/libcamera.git/commit/?id=59de56f42a0fda1b8e778fb237b7bce494dc0584]
+---
+ src/qcam/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/qcam/meson.build b/src/qcam/meson.build
+index acde7682..fad4cc95 100644
+--- a/src/qcam/meson.build
++++ b/src/qcam/meson.build
+@@ -34,6 +34,7 @@ qcam_resources = files([
+ ])
+ 
+ qcam_deps = [
++    libatomic,
+     libcamera_dep,
+     qt5_dep,
+ ]
+-- 
+cgit v1.2.1
+
-- 
2.30.2

[Buildroot] [PATCH 2/2] package/libcamera: fix atomic linking with qcam

[Kieran Bingham]

Hi Fabrice,

On 03/06/2021 06:36, Fabrice Fontaine wrote:
> Fix build failure with sparc v8 which is raised since commit
> bd9b7b092cf34dc065a4b40268c18a9fe319f5e4 due to
> https://git.linuxtv.org/libcamera.git/commit/?id=97e8b3a2eb321884fe1e15fb584f41a38cc33d51
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/d0726b2253f1f3d006e057f3b32c646c4b9b5f7a
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  .../0001-qcam-Add-libatomic-dependency        | 40 +++++++++++++++++++
>  1 file changed, 40 insertions(+)
>  create mode 100644 package/libcamera/0001-qcam-Add-libatomic-dependency
> 
> diff --git a/package/libcamera/0001-qcam-Add-libatomic-dependency b/package/libcamera/0001-qcam-Add-libatomic-dependency
> new file mode 100644
> index 0000000000..72e4b1aee3
> --- /dev/null
> +++ b/package/libcamera/0001-qcam-Add-libatomic-dependency
> @@ -0,0 +1,40 @@
> +From 59de56f42a0fda1b8e778fb237b7bce494dc0584 Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Wed, 2 Jun 2021 22:56:49 +0200
> +Subject: qcam: Add libatomic dependency
> +
> +Add libatomic dependency due to std::shared_ptr which is used by qcam
> +since its addition in commit 97e8b3a2eb321884fe1e15fb584f41a38cc33d51:
> +https://en.cppreference.com/w/cpp/memory/shared_ptr.
> +
> +This will avoid the following build failure:
> +
> +/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/9.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: src/qcam/qcam.p/main_window.cpp.o: undefined reference to symbol '__atomic_fetch_add_4@@LIBATOMIC_1.0'
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/d0726b2253f1f3d006e057f3b32c646c4b9b5f7a
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> +Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> +[Retrieved from:
> +https://git.linuxtv.org/libcamera.git/commit/?id=59de56f42a0fda1b8e778fb237b7bce494dc0584]

Given that this is now an upstream commit - wouldn't it make more sense
to bump the libcamera version to here, rather than carry the patch back?

Or is there some reason you don't want to update yet?
--
Kieran


> +---
> + src/qcam/meson.build | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/src/qcam/meson.build b/src/qcam/meson.build
> +index acde7682..fad4cc95 100644
> +--- a/src/qcam/meson.build
> ++++ b/src/qcam/meson.build
> +@@ -34,6 +34,7 @@ qcam_resources = files([
> + ])
> + 
> + qcam_deps = [
> ++    libatomic,
> +     libcamera_dep,
> +     qt5_dep,
> + ]
> +-- 
> +cgit v1.2.1
> +
> 

-- 
Regards
--
Kieran

[Buildroot] [PATCH 2/2] package/libcamera: fix atomic linking with qcam

[Fabrice Fontaine]

Hi Kieran,

Le jeu. 3 juin 2021 ? 13:06, Kieran Bingham
<kieran.bingham@ideasonboard.com> a ?crit :
>
> Hi Fabrice,
>
> On 03/06/2021 06:36, Fabrice Fontaine wrote:
> > Fix build failure with sparc v8 which is raised since commit
> > bd9b7b092cf34dc065a4b40268c18a9fe319f5e4 due to
> > https://git.linuxtv.org/libcamera.git/commit/?id=97e8b3a2eb321884fe1e15fb584f41a38cc33d51
> >
> > Fixes:
> >  - http://autobuild.buildroot.org/results/d0726b2253f1f3d006e057f3b32c646c4b9b5f7a
> >
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> > ---
> >  .../0001-qcam-Add-libatomic-dependency        | 40 +++++++++++++++++++
> >  1 file changed, 40 insertions(+)
> >  create mode 100644 package/libcamera/0001-qcam-Add-libatomic-dependency
> >
> > diff --git a/package/libcamera/0001-qcam-Add-libatomic-dependency b/package/libcamera/0001-qcam-Add-libatomic-dependency
> > new file mode 100644
> > index 0000000000..72e4b1aee3
> > --- /dev/null
> > +++ b/package/libcamera/0001-qcam-Add-libatomic-dependency
> > @@ -0,0 +1,40 @@
> > +From 59de56f42a0fda1b8e778fb237b7bce494dc0584 Mon Sep 17 00:00:00 2001
> > +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> > +Date: Wed, 2 Jun 2021 22:56:49 +0200
> > +Subject: qcam: Add libatomic dependency
> > +
> > +Add libatomic dependency due to std::shared_ptr which is used by qcam
> > +since its addition in commit 97e8b3a2eb321884fe1e15fb584f41a38cc33d51:
> > +https://en.cppreference.com/w/cpp/memory/shared_ptr.
> > +
> > +This will avoid the following build failure:
> > +
> > +/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/9.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: src/qcam/qcam.p/main_window.cpp.o: undefined reference to symbol '__atomic_fetch_add_4@@LIBATOMIC_1.0'
> > +
> > +Fixes:
> > + - http://autobuild.buildroot.org/results/d0726b2253f1f3d006e057f3b32c646c4b9b5f7a
> > +
> > +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> > +Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > +Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > +[Retrieved from:
> > +https://git.linuxtv.org/libcamera.git/commit/?id=59de56f42a0fda1b8e778fb237b7bce494dc0584]
>
> Given that this is now an upstream commit - wouldn't it make more sense
> to bump the libcamera version to here, rather than carry the patch back?
>
> Or is there some reason you don't want to update yet?
Yes, there is a very good reason: buildroot 2021.05 will be released
in the next few hours/days.
> --
> Kieran
>
>
> > +---
> > + src/qcam/meson.build | 1 +
> > + 1 file changed, 1 insertion(+)
> > +
> > +diff --git a/src/qcam/meson.build b/src/qcam/meson.build
> > +index acde7682..fad4cc95 100644
> > +--- a/src/qcam/meson.build
> > ++++ b/src/qcam/meson.build
> > +@@ -34,6 +34,7 @@ qcam_resources = files([
> > + ])
> > +
> > + qcam_deps = [
> > ++    libatomic,
> > +     libcamera_dep,
> > +     qt5_dep,
> > + ]
> > +--
> > +cgit v1.2.1
> > +
> >
>
> --
> Regards
> --
> Kieran
Best Regards,

Fabrice

[Buildroot] [PATCH 2/2] package/libcamera: fix atomic linking with qcam

[Kieran Bingham]

Hi Fabrice,

On 03/06/2021 13:17, Fabrice Fontaine wrote:
> Hi Kieran,
> 
> Le jeu. 3 juin 2021 ? 13:06, Kieran Bingham
> <kieran.bingham@ideasonboard.com> a ?crit :
>>
>> Hi Fabrice,
>>
>> On 03/06/2021 06:36, Fabrice Fontaine wrote:
>>> Fix build failure with sparc v8 which is raised since commit
>>> bd9b7b092cf34dc065a4b40268c18a9fe319f5e4 due to
>>> https://git.linuxtv.org/libcamera.git/commit/?id=97e8b3a2eb321884fe1e15fb584f41a38cc33d51
>>>
>>> Fixes:
>>>  - http://autobuild.buildroot.org/results/d0726b2253f1f3d006e057f3b32c646c4b9b5f7a
>>>
>>> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>>> ---
>>>  .../0001-qcam-Add-libatomic-dependency        | 40 +++++++++++++++++++
>>>  1 file changed, 40 insertions(+)
>>>  create mode 100644 package/libcamera/0001-qcam-Add-libatomic-dependency
>>>
>>> diff --git a/package/libcamera/0001-qcam-Add-libatomic-dependency b/package/libcamera/0001-qcam-Add-libatomic-dependency
>>> new file mode 100644
>>> index 0000000000..72e4b1aee3
>>> --- /dev/null
>>> +++ b/package/libcamera/0001-qcam-Add-libatomic-dependency
>>> @@ -0,0 +1,40 @@
>>> +From 59de56f42a0fda1b8e778fb237b7bce494dc0584 Mon Sep 17 00:00:00 2001
>>> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>>> +Date: Wed, 2 Jun 2021 22:56:49 +0200
>>> +Subject: qcam: Add libatomic dependency
>>> +
>>> +Add libatomic dependency due to std::shared_ptr which is used by qcam
>>> +since its addition in commit 97e8b3a2eb321884fe1e15fb584f41a38cc33d51:
>>> +https://en.cppreference.com/w/cpp/memory/shared_ptr.
>>> +
>>> +This will avoid the following build failure:
>>> +
>>> +/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/9.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: src/qcam/qcam.p/main_window.cpp.o: undefined reference to symbol '__atomic_fetch_add_4@@LIBATOMIC_1.0'
>>> +
>>> +Fixes:
>>> + - http://autobuild.buildroot.org/results/d0726b2253f1f3d006e057f3b32c646c4b9b5f7a
>>> +
>>> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>>> +Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>>> +Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>>> +[Retrieved from:
>>> +https://git.linuxtv.org/libcamera.git/commit/?id=59de56f42a0fda1b8e778fb237b7bce494dc0584]
>>
>> Given that this is now an upstream commit - wouldn't it make more sense
>> to bump the libcamera version to here, rather than carry the patch back?
>>
>> Or is there some reason you don't want to update yet?
> Yes, there is a very good reason: buildroot 2021.05 will be released
> in the next few hours/days.

That's understandable, no problem here!

>> --
>> Kieran
>>
>>
>>> +---
>>> + src/qcam/meson.build | 1 +
>>> + 1 file changed, 1 insertion(+)
>>> +
>>> +diff --git a/src/qcam/meson.build b/src/qcam/meson.build
>>> +index acde7682..fad4cc95 100644
>>> +--- a/src/qcam/meson.build
>>> ++++ b/src/qcam/meson.build
>>> +@@ -34,6 +34,7 @@ qcam_resources = files([
>>> + ])
>>> +
>>> + qcam_deps = [
>>> ++    libatomic,
>>> +     libcamera_dep,
>>> +     qt5_dep,
>>> + ]
>>> +--
>>> +cgit v1.2.1
>>> +
>>>
>>
>> --
>> Regards
>> --
>> Kieran
> Best Regards,
> 
> Fabrice
> 

-- 
Regards
--
Kieran

[Buildroot] [PATCH 2/2] package/libcamera: fix atomic linking with qcam

[Arnout Vandecappelle]

On 03/06/2021 15:07, Kieran Bingham wrote:
> Hi Fabrice,
> 
> On 03/06/2021 13:17, Fabrice Fontaine wrote:
>> Hi Kieran,
>>
>> Le jeu. 3 juin 2021 ? 13:06, Kieran Bingham
>> <kieran.bingham@ideasonboard.com> a ?crit :
>>>
>>> Hi Fabrice,
>>>
>>> On 03/06/2021 06:36, Fabrice Fontaine wrote:
[snip]
>>>> +[Retrieved from:
>>>> +https://git.linuxtv.org/libcamera.git/commit/?id=59de56f42a0fda1b8e778fb237b7bce494dc0584]

 Although we generally prefer upstream patches, in this case I don't think it's
worth replacing the patch that is already committed with the upstream one, since
it's anyway just a build-time change. Therefore, I've marked the series as Rejected.

>>>
>>> Given that this is now an upstream commit - wouldn't it make more sense
>>> to bump the libcamera version to here, rather than carry the patch back?
>>>
>>> Or is there some reason you don't want to update yet?
>> Yes, there is a very good reason: buildroot 2021.05 will be released
>> in the next few hours/days.
> 
> That's understandable, no problem here!

 Now that 2021.05 has been released, it would be a good time to bump libcamera
and remove the patch!

 Regards,
 Arnout