Attachment 14489 Details for Bug 30945 – spec patch for 32 bit libs

[patch] spec patch for 32 bit libs

mangohud.spec.patch (text/plain), 2.36 KB, created by Aurelian R on 2024-04-01 22:07:54 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Aurelian R

Created: 2024-04-01 22:07:54 CEST

Size: 2.36 KB

patch

obsolete

>--- mangohud/mangohud.spec	2024-04-01 22:48:48.852406875 +0300
>+++ SPECS/mangohud_DFSG_SVN.spec	2024-04-01 22:54:43.215440837 +0300
>@@ -3,6 +3,9 @@
> %define srcname %{uname}-v%{uversion}
> %define rdnsname io.github.flightlessmango.mangohud
> 
>+# Mangohud library support for ix86
>+%define mango_lib32  mangohud_lib32
>+
> Name:           mangohud
> Version:        0.7.1
> Release:        %mkrel 1
>@@ -36,6 +39,13 @@ Requires:       %{_lib}vulkan-loader1
> Provides:       bundled(imgui)
> Provides:       bundled(vulkan-headers)
> 
>+# Load 32bit support for x86_64 system if 32bit repos enabled
>+%ifarch %{ix86}
>+Requires:       %{mango_lib32} == %{version}-%{release}
>+%else
>+Recommends:     %{mango_lib32} == %{version}-%{release}
>+%endif
>+
> %description
> A Vulkan overlay layer for monitoring FPS, temperatures, CPU/GPU load and more.
> 
>@@ -45,6 +55,15 @@ See '%{_docdir}/%{name}' for configurati
> 
> The `goverlay` package provides a third-party GUI frontend for MangoHud.
> 
>+%ifarch %{ix86}
>+%package -n %{mango_lib32}
>+Summary:        Mangohud library files for 32bit support.
>+Group:          System/Libraries
>+
>+%description -n %{mango_lib32}
>+Mangohud library files for 32bit support.
>+%endif
>+
> %prep
> %autosetup -p1 -n %{srcname}-1-geca65e6
> 
>@@ -57,7 +76,9 @@ The `goverlay` package provides a third-
>   -Duse_system_spdlog=enabled \
>   -Dwith_wayland=enabled \
>   -Dwith_nvml=disabled \
>-  -Dwith_xnvctrl=disabled
>+  -Dwith_xnvctrl=disabled \
>+  -Dwith_x11=enabled \
>+  -Dtests=enabled
> # NVML is nonfree, XNVCtrl is not packaged yet (but could be enabled if it is)
> 
> %meson_build
>@@ -65,21 +86,25 @@ The `goverlay` package provides a third-
> %install
> %meson_install
> 
>-# Handled below. We still need -Dinclude_doc which governs other desktop data.
>-rm -rf %{buildroot}%{_docdir}
>-
> # python shebang
> %py3_shebang_fix %{buildroot}%{_bindir}/mangoplot
> 
>+%check
>+%meson_test
>+
> %files
>-%doc README.md data/%{uname}.conf
>+%doc README.md %{uname}.conf.example presets.conf.example
> %license LICENSE
> %{_bindir}/%{name}*
> %{_bindir}/mangoapp
> %{_bindir}/mangoplot
> %{_metainfodir}/%{rdnsname}.metainfo.xml
>-%{_datadir}/vulkan/implicit_layer.d/*Mango*.json
> %{_iconsdir}/hicolor/scalable/apps/%{rdnsname}.svg
>-%{_libdir}/%{name}/
> %{_mandir}/man1/%{name}.1.*
> %{_mandir}/man1/mangoapp.1.*
>+
>+%ifarch %{ix86}
>+%files -n %{mango_lib32}
>+%endif
>+%{_libdir}/%{name}/
>+%{_datadir}/vulkan/implicit_layer.d/*Mango*.json

--- mangohud/mangohud.spec	2024-04-01 22:48:48.852406875 +0300
+++ SPECS/mangohud_DFSG_SVN.spec	2024-04-01 22:54:43.215440837 +0300
@@ -3,6 +3,9 @@
 %define srcname %{uname}-v%{uversion}
 %define rdnsname io.github.flightlessmango.mangohud
 
+# Mangohud library support for ix86
+%define mango_lib32  mangohud_lib32
+
 Name:           mangohud
 Version:        0.7.1
 Release:        %mkrel 1
@@ -36,6 +39,13 @@ Requires:       %{_lib}vulkan-loader1
 Provides:       bundled(imgui)
 Provides:       bundled(vulkan-headers)
 
+# Load 32bit support for x86_64 system if 32bit repos enabled
+%ifarch %{ix86}
+Requires:       %{mango_lib32} == %{version}-%{release}
+%else
+Recommends:     %{mango_lib32} == %{version}-%{release}
+%endif
+
 %description
 A Vulkan overlay layer for monitoring FPS, temperatures, CPU/GPU load and more.
 
@@ -45,6 +55,15 @@ See '%{_docdir}/%{name}' for configurati
 
 The `goverlay` package provides a third-party GUI frontend for MangoHud.
 
+%ifarch %{ix86}
+%package -n %{mango_lib32}
+Summary:        Mangohud library files for 32bit support.
+Group:          System/Libraries
+
+%description -n %{mango_lib32}
+Mangohud library files for 32bit support.
+%endif
+
 %prep
 %autosetup -p1 -n %{srcname}-1-geca65e6
 
@@ -57,7 +76,9 @@ The `goverlay` package provides a third-
   -Duse_system_spdlog=enabled \
   -Dwith_wayland=enabled \
   -Dwith_nvml=disabled \
-  -Dwith_xnvctrl=disabled
+  -Dwith_xnvctrl=disabled \
+  -Dwith_x11=enabled \
+  -Dtests=enabled
 # NVML is nonfree, XNVCtrl is not packaged yet (but could be enabled if it is)
 
 %meson_build
@@ -65,21 +86,25 @@ The `goverlay` package provides a third-
 %install
 %meson_install
 
-# Handled below. We still need -Dinclude_doc which governs other desktop data.
-rm -rf %{buildroot}%{_docdir}
-
 # python shebang
 %py3_shebang_fix %{buildroot}%{_bindir}/mangoplot
 
+%check
+%meson_test
+
 %files
-%doc README.md data/%{uname}.conf
+%doc README.md %{uname}.conf.example presets.conf.example
 %license LICENSE
 %{_bindir}/%{name}*
 %{_bindir}/mangoapp
 %{_bindir}/mangoplot
 %{_metainfodir}/%{rdnsname}.metainfo.xml
-%{_datadir}/vulkan/implicit_layer.d/*Mango*.json
 %{_iconsdir}/hicolor/scalable/apps/%{rdnsname}.svg
-%{_libdir}/%{name}/
 %{_mandir}/man1/%{name}.1.*
 %{_mandir}/man1/mangoapp.1.*
+
+%ifarch %{ix86}
+%files -n %{mango_lib32}
+%endif
+%{_libdir}/%{name}/
+%{_datadir}/vulkan/implicit_layer.d/*Mango*.json

Actions: View | Diff

Attachments on bug 30945: 13414 | 13873 | 14489