From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 07 Nov 2022 17:28:34 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1os4zC-000atZ-5J for lore@lore.pengutronix.de; Mon, 07 Nov 2022 17:28:34 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1os4zA-0005Rr-TU; Mon, 07 Nov 2022 17:28:32 +0100 Received: from lx20.hoststar.hosting ([168.119.41.54]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1os4yh-0005RH-U2 for ptxdist@pengutronix.de; Mon, 07 Nov 2022 17:28:05 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=emfend.at; s=mail; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=uaL0oedH9H7CWm5aFopBCac9fKcb4c6KvI4ZKCX6RWU=; b=DtJPv8//eNYrxqa97xOtrfRpnD 4fOnx8RAaJrE7IZDuq4QwqGgitOrCq0kkyuPhEDAtZOISWUvefK5NfRic24yTMqhEXgzu4kSrAujC aswCqTy+X/x1V9TZoL33EZAlQLMgDzRKsxKTDnS1IojIgo3bgh6V+28t+w+GJluD0qyk=; Received: from 194-208-208-245.tele.net ([194.208.208.245]:57784 helo=localhost.localdomain) by lx20.hoststar.hosting with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1os4ye-000aVt-V9 for ptxdist@pengutronix.de; Mon, 07 Nov 2022 17:28:01 +0100 From: Matthias Fend To: ptxdist@pengutronix.de Date: Mon, 7 Nov 2022 17:27:55 +0100 Message-Id: <20221107162755.321807-1-matthias.fend@emfend.at> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.0 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] libcamera: version bump 2022-08-30-g68683d3811a8 -> 0.0.1 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false 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 --- ...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 -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 ---- - 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