From f3896c29086f38b01987c84aeabf59c6ebf3c78c636ef36ffe4a2f077cbbb6ac Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 23 Jul 2021 13:46:25 +0000 Subject: [PATCH 1/3] - Update to snapshot 0~2809 (e0704e97) [boo#1188650] OBS-URL: https://build.opensuse.org/package/show/graphics/libcamera?expand=0&rev=20 --- libcamera-0~2532.093b71b2.tar.xz | 3 --- libcamera-0~2809.e0704e97.tar.xz | 3 +++ libcamera.changes | 4 ++-- libcamera.spec | 13 +++++++---- vers.diff | 39 +++++++++++++++++++++++--------- 5 files changed, 41 insertions(+), 21 deletions(-) delete mode 100644 libcamera-0~2532.093b71b2.tar.xz create mode 100644 libcamera-0~2809.e0704e97.tar.xz diff --git a/libcamera-0~2532.093b71b2.tar.xz b/libcamera-0~2532.093b71b2.tar.xz deleted file mode 100644 index eb20439..0000000 --- a/libcamera-0~2532.093b71b2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b935c3994b02d6e91e6f7aa0232aae68c71250dc26a4acd3b9510383266b73d0 -size 769076 diff --git a/libcamera-0~2809.e0704e97.tar.xz b/libcamera-0~2809.e0704e97.tar.xz new file mode 100644 index 0000000..ea82666 --- /dev/null +++ b/libcamera-0~2809.e0704e97.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e627686e8686d8d9112d43fe4f9cb84930b685c8658125dc48f1f8f7f33dcf9d +size 795400 diff --git a/libcamera.changes b/libcamera.changes index 141baef..e800230 100644 --- a/libcamera.changes +++ b/libcamera.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Wed May 5 07:01:02 UTC 2021 - Jan Engelhardt -- Update to snapshot 0~2532 (093b71b2) - * No changelog available, understandably. +- Update to snapshot 0~2809 (e0704e97) [boo#1188650] + * cam: support using multiple cameras concurrently - Add -Wno-error ------------------------------------------------------------------- diff --git a/libcamera.spec b/libcamera.spec index 81390ca..0936edf 100644 --- a/libcamera.spec +++ b/libcamera.spec @@ -17,8 +17,8 @@ Name: libcamera -%define lname libcamera-suse4 -Version: 0~2532.093b71b2 +%define lname libcamera-suse5 +Version: 0~2809.e0704e97 Release: 0 Summary: A complex camera support library in C++ License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -102,9 +102,10 @@ export CFLAGS="%optflags -Wno-error" export CXXFLAGS="$CFLAGS" %meson \ -Ddocumentation=disabled \ - -Dqcam=enabled \ + -Dqcam=enabled -Dtest=false \ -Dv4l2=false -Dtracing=disabled \ - -Dpipelines=ipu3,raspberrypi,rkisp1,simple,uvcvideo,vimc + -Dpipelines=ipu3,raspberrypi,rkisp1,simple,uvcvideo,vimc \ + -Dlc-compliance=disabled %meson_build %install @@ -112,6 +113,8 @@ export CXXFLAGS="$CFLAGS" # Together with patch1, this makes for the "-release" feature from libtool mv "%buildroot/%_libdir/libcamera-suse.so" "%buildroot/%_libdir/libcamera.so" perl -i -pe 's{-lcamera-suse}{-lcamera}' "%buildroot/%_libdir/pkgconfig"/*.pc +mv "%buildroot/%_libdir/libcamera-base-suse.so" "%buildroot/%_libdir/libcamera-base.so" +perl -i -pe 's{-lcamera-base-suse}{-lcamera-base}' "%buildroot/%_libdir/pkgconfig"/*.pc %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig @@ -122,12 +125,12 @@ perl -i -pe 's{-lcamera-suse}{-lcamera}' "%buildroot/%_libdir/pkgconfig"/*.pc %files devel %license LICENSES/*GPL* %_includedir/libcamera/ +%_libdir/libcamera-base.so %_libdir/libcamera.so %_libdir/pkgconfig/*.pc %files tools %_bindir/cam -%_bindir/lc-compliance %_bindir/qcam %_libexecdir/libcamera/ %_libdir/libcamera/ diff --git a/vers.diff b/vers.diff index 3e9e34e..991a7aa 100644 --- a/vers.diff +++ b/vers.diff @@ -3,21 +3,38 @@ Date: 2018-12-06 12:28:42.992186963 +0100 I get it is still in development. But unversioned libraries suck nevertheless. --- - src/libcamera/meson.build | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + src/libcamera/base/meson.build | 3 ++- + src/libcamera/meson.build | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) -Index: libcamera-0~2532.093b71b2/src/libcamera/meson.build +Index: libcamera-0~2809.e0704e97/src/libcamera/base/meson.build =================================================================== ---- libcamera-0~2532.093b71b2.orig/src/libcamera/meson.build -+++ libcamera-0~2532.093b71b2/src/libcamera/meson.build -@@ -144,8 +144,9 @@ endif +--- libcamera-0~2809.e0704e97.orig/src/libcamera/base/meson.build ++++ libcamera-0~2809.e0704e97/src/libcamera/base/meson.build +@@ -25,9 +25,10 @@ libcamera_base_deps = [ + # the use of headers which must not be exposed to the libcamera public api. + libcamera_base_args = [ '-DLIBCAMERA_BASE_PRIVATE' ] + +-libcamera_base_lib = shared_library('libcamera-base', ++libcamera_base_lib = shared_library('libcamera-base-suse', + [libcamera_base_sources, libcamera_base_headers], + name_prefix : '', ++ soversion : '5', + install : true, + cpp_args : libcamera_base_args, + include_directories : libcamera_includes, +Index: libcamera-0~2809.e0704e97/src/libcamera/meson.build +=================================================================== +--- libcamera-0~2809.e0704e97.orig/src/libcamera/meson.build ++++ libcamera-0~2809.e0704e97/src/libcamera/meson.build +@@ -124,8 +124,9 @@ libcamera_deps = [ # 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 = shared_library('libcamera', ++libcamera = shared_library('libcamera-suse', libcamera_sources, -+ soversion : '4', ++ soversion : '5', + name_prefix : '', install : true, - link_with : libcamera_link_with, - cpp_args : libcamera_cpp_args, + include_directories : includes, From a727b83745d58d302739c63d6bd75a2add3b4510c5df5ae1e8f15e82fc4f742d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 23 Jul 2021 16:47:23 +0000 Subject: [PATCH 2/3] restore trimmed changelog, adjust .pc files to not contain -suse OBS-URL: https://build.opensuse.org/package/show/graphics/libcamera?expand=0&rev=21 --- libcamera.changes | 8 +++++++- libcamera.spec | 8 +++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libcamera.changes b/libcamera.changes index e800230..0821e4a 100644 --- a/libcamera.changes +++ b/libcamera.changes @@ -1,8 +1,14 @@ ------------------------------------------------------------------- -Wed May 5 07:01:02 UTC 2021 - Jan Engelhardt +Fri Jul 23 16:39:41 UTC 2021 - Jan Engelhardt - Update to snapshot 0~2809 (e0704e97) [boo#1188650] * cam: support using multiple cameras concurrently + +------------------------------------------------------------------- +Wed May 5 07:01:02 UTC 2021 - Jan Engelhardt + +- Update to snapshot 0~2532 (093b71b2) + * No changelog available, understandably. - Add -Wno-error ------------------------------------------------------------------- diff --git a/libcamera.spec b/libcamera.spec index 0936edf..bceb605 100644 --- a/libcamera.spec +++ b/libcamera.spec @@ -110,11 +110,13 @@ export CXXFLAGS="$CFLAGS" %install %meson_install -# Together with patch1, this makes for the "-release" feature from libtool +# libtool's -release would be so much more direct, but alas, meson... mv "%buildroot/%_libdir/libcamera-suse.so" "%buildroot/%_libdir/libcamera.so" -perl -i -pe 's{-lcamera-suse}{-lcamera}' "%buildroot/%_libdir/pkgconfig"/*.pc mv "%buildroot/%_libdir/libcamera-base-suse.so" "%buildroot/%_libdir/libcamera-base.so" -perl -i -pe 's{-lcamera-base-suse}{-lcamera-base}' "%buildroot/%_libdir/pkgconfig"/*.pc +mv "%buildroot/%_libdir/pkgconfig/libcamera-suse.pc" "%buildroot/%_libdir/pkgconfig/libcamera.pc" +mv "%buildroot/%_libdir/pkgconfig/libcamera-base-suse.pc" "%buildroot/%_libdir/pkgconfig/libcamera-base.pc" +perl -i -pe 's{camera-suse}{camera}' "%buildroot/%_libdir/pkgconfig"/*.pc +perl -i -pe 's{camera-base-suse}{camera-base}' "%buildroot/%_libdir/pkgconfig"/*.pc %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig From 9cb7c67f4ec186454756d20a9b9b9de5c0e2ac7f6f013aa237bbe438a0185fa4 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 23 Jul 2021 16:50:05 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/graphics/libcamera?expand=0&rev=22 --- libcamera.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcamera.spec b/libcamera.spec index bceb605..f314775 100644 --- a/libcamera.spec +++ b/libcamera.spec @@ -102,7 +102,7 @@ export CFLAGS="%optflags -Wno-error" export CXXFLAGS="$CFLAGS" %meson \ -Ddocumentation=disabled \ - -Dqcam=enabled -Dtest=false \ + -Dqcam=enabled \ -Dv4l2=false -Dtracing=disabled \ -Dpipelines=ipu3,raspberrypi,rkisp1,simple,uvcvideo,vimc \ -Dlc-compliance=disabled