[xorg-x11-drv-nvidia] Split xorg libs
by Leigh Scott
commit e07424fd1ba1980780fbe5ed2cc0259c25f91c68
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Sep 20 22:36:05 2024 +0100
Split xorg libs
xorg-x11-drv-nvidia.spec | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index ca6b2f4..ab3d512 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -23,7 +23,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 3
Version: 560.35.03
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -62,10 +62,9 @@ Suggests: nvidia-xconfig%{?_isa} = %{?epoch}:%{version}
# nvidia-bug-report.sh requires needed to provide extra info
Suggests: acpica-tools
Suggests: vulkan-tools
-%ifarch x86_64
Recommends: %{name}-cuda-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Recommends: %{name}-power%{?_isa} = %{?epoch}:%{version}-%{release}
-%endif
+Requires: (%{name}-xorg-libs%{?_isa} = %{?epoch}:%{version}-%{release} if xorg-x11-server-Xorg%{?_isa})
Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
Requires: %{name}-libs%{?_isa} = %{?epoch}:%{version}-%{release}
@@ -188,6 +187,14 @@ Requires: mesa-libGLES%{?_isa}
%description libs
This package provides the shared libraries for %{name}.
+%package xorg-libs
+Summary: Xorg Libraries for %{name}
+Requires: %{name}%{?_isa} = %{?epoch}:%{version}
+Requires: xorg-x11-server-Xorg%{?_isa}
+
+%description xorg-libs
+This package provides the Xorg libraries for %{name}.
+
%package power
Summary: Advanced power management
Requires: %{name}%{?_isa} = %{?epoch}:%{version}
@@ -438,10 +445,6 @@ fi ||:
%dir %{_alternate_dir}
%{_alternate_dir}/alternate-install-present
%dir %{_sysconfdir}/nvidia
-%ghost %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
-%ghost %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
-%ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf
-%{_datadir}/X11/xorg.conf.d/nvidia.conf
%{_udevrulesdir}/10-nvidia.rules
%{_udevrulesdir}/80-nvidia-pm.rules
%{_unitdir}/nvidia-fallback.service
@@ -449,10 +452,6 @@ fi ||:
%{_datadir}/pixmaps/%{name}.png
%{_dracut_conf_d}/99-nvidia-dracut.conf
%{_bindir}/nvidia-bug-report.sh
-# Xorg libs that do not need to be multilib
-%{_libdir}/xorg/modules/extensions/libglxserver_nvidia.so
-%{_libdir}/xorg/modules/drivers/nvidia_drv.so
-#/no_multilib
%dir %{_datadir}/nvidia
%{_datadir}/nvidia/nvidia-application-profiles-*
%{_datadir}/nvidia/nvoptix.bin
@@ -510,6 +509,14 @@ fi ||:
%endif
%ifarch x86_64 aarch64
+%files xorg-libs
+%ghost %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
+%ghost %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
+%ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf
+%{_datadir}/X11/xorg.conf.d/nvidia.conf
+%{_libdir}/xorg/modules/extensions/libglxserver_nvidia.so
+%{_libdir}/xorg/modules/drivers/nvidia_drv.so
+
%files cuda
%license nvidiapkg/LICENSE
%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd
@@ -586,6 +593,9 @@ fi ||:
%endif
%changelog
+* Fri Sep 20 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:560.35.03-4
+- Split xorg libs
+
* Fri Aug 23 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:560.35.03-3
- Various packaging fixes
2 months
[ffmpeg] Rebuild
by Leigh Scott
commit c5c6b49e5da4d61a15718dc5ea594038b30006c4
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Sep 20 17:22:17 2024 +0100
Rebuild
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index c9ff90c..d7e55ae 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -98,7 +98,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 7.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
@@ -532,6 +532,9 @@ cp -pa %{buildroot}%{_libdir}/libavcodec.so.* \
%changelog
+* Fri Sep 20 2024 Leigh Scott <leigh123linux(a)gmail.com> - 7.0.2-2
+- Rebuild
+
* Sun Aug 04 2024 Leigh Scott <leigh123linux(a)gmail.com> - 7.0.2-1
- Update to 7.0.2
2 months
[mesa-freeworld/f41] Fix build
by Nicolas Chauvet
Summary of changes:
a35c8c9... Fix build (*)
(*) This commit already existed in another branch; no separate mail sent
2 months
[mesa-freeworld] Fix build
by Nicolas Chauvet
commit a35c8c95fbdecac0e9407b5980f6e2188c0fcc98
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Sep 20 14:43:36 2024 +0200
Fix build
mesa-freeworld.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 874dedb..044529b 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -313,7 +313,7 @@ rm -fr %{buildroot}%{_libdir}/libOSMesa.so*
rm -fr %{buildroot}%{_libdir}/pkgconfig/osmesa.pc
rm -fr %{buildroot}%{_libdir}/libgbm.so*
rm -fr %{buildroot}%{_includedir}/gbm.h
-rm -fr %{buildroot}%{_libdir}/libxatracker.so*
+rm -fr %{buildroot}%{_libdir}{,/dri-freeworld}/libxatracker.so*
rm -fr %{buildroot}%{_includedir}/xa_*.h
rm -fr %{buildroot}%{_libdir}/libMesaOpenCL.so*
rm -fr %{buildroot}%{_libdir}/dri/*_dri.so
2 months
[mesa-freeworld/f41] (7 commits) ...Update changelog
by Nicolas Chauvet
Summary of changes:
d1f5525... Update to 24.2.3 (*)
ef5f23a... drop %{_libdir}/dri/libgallium_drv_video.so from files (*)
7b2563d... drop %{_libdir}/vdpau/libvdpau_gallium.so.1* from files (*)
36bf8c3... Add workaround for -freeworld build (*)
81f7dd7... Revert "Add workaround for -freeworld build" (*)
69386a3... Attemp to fix complement package (*)
f6ec6b5... Update changelog (*)
(*) This commit already existed in another branch; no separate mail sent
2 months
[mesa-freeworld] Update changelog
by Nicolas Chauvet
commit f6ec6b59329437f8457de1fc8fa97fb577e34df0
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Sep 20 14:10:31 2024 +0200
Update changelog
mesa-freeworld.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 9a29046..874dedb 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -73,7 +73,7 @@ Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
%global ver 24.2.3
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: MIT AND BSD-3-Clause AND SGI-B-2.0
URL: http://www.mesa3d.org
@@ -350,6 +350,9 @@ rm -fr %{buildroot}%{_libdir}{,/dri-freeworld}/libVkLayer_MESA_device_select.so
%endif
%changelog
+* Fri Sep 20 2024 Nicolas Chauvet <kwizart(a)gmail.com> - 24.2.3-2
+- Attempt to complement Fedora
+
* Thu Sep 19 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.2.3-1
- Update to 24.2.3
- Sync a few bits with mesa.spec from fedora
2 months
[mesa-freeworld] Attemp to fix complement package
by Nicolas Chauvet
commit 69386a357cf9a5922060be16b7433ad637bbdafd
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Sep 20 14:09:50 2024 +0200
Attemp to fix complement package
mesa-freeworld.spec | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index c9113fc..9a29046 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -218,6 +218,10 @@ export RUSTFLAGS="%build_rustflags"
%define _lto_cflags %{nil}
%meson \
+ --libdir=%{_libdir}/dri-freeworld \
+ -Dvdpau-libs-path=%{_libdir}/vdpau \
+ -Ddri-drivers-path=%{_libdir}/dri-freeworld \
+ -Dva-libs-path=%{_libdir}/dri-freeworld \
-Dplatforms=x11,wayland \
-Ddri3=enabled \
-Dosmesa=false \
@@ -299,12 +303,12 @@ popd
# strip unneeded files from va-api and vdpau
rm -rf %{buildroot}%{_datadir}/{drirc.d,glvnd,vulkan}
-rm -rf %{buildroot}%{_libdir}/{d3d,EGL,gallium-pipe,libGLX,pkgconfig}
+rm -rf %{buildroot}%{_libdir}{,/dri-freeworld}/{d3d,EGL,gallium-pipe,libGLX,pkgconfig}
rm -rf %{buildroot}%{_includedir}/{d3dadapter,EGL,GL,KHR}
rm -fr %{buildroot}%{_sysconfdir}/OpenGL
-rm -fr %{buildroot}%{_libdir}/libGL.so*
+rm -fr %{buildroot}%{_libdir}{,/dri-freeworld}/libGL.so*
rm -fr %{buildroot}%{_libdir}/libgallium-*.so
-rm -fr %{buildroot}%{_libdir}/libglapi.so*
+rm -fr %{buildroot}%{_libdir}{,/dri-freeworld}/libglapi.so*
rm -fr %{buildroot}%{_libdir}/libOSMesa.so*
rm -fr %{buildroot}%{_libdir}/pkgconfig/osmesa.pc
rm -fr %{buildroot}%{_libdir}/libgbm.so*
@@ -314,18 +318,19 @@ rm -fr %{buildroot}%{_includedir}/xa_*.h
rm -fr %{buildroot}%{_libdir}/libMesaOpenCL.so*
rm -fr %{buildroot}%{_libdir}/dri/*_dri.so
rm -fr %{buildroot}%{_libdir}/libvulkan*.so
-rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
+rm -fr %{buildroot}%{_libdir}{,/dri-freeworld}/libVkLayer_MESA_device_select.so
%if 0%{?with_va}
%files -n %{srcname}-va-drivers-freeworld
-%{_libdir}/dri/nouveau_drv_video.so
+%{_libdir}/dri-freeworld/libgallium-%{version}.so
+%{_libdir}/dri-freeworld/nouveau_drv_video.so
%if 0%{?with_r600}
-%{_libdir}/dri/r600_drv_video.so
+%{_libdir}/dri-freeworld/r600_drv_video.so
%endif
%if 0%{?with_radeonsi}
-%{_libdir}/dri/radeonsi_drv_video.so
+%{_libdir}/dri-freeworld/radeonsi_drv_video.so
%endif
-%{_libdir}/dri/virtio_gpu_drv_video.so
+%{_libdir}/dri-freeworld/virtio_gpu_drv_video.so
%{_metainfodir}/org.mesa3d.vaapi.freeworld.metainfo.xml
%license docs/license.rst
%endif
2 months
[mesa-freeworld] Revert "Add workaround for -freeworld build"
by Nicolas Chauvet
commit 81f7dd7bcddfa254627c6fb6863a9306a6dd724b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Sep 20 12:56:45 2024 +0200
Revert "Add workaround for -freeworld build"
This reverts commit 36bf8c36788f8c7823f1be0d0fdef378b50af252.
mesa-freeworld.spec | 2 --
1 file changed, 2 deletions(-)
---
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 677acec..c9113fc 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -1,5 +1,3 @@
-%global debug_package %{nil}
-
%global srcname mesa
%global _description These drivers contains video acceleration codecs for decoding/encoding H.264 and H.265 \
algorithms and decoding only VC1 algorithm.
2 months