rpms/Mesa
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix typo in %ix86 for multiarch libGL.so.1 link support [release 18.2.0-2mamba;Sat Sep 22 2018]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 17:47:40 +01:00
parent 288b56ed25
commit bb8ee3168d
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Mesa.spec
View File

@ -10,7 +10,7 @@
Name: Mesa Name: Mesa
Epoch: 1 Epoch: 1
Version: 18.1.8 Version: 18.2.0
Release: 2mamba Release: 2mamba
Summary: A 3-D graphics library with an API which is very similar to that of OpenGL Summary: A 3-D graphics library with an API which is very similar to that of OpenGL
Group: System/Libraries Group: System/Libraries
@ -334,6 +334,8 @@ Mesa vulkan drivers.
%prep %prep
%setup -q -n mesa-%{version} %setup -q -n mesa-%{version}
#-D -T
#:<< _EOF
%ifarch arm %ifarch arm
# Force libglx dri backend using swrast on non-DRI accelerated platforms # Force libglx dri backend using swrast on non-DRI accelerated platforms
sed -i 's|default_driver="xlib"|default_driver="dri"|' configure sed -i 's|default_driver="xlib"|default_driver="dri"|' configure
@ -342,6 +344,7 @@ sed -i 's|default_driver="xlib"|default_driver="dri"|' configure
#%patch3 -p1 #%patch3 -p1
%build %build
#:<< _EOF
#./autogen.sh \ #./autogen.sh \
#export CXXFLAGS="%{optflags} -std=c++11" #export CXXFLAGS="%{optflags} -std=c++11"
@ -382,7 +385,10 @@ sed -i 's|default_driver="xlib"|default_driver="dri"|' configure
--enable-xa \ --enable-xa \
--enable-opencl \ --enable-opencl \
--enable-opencl-icd \ --enable-opencl-icd \
CXX=clang++ CC=clang CXX=clang++ CC=clang \
%ifarch %{ix86}
LDFLAGS="-lm"
%endif
%endif %endif
# 18.1.8: --with-gallium-driver=swr disabled due to crashes on swrast # 18.1.8: --with-gallium-driver=swr disabled due to crashes on swrast
@ -395,6 +401,8 @@ sed -i 's|default_driver="xlib"|default_driver="dri"|' configure
# --enable-libglvnd \ # --enable-libglvnd \
#_EOF
%make %make
# -j1 # -j1
@ -447,7 +455,7 @@ rm -f %{buildroot}%{_libdir}/*.la
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%post -n libGL-Mesa-dri %post -n libGL-Mesa-dri
%ifarch %{_ix86} %ifarch %{ix86}
CURRARCH=`uname -m` CURRARCH=`uname -m`
if [ "$CURRARCH" = "x86_64" ]; then if [ "$CURRARCH" = "x86_64" ]; then
ALT_APPEND="-32" ALT_APPEND="-32"
@ -455,7 +463,7 @@ fi
%endif %endif
if [ $1 -ge 1 ]; then if [ $1 -ge 1 ]; then
# remove old alternative # remove old alternative
/usr/sbin/update-alternatives --remove libGL.so.1 \ /usr/sbin/update-alternatives --remove libGL.so.1${ALT_APPEND} \
%{_libdir}/libGL_so.%{dri_libglver} &>/dev/null %{_libdir}/libGL_so.%{dri_libglver} &>/dev/null
/usr/sbin/update-alternatives \ /usr/sbin/update-alternatives \
--install %{_libdir}/libGL.so.1 libGL.so.1${ALT_APPEND} \ --install %{_libdir}/libGL.so.1 libGL.so.1${ALT_APPEND} \
@ -464,7 +472,7 @@ fi
exit 0 exit 0
%preun -n libGL-Mesa-dri %preun -n libGL-Mesa-dri
%ifarch %{_ix86} %ifarch %{ix86}
CURRARCH=`uname -m` CURRARCH=`uname -m`
if [ "$CURRARCH" = "x86_64" ]; then if [ "$CURRARCH" = "x86_64" ]; then
ALT_APPEND="-32" ALT_APPEND="-32"
@ -510,8 +518,8 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la
%post -n libMesaOpenCL -p /sbin/ldconfig %post -n libMesaOpenCL -p /sbin/ldconfig
%postun -n libMesaOpenCL -p /sbin/ldconfig %postun -n libMesaOpenCL -p /sbin/ldconfig
%post -n libwayland-egl-Mesa -p /sbin/ldconfig #%post -n libwayland-egl-Mesa -p /sbin/ldconfig
%postun -n libwayland-egl-Mesa -p /sbin/ldconfig #%postun -n libwayland-egl-Mesa -p /sbin/ldconfig
%files -n libgbm %files -n libgbm
%defattr(-,root,root) %defattr(-,root,root)
@ -710,14 +718,14 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la
#%{_libdir}/libOpenVG.so #%{_libdir}/libOpenVG.so
#%{_libdir}/pkgconfig/vg.pc #%{_libdir}/pkgconfig/vg.pc
%files -n libwayland-egl-Mesa #%files -n libwayland-egl-Mesa
%defattr(-,root,root) #%defattr(-,root,root)
%{_libdir}/libwayland-egl.so.* #%{_libdir}/libwayland-egl.so.*
%files -n libwayland-egl-Mesa-devel #%files -n libwayland-egl-Mesa-devel
%defattr(-,root,root) #%defattr(-,root,root)
%{_libdir}/libwayland-egl.so #%{_libdir}/libwayland-egl.so
%{_libdir}/pkgconfig/wayland-egl.pc #%{_libdir}/pkgconfig/wayland-egl.pc
%ifnarch arm %ifnarch arm
%files -n libxatracker %files -n libxatracker
@ -738,6 +746,12 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la
%endif %endif
%changelog %changelog
* Sat Sep 22 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 18.2.0-2mamba
- fix typo in %ix86 for multiarch libGL.so.1 link support
* Sat Sep 15 2018 Automatic Build System <autodist@mambasoft.it> 18.2.0-1mamba
- automatic version update by autodist
* Sat Sep 08 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 18.1.8-2mamba * Sat Sep 08 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 18.1.8-2mamba
- disable --with-gallium-driver=swr due to crashes on swrast (seen on Virtualbox guest) - disable --with-gallium-driver=swr due to crashes on swrast (seen on Virtualbox guest)