From 55ec747a84c987167218a1772a3fe2f4a8bd7a1f Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 28 Oct 2021 21:19:06 +0200 Subject: [PATCH] git subrepo commit (merge) libcamera-clang-git subrepo: subdir: "libcamera-clang-git" merged: "421ee10" upstream: origin: "https://aur.archlinux.org/libcamera-clang-git.git" branch: "master" commit: "2750f46" git-subrepo: version: "0.4.3" origin: "???" commit: "???" --- libcamera-clang-git/.SRCINFO | 13 +++++-------- libcamera-clang-git/.gitrepo | 2 +- libcamera-clang-git/PKGBUILD | 17 +++++++++-------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/libcamera-clang-git/.SRCINFO b/libcamera-clang-git/.SRCINFO index 7799846..ffaeee8 100644 --- a/libcamera-clang-git/.SRCINFO +++ b/libcamera-clang-git/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = libcamera-clang-git - pkgdesc = A complex camera support library for Linux, Android, and ChromeOS (built with clang) - pkgver = r2742.143b2524 + pkgdesc = A complex camera support library for Linux, Android, and ChromeOS (built with LLVM toolchain) + pkgver = r3203.76bd9f3d pkgrel = 1 url = https://libcamera.org/ arch = x86_64 @@ -18,24 +18,21 @@ pkgbase = libcamera-clang-git makedepends = gnutls makedepends = openssl makedepends = git - makedepends = gtest makedepends = udev makedepends = gstreamer makedepends = qt5-tools makedepends = libevent - makedepends = meson>=0.55 + makedepends = meson makedepends = clang>=5.0 + depends = libc++ depends = gst-plugins-base-libs optdepends = qt5-base: for qcam test application optdepends = libevent: for test commands - optdepends = gtest: for lc-compliance test command provides = libcamera - provides = libcamera-clang provides = libcamera-git - provides = qcam conflicts = libcamera options = !docs - source = git://linuxtv.org/libcamera.git/ + source = git+https://git.linuxtv.org/libcamera.git md5sums = SKIP pkgname = libcamera-clang-git diff --git a/libcamera-clang-git/.gitrepo b/libcamera-clang-git/.gitrepo index 8ce2c45..8bbe098 100644 --- a/libcamera-clang-git/.gitrepo +++ b/libcamera-clang-git/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://aur.archlinux.org/libcamera-clang-git.git branch = master - commit = 59e484605fdf8553bcc9d0cc7bf5814d8ec2fc3f + commit = 2750f4678a3a4250f6d84636b2b3572d3ed4794c parent = 675f6cd6a9a867a64d2ad00d5848966f841b2825 method = merge cmdver = 0.4.3 diff --git a/libcamera-clang-git/PKGBUILD b/libcamera-clang-git/PKGBUILD index e149a7b..e6bdfab 100644 --- a/libcamera-clang-git/PKGBUILD +++ b/libcamera-clang-git/PKGBUILD @@ -1,35 +1,35 @@ # Maintainer: Sam L. Yes pkgname=libcamera-clang-git -pkgver=r2866.abaa45d6 +pkgver=r3203.76bd9f3d pkgrel=1 -pkgdesc='A complex camera support library for Linux, Android, and ChromeOS (built with clang)' +pkgdesc='A complex camera support library for Linux, Android, and ChromeOS (built with LLVM toolchain)' arch=('x86_64' 'i686') url='https://libcamera.org/' -provides=('libcamera' 'libcamera-clang' 'libcamera-git' 'qcam') +provides=('libcamera' 'libcamera-git') conflicts=('libcamera') makedepends=( - 'python-yaml' 'python-ply' 'python-jinja' 'pkgconf' 'gnutls' 'openssl' 'git' 'gtest' + 'python-yaml' 'python-ply' 'python-jinja' 'pkgconf' 'gnutls' 'openssl' 'git' 'udev' # for device hotplug enumeration 'gstreamer' # for gstreamer support 'qt5-tools' # for 'qcam' 'libevent' # for 'cam' - 'meson>=0.55' + #'gtest' # for 'lc-compliance' + 'meson' 'clang>=5.0' ) depends=( - #'libc++' + 'libc++' 'gst-plugins-base-libs' # for gstreamer support #'lttng-ust' # for tracing with LTTng ) optdepends=( 'qt5-base: for qcam test application' 'libevent: for test commands' - 'gtest: for lc-compliance test command' ) license=('LGPL' 'GPL' 'Apache' 'BSD' 'MIT' 'custom') options=('!docs') -source=('git://linuxtv.org/libcamera.git/') +source=('git+https://git.linuxtv.org/libcamera.git') md5sums=('SKIP') _licensedir=/usr/share/licenses/${pkgname} @@ -50,6 +50,7 @@ build() { -Dipas=ipu3,vimc \ -Dpipelines=ipu3,uvcvideo,vimc \ -Ddocumentation=disabled \ + -Dlc-compliance=disabled \ -Dtracing=disabled # comment this line to enable LTTng support ninja -C build }