forked from pool/libcamera
Accepting request 847146 from graphics
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/847146 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcamera?expand=0&rev=4
This commit is contained in:
commit
fd138fb9b4
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:c367b2c19d18f60e6676ae08762a05bb88318a21f91d30e501ca3181c4b3ef96
|
|
||||||
size 415256
|
|
3
libcamera-0~1998.4757ff4.tar.xz
Normal file
3
libcamera-0~1998.4757ff4.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:72d212129a7a9f05003b7e6330e6334f9bb04034c1526d8861bd04b01aecaaad
|
||||||
|
size 608340
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Nov 2 08:46:59 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||||
|
|
||||||
|
- Update to 0~1998.4757ff4
|
||||||
|
- Add 'qcam' tool
|
||||||
|
- Enable all pipelines
|
||||||
|
- Drop upstream patch:
|
||||||
|
* noforcedsize.diff
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Mar 9 14:08:43 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
|
Mon Mar 9 14:08:43 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
@ -17,8 +17,8 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: libcamera
|
Name: libcamera
|
||||||
%define lname libcamera-suse2
|
%define lname libcamera-suse3
|
||||||
Version: 0~1118.4de31cc
|
Version: 0~1998.4757ff4
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A complex camera support library in C++
|
Summary: A complex camera support library in C++
|
||||||
License: LGPL-2.1-or-later AND GPL-2.0-or-later
|
License: LGPL-2.1-or-later AND GPL-2.0-or-later
|
||||||
@ -27,15 +27,20 @@ URL: http://libcamera.org/
|
|||||||
|
|
||||||
Source: %name-%version.tar.xz
|
Source: %name-%version.tar.xz
|
||||||
Patch1: vers.diff
|
Patch1: vers.diff
|
||||||
Patch2: noforcedsize.diff
|
BuildRequires: boost-devel
|
||||||
BuildRequires: c++_compiler
|
BuildRequires: c++_compiler
|
||||||
|
BuildRequires: libQt5Core-devel
|
||||||
|
BuildRequires: libQt5Gui-devel
|
||||||
|
BuildRequires: libQt5Widgets-devel
|
||||||
BuildRequires: meson >= 0.47
|
BuildRequires: meson >= 0.47
|
||||||
BuildRequires: pkg-config
|
BuildRequires: pkg-config
|
||||||
BuildRequires: python3-PyYAML
|
BuildRequires: python3-PyYAML
|
||||||
BuildRequires: xz
|
BuildRequires: xz
|
||||||
BuildRequires: pkgconfig(glib-2.0)
|
BuildRequires: pkgconfig(glib-2.0)
|
||||||
|
BuildRequires: pkgconfig(gnutls)
|
||||||
BuildRequires: pkgconfig(gstreamer-video-1.0)
|
BuildRequires: pkgconfig(gstreamer-video-1.0)
|
||||||
BuildRequires: pkgconfig(libudev)
|
BuildRequires: pkgconfig(libudev)
|
||||||
|
BuildRequires: pkgconfig(openssl)
|
||||||
|
|
||||||
%description
|
%description
|
||||||
libcamera is an experimental camera user-space API.
|
libcamera is an experimental camera user-space API.
|
||||||
@ -90,7 +95,11 @@ This is its integration plugin for gstreamer.
|
|||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%meson
|
%meson \
|
||||||
|
-Ddocumentation=disabled \
|
||||||
|
-Dqcam=enabled \
|
||||||
|
-Dv4l2=false \
|
||||||
|
-Dpipelines=ipu3,raspberrypi,rkisp1,simple,uvcvideo,vimc
|
||||||
%meson_build
|
%meson_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -106,15 +115,17 @@ perl -i -pe 's{-lcamera-suse}{-lcamera}' "%buildroot/%_libdir/pkgconfig"/*.pc
|
|||||||
%_libdir/libcamera*.so.*
|
%_libdir/libcamera*.so.*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%license licenses/*gpl*
|
%license LICENSES/*GPL*
|
||||||
%_includedir/libcamera/
|
%_includedir/libcamera/
|
||||||
%_libdir/libcamera.so
|
%_libdir/libcamera.so
|
||||||
%_libdir/pkgconfig/*.pc
|
%_libdir/pkgconfig/*.pc
|
||||||
|
|
||||||
%files tools
|
%files tools
|
||||||
%_bindir/cam
|
%_bindir/cam
|
||||||
|
%_bindir/qcam
|
||||||
%_libexecdir/libcamera/
|
%_libexecdir/libcamera/
|
||||||
%_libdir/libcamera/
|
%_libdir/libcamera/
|
||||||
|
%_datadir/libcamera/
|
||||||
|
|
||||||
%files -n gstreamer-plugins-libcamera
|
%files -n gstreamer-plugins-libcamera
|
||||||
%_libdir/gstreamer-1.0/
|
%_libdir/gstreamer-1.0/
|
||||||
|
@ -1,20 +0,0 @@
|
|||||||
|
|
||||||
It's 12 on i586.
|
|
||||||
|
|
||||||
---
|
|
||||||
include/libcamera/controls.h | 2 --
|
|
||||||
1 file changed, 2 deletions(-)
|
|
||||||
|
|
||||||
Index: libcamera/include/libcamera/controls.h
|
|
||||||
===================================================================
|
|
||||||
--- libcamera.orig/include/libcamera/controls.h
|
|
||||||
+++ libcamera/include/libcamera/controls.h
|
|
||||||
@@ -170,8 +170,6 @@ private:
|
|
||||||
std::size_t numElements, std::size_t elementSize);
|
|
||||||
};
|
|
||||||
|
|
||||||
-static_assert(sizeof(ControlValue) == 16, "Invalid size of ControlValue class");
|
|
||||||
-
|
|
||||||
class ControlId
|
|
||||||
{
|
|
||||||
public:
|
|
@ -17,7 +17,7 @@ Index: libcamera-0~1118.4de31cc/src/libcamera/meson.build
|
|||||||
-libcamera = shared_library('camera',
|
-libcamera = shared_library('camera',
|
||||||
+libcamera = shared_library('camera-suse',
|
+libcamera = shared_library('camera-suse',
|
||||||
libcamera_sources,
|
libcamera_sources,
|
||||||
+ soversion : '2',
|
+ soversion : '3',
|
||||||
install : true,
|
install : true,
|
||||||
link_with : libcamera_link_with,
|
link_with : libcamera_link_with,
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
|
Loading…
Reference in New Issue
Block a user