Apart from the other advances in libcamera, some version handling improvements have been implemented that make the previously required patches superfluous.
Signed-off-by: Matthias Fend <[email protected]> --- ...t-information-for-version-generation.patch | 29 ------------------- .../libcamera-2022-08-30-g68683d3811a8/series | 4 --- rules/libcamera.make | 6 ++-- 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch delete mode 100644 patches/libcamera-2022-08-30-g68683d3811a8/series diff --git a/patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch b/patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch deleted file mode 100644 index 3e5c5ce68..000000000 --- a/patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Matthias Fend <[email protected]> -Date: Wed, 31 Aug 2022 16:54:20 +0200 -Subject: [PATCH] do not use git information for version generation - -Since libcamera is checked out without a git repo, git version reports the -version of the BSP. Since this is obviously wrong, just use the project -version. - -Signed-off-by: Matthias Fend <[email protected]> ---- - meson.build | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 72919102ad55..e333df59388d 100644 ---- a/meson.build -+++ b/meson.build -@@ -20,9 +20,8 @@ libcamera_git_version = run_command('utils/gen-version.sh', - meson.project_build_root(), - meson.project_source_root(), - check: false).stdout().strip() --if libcamera_git_version == '' -- libcamera_git_version = meson.project_version() --endif -+ -+libcamera_git_version = meson.project_version() - - libcamera_version = libcamera_git_version.split('+')[0] - diff --git a/patches/libcamera-2022-08-30-g68683d3811a8/series b/patches/libcamera-2022-08-30-g68683d3811a8/series deleted file mode 100644 index 6ca42eafc..000000000 --- a/patches/libcamera-2022-08-30-g68683d3811a8/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-do-not-use-git-information-for-version-generation.patch -# c3a57143ea9764ab95b84a7fb79896f4 - git-ptx-patches magic diff --git a/rules/libcamera.make b/rules/libcamera.make index a6560fb48..24b71ea7d 100644 --- a/rules/libcamera.make +++ b/rules/libcamera.make @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBCAMERA) += libcamera # # Paths and names # -LIBCAMERA_VERSION := 2022-08-30-g68683d3811a8 -LIBCAMERA_MD5 := 2f5a985257a0797e0bd0b4182ef9bc9c +LIBCAMERA_VERSION := 0.0.1 +LIBCAMERA_MD5 := d428d7e7455e9cca763d313323043e7b LIBCAMERA := libcamera-$(LIBCAMERA_VERSION) LIBCAMERA_SUFFIX := tar.gz -LIBCAMERA_URL := https://git.libcamera.org/libcamera/libcamera.git;tag=$(LIBCAMERA_VERSION) +LIBCAMERA_URL := https://git.libcamera.org/libcamera/libcamera.git;tag=v$(LIBCAMERA_VERSION) LIBCAMERA_SOURCE := $(SRCDIR)/$(LIBCAMERA).$(LIBCAMERA_SUFFIX) LIBCAMERA_DIR := $(BUILDDIR)/$(LIBCAMERA) LIBCAMERA_LICENSE := Apache-2.0 AND \ -- 2.25.1
