From 7713e806bd9deef09f9fee85256829db903b9a94433940758677825ea70019db Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 9 Mar 2020 16:44:37 +0000 Subject: [PATCH 1/3] - Update to new development snapshot 0~1118.4de31cc OBS-URL: https://build.opensuse.org/package/show/graphics/libcamera?expand=0&rev=10 --- libcamera-0~1118.4de31cc.tar.xz | 3 +++ libcamera-0~699.8a92e6f.tar.xz | 3 --- libcamera.changes | 7 +++++++ libcamera.spec | 25 ++++++++++++++++++++----- vers.diff | 14 +++++++------- 5 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 libcamera-0~1118.4de31cc.tar.xz delete mode 100644 libcamera-0~699.8a92e6f.tar.xz diff --git a/libcamera-0~1118.4de31cc.tar.xz b/libcamera-0~1118.4de31cc.tar.xz new file mode 100644 index 0000000..0e1856b --- /dev/null +++ b/libcamera-0~1118.4de31cc.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c367b2c19d18f60e6676ae08762a05bb88318a21f91d30e501ca3181c4b3ef96 +size 415256 diff --git a/libcamera-0~699.8a92e6f.tar.xz b/libcamera-0~699.8a92e6f.tar.xz deleted file mode 100644 index 779beda..0000000 --- a/libcamera-0~699.8a92e6f.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0cf3775330891a3611dd3a130fa37454caee5f24cae9d6971edf5c34ab78a441 -size 311816 diff --git a/libcamera.changes b/libcamera.changes index b26716f..5831518 100644 --- a/libcamera.changes +++ b/libcamera.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 9 14:08:43 UTC 2020 - Jan Engelhardt + +- Update to new development snapshot 0~1118.4de31cc + * No user-friendly changelog at this stage + * C++14 is now mandated + ------------------------------------------------------------------- Fri Aug 23 18:54:16 UTC 2019 - Jan Engelhardt diff --git a/libcamera.spec b/libcamera.spec index 42fe16f..7d6065e 100644 --- a/libcamera.spec +++ b/libcamera.spec @@ -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/ + Source: %name-%version.tar.xz Patch1: vers.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: c++_compiler -BuildRequires: meson >= 0.40 +BuildRequires: cmake +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 diff --git a/vers.diff b/vers.diff index 914ea93..e3e928e 100644 --- a/vers.diff +++ b/vers.diff @@ -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, From 44a820563452d05b18071bac023af0389a379422a608e42335d23aa06bf78797 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 9 Mar 2020 17:55:44 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/graphics/libcamera?expand=0&rev=11 --- libcamera.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libcamera.spec b/libcamera.spec index 7d6065e..7aa6fd1 100644 --- a/libcamera.spec +++ b/libcamera.spec @@ -28,7 +28,6 @@ URL: https://git.linuxtv.org/libcamera.git/ Source: %name-%version.tar.xz Patch1: vers.diff BuildRequires: c++_compiler -BuildRequires: cmake BuildRequires: meson >= 0.47 BuildRequires: pkg-config BuildRequires: python3-PyYAML From d1f25434fad58ab3046ee05973e0aad822b67b6cf8dde327fbe5d670fe0f4ce7 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 9 Mar 2020 19:10:31 +0000 Subject: [PATCH 3/3] - Add noforcedsize.diff OBS-URL: https://build.opensuse.org/package/show/graphics/libcamera?expand=0&rev=12 --- libcamera.changes | 1 + libcamera.spec | 3 ++- noforcedsize.diff | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 noforcedsize.diff diff --git a/libcamera.changes b/libcamera.changes index 5831518..60114d9 100644 --- a/libcamera.changes +++ b/libcamera.changes @@ -4,6 +4,7 @@ Mon Mar 9 14:08:43 UTC 2020 - Jan Engelhardt - 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 diff --git a/libcamera.spec b/libcamera.spec index 7aa6fd1..12e3c08 100644 --- a/libcamera.spec +++ b/libcamera.spec @@ -23,10 +23,11 @@ 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 +Patch2: noforcedsize.diff BuildRequires: c++_compiler BuildRequires: meson >= 0.47 BuildRequires: pkg-config diff --git a/noforcedsize.diff b/noforcedsize.diff new file mode 100644 index 0000000..a5f5dc7 --- /dev/null +++ b/noforcedsize.diff @@ -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: