%bcond_with egl # don't build egl
%bcond_without gallium # don't build gallium
%bcond_with gallium_intel # gallium i915 driver (but doesn't work with AIGLX)
+%bcond_with gallium_nouveau # doesn't build due to libdrm API changes (fixed in Mesa 7.8)
%bcond_without motif # build static libGLw without Motif interface
%bcond_with multigl # package libGL in a way allowing concurrent install with nvidia/fglrx drivers
%bcond_without osmesa # don't build osmesa
# (until they start to be somehow versioned themselves)
%define glapi_ver 7.1.0
#
-%define snap -rc3
+%define libdrm_ver 2.4.18
+%define dri2proto_ver 1.99.3
+#
Summary: Free OpenGL implementation
Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL
Name: Mesa
Version: 7.7
-Release: 0.1%{?with_multigl:.mgl}
+Release: 3%{?with_multigl:.mgl}
License: MIT (core), SGI (GLU,libGLw) and others - see license.html file
Group: X11/Libraries
-Source0: ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}%{snap}.tar.bz2
-# Source0-md5: 775c278a211deacd722ed599e706a20e
-Source1: ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Demos-%{version}%{snap}.tar.bz2
-# Source1-md5: 2404747b148e05ca74ffb243b6e26606
-Source2: http://www.archlinux.org/~jgc/gl-manpages-1.0.1.tar.bz2
-# Source2-md5: 6ae05158e678f4594343f32c2ca50515
+Source0: ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar.bz2
+# Source0-md5: e3fa64a1508bc23dd9de9dd2cea7cfb1
+Source1: ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Demos-%{version}.tar.bz2
+# Source1-md5: 6fd616b27b9826d0faa23e08e05d9435
Patch0: %{name}-realclean.patch
+Patch1: %{name}-tgsi_dump.patch
URL: http://www.mesa3d.org/
%{?with_demos:BuildRequires: OpenGL-glut-devel >= 3.8}
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: expat-devel
%{?with_demos:BuildRequires: glew-devel}
-BuildRequires: libdrm-devel >= 2.4.12-3
+BuildRequires: libdrm-devel >= %{libdrm_ver}
BuildRequires: libselinux-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:1.4d
BuildRequires: xorg-lib-libXext-devel >= 1.0.5
BuildRequires: xorg-lib-libXt-devel
BuildRequires: xorg-lib-libXxf86vm-devel
-BuildRequires: xorg-proto-dri2proto-devel >= 1.99.3
+BuildRequires: xorg-proto-dri2proto-devel >= %{dri2proto_ver}
BuildRequires: xorg-proto-glproto-devel
BuildRequires: xorg-proto-printproto-devel
BuildRequires: xorg-util-makedepend
Summary(pl.UTF-8): Wolnodostępna implementacja Mesa3D biblioteki libGL ze standardu OpenGL
License: MIT
Group: X11/Libraries
-Requires: libdrm >= 2.4.5
+Requires: libdrm >= %{libdrm_ver}
Provides: OpenGL = 2.1
# reports version 1.3, but supports glXGetProcAddress() from 1.4
Provides: OpenGL-GLX = 1.4
Group: X11/Development/Libraries
# loose dependency on libGL to use with other libGL binaries
Requires: OpenGL >= 1.5
+Requires: libdrm-devel >= %{libdrm_ver}
Requires: xorg-lib-libX11-devel
+Requires: xorg-lib-libXdamage-devel
+Requires: xorg-lib-libXext-devel
+Requires: xorg-lib-libXxf86vm-devel
+Requires: xorg-proto-dri2proto-devel >= %{dri2proto_ver}
+Suggests: OpenGL-doc-man
Provides: OpenGL-GLX-devel = 1.4
Provides: OpenGL-devel = 2.1
Obsoletes: Mesa-devel
Sterownik X.org DRI dla VMware.
%prep
-%setup -q -b1 -a2
+%setup -q -b1
%patch0 -p0
+%patch1 -p1
# fix demos
find progs -type f|xargs sed -i -e "s,\.\./images/,%{_examplesdir}/%{name}-%{version}/images/,g"
%if %{with gallium}
--enable-gallium \
--%{?with_gallium_intel:en}%{!?with_gallium_intel:dis}able-gallium-intel \
- --enable-gallium-nouveau \
+ --enable-gallium-svga \
+ --%{?with_gallium_nouveau:en}%{!?with_gallium_nouveau:dis}able-gallium-nouveau \
--with-state-trackers=dri \
%else
--disable-gallium \
%{__make} -C progs/demos
%endif
-cd gl-manpages-*
-%configure
-%{__make}
-
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-cd gl-manpages-*
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
-cd ..
-
%if %{with osmesa}
install osmesa*/* $RPM_BUILD_ROOT%{_libdir}
%endif
%{_includedir}/GL/internal/dri_interface.h
%{_pkgconfigdir}/dri.pc
%{_pkgconfigdir}/gl.pc
-%{_mandir}/man3/gl[^uX]*.3gl*
-%{_mandir}/man3/glX*.3gl*
%if %{with static}
%files libGL-static
%{_includedir}/GL/glu.h
%{_includedir}/GL/glu_mangle.h
%{_pkgconfigdir}/glu.pc
-%{_mandir}/man3/glu*.3gl*
%if %{with static}
%files libGLU-static
%attr(755,root,root) %{_libdir}/xorg/modules/dri/mga_dri.so
%if %{with gallium}
+%if %{with gallium_nouveau}
%files dri-driver-nouveau
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/nouveau_dri.so
%endif
+%endif
%files dri-driver-savage
%defattr(644,root,root,755)
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/unichrome_dri.so
+%if %{with gallium}
%files dri-driver-vmwgfx
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/vmwgfx_dri
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/vmwgfx_dri.so
+%endif
%if %{with demos}
%files demos