support for lib32 alternative when installed on x86_64 [release 10.5.7-2mamba;Sat Jun 20 2015]

2024-01-05 17:47:39 +01:00 · 2024-01-05 17:47:39 +01:00 · 17bf5c44bd
commit 17bf5c44bd
parent 7e8e4b6879
1 changed files with 116 additions and 37 deletions
--- a/Mesa.spec
+++ b/Mesa.spec
@ -10,15 +10,15 @@

 Name:          Mesa
 Epoch:         1
-Version:       10.3.5
-Release:       1mamba
+Version:       10.5.7
+Release:       2mamba
 Summary:       A 3-D graphics library with an API which is very similar to that of OpenGL
 Group:         System/Libraries
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://mesa3d.sourceforge.net/
-Source:        ftp://freedesktop.org/pub/mesa/%{version}/MesaLib-%{version}.tar.bz2
+Source:        ftp://ftp.freedesktop.org/pub/mesa/%{version}/mesa-%{version}.tar.xz
 #Source:        http://www.mesa3d.org/beta/MesaLib-%{pkgver}.tar.gz
 Source3:       Mesa-7.0.3-libGL.la
 Patch0:        %{name}-7.10.2-driproto-2.4.patch
@ -245,6 +245,22 @@ Requires:      libOpenVG == %{?epoch:%epoch:}%{version}-%{release}
 Mesa implementation of the OpenVG graphics library.
 This package contains the headers and other files needed for development.

+%package -n libwayland-egl
+Summary:       Mesa implementation of Wayland EGL graphics library
+Group:         System/Libraries
+
+%description -n libwayland-egl
+Mesa implementation of Wayland EGL graphics library.
+
+%package -n libwayland-egl-devel
+Summary:       Development files for libwayland-egl
+Group:         Development/Libraries
+Requires:      libwayland-egl == %{?epoch:%epoch:}%{version}-%{release}
+
+%description -n libwayland-egl-devel
+Mesa implementation of Wayland EGL graphics library.
+This package contains the headers and other files needed for development.
+
 %package -n libxatracker
 Summary:       Mesa XA tracker library
 Group:         System/Libraries
@ -304,7 +320,7 @@ Mesa OpenCL library.
 %debug_package

 %prep
-%setup -q
+%setup -q -n mesa-%{version}
 #-D -T
 #:<< ___EOF
 %ifarch arm
@ -316,44 +332,50 @@ sed -i 's|default_driver="xlib"|default_driver="dri"|' configure

 %build
 #:<< ___EOF
-./autogen.sh \
-   --with-dri-drivers=swrast \
-   --with-gallium-drivers=swrast
+#./autogen.sh \
+#   --with-dri-drivers=swrast \
+#   --with-gallium-drivers=swrast

 export CXXFLAGS="%{optflags} -std=c++11"

 %configure \
-   --enable-osmesa \
-   --with-osmesa-bits=8 \
   --enable-egl \
   --enable-gles1 \
   --enable-gles2 \
-   --with-egl-platforms=x11,drm \
+   --with-egl-platforms=x11,drm,wayland \
   --enable-driglx-direct \
   --enable-dri \
-   --enable-shared-glapi \
+   --enable-gbm \
   --enable-glx \
   --enable-glx-tls \
+   --enable-llvm-shared-libs \
+   --with-clang-libdir=%{_prefix}/lib \
+   --enable-osmesa \
+   --with-osmesa-bits=8 \
+   --enable-omx \
+   --enable-nine \
+   --enable-shared-glapi \
   --enable-vdpau \
   --enable-xvmc \
-   --enable-omx \
-   --with-clang-libdir=%{_prefix}/lib \
 %ifarch arm
   --with-dri-drivers=swrast \
-   --with-gallium-drivers=swrast \
-   --enable-openvg \
+   --with-gallium-drivers=swrast,freedreno,vc4 \
   --enable-gallium-egl \
   --disable-gallium-llvm \
 %else
-   --enable-openvg \
-   --enable-gallium-egl \
+   --enable-texture-float \
   --enable-gallium-llvm \
-   --with-gallium-drivers=nouveau,r300,r600,swrast \
+   --with-gallium-drivers=ilo,nouveau,r300,r600,radeonsi,svga,swrast \
+   --with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast \
   --enable-xa \
   --enable-opencl \
   --enable-opencl-icd \
+   --enable-r600-llvm-compiler \
 %endif

+#   --enable-openvg \
+#   --enable-gallium-egl \
+
 #   --with-driver=dri \
 #   --disable-gallium-egl \

@ -407,19 +429,31 @@ rm -f %{buildroot}%{_libdir}/*.la
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"

 %post -n libGL-Mesa-dri
+%ifarch %{_ix86}
+CURRARCH=`uname -m`
+if [ "$CURRARCH" = "x86_64" ]; then
+   ALT_APPEND="-32"
+fi
+%endif
 if [ $1 -ge 1 ]; then
   # remove old alternative
   /usr/sbin/update-alternatives --remove libGL.so.1 \
      %{_libdir}/libGL_so.%{dri_libglver} &>/dev/null
   /usr/sbin/update-alternatives \
-      --install %{_libdir}/libGL.so.1 libGL.so.1 \
+      --install %{_libdir}/libGL.so.1 libGL.so.1${ALT_APPEND} \
      %{_libdir}/mesa/libGL.so.%{dri_libglver} 50
 fi
 exit 0

 %preun -n libGL-Mesa-dri
+%ifarch %{_ix86}
+CURRARCH=`uname -m`
+if [ "$CURRARCH" = "x86_64" ]; then
+   ALT_APPEND="-32"
+fi
+%endif
 if [ $1 -eq 0 ]; then
-   /usr/sbin/update-alternatives --remove libGL.so.1 \
+   /usr/sbin/update-alternatives --remove libGL.so.1${ALT_APPEND} \
      %{_libdir}/mesa/libGL.so.%{dri_libglver}
 fi
 exit 0
@ -458,12 +492,15 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la
 %post -n libMesaOpenCL -p /sbin/ldconfig
 %postun -n libMesaOpenCL -p /sbin/ldconfig

+%post -n libwayland-egl -p /sbin/ldconfig
+%postun -n libwayland-egl -p /sbin/ldconfig
+
 %files -n libgbm
 %defattr(-,root,root)
 %{_libdir}/libgbm.so.*
-%dir %{_libdir}/gbm
-%{_libdir}/gbm/gbm_gallium_drm.so
-%{_libdir}/gbm/gbm_gallium_drm.la
+#%dir %{_libdir}/gbm
+#%{_libdir}/gbm/gbm_gallium_drm.so
+#%{_libdir}/gbm/gbm_gallium_drm.la
 #%{_libdir}/gbm/pipe_swrast.so
 #%ifarch %{ix86} x86_64
 #%{_libdir}/gbm/pipe_nouveau.so
@ -480,23 +517,29 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la
 %files -n libEGL
 %defattr(-,root,root)
 %{_libdir}/libEGL.so.*
-%dir %{_libdir}/egl
-%{_libdir}/egl/egl_gallium.so
+#%dir %{_libdir}/egl
+#%{_libdir}/egl/egl_gallium.so
 %ifarch %{ix86} x86_64
 %dir %{_libdir}/gallium-pipe
+%{_libdir}/gallium-pipe/pipe_i965.la
+%{_libdir}/gallium-pipe/pipe_i965.so
 %{_libdir}/gallium-pipe/pipe_nouveau.la
 %{_libdir}/gallium-pipe/pipe_nouveau.so
 %{_libdir}/gallium-pipe/pipe_r300.la
 %{_libdir}/gallium-pipe/pipe_r300.so
 %{_libdir}/gallium-pipe/pipe_r600.la
 %{_libdir}/gallium-pipe/pipe_r600.so
+%{_libdir}/gallium-pipe/pipe_radeonsi.la
+%{_libdir}/gallium-pipe/pipe_radeonsi.so
 %{_libdir}/gallium-pipe/pipe_swrast.la
 %{_libdir}/gallium-pipe/pipe_swrast.so
+%{_libdir}/gallium-pipe/pipe_vmwgfx.la
+%{_libdir}/gallium-pipe/pipe_vmwgfx.so
 %endif

 %files -n libEGL-devel
 %defattr(-,root,root)
-%{_libdir}/egl/egl_gallium.la
+#%{_libdir}/egl/egl_gallium.la
 %{_libdir}/pkgconfig/egl.pc

 %files -n libGL-Mesa-dri
@ -506,6 +549,8 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la
 %{_libdir}/mesa/libGL.so.*
 %{_libdir}/bellagio/libomx_mesa.la
 %{_libdir}/bellagio/libomx_mesa.so
+%dir %{_libdir}/d3d
+%{_libdir}/d3d/d3dadapter9.so.*
 #%{_libdir}/bellagio/libomx_nouveau.la
 #%{_libdir}/bellagio/libomx_nouveau.so
 #%{_libdir}/bellagio/libomx_r600.la
@ -533,12 +578,17 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la
 %dir %{_includedir}/GL/internal
 %{_includedir}/GL/internal/dri_interface.h
 %{_includedir}/GL/wglext.h
+%dir %{_includedir}/d3dadapter
+%{_includedir}/d3dadapter/*.h
 #%{_libdir}/libGL.la
 %{_libdir}/libGL.so
 %{_libdir}/libEGL.so
 %{_libdir}/libglapi.so
+%{_libdir}/d3d/d3dadapter9.la
+%{_libdir}/d3d/d3dadapter9.so
 #%{_libdir}/libdricore%{version}*.so
-#%{_libdir}/dri/*.la
+%{_libdir}/dri/gallium_drv_video.la
+%{_libdir}/pkgconfig/d3d.pc
 %{_libdir}/pkgconfig/dri.pc
 %{_libdir}/pkgconfig/gl.pc

@ -549,11 +599,13 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la
 %{_libdir}/vdpau/libvdpau_nouveau.so
 %{_libdir}/vdpau/libvdpau_nouveau.so.*
 #%{_libdir}/vdpau/libvdpau_r300.la
-#%{_libdir}/vdpau/libvdpau_r300.so
-#%{_libdir}/vdpau/libvdpau_r300.so.*
+%{_libdir}/vdpau/libvdpau_r300.so
+%{_libdir}/vdpau/libvdpau_r300.so.*
 #%{_libdir}/vdpau/libvdpau_r600.la
 %{_libdir}/vdpau/libvdpau_r600.so
 %{_libdir}/vdpau/libvdpau_r600.so.*
+%{_libdir}/vdpau/libvdpau_radeonsi.so
+%{_libdir}/vdpau/libvdpau_radeonsi.so.*
 %endif
 #%{_libdir}/vdpau/libvdpau_softpipe.la
 #%{_libdir}/vdpau/libvdpau_softpipe.so
@ -614,16 +666,25 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la
 %{_libdir}/libOSMesa.so
 %{_libdir}/pkgconfig/osmesa.pc

-%files -n libOpenVG
-%defattr(-,root,root)
-%{_libdir}/libOpenVG.so.*
+#%files -n libOpenVG
+#%defattr(-,root,root)
+#%{_libdir}/libOpenVG.so.*

-%files -n libOpenVG-devel
+#%files -n libOpenVG-devel
+#%defattr(-,root,root)
+#%dir %{_includedir}/VG
+#%{_includedir}/VG/*.h
+#%{_libdir}/libOpenVG.so
+#%{_libdir}/pkgconfig/vg.pc
+
+%files -n libwayland-egl
 %defattr(-,root,root)
-%dir %{_includedir}/VG
-%{_includedir}/VG/*.h
-%{_libdir}/libOpenVG.so
-%{_libdir}/pkgconfig/vg.pc
+%{_libdir}/libwayland-egl.so.*
+
+%files -n libwayland-egl-devel
+%defattr(-,root,root)
+%{_libdir}/libwayland-egl.so
+%{_libdir}/pkgconfig/wayland-egl.pc

 %ifnarch arm
 %files -n libxatracker
@ -644,6 +705,24 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la
 %endif

 %changelog
+* Sat Jun 20 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 10.5.7-2mamba
+- support for lib32 alternative when installed on x86_64
+
+* Sun Jun 07 2015 Automatic Build System <autodist@mambasoft.it> 10.5.7-1mamba
+- automatic version update by autodist
+
+* Fri Jun 05 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 10.5.6-1mamba
+- update to 10.5.6
+
+* Sat Mar 28 2015 Automatic Build System <autodist@mambasoft.it> 10.4.7-1mamba
+- automatic update by autodist
+
+* Sat Feb 21 2015 Automatic Build System <autodist@mambasoft.it> 10.4.5-1mamba
+- automatic version update by autodist
+
+* Fri Feb 13 2015 Automatic Build System <autodist@mambasoft.it> 10.4.4-1mamba
+- automatic version update by autodist
+
 * Sat Dec 06 2014 Automatic Build System <autodist@mambasoft.it> 10.3.5-1mamba
 - automatic version update by autodist