Skip to contentSkip to conversation

package/libcamera: needs faligned-new

PATCH New Peter Seiderer 2 participants 4 messages Jul 31, 2020 – Aug 8, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/libcamera: needs faligned-new

Fixes:

- http://autobuild.buildroot.net/results/2db7292e251ce81d31187c3a9eb36dbc9236bd07

../src/libcamera/v4l2_videodevice.cpp: In member function 'int libcamera::V4L2VideoDevice::allocateBuffers(unsigned int, std::vector<std::unique_ptr<libcamera::FrameBuffer> >*)':
../src/libcamera/v4l2_videodevice.cpp:1139:39: error: 'new' of type 'libcamera::V4L2BufferCache' with extended alignment 8 [-Werror=aligned-new=]
1139 | cache_ = new V4L2BufferCache(*buffers);
| ^
../src/libcamera/v4l2_videodevice.cpp:1139:39: note: uses 'void* operator new(std::size_t)', which does not have an alignment parameter ../src/libcamera/v4l2_videodevice.cpp:1139:39: note: use '-faligned-new' to enable C++17 over-aligned new support ../src/libcamera/v4l2_videodevice.cpp: In member function 'int libcamera::V4L2VideoDevice::importBuffers(unsigned int)':
../src/libcamera/v4l2_videodevice.cpp:1315:36: error: 'new' of type 'libcamera::V4L2BufferCache' with extended alignment 8 [-Werror=aligned-new=]
1315 | cache_ = new V4L2BufferCache(count);
| ^
../src/libcamera/v4l2_videodevice.cpp:1315:36: note: uses 'void* operator new(std::size_t)', which does not have an alignment parameter ../src/libcamera/v4l2_videodevice.cpp:1315:36: note: use '-faligned-new' to enable C++17 over-aligned new support

---
 package/libcamera/libcamera.mk | 4 ++++
 1 file changed, 4 insertions(+)
package/libcamera/libcamera.mk +4 -0
index a39e9f1c3e..9739f715a1 100644
@@ -36,6 +36,10 @@ LIBCAMERA_LICENSE_FILES = \
 	LICENSES/CC0-1.0.txt \
 	LICENSES/CC-BY-SA-4.0.txt
 
+ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_7),y)
+LIBCAMERA_CXXFLAGS = -faligned-new
+endif
+
 ifeq ($(BR2_PACKAGE_LIBCAMERA_V4L2),y)
 LIBCAMERA_CONF_OPTS += -Dv4l2=true
 else
Signature · 1 line
2.27.0
#1 lore raw

PATCH 2/2 package/libcamera: bump version to 565f95d

- add support for new qcam feature option

---
 package/libcamera/libcamera.hash | 2 +-
 package/libcamera/libcamera.mk   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
package/libcamera/libcamera.hash +1 -1
index 907764de63..676d3ac739 100644
@@ -1,4 +1,4 @@
-sha256  6995be9d707ba3bcbe7a79bad894484561ee686f68b6523943ada7c0f6607e86  libcamera-96fab38e02792a109c0d35ca2154e95a7b4c8fcb.tar.gz
+sha256  55b7d7e5d8c70b2586b31544e6c4891a994c4e69c18d0ebd760e87b75277c348  libcamera-565f95d64ff92e8712e8090988180c343dd3bcb5.tar.gz
 
 # license files
 sha256  fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c  LICENSES/BSD-2-Clause.txt
package/libcamera/libcamera.mk +4 -1
index 9739f715a1..ce23d44661 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git
-LIBCAMERA_VERSION = 96fab38e02792a109c0d35ca2154e95a7b4c8fcb
+LIBCAMERA_VERSION = 565f95d64ff92e8712e8090988180c343dd3bcb5
 LIBCAMERA_SITE_METHOD = git
 LIBCAMERA_DEPENDENCIES = \
 	host-openssl \
@@ -65,10 +65,13 @@ LIBCAMERA_DEPENDENCIES += gstreamer1 gst1-plugins-base
 endif
 
 ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
+LIBCAMERA_CONF_OPTS += -Dqcam=enabled
 LIBCAMERA_DEPENDENCIES += qt5base
 ifeq ($(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS),y)
 LIBCAMERA_DEPENDENCIES += qt5tools
 endif
+else
+LIBCAMERA_CONF_OPTS += -Dqcam=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_TIFF),y)
Signature · 1 line
2.27.0
#2 lore raw

PATCH 2/2 package/libcamera: bump version to 565f95d

Quoted 7 lines · On Sat, 1 Aug 2020 00:15:14 +0200 Peter Seiderer <[email protected]> wrote:

- add support for new qcam feature option

---
 package/libcamera/libcamera.hash | 2 +-
 package/libcamera/libcamera.mk   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/2 package/libcamera: needs faligned-new

In reply to Peter Seiderer
Quoted 17 lines · On Sat, 1 Aug 2020 00:15:13 +0200 Peter Seiderer <[email protected]> wrote:

Fixes:

- http://autobuild.buildroot.net/results/2db7292e251ce81d31187c3a9eb36dbc9236bd07

../src/libcamera/v4l2_videodevice.cpp: In member function 'int libcamera::V4L2VideoDevice::allocateBuffers(unsigned int, std::vector<std::unique_ptr<libcamera::FrameBuffer> >*)':
../src/libcamera/v4l2_videodevice.cpp:1139:39: error: 'new' of type 'libcamera::V4L2BufferCache' with extended alignment 8 [-Werror=aligned-new=]
1139 | cache_ = new V4L2BufferCache(*buffers);
| ^
../src/libcamera/v4l2_videodevice.cpp:1139:39: note: uses 'void* operator new(std::size_t)', which does not have an alignment parameter ../src/libcamera/v4l2_videodevice.cpp:1139:39: note: use '-faligned-new' to enable C++17 over-aligned new support ../src/libcamera/v4l2_videodevice.cpp: In member function 'int libcamera::V4L2VideoDevice::importBuffers(unsigned int)':
../src/libcamera/v4l2_videodevice.cpp:1315:36: error: 'new' of type 'libcamera::V4L2BufferCache' with extended alignment 8 [-Werror=aligned-new=]
1315 | cache_ = new V4L2BufferCache(count);
| ^
../src/libcamera/v4l2_videodevice.cpp:1315:36: note: uses 'void* operator new(std::size_t)', which does not have an alignment parameter ../src/libcamera/v4l2_videodevice.cpp:1315:36: note: use '-faligned-new' to enable C++17 over-aligned new support

Quoted 4 lines
---
 package/libcamera/libcamera.mk | 4 ++++
 1 file changed, 4 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com