Accepting request 783098 from graphics

- Update to new development snapshot 0~1118.4de31cc

OBS-URL: https://build.opensuse.org/request/show/783098
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcamera?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2020-03-11 17:47:01 +00:00 committed by Git OBS Bridge
commit a3d4d41116
6 changed files with 59 additions and 16 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c367b2c19d18f60e6676ae08762a05bb88318a21f91d30e501ca3181c4b3ef96
size 415256

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0cf3775330891a3611dd3a130fa37454caee5f24cae9d6971edf5c34ab78a441
size 311816

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Mar 9 14:08:43 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Update to new development snapshot 0~1118.4de31cc
* No user-friendly changelog at this stage
* C++14 is now mandated
- Add noforcedsize.diff
-------------------------------------------------------------------
Fri Aug 23 18:54:16 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package libcamera
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,20 +17,24 @@
Name: libcamera
%define lname libcamera-suse1
Version: 0~699.8a92e6f
%define lname libcamera-suse2
Version: 0~1118.4de31cc
Release: 0
Summary: A complex camera support library in C++
License: LGPL-2.1-or-later AND GPL-2.0-or-later
Group: Development/Libraries/C and C++
URL: https://git.linuxtv.org/libcamera.git/
URL: http://libcamera.org/
Source: %name-%version.tar.xz
Patch1: vers.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch2: noforcedsize.diff
BuildRequires: c++_compiler
BuildRequires: meson >= 0.40
BuildRequires: meson >= 0.47
BuildRequires: pkg-config
BuildRequires: python3-PyYAML
BuildRequires: xz
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gstreamer-video-1.0)
BuildRequires: pkgconfig(libudev)
%description
@ -74,6 +78,14 @@ libcamera is an experimental camera user-space API.
limited and only supports listing cameras in the system and selecting a camera
to interact with.
%package -n gstreamer-plugins-libcamera
Summary: GStreamer plugins from libcamera
Group: Productivity/Multimedia/Other
%description -n gstreamer-plugins-libcamera
libcamera is an experimental camera user-space API.
This is its integration plugin for gstreamer.
%prep
%autosetup -p1
@ -104,4 +116,7 @@ perl -i -pe 's{-lcamera-suse}{-lcamera}' "%buildroot/%_libdir/pkgconfig"/*.pc
%_libexecdir/libcamera/
%_libdir/libcamera/
%files -n gstreamer-plugins-libcamera
%_libdir/gstreamer-1.0/
%changelog

20
noforcedsize.diff Normal file
View File

@ -0,0 +1,20 @@
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:

View File

@ -6,18 +6,18 @@ I get it is still in development. But unversioned libraries suck nevertheless.
src/libcamera/meson.build | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: libcamera-0~699.8a92e6f/src/libcamera/meson.build
Index: libcamera-0~1118.4de31cc/src/libcamera/meson.build
===================================================================
--- libcamera-0~699.8a92e6f.orig/src/libcamera/meson.build
+++ libcamera-0~699.8a92e6f/src/libcamera/meson.build
@@ -112,8 +112,9 @@ if get_option('android')
libcamera_link_with += android_camera_metadata
endif
--- libcamera-0~1118.4de31cc.orig/src/libcamera/meson.build
+++ libcamera-0~1118.4de31cc/src/libcamera/meson.build
@@ -114,8 +114,9 @@ endif
# runtime if the library is running from an installed location by checking
# for the presence or abscence of the dynamic tag.
-libcamera = shared_library('camera',
+libcamera = shared_library('camera-suse',
libcamera_sources,
+ soversion : '1',
+ soversion : '2',
install : true,
link_with : libcamera_link_with,
include_directories : includes,