# (until they start to be somehow versioned themselves)
%define glapi_ver 7.1.0
#
-%define libdrm_ver 2.4.21
-%define dri2proto_ver 1.99.3
+%define libdrm_ver 2.4.23
+%define dri2proto_ver 2.1
%define glproto_ver 1.4.11
#
Summary: Free OpenGL implementation
Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL
Name: Mesa
-Version: 7.9
-Release: 8%{?with_multigl:.mgl}
+Version: 7.10.1
+Release: 1%{?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}.tar.bz2
-# Source0-md5: 82c740c49d572baa6da2b1a1eee90bca
+# Source0-md5: efe8da4d80c2a5d32a800770b8ce5dfa
Patch0: %{name}-realclean.patch
Patch1: %{name}-selinux.patch
Patch2: %{name}-git.patch
-Patch3: %{name}-nouveau.patch
+Patch3: %{name}-nouveau-updates.patch
+Patch4: %{name}-nouveau-revert.patch
+Patch5: %{name}-nouveau-classic-libdrm.patch
URL: http://www.mesa3d.org/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.59
BuildRequires: automake
BuildRequires: expat-devel
BuildRequires: libdrm-devel >= %{libdrm_ver}
BuildRequires: libselinux-devel
-BuildRequires: libstdc++-devel
+BuildRequires: libstdc++-devel >= 5:3.3.0
+BuildRequires: libtalloc-devel >= 2:2.0.1
BuildRequires: libtool >= 2:1.4d
%{?with_motif:BuildRequires: motif-devel}
BuildRequires: pixman-devel
BuildRequires: pkgconfig
-BuildRequires: pkgconfig(talloc) >= 2.0.1
BuildRequires: python
BuildRequires: python-modules
BuildRequires: rpmbuild(macros) >= 1.470
BuildRequires: xorg-proto-glproto-devel >= %{glproto_ver}
BuildRequires: xorg-util-makedepend
BuildRequires: xorg-xserver-server-devel
+%if %{with egl}
+BuildRequires: libxcb-devel
+BuildRequires: udev-devel >= 150
+%endif
+%if %{with gallium}
+BuildRequires: xorg-proto-xextproto-devel >= 7.0.99.1
+BuildRequires: xorg-xserver-server-devel >= 1.6.0
+%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%if %{without gallium}
OpenGL ani powiązana z SGI.
%package libEGL
-Summary: SGI implementation of libEGL OpenGL library
-Summary(pl.UTF-8): Implementacja SGI biblioteki libEGL ze standardu OpenGL
-License: SGI Free Software License B v2.0 (MIT-like)
+Summary: Mesa implementation of EGL Native Platform Graphics Interface library
+Summary(pl.UTF-8): Implementacja Mesa biblioteki interfejsu EGL
+License: MIT
Group: Libraries
Requires: OpenGL >= 1.2
-Provides: OpenGL-EGL = 1.0
+Requires: udev-libs >= 150
+Provides: EGL = 1.4
%description libEGL
-SGI implementation of libEGL OpenGL library.
+This package contains shared libEGL - Mesa implementation of EGL
+Native Platform Graphics Interface as specified by Khronos Group:
+<http://www.khronos.org/egl/>.
%description libEGL -l pl.UTF-8
-Implementacja SGI biblioteki libEGL ze standardu OpenGL.
+Ten pakiet zawiera bibliotekę współdzieloną libEGL - implementację
+Mesa standardu EGL Native Platform Graphics Interface (interfejsu
+graficznego platformy natywnej) wg specyfikacji Khronos Group:
+<http://www.khronos.org/egl/>.
%package libEGL-devel
-Summary: Header files for SGI libEGL library
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki SGI libEGL
-License: SGI Free Software License B v2.0 (MIT-like)
+Summary: Header files for Mesa implementation of EGL library
+Summary(pl.UTF-8): Pliki nagłówkowe implementacji Mesa biblioteki EGL
+License: MIT
Group: Development/Libraries
Requires: %{name}-libEGL = %{version}-%{release}
Requires: OpenGL-devel >= 1.2
Requires: libstdc++-devel
-Provides: OpenGL-EGL-devel = 1.0
+Provides: EGL-devel = 1.4
%description libEGL-devel
-Header files for SGI libEGL library.
+Header files for Mesa implementation of EGL library.
%description libEGL-devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki SGI libEGL.
+Pliki nagłówkowe implementacji Mesa biblioteki EGL.
%package libEGL-static
-Summary: Static SGI libEGL library
-Summary(pl.UTF-8): Statyczna biblioteka SGI libEGL
-License: SGI Free Software License B v2.0 (MIT-like)
+Summary: Static Mesa libEGL library
+Summary(pl.UTF-8): Statyczna biblioteka Mesa libEGL
+License: MIT
Group: Development/Libraries
Requires: %{name}-libEGL-devel = %{version}-%{release}
-Provides: OpenGL-EGL-static = 1.0
+Provides: EGL-static = 1.4
%description libEGL-static
-Static SGI libEGL library.
+Static Mesa libEGL library.
%description libEGL-static -l pl.UTF-8
-Statyczna biblioteka SGI libEGL.
+Statyczna biblioteka Mesa libEGL.
%package libGL
Summary: Free Mesa3D implementation of libGL OpenGL library
%description libGLw
SGI OpenGL Xt widgets library.
-%description libGLU -l pl.UTF-8
+%description libGLw -l pl.UTF-8
Biblioteka SGI widgetów Xt dla OpenGL-a.
%package libGLw-devel
%setup -q
%patch0 -p0
%patch1 -p1
-%patch2 -p1
+#patch2 -p1
%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
%{__aclocal}
--%{?with_gallium_intel:en}%{!?with_gallium_intel:dis}able-gallium-intel \
--%{?with_gallium_radeon:en}%{!?with_gallium_radeon:dis}able-gallium-radeon \
--enable-gallium-svga \
-%{?with_gallium_nouveau:--enable-gallium-nouveau} \
+ %{?with_gallium_nouveau:--enable-gallium-nouveau} \
--with-state-trackers=dri,glx \
%else
--disable-gallium \