1
0
forked from jengelh/libcamera

4 Commits

4 changed files with 60 additions and 15 deletions

View File

@@ -1,2 +1,2 @@
libcamera0_3
libcamera-base0_3
libcamera0_4
libcamera-base0_4

View File

@@ -0,0 +1,36 @@
From 91de550243121056984e5b9b693b486860655d31 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 28 Dec 2024 19:11:19 +0000
Subject: [PATCH] libcamera: Add missing <stdint.h> include to
dma_buf_allocator.h
Without the change the build fails on upcoming `gcc-15` as:
In file included from ../src/libcamera/dma_buf_allocator.cpp:9:
../include/libcamera/internal/dma_buf_allocator.h:66:19: error: 'uint64_t' has not been declared
66 | void sync(uint64_t step);
| ^~~~~~~~
Signed-off-by: Sergei Trofimovich <slyich@gmail.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
include/libcamera/internal/dma_buf_allocator.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/libcamera/internal/dma_buf_allocator.h b/include/libcamera/internal/dma_buf_allocator.h
index d26f8a74..13600915 100644
--- a/include/libcamera/internal/dma_buf_allocator.h
+++ b/include/libcamera/internal/dma_buf_allocator.h
@@ -8,6 +8,7 @@
#pragma once
#include <memory>
+#include <stdint.h>
#include <string>
#include <vector>
--
2.49.0

View File

@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Mar 20 12:19:00 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Make build recipe POSIX sh compatible
-------------------------------------------------------------------
Thu Mar 20 10:48:50 UTC 2025 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Add trivial patch to fix build with gcc15:
* libcamera-fix-for-gcc15.patch
-------------------------------------------------------------------
Mon Dec 23 21:51:19 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package libcamera
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,14 +27,13 @@ Name: libcamera%extname
Version: 0.4.0
Release: 0
Summary: A complex camera support library in C++
License: GPL-2.0-or-later AND LGPL-2.1-or-later AND CC-BY-SA-4.0
License: CC-BY-SA-4.0 AND GPL-2.0-or-later AND LGPL-2.1-or-later
Group: Development/Libraries/C and C++
URL: https://libcamera.org/
#Git-Web: https://git.libcamera.org/libcamera/libcamera.git/
Source: libcamera-%version.tar.xz
Source1: baselibs.conf
Patch1: libcamera-fix-for-gcc15.patch
BuildRequires: boost-devel
BuildRequires: c++_compiler
%if 0%{?suse_version} <= 1500
@@ -57,8 +56,8 @@ BuildRequires: pkgconfig(libevent_pthreads)
BuildRequires: pkgconfig(libtiff-4)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(python3)
BuildRequires: pkgconfig(pybind11)
BuildRequires: pkgconfig(python3)
BuildRequires: pkgconfig(yaml-0.1)
%if "@BUILD_FLAVOR@" != ""
BuildRequires: pkgconfig(Qt6Core)
@@ -155,26 +154,25 @@ export CC=gcc-11
export CXX=g++-11
%endif
%meson \
-Ddocumentation=disabled \
-Ddocumentation=disabled \
%if "@BUILD_FLAVOR@" != ""
-Dqcam=enabled \
-Dqcam=enabled \
%else
-Dqcam=disabled \
-Dqcam=disabled \
%endif
-Dv4l2=false -Dtracing=disabled \
-Dpipelines=ipu3,rkisp1,simple,uvcvideo,vimc \
-Dlc-compliance=disabled
-Dv4l2=false -Dtracing=disabled \
-Dpipelines=ipu3,rkisp1,simple,uvcvideo,vimc \
-Dlc-compliance=disabled
%meson_build
%install
%meson_install
pushd "%buildroot"
cd "%buildroot"
%if "@BUILD_FLAVOR@" != ""
find . ! -type d ! -path ./usr/bin/cam ! -path ./usr/bin/qcam -print -delete
%else
rm -v usr/bin/cam
%endif
popd
%ldconfig_scriptlets -n %lname
%ldconfig_scriptlets -n %lname_base