diff mbox series

[meta-multimedia,07/15] libcamera: upgrade 0.7.2 -> 0.8.0

Message ID 20261115165955.3485789-7-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-multimedia,01/15] aom: upgrade 3.15.1 -> 3.15.3 | expand

Commit Message

Khem Raj Nov. 15, 2026, 4:59 p.m. UTC
Drop 0002-libcamera-egl-Don-t-redefine-EGL_NO_X11.patch, merged
upstream.

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 ...camera-egl-Don-t-redefine-EGL_NO_X11.patch | 46 -------------------
 ...{libcamera_0.7.2.bb => libcamera_0.8.0.bb} |  3 +-
 2 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 meta-multimedia/recipes-multimedia/libcamera/libcamera/0002-libcamera-egl-Don-t-redefine-EGL_NO_X11.patch
 rename meta-multimedia/recipes-multimedia/libcamera/{libcamera_0.7.2.bb => libcamera_0.8.0.bb} (96%)
diff mbox series

Patch

diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0002-libcamera-egl-Don-t-redefine-EGL_NO_X11.patch b/meta-multimedia/recipes-multimedia/libcamera/libcamera/0002-libcamera-egl-Don-t-redefine-EGL_NO_X11.patch
deleted file mode 100644
index eace529b06..0000000000
--- a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0002-libcamera-egl-Don-t-redefine-EGL_NO_X11.patch
+++ /dev/null
@@ -1,46 +0,0 @@ 
-From 998b5c7ee5cabd51292ac216ccb390c35f989a78 Mon Sep 17 00:00:00 2001
-From: Joel Winarske <joel.winarske@linux.com>
-Date: Mon, 12 Oct 2026 18:20:01 -0700
-Subject: [PATCH] libcamera: egl: Don't redefine EGL_NO_X11
-
-Mesa built without the X11 platform exports -DEGL_NO_X11 via egl.pc
-Cflags, from mesa!2226 (19.3) until mesa!18848 (22.3) moved Xlib
-inclusion behind USE_X11. This affects non-glvnd builds, where egl.pc
-comes from Mesa rather than libglvnd, e.g. the PowerVR mesa-pvr (22.1)
-used on StarFive JH7110.
-
-The -D defines the macro as 1, so the unconditional empty define in
-egl.h is a redefinition, which is an error with -Werror:
-
-  include/libcamera/internal/egl.h:23:9: error: 'EGL_NO_X11' redefined [-Werror]
-
-The define is still needed for EGL headers predating
-KhronosGroup/EGL-Registry#130, which otherwise pull in Xlib.h, so only
-define it when it isn't already set.
-
-Upstream-Status: Submitted [https://patchwork.libcamera.org/patch/28452/]
-
-Signed-off-by: Joel Winarske <joel.winarske@linux.com>
-Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
----
- include/libcamera/internal/egl.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/libcamera/internal/egl.h b/include/libcamera/internal/egl.h
-index 1e31d490b..aeb4da80d 100644
---- a/include/libcamera/internal/egl.h
-+++ b/include/libcamera/internal/egl.h
-@@ -20,7 +20,9 @@
-  * Workaround for build issues on Mesa <= 22.2, see
-  * https://github.com/KhronosGroup/EGL-Registry/pull/130
-  */
-+#ifndef EGL_NO_X11
- #define EGL_NO_X11
-+#endif
-
- #define EGL_EGLEXT_PROTOTYPES
- #include <EGL/egl.h>
---
-2.56.0
-
diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.7.2.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.8.0.bb
similarity index 96%
rename from meta-multimedia/recipes-multimedia/libcamera/libcamera_0.7.2.bb
rename to meta-multimedia/recipes-multimedia/libcamera/libcamera_0.8.0.bb
index 624ca1e33e..adf17d9b40 100644
--- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.7.2.bb
+++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.8.0.bb
@@ -12,10 +12,9 @@  LIC_FILES_CHKSUM = "\
 SRC_URI = " \
         git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master;tag=v${PV} \
         file://0001-ipa_data_serializer-Mark-vector-readPOD-overload-as-m.patch \
-        file://0002-libcamera-egl-Don-t-redefine-EGL_NO_X11.patch \
 "

-SRCREV = "191e202178f02430b5942397c70d215cdd2056fa"
+SRCREV = "df8e348d64b4932a0676256ed24f0da3ee9438bc"

 PE = "1"