Compare commits
1 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
|
|
2e9ce79f76 |
@@ -1,22 +1,22 @@
|
||||
From 741bb123f2577efc8ca56f836c90a6b3b9fd074b Mon Sep 17 00:00:00 2001
|
||||
From aa8679bc8d66e2887c19709a2f4b1b4043691dd7 Mon Sep 17 00:00:00 2001
|
||||
From: Kyle Brenneman <kbrenneman@nvidia.com>
|
||||
Date: Fri, 18 Apr 2025 09:34:14 -0600
|
||||
Subject: [PATCH 1/3] Increment version number to 1.0.2.
|
||||
Date: Fri, 30 May 2025 11:28:06 -0600
|
||||
Subject: [PATCH] Increment the version number to 1.0.3.
|
||||
|
||||
---
|
||||
meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index b8680c0..1109916 100644
|
||||
index 1109916..7bf4fde 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -14,7 +14,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
project('egl-x11', 'c',
|
||||
- version : '1.0.1',
|
||||
+ version : '1.0.2',
|
||||
- version : '1.0.2',
|
||||
+ version : '1.0.3',
|
||||
default_options : ['c_std=gnu99'],
|
||||
)
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
From 30455efd7dc4d461d38f65849b3cd482787ad90d Mon Sep 17 00:00:00 2001
|
||||
From: Kyle Brenneman <kbrenneman@nvidia.com>
|
||||
Date: Thu, 1 May 2025 12:30:03 -0600
|
||||
Subject: [PATCH 2/3] Don't close the syncfd in WaitImplicitFence.
|
||||
|
||||
In WaitImplicitFence, we pass the syncfd to eglCreateSync, which takes
|
||||
ownership of it, so we shouldn't close it ourselves.
|
||||
---
|
||||
src/x11/x11-window.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/src/x11/x11-window.c b/src/x11/x11-window.c
|
||||
index ae7bc17..48de96c 100644
|
||||
--- a/src/x11/x11-window.c
|
||||
+++ b/src/x11/x11-window.c
|
||||
@@ -1710,7 +1710,6 @@ static EGLBoolean WaitImplicitFence(EplDisplay *pdpy, X11ColorBuffer *buffer)
|
||||
if (fd >= 0)
|
||||
{
|
||||
success = WaitForSyncFDGPU(pdpy->priv->inst, fd);
|
||||
- close(fd);
|
||||
}
|
||||
|
||||
if (success)
|
||||
--
|
||||
2.43.0
|
||||
|
||||
34
0002-egl-x11-Add-support-for-tegradisp-drm.patch
Normal file
34
0002-egl-x11-Add-support-for-tegradisp-drm.patch
Normal file
@@ -0,0 +1,34 @@
|
||||
From a5ac8e9ce431217c80553eee3f0dc09a4650dc27 Mon Sep 17 00:00:00 2001
|
||||
From: Sruthik P <spatibandlla@nvidia.com>
|
||||
Date: Thu, 3 Apr 2025 18:18:15 +0530
|
||||
Subject: [PATCH] egl-x11: Add support for tegradisp-drm
|
||||
|
||||
This change adds support in the X11/XCB EGL Platform library
|
||||
for the tegradisp-drm DRM driver meant for Automotive (DRIVE OS)
|
||||
Tegra platforms.
|
||||
---
|
||||
src/x11/x11-platform.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/x11/x11-platform.c b/src/x11/x11-platform.c
|
||||
index c1fa162..be78a69 100644
|
||||
--- a/src/x11/x11-platform.c
|
||||
+++ b/src/x11/x11-platform.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
|
||||
+ * SPDX-FileCopyrightText: Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@@ -500,6 +500,7 @@ static EGLDeviceEXT FindDeviceForFD(EplPlatformData *plat, int fd)
|
||||
if (version->name != NULL)
|
||||
{
|
||||
if (strcmp(version->name, "nvidia-drm") == 0
|
||||
+ || strcmp(version->name, "tegradisp-drm") == 0
|
||||
|| strcmp(version->name, "tegra-udrm") == 0
|
||||
|| strcmp(version->name, "tegra") == 0)
|
||||
{
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
From f4263093fa941ecbecfcbe2035a2db2499ec7a5b Mon Sep 17 00:00:00 2001
|
||||
From: Kyle Brenneman <kbrenneman@nvidia.com>
|
||||
Date: Thu, 1 May 2025 12:34:30 -0600
|
||||
Subject: [PATCH 3/3] Fix the error reporting in WaitTimelinePoint.
|
||||
|
||||
In WaitTimelinePoint, return success if drmSyncobjTimelineWait succeeds,
|
||||
and report an error only if it fails.
|
||||
---
|
||||
src/x11/x11-window.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/x11/x11-window.c b/src/x11/x11-window.c
|
||||
index ae7bc17..02167a9 100644
|
||||
--- a/src/x11/x11-window.c
|
||||
+++ b/src/x11/x11-window.c
|
||||
@@ -1886,11 +1886,14 @@ static EGLBoolean WaitTimelinePoint(X11DisplayInstance *inst, X11Timeline *timel
|
||||
&timeline->handle, &timeline->point, 1, INT64_MAX,
|
||||
DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT,
|
||||
&first) == 0)
|
||||
+ {
|
||||
+ success = EGL_TRUE;
|
||||
+ }
|
||||
+ else
|
||||
{
|
||||
eplSetError(inst->platform, EGL_BAD_ALLOC,
|
||||
"Internal error: drmSyncobjTimelineWait(WAIT_FOR_SUBMIT) failed: %s\n",
|
||||
strerror(errno));
|
||||
- success = EGL_TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
||||
BIN
egl-x11-1.0.1.tar.gz
LFS
BIN
egl-x11-1.0.1.tar.gz
LFS
Binary file not shown.
BIN
egl-x11-1.0.2.tar.gz
LFS
Normal file
BIN
egl-x11-1.0.2.tar.gz
LFS
Normal file
Binary file not shown.
@@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 12 14:20:20 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- updated to v1.0.2 tarball/version 1.0.3 with patches below
|
||||
(needed by 580.76.05 driver, boo#1247907)
|
||||
- added 0001-Increment-the-version-number-to-1.0.3.patch
|
||||
- added 0002-egl-x11-Add-support-for-tegradisp-drm.patch
|
||||
- supersedes the following patches
|
||||
* 0001-Increment-version-number-to-1.0.2.patch
|
||||
* 0002-Don-t-close-the-syncfd-in-WaitImplicitFence.patch
|
||||
* 0003-Fix-the-error-reporting-in-WaitTimelinePoint.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 15 13:40:54 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libnvidia-egl-x11
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -20,18 +20,17 @@
|
||||
%define lname libnvidia-egl-x11%{so_ver}
|
||||
%define rname egl-x11
|
||||
Name: libnvidia-egl-x11
|
||||
Version: 1.0.1
|
||||
Version: 1.0.3
|
||||
Release: 0
|
||||
Summary: NVIDIA XLib and XCB EGL Platform Library
|
||||
# src/x11/dma-buf.h:/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||
License: Apache-2.0
|
||||
Group: Development/Libraries/C and C++
|
||||
URL: https://github.com/NVIDIA/egl-x11
|
||||
Source0: https://github.com/sndirsch/egl-x11/archive/%{version}/%{rname}-%{version}.tar.gz
|
||||
Source0: %{rname}-1.0.2.tar.gz
|
||||
Source1: baselibs.conf
|
||||
Patch1: 0001-Increment-version-number-to-1.0.2.patch
|
||||
Patch2: 0002-Don-t-close-the-syncfd-in-WaitImplicitFence.patch
|
||||
Patch3: 0003-Fix-the-error-reporting-in-WaitTimelinePoint.patch
|
||||
Patch1: 0001-Increment-the-version-number-to-1.0.3.patch
|
||||
Patch2: 0002-egl-x11-Add-support-for-tegradisp-drm.patch
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: meson
|
||||
BuildRequires: ninja
|
||||
@@ -95,7 +94,7 @@ This package provides headers and libraries required to build software
|
||||
using %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{rname}-%{version} -p1
|
||||
%autosetup -n %{rname}-1.0.2 -p1
|
||||
|
||||
%build
|
||||
export LDFLAGS="-Wl,-z,noexecstack -Wl,-z,now -Wl,-z,relro %{?_lto_cflags}"
|
||||
|
||||
Reference in New Issue
Block a user