From 888bfb98ad01107a4459cfaa633924b583bfcc89e5295977b58faf71c547a9f2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 2 Nov 2020 11:25:14 +0000 Subject: [PATCH 1/3] Accepting request 845403 from home:Guillaume_G:branches:graphics - Update to 0~1998.4757ff4 - Add 'qcam' tool - Enable all pipelines - Drop upstream patch: * noforcedsize.diff OBS-URL: https://build.opensuse.org/request/show/845403 OBS-URL: https://build.opensuse.org/package/show/graphics/libcamera?expand=0&rev=14 --- libcamera-0~1118.4de31cc.tar.xz | 3 --- libcamera-0~1998.4757ff4.tar.xz | 3 +++ libcamera.changes | 9 +++++++++ libcamera.spec | 24 ++++++++++++++++++++---- noforcedsize.diff | 20 -------------------- 5 files changed, 32 insertions(+), 27 deletions(-) delete mode 100644 libcamera-0~1118.4de31cc.tar.xz create mode 100644 libcamera-0~1998.4757ff4.tar.xz delete mode 100644 noforcedsize.diff diff --git a/libcamera-0~1118.4de31cc.tar.xz b/libcamera-0~1118.4de31cc.tar.xz deleted file mode 100644 index 0e1856b..0000000 --- a/libcamera-0~1118.4de31cc.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c367b2c19d18f60e6676ae08762a05bb88318a21f91d30e501ca3181c4b3ef96 -size 415256 diff --git a/libcamera-0~1998.4757ff4.tar.xz b/libcamera-0~1998.4757ff4.tar.xz new file mode 100644 index 0000000..a98c529 --- /dev/null +++ b/libcamera-0~1998.4757ff4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72d212129a7a9f05003b7e6330e6334f9bb04034c1526d8861bd04b01aecaaad +size 608340 diff --git a/libcamera.changes b/libcamera.changes index 60114d9..ac7b3e5 100644 --- a/libcamera.changes +++ b/libcamera.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Nov 2 08:46:59 UTC 2020 - Guillaume GARDET + +- 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 diff --git a/libcamera.spec b/libcamera.spec index 12e3c08..00578e7 100644 --- a/libcamera.spec +++ b/libcamera.spec @@ -18,7 +18,7 @@ Name: libcamera %define lname libcamera-suse2 -Version: 0~1118.4de31cc +Version: 0~1998.4757ff4 Release: 0 Summary: A complex camera support library in C++ 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 Patch1: vers.diff -Patch2: noforcedsize.diff +BuildRequires: boost-devel BuildRequires: c++_compiler +BuildRequires: libQt5Core-devel +BuildRequires: libQt5Gui-devel +BuildRequires: libQt5Widgets-devel BuildRequires: meson >= 0.47 BuildRequires: pkg-config BuildRequires: python3-PyYAML BuildRequires: xz BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(gstreamer-video-1.0) BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(openssl) %description libcamera is an experimental camera user-space API. @@ -90,7 +95,11 @@ This is its integration plugin for gstreamer. %autosetup -p1 %build -%meson +%meson \ + -Ddocumentation=disabled \ + -Dqcam=enabled \ + -Dv4l2=false \ + -Dpipelines=ipu3,raspberrypi,rkisp1,simple,uvcvideo,vimc %meson_build %install @@ -106,15 +115,22 @@ perl -i -pe 's{-lcamera-suse}{-lcamera}' "%buildroot/%_libdir/pkgconfig"/*.pc %_libdir/libcamera*.so.* %files devel -%license licenses/*gpl* +%license LICENSES/*GPL* %_includedir/libcamera/ %_libdir/libcamera.so %_libdir/pkgconfig/*.pc %files tools %_bindir/cam +%_bindir/qcam %_libexecdir/libcamera/ %_libdir/libcamera/ +%dir %{_datadir}/libcamera +%dir %{_datadir}/libcamera/ipa +%dir %{_datadir}/libcamera/ipa/raspberrypi +%{_datadir}/libcamera/ipa/raspberrypi/*.json +%dir %{_datadir}/libcamera/ipa/vimc +%{_datadir}/libcamera/ipa/vimc/vimc.conf %files -n gstreamer-plugins-libcamera %_libdir/gstreamer-1.0/ diff --git a/noforcedsize.diff b/noforcedsize.diff deleted file mode 100644 index a5f5dc7..0000000 --- a/noforcedsize.diff +++ /dev/null @@ -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: From b1f4b08e3f1a7c58dd6c8a88e9d76ff9cc62a5ef51763271bb95fafa904bfed5 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 2 Nov 2020 11:25:30 +0000 Subject: [PATCH 2/3] Run spec-beautifier OBS-URL: https://build.opensuse.org/package/show/graphics/libcamera?expand=0&rev=15 --- libcamera.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libcamera.spec b/libcamera.spec index 00578e7..e24b8cc 100644 --- a/libcamera.spec +++ b/libcamera.spec @@ -125,12 +125,12 @@ perl -i -pe 's{-lcamera-suse}{-lcamera}' "%buildroot/%_libdir/pkgconfig"/*.pc %_bindir/qcam %_libexecdir/libcamera/ %_libdir/libcamera/ -%dir %{_datadir}/libcamera -%dir %{_datadir}/libcamera/ipa -%dir %{_datadir}/libcamera/ipa/raspberrypi -%{_datadir}/libcamera/ipa/raspberrypi/*.json -%dir %{_datadir}/libcamera/ipa/vimc -%{_datadir}/libcamera/ipa/vimc/vimc.conf +%dir %_datadir/libcamera +%dir %_datadir/libcamera/ipa +%dir %_datadir/libcamera/ipa/raspberrypi +%_datadir/libcamera/ipa/raspberrypi/*.json +%dir %_datadir/libcamera/ipa/vimc +%_datadir/libcamera/ipa/vimc/vimc.conf %files -n gstreamer-plugins-libcamera %_libdir/gstreamer-1.0/ From 017d4ed82f41d9638248b719b2a01859b056367dad8221fe08108ea77ed4bebe Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 2 Nov 2020 11:31:19 +0000 Subject: [PATCH 3/3] Compact filelist. Bump SO version due to ABI change (ManualExposure is gone). OBS-URL: https://build.opensuse.org/package/show/graphics/libcamera?expand=0&rev=16 --- libcamera.spec | 9 ++------- vers.diff | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libcamera.spec b/libcamera.spec index e24b8cc..8b2db3a 100644 --- a/libcamera.spec +++ b/libcamera.spec @@ -17,7 +17,7 @@ Name: libcamera -%define lname libcamera-suse2 +%define lname libcamera-suse3 Version: 0~1998.4757ff4 Release: 0 Summary: A complex camera support library in C++ @@ -125,12 +125,7 @@ perl -i -pe 's{-lcamera-suse}{-lcamera}' "%buildroot/%_libdir/pkgconfig"/*.pc %_bindir/qcam %_libexecdir/libcamera/ %_libdir/libcamera/ -%dir %_datadir/libcamera -%dir %_datadir/libcamera/ipa -%dir %_datadir/libcamera/ipa/raspberrypi -%_datadir/libcamera/ipa/raspberrypi/*.json -%dir %_datadir/libcamera/ipa/vimc -%_datadir/libcamera/ipa/vimc/vimc.conf +%_datadir/libcamera/ %files -n gstreamer-plugins-libcamera %_libdir/gstreamer-1.0/ diff --git a/vers.diff b/vers.diff index e3e928e..dc3542b 100644 --- a/vers.diff +++ b/vers.diff @@ -17,7 +17,7 @@ Index: libcamera-0~1118.4de31cc/src/libcamera/meson.build -libcamera = shared_library('camera', +libcamera = shared_library('camera-suse', libcamera_sources, -+ soversion : '2', ++ soversion : '3', install : true, link_with : libcamera_link_with, include_directories : includes,