* [Buildroot] [PATCH 2/3] package/libcamera-apps: bump to version 1.1.0
2023-01-23 8:35 [Buildroot] [PATCH 1/3] package/libcamera: bump to version 0.0.3 Marcus Folkesson
@ 2023-01-23 8:35 ` Marcus Folkesson
2023-01-23 8:35 ` [Buildroot] [PATCH 3/3] DEVELOPERS: add libcamera/libcamera-apps Marcus Folkesson
2023-01-23 12:04 ` [Buildroot] [PATCH 1/3] package/libcamera: bump to version 0.0.3 Kieran Bingham
2 siblings, 0 replies; 5+ messages in thread
From: Marcus Folkesson @ 2023-01-23 8:35 UTC (permalink / raw)
To: buildroot; +Cc: Marcus Folkesson, Kieran Bingham
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
...ror-and-Wfatal-errors-compiler-comma.patch | 37 ------------------
...preview-compile-conversion-from-Wind.patch | 39 -------------------
package/libcamera-apps/libcamera-apps.hash | 2 +-
package/libcamera-apps/libcamera-apps.mk | 4 +-
4 files changed, 3 insertions(+), 79 deletions(-)
delete mode 100644 package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch
delete mode 100644 package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch
diff --git a/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch b/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch
deleted file mode 100644
index 988d89cca3..0000000000
--- a/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6bd733b52f0b4039407c676cd3126a9e2f79456b Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Fri, 5 Feb 2021 18:24:08 +0100
-Subject: [PATCH] cmake: remove -Werror and -Wfatal-errors compiler command
- line option
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes (with bootlin-riscv64-musl toolchain):
-
- .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/core/libcamera_app.cpp:30:22: error: overflow in conversion from ‘long unsigned int’ to ‘int’ changes value from ‘2154321408’ to ‘-2140645888’ [-Werror=overflow]
- 30 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps);
- | ^~~~~~~~~~~~~~~
- cc1plus: all warnings being treated as errors
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 748c6dd..1ca1e39 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,7 +11,7 @@ endif()
-
- set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
- set (CMAKE_CXX_STANDARD 17)
--add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new -Werror -Wfatal-errors)
-+add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new)
- add_definitions(-D_FILE_OFFSET_BITS=64)
-
- if (CMAKE_COMPILER_IS_GNUCXX)
---
-2.34.1
-
diff --git a/package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch b/package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch
deleted file mode 100644
index cc9069aa86..0000000000
--- a/package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 60715769cd5368a63b2bdc2e6d6bb6df0030a54d Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Thu, 31 Mar 2022 21:44:22 +0200
-Subject: [PATCH] preview: fix egl_preview compile (conversion from Window to
- EGLNativeWindowType)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes:
-
- .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:329:69: error: invalid conversion from ‘Window’ {aka ‘long unsigned int’} to ‘EGLNativeWindowType’ {aka ‘fbdev_window*’} [-fpermissive]
- 329 | egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL);
- | ^~~~~~~
- | |
- | Window {aka long unsigned int}
-
-[Upstream: https://github.com/raspberrypi/libcamera-apps/pull/283]
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- preview/egl_preview.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/preview/egl_preview.cpp b/preview/egl_preview.cpp
-index b936e57..593583d 100644
---- a/preview/egl_preview.cpp
-+++ b/preview/egl_preview.cpp
-@@ -326,7 +326,7 @@ void EglPreview::makeWindow(char const *name)
- wm_delete_window_ = XInternAtom(display_, "WM_DELETE_WINDOW", False);
- XSetWMProtocols(display_, window_, &wm_delete_window_, 1);
-
-- egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL);
-+ egl_surface_ = eglCreateWindowSurface(egl_display_, config, reinterpret_cast<EGLNativeWindowType>(window_), NULL);
- if (!egl_surface_)
- throw std::runtime_error("eglCreateWindowSurface failed");
-
---
-2.35.1
-
diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash
index 2dbb74d463..cc2d3b6926 100644
--- a/package/libcamera-apps/libcamera-apps.hash
+++ b/package/libcamera-apps/libcamera-apps.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 611aec06dd24de6586580164d9b7c55da0698ac4cf129944b2fc41fe67210597 libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5.tar.gz
+sha256 2d895ad5d11a6004b1e84eb8d486d5dca64dda1b41e0f4f3f87904666f249e3e libcamera-apps-1.1.0.tar.gz
sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt
diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk
index f4fc019c17..a5d9227250 100644
--- a/package/libcamera-apps/libcamera-apps.mk
+++ b/package/libcamera-apps/libcamera-apps.mk
@@ -4,8 +4,8 @@
#
################################################################################
-LIBCAMERA_APPS_VERSION = 2d1009e3badcc8047361ff81149ad6cba3b911b5
-LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION))
+LIBCAMERA_APPS_VERSION = 1.1.0
+LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,v$(LIBCAMERA_APPS_VERSION))
LIBCAMERA_APPS_LICENSE = BSD-2-Clause
LIBCAMERA_APPS_LICENSE_FILES = license.txt
LIBCAMERA_APPS_DEPENDENCIES = \
--
2.38.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Buildroot] [PATCH 1/3] package/libcamera: bump to version 0.0.3
2023-01-23 8:35 [Buildroot] [PATCH 1/3] package/libcamera: bump to version 0.0.3 Marcus Folkesson
2023-01-23 8:35 ` [Buildroot] [PATCH 2/3] package/libcamera-apps: bump to version 1.1.0 Marcus Folkesson
2023-01-23 8:35 ` [Buildroot] [PATCH 3/3] DEVELOPERS: add libcamera/libcamera-apps Marcus Folkesson
@ 2023-01-23 12:04 ` Kieran Bingham
2023-01-23 12:20 ` Marcus Folkesson
2 siblings, 1 reply; 5+ messages in thread
From: Kieran Bingham @ 2023-01-23 12:04 UTC (permalink / raw)
To: Marcus Folkesson, buildroot; +Cc: Marcus Folkesson
Quoting Marcus Folkesson (2023-01-23 08:35:06)
> At the same time, change site to github in order to fetch the release
> bundles.
>
> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
> ---
> package/libcamera/libcamera.hash | 2 +-
> package/libcamera/libcamera.mk | 7 ++++---
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash
> index 68c9c1f005..13f6c4d907 100644
> --- a/package/libcamera/libcamera.hash
> +++ b/package/libcamera/libcamera.hash
> @@ -1,4 +1,4 @@
> -sha256 59318208a9c1b183cacaf5a7175568d8a9fa094f2dd8c9794269bb6e9636986e libcamera-ba6435930f08e802cffc688d90f156a8959a0f86-br1.tar.gz
> +sha256 af85008f4e8bf1dc70aba4e5612513371b016788cf3c83343cf2d02483bc64ec libcamera-0.0.3.tar.gz
>
> # license files
> sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt
> diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk
> index 9c03d3a3b3..d00f076cea 100644
> --- a/package/libcamera/libcamera.mk
> +++ b/package/libcamera/libcamera.mk
> @@ -4,9 +4,10 @@
> #
> ################################################################################
>
> -LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git
> -LIBCAMERA_VERSION = ba6435930f08e802cffc688d90f156a8959a0f86
> -LIBCAMERA_SITE_METHOD = git
> +LIBCAMERA_VERSION = 0.0.3
> +LIBCAMERA_SOURCE = libcamera-$(LIBCAMERA_VERSION).tar.gz
> +LIBCAMERA_SITE = $(call github,kbingham,libcamera,v$(LIBCAMERA_VERSION))
The address github.com/kbingham/libcamera is an *unofficial mirror*. As
in - I arbitrarily (but frequently) push there and store some branches
there.
As I'm currently the release manager for libcamera, it's possibly
reasonable to assume I'll always keep this in sync - but this is not an
official location to obtain libcamera.
If anyone else starts making releases for libcamera, I likely won't
guarantee that I'll keep updating kbingham/libcamera.git
Valid official hosting for libcamera is currently only:
- https://git.linuxtv.org/libcamera.git/
or
- https://git.libcamera.org/libcamera/libcamera.git/
Now of course you're free to obtain libcamera from any mirror you like,
but I feel it's important I make that distinction clear.
--
Kieran
> +
> LIBCAMERA_DEPENDENCIES = \
> host-openssl \
> host-pkgconf \
> --
> 2.38.1
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread