From 03abaa2d140a9110d4f42d469a48b71d848bcd1f01a5e05ba23e983155c553f2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 23 Aug 2019 18:54:48 +0000 Subject: [PATCH 1/2] - Update to new development snapshot 0~699.8a92e6f OBS-URL: https://build.opensuse.org/package/show/graphics/libcamera?expand=0&rev=7 --- libcamera-0~14.b99da21.tar.xz | 3 --- libcamera-0~699.8a92e6f.tar.xz | 3 +++ libcamera.changes | 6 ++++++ libcamera.spec | 26 +++++++++++++++++++++----- vers.diff | 22 ++++++++++++---------- 5 files changed, 42 insertions(+), 18 deletions(-) delete mode 100644 libcamera-0~14.b99da21.tar.xz create mode 100644 libcamera-0~699.8a92e6f.tar.xz diff --git a/libcamera-0~14.b99da21.tar.xz b/libcamera-0~14.b99da21.tar.xz deleted file mode 100644 index fb64bb6..0000000 --- a/libcamera-0~14.b99da21.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:48c427270449303cc1e411872363a5bf63e924fa8b844a750298c116b2d922cd -size 23364 diff --git a/libcamera-0~699.8a92e6f.tar.xz b/libcamera-0~699.8a92e6f.tar.xz new file mode 100644 index 0000000..779beda --- /dev/null +++ b/libcamera-0~699.8a92e6f.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cf3775330891a3611dd3a130fa37454caee5f24cae9d6971edf5c34ab78a441 +size 311816 diff --git a/libcamera.changes b/libcamera.changes index ba9833e..b26716f 100644 --- a/libcamera.changes +++ b/libcamera.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 23 18:54:16 UTC 2019 - Jan Engelhardt + +- 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 diff --git a/libcamera.spec b/libcamera.spec index eedb392..1851e1f 100644 --- a/libcamera.spec +++ b/libcamera.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -17,8 +17,8 @@ Name: libcamera -%define lname libcamera-suse0 -Version: 0~14.b99da21 +%define lname libcamera-suse1 +Version: 0~699.8a92e6f Release: 0 Summary: A complex camera support library in C++ License: LGPL-2.1-or-later AND GPL-2.0-or-later @@ -28,9 +28,11 @@ Source: %name-%version.tar.xz Patch1: vers.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: c++_compiler +BuildRequires: cmake BuildRequires: meson >= 0.40 BuildRequires: pkg-config BuildRequires: xz +BuildRequires: pkgconfig(libudev) %description 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. +%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 %autosetup -p1 @@ -79,14 +92,17 @@ perl -i -pe 's{-lcamera-suse}{-lcamera}' "%buildroot/%_libdir/pkgconfig"/*.pc %postun -n %lname -p /sbin/ldconfig %files -n %lname -%defattr(-,root,root) %_libdir/libcamera*.so.* %files devel -%defattr(-,root,root) %license licenses/*gpl* %_includedir/libcamera/ %_libdir/libcamera.so %_libdir/pkgconfig/*.pc +%files tools +%_bindir/cam +%_libexecdir/libcamera/ +%_libdir/libcamera/ + %changelog diff --git a/vers.diff b/vers.diff index d02863a..914ea93 100644 --- a/vers.diff +++ b/vers.diff @@ -1,21 +1,23 @@ From: Jan Engelhardt 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(-) -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~14.b99da21/lib/meson.build -@@ -1,6 +1,7 @@ - sources = ['main.cpp'] +--- 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 = shared_library('camera', +libcamera = shared_library('camera-suse', - sources, + libcamera_sources, ++ soversion : '1', install : true, -+ soversion : '0', - include_directories : inc) + link_with : libcamera_link_with, + include_directories : includes, From ede25683170d2f9f7c6317327989afafbf311508243e9a4f486574a142c8cda8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 23 Aug 2019 19:46:00 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/graphics/libcamera?expand=0&rev=8 --- libcamera.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libcamera.spec b/libcamera.spec index 1851e1f..42fe16f 100644 --- a/libcamera.spec +++ b/libcamera.spec @@ -28,7 +28,6 @@ Source: %name-%version.tar.xz Patch1: vers.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: c++_compiler -BuildRequires: cmake BuildRequires: meson >= 0.40 BuildRequires: pkg-config BuildRequires: xz