1
0
forked from pool/libcamera

- Update to new development snapshot 0~699.8a92e6f

OBS-URL: https://build.opensuse.org/package/show/graphics/libcamera?expand=0&rev=7
This commit is contained in:
Jan Engelhardt 2019-08-23 18:54:48 +00:00 committed by Git OBS Bridge
parent 865db05ad4
commit 03abaa2d14
5 changed files with 42 additions and 18 deletions

View File

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

View File

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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Aug 23 18:54:16 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Update to new development snapshot 0~699.8a92e6f
* No user-friendly changelog at this stage
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 6 09:35:42 UTC 2018 - Jan Engelhardt <jengelh@inai.de> Thu Dec 6 09:35:42 UTC 2018 - Jan Engelhardt <jengelh@inai.de>

View File

@ -1,7 +1,7 @@
# #
# spec file for package libcamera # spec file for package libcamera
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,8 +17,8 @@
Name: libcamera Name: libcamera
%define lname libcamera-suse0 %define lname libcamera-suse1
Version: 0~14.b99da21 Version: 0~699.8a92e6f
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
@ -28,9 +28,11 @@ Source: %name-%version.tar.xz
Patch1: vers.diff Patch1: vers.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: c++_compiler BuildRequires: c++_compiler
BuildRequires: cmake
BuildRequires: meson >= 0.40 BuildRequires: meson >= 0.40
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: xz BuildRequires: xz
BuildRequires: pkgconfig(libudev)
%description %description
libcamera is an experimental camera user-space API. libcamera is an experimental camera user-space API.
@ -62,6 +64,17 @@ libcamera is an experimental camera user-space API.
This subpackage contains the header files. This subpackage contains the header files.
%package tools
Summary: Command-line utilities from libcamera
Group: Development/Tools/Other
%description tools
libcamera is an experimental camera user-space API.
"cam" is a command-line utility to interact with cameras. The initial state is
limited and only supports listing cameras in the system and selecting a camera
to interact with.
%prep %prep
%autosetup -p1 %autosetup -p1
@ -79,14 +92,17 @@ perl -i -pe 's{-lcamera-suse}{-lcamera}' "%buildroot/%_libdir/pkgconfig"/*.pc
%postun -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig
%files -n %lname %files -n %lname
%defattr(-,root,root)
%_libdir/libcamera*.so.* %_libdir/libcamera*.so.*
%files devel %files devel
%defattr(-,root,root)
%license licenses/*gpl* %license licenses/*gpl*
%_includedir/libcamera/ %_includedir/libcamera/
%_libdir/libcamera.so %_libdir/libcamera.so
%_libdir/pkgconfig/*.pc %_libdir/pkgconfig/*.pc
%files tools
%_bindir/cam
%_libexecdir/libcamera/
%_libdir/libcamera/
%changelog %changelog

View File

@ -1,21 +1,23 @@
From: Jan Engelhardt <jengelh@inai.de> From: Jan Engelhardt <jengelh@inai.de>
Date: 2018-12-06 12:28:42.992186963 +0100 Date: 2018-12-06 12:28:42.992186963 +0100
Unversioned libraries suck! I get it is still in development. But unversioned libraries suck nevertheless.
--- ---
lib/meson.build | 3 ++- src/libcamera/meson.build | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
Index: libcamera-0~14.b99da21/lib/meson.build Index: libcamera-0~699.8a92e6f/src/libcamera/meson.build
=================================================================== ===================================================================
--- libcamera-0~14.b99da21.orig/lib/meson.build --- libcamera-0~699.8a92e6f.orig/src/libcamera/meson.build
+++ libcamera-0~14.b99da21/lib/meson.build +++ libcamera-0~699.8a92e6f/src/libcamera/meson.build
@@ -1,6 +1,7 @@ @@ -112,8 +112,9 @@ if get_option('android')
sources = ['main.cpp'] libcamera_link_with += android_camera_metadata
endif
-libcamera = shared_library('camera', -libcamera = shared_library('camera',
+libcamera = shared_library('camera-suse', +libcamera = shared_library('camera-suse',
sources, libcamera_sources,
+ soversion : '1',
install : true, install : true,
+ soversion : '0', link_with : libcamera_link_with,
include_directories : inc) include_directories : includes,