Accepting request 890556 from graphics

- Update to snapshot 0~2532 (093b71b2)

OBS-URL: https://build.opensuse.org/request/show/890556
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcamera?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2021-05-05 18:40:02 +00:00 committed by Git OBS Bridge
commit a691db7eb7
5 changed files with 28 additions and 15 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:72d212129a7a9f05003b7e6330e6334f9bb04034c1526d8861bd04b01aecaaad
size 608340

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b935c3994b02d6e91e6f7aa0232aae68c71250dc26a4acd3b9510383266b73d0
size 769076

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed May 5 07:01:02 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
- Update to snapshot 0~2532 (093b71b2)
* No changelog available, understandably.
- Add -Wno-error
-------------------------------------------------------------------
Mon Nov 2 08:46:59 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>

View File

@ -1,7 +1,7 @@
#
# spec file for package libcamera
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,11 +17,11 @@
Name: libcamera
%define lname libcamera-suse3
Version: 0~1998.4757ff4
%define lname libcamera-suse4
Version: 0~2532.093b71b2
Release: 0
Summary: A complex camera support library in C++
License: LGPL-2.1-or-later AND GPL-2.0-or-later
License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: Development/Libraries/C and C++
URL: http://libcamera.org/
@ -32,13 +32,16 @@ BuildRequires: c++_compiler
BuildRequires: libQt5Core-devel
BuildRequires: libQt5Gui-devel
BuildRequires: libQt5Widgets-devel
BuildRequires: meson >= 0.47
BuildRequires: meson >= 0.55
BuildRequires: pkg-config
BuildRequires: python3-Jinja2
BuildRequires: python3-PyYAML
BuildRequires: python3-ply
BuildRequires: xz
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gnutls)
BuildRequires: pkgconfig(gstreamer-video-1.0)
BuildRequires: pkgconfig(libevent_pthreads)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(openssl)
@ -95,10 +98,12 @@ This is its integration plugin for gstreamer.
%autosetup -p1
%build
export CFLAGS="%optflags -Wno-error"
export CXXFLAGS="$CFLAGS"
%meson \
-Ddocumentation=disabled \
-Dqcam=enabled \
-Dv4l2=false \
-Dv4l2=false -Dtracing=disabled \
-Dpipelines=ipu3,raspberrypi,rkisp1,simple,uvcvideo,vimc
%meson_build
@ -122,6 +127,7 @@ perl -i -pe 's{-lcamera-suse}{-lcamera}' "%buildroot/%_libdir/pkgconfig"/*.pc
%files tools
%_bindir/cam
%_bindir/lc-compliance
%_bindir/qcam
%_libexecdir/libcamera/
%_libdir/libcamera/

View File

@ -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~1118.4de31cc/src/libcamera/meson.build
Index: libcamera-0~2532.093b71b2/src/libcamera/meson.build
===================================================================
--- libcamera-0~1118.4de31cc.orig/src/libcamera/meson.build
+++ libcamera-0~1118.4de31cc/src/libcamera/meson.build
@@ -114,8 +114,9 @@ endif
--- libcamera-0~2532.093b71b2.orig/src/libcamera/meson.build
+++ libcamera-0~2532.093b71b2/src/libcamera/meson.build
@@ -144,8 +144,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 : '3',
+ soversion : '4',
install : true,
link_with : libcamera_link_with,
include_directories : includes,
cpp_args : libcamera_cpp_args,