From 7a5b4cfdc9205949e5c9ca8063790c96b06a83856a57d18054233f031fa7d7a8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 1 Oct 2021 20:12:57 +0000 Subject: [PATCH] 0.0.0+g3076.d79b4120 OBS-URL: https://build.opensuse.org/package/show/graphics/libcamera?expand=0&rev=27 --- _service | 6 ++-- baselibs.conf | 2 +- libcamera-0.0.0+g3076.d79b4120.tar.xz | 3 ++ libcamera-0~3015.a2571042.tar.xz | 3 -- libcamera.changes | 8 +++++- libcamera.spec | 4 +-- vers.diff | 40 ++++++++++++++++----------- 7 files changed, 40 insertions(+), 26 deletions(-) create mode 100644 libcamera-0.0.0+g3076.d79b4120.tar.xz delete mode 100644 libcamera-0~3015.a2571042.tar.xz diff --git a/_service b/_service index 7770590..98356b8 100644 --- a/_service +++ b/_service @@ -2,9 +2,9 @@ git git://linuxtv.org/libcamera - master - 87ba17ba41f2c540efe9ecd46379477282852642 - 0~@TAG_OFFSET@.%h + d79b41200199e03834578f5120bb8375bad37aec + v0.0.0 + 0.0.0+g@TAG_OFFSET@.%h *.tar diff --git a/baselibs.conf b/baselibs.conf index 2eb92db..75e1181 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libcamera-suse6 +libcamera-suse7 diff --git a/libcamera-0.0.0+g3076.d79b4120.tar.xz b/libcamera-0.0.0+g3076.d79b4120.tar.xz new file mode 100644 index 0000000..994da13 --- /dev/null +++ b/libcamera-0.0.0+g3076.d79b4120.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18f16704843df8f2f393556083258c2530c909e64f6538f47e0557ee5d47fbc4 +size 824600 diff --git a/libcamera-0~3015.a2571042.tar.xz b/libcamera-0~3015.a2571042.tar.xz deleted file mode 100644 index 12a7643..0000000 --- a/libcamera-0~3015.a2571042.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b284239839b1288624fab6d914dc0c8515af6dc7ac1d934f28ae9b1b55a0e59c -size 820876 diff --git a/libcamera.changes b/libcamera.changes index fab1334..f60b328 100644 --- a/libcamera.changes +++ b/libcamera.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 1 20:07:34 UTC 2021 - Jan Engelhardt + +- Update to snapshot 0.0.0+g3076 (d79b412) + * Still in development, not much of a changelog to be had. + ------------------------------------------------------------------- Thu Sep 9 02:42:44 UTC 2021 - Lukas Müller @@ -14,7 +20,7 @@ Fri Aug 27 18:03:48 UTC 2021 - Antonio Larrosa ------------------------------------------------------------------- Fri Jul 23 17:38:10 UTC 2021 - Marcus Rueckert -- pipewire has baselibs, so we should have them here as well +- pipewire has baselibs, so we should have them here as well ------------------------------------------------------------------- Fri Jul 23 16:39:41 UTC 2021 - Jan Engelhardt diff --git a/libcamera.spec b/libcamera.spec index bb1ec52..651e262 100644 --- a/libcamera.spec +++ b/libcamera.spec @@ -17,8 +17,8 @@ Name: libcamera -%define lname libcamera-suse6 -Version: 0~3015.a2571042 +%define lname libcamera-suse7 +Version: 0.0.0+g3076.d79b4120 Release: 0 Summary: A complex camera support library in C++ License: GPL-2.0-or-later AND LGPL-2.1-or-later diff --git a/vers.diff b/vers.diff index 8229f01..7874652 100644 --- a/vers.diff +++ b/vers.diff @@ -1,40 +1,48 @@ From: Jan Engelhardt Date: 2018-12-06 12:28:42.992186963 +0100 -I get it is still in development. But unversioned libraries suck nevertheless. ---- - src/libcamera/base/meson.build | 3 ++- - src/libcamera/meson.build | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) +Every new symbol set shipped needs a new SONAME. -Index: libcamera-0~2809.e0704e97/src/libcamera/base/meson.build +Normally, a distro would just ship tarballed releases, and so SONAMEs are just +what upstream puts out. + +When shipping snapshots however that have a noncongruent symbol set to any +other release, a custom SONAME will be needed to not claim false compatibility +with any other release. +--- + src/libcamera/base/meson.build | 4 ++-- + src/libcamera/meson.build | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +Index: libcamera-0.0.0+g3076.d79b4120/src/libcamera/base/meson.build =================================================================== ---- 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 = [ +--- libcamera-0.0.0+g3076.d79b4120.orig/src/libcamera/base/meson.build ++++ libcamera-0.0.0+g3076.d79b4120/src/libcamera/base/meson.build +@@ -27,9 +27,9 @@ 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], +- version : libcamera_version, ++ soversion : '7', name_prefix : '', -+ soversion : '6', install : true, cpp_args : libcamera_base_args, - include_directories : libcamera_includes, -Index: libcamera-0~2809.e0704e97/src/libcamera/meson.build +Index: libcamera-0.0.0+g3076.d79b4120/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 = [ +--- libcamera-0.0.0+g3076.d79b4120.orig/src/libcamera/meson.build ++++ libcamera-0.0.0+g3076.d79b4120/src/libcamera/meson.build +@@ -126,9 +126,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('libcamera', +libcamera = shared_library('libcamera-suse', libcamera_sources, -+ soversion : '6', +- version : libcamera_version, ++ soversion : '7', name_prefix : '', install : true, include_directories : includes,