Accepting request 908014 from graphics
- Update to snapshot 0~2809 (e0704e97) [boo#1188650] * cam: support using multiple cameras concurrently OBS-URL: https://build.opensuse.org/request/show/908014 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcamera?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
f24b26692b
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b935c3994b02d6e91e6f7aa0232aae68c71250dc26a4acd3b9510383266b73d0
|
||||
size 769076
|
||||
3
libcamera-0~2809.e0704e97.tar.xz
Normal file
3
libcamera-0~2809.e0704e97.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e627686e8686d8d9112d43fe4f9cb84930b685c8658125dc48f1f8f7f33dcf9d
|
||||
size 795400
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 23 16:39:41 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to snapshot 0~2809 (e0704e97) [boo#1188650]
|
||||
* cam: support using multiple cameras concurrently
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 5 07:01:02 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
@ -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
|
||||
@ -104,14 +104,19 @@ export CXXFLAGS="$CFLAGS"
|
||||
-Ddocumentation=disabled \
|
||||
-Dqcam=enabled \
|
||||
-Dv4l2=false -Dtracing=disabled \
|
||||
-Dpipelines=ipu3,raspberrypi,rkisp1,simple,uvcvideo,vimc
|
||||
-Dpipelines=ipu3,raspberrypi,rkisp1,simple,uvcvideo,vimc \
|
||||
-Dlc-compliance=disabled
|
||||
%meson_build
|
||||
|
||||
%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"
|
||||
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
|
||||
@ -122,12 +127,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/
|
||||
|
||||
39
vers.diff
39
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,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user