From a6a69d64d99c5e699003fc0797e17a6a8a2593c3 Mon Sep 17 00:00:00 2001 From: yanansong Date: Mon, 30 Oct 2023 11:27:58 +0800 Subject: [PATCH] add fangtian macro (cherry picked from commit 8bd511f0914669588f0f4b4bc3a573721d555598) --- export_fangtian_extra_ext_header.patch | 28 ++++++++++++++++++++++++++ libglvnd.spec | 6 +++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 export_fangtian_extra_ext_header.patch diff --git a/export_fangtian_extra_ext_header.patch b/export_fangtian_extra_ext_header.patch new file mode 100644 index 0000000..a98ebe4 --- /dev/null +++ b/export_fangtian_extra_ext_header.patch @@ -0,0 +1,28 @@ +diff --git a/include/EGL/eglext.h b/include/EGL/eglext.h +index 94dd038..a3a4e3c 100644 +--- a/include/EGL/eglext.h ++++ b/include/EGL/eglext.h +@@ -276,6 +276,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSetDamageRegionKHR (EGLDisplay dpy, EGLSurface + #define EGL_PLATFORM_GBM_KHR 0x31D7 + #endif /* EGL_KHR_platform_gbm */ + ++#ifndef EGL_KHR_platform_ohos ++#define EGL_KHR_platform_ohos 1 ++#define EGL_PLATFORM_OHOS_KHR 0x34E0 ++#endif /* EGL_KHR_platform_ohos */ ++ + #ifndef EGL_KHR_platform_wayland + #define EGL_KHR_platform_wayland 1 + #define EGL_PLATFORM_WAYLAND_KHR 0x31D8 +@@ -1402,6 +1407,11 @@ EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV (void); + #define EGL_TRIPLE_BUFFER_NV 0x3230 + #endif /* EGL_NV_triple_buffer */ + ++#ifndef EGL_OHOS_image_native_buffer ++#define EGL_OHOS_image_native_buffer 1 ++#define EGL_NATIVE_BUFFER_OHOS 0x34E1 ++#endif /* EGL_OHOS_image_native_buffer */ ++ + #ifndef EGL_TIZEN_image_native_buffer + #define EGL_TIZEN_image_native_buffer 1 + #define EGL_NATIVE_BUFFER_TIZEN 0x32A0 diff --git a/libglvnd.spec b/libglvnd.spec index fe3bb65..745ba11 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -1,6 +1,6 @@ Name: libglvnd Version: 1.3.4 -Release: 3 +Release: 4 Epoch: 1 Summary: The GL Vendor-Neutral Dispatch library License: MIT @@ -9,6 +9,7 @@ Source0: https://github.com/NVIDIA/libglvnd/archive/v%{version}/%{name}-% Patch6000: backport-libglvnd-python3.patch Patch6001: backport-0001-glx-Add-another-fallback-library-name.patch +Patch6002: export_fangtian_extra_ext_header.patch BuildRequires: libtool xorg-x11-server-Xvfb pkgconfig(xext) pkgconfig(x11) BuildRequires: gcc python3-rpm-macros python3-libxml2 pkgconfig(glproto) make @@ -170,6 +171,9 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || (cat `find . -name test- %{_libdir}/pkgconfig/opengl.pc %changelog +* Mon Oct 30 2023 yanansong - 1:1.3.4-4 +- export fangtian macro + * Tue Oct 25 2022 wangkerong - 1:1.3.4-3 - rebuild for next release -- Gitee