From 8388b1726d07bab8dae3e44846a3a3c765603fbeb9256c90ae2700b7f998a881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 29 Oct 2024 09:34:39 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main libnvidia-egl-gbm revision 2f9cbc385d84f738ee62a0b0ed9da6b9 --- .gitattributes | 23 +++++++++++ U_Add-ICD-json-file.patch | 37 +++++++++++++++++ baselibs.conf | 1 + egl-gbm-1.1.2.tar.gz | 3 ++ libnvidia-egl-gbm.changes | 12 ++++++ libnvidia-egl-gbm.spec | 87 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 163 insertions(+) create mode 100644 .gitattributes create mode 100644 U_Add-ICD-json-file.patch create mode 100644 baselibs.conf create mode 100644 egl-gbm-1.1.2.tar.gz create mode 100644 libnvidia-egl-gbm.changes create mode 100644 libnvidia-egl-gbm.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/U_Add-ICD-json-file.patch b/U_Add-ICD-json-file.patch new file mode 100644 index 0000000..59f0747 --- /dev/null +++ b/U_Add-ICD-json-file.patch @@ -0,0 +1,37 @@ +From fe861e3d83d893fd5239b7fba4439d22dc62602c Mon Sep 17 00:00:00 2001 +From: Simone Caronni +Date: Thu, 19 Sep 2024 16:04:01 +0200 +Subject: [PATCH] Add ICD json file + +--- + src/15_nvidia_gbm.json | 6 ++++++ + src/meson.build | 3 +++ + 2 files changed, 9 insertions(+) + create mode 100644 src/15_nvidia_gbm.json + +diff --git a/src/15_nvidia_gbm.json b/src/15_nvidia_gbm.json +new file mode 100644 +index 0000000..5c2aa9b +--- /dev/null ++++ b/src/15_nvidia_gbm.json +@@ -0,0 +1,6 @@ ++{ ++ "file_format_version" : "1.0.0", ++ "ICD" : { ++ "library_path" : "libnvidia-egl-gbm.so.1" ++ } ++} +diff --git a/src/meson.build b/src/meson.build +index a8fff2c..916ca28 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -35,3 +35,6 @@ egl_gbm = library('nvidia-egl-gbm', + version : meson.project_version(), + install : true, + ) ++ ++install_data('15_nvidia_gbm.json', ++ install_dir: '@0@/egl/egl_external_platform.d'.format(get_option('datadir'))) +-- +2.43.0 + diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..1362afd --- /dev/null +++ b/baselibs.conf @@ -0,0 +1 @@ +libnvidia-egl-gbm1 diff --git a/egl-gbm-1.1.2.tar.gz b/egl-gbm-1.1.2.tar.gz new file mode 100644 index 0000000..5a91188 --- /dev/null +++ b/egl-gbm-1.1.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40c8a1a3df0639ea83031a92e9adcbef92ed696445307aa23cfc5895e63d11f0 +size 17897 diff --git a/libnvidia-egl-gbm.changes b/libnvidia-egl-gbm.changes new file mode 100644 index 0000000..077a66d --- /dev/null +++ b/libnvidia-egl-gbm.changes @@ -0,0 +1,12 @@ +------------------------------------------------------------------- +Mon Oct 7 13:24:46 UTC 2024 - Stefan Dirsch + +- U_Add-ICD-json-file.patch + * Add ICD json file; related: + https://github.com/openSUSE/nvidia-driver-G06/issues/26 + +------------------------------------------------------------------- +Sat Sep 28 00:15:46 UTC 2024 - Stefan Dirsch + +- created packge + --> https://github.com/openSUSE/nvidia-driver-G06/issues/12 diff --git a/libnvidia-egl-gbm.spec b/libnvidia-egl-gbm.spec new file mode 100644 index 0000000..b95d142 --- /dev/null +++ b/libnvidia-egl-gbm.spec @@ -0,0 +1,87 @@ +# +# spec file for package libnvidia-egl-gbm +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define so_ver 1 +%define lname libnvidia-egl-gbm%{so_ver} +%define rname egl-gbm +Name: libnvidia-egl-gbm +Version: 1.1.2 +Release: 0 +Summary: The GBM EGL external platform library +License: MIT +Group: Development/Libraries/C and C++ +URL: https://github.com/NVIDIA/egl-gbm +Source0: https://github.com/NVIDIA/egl-gbm/archive/%{version}/%{rname}-%{version}.tar.gz +Source1: baselibs.conf +Patch0: U_Add-ICD-json-file.patch +BuildRequires: gcc-c++ +BuildRequires: meson +BuildRequires: ninja +BuildRequires: pkgconfig +BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(eglexternalplatform) >= 1.2 +BuildRequires: pkgconfig(gbm) +BuildRequires: pkgconfig(libdrm) + +%description +The GBM EGL external platform library. + +%package -n %{lname} +Summary: The GBM EGL external platform library +Group: System/Libraries + +%description -n %{lname} +The GBM EGL external platform library. + +%package -n libnvidia-egl-gbm-devel +Summary: Development package for %{name} +Group: Development/Languages/C and C++ +Requires: %{lname} = %{version}-%{release} + +%description -n libnvidia-egl-gbm-devel +The GBM EGL external platform library. + +This package provides headers and libraries required to build software +using %{name}. + +%prep +%autosetup -n %{rname}-%{version} -p1 + +%build +export LDFLAGS="-Wl,-z,noexecstack -Wl,-z,now -Wl,-z,relro %{?_lto_cflags}" +%meson +%meson_build + +%install +%meson_install + +%post -n %{lname} -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig + +%files -n %{lname} +%license COPYING +%{_libdir}/libnvidia-egl-gbm.so.%{so_ver}* +%dir %{_datadir}/egl +%dir %{_datadir}/egl/egl_external_platform.d +%{_datadir}/egl/egl_external_platform.d/15_nvidia_gbm.json + +%files -n libnvidia-egl-gbm-devel +%license COPYING +%{_libdir}/libnvidia-egl-gbm.so + +%changelog