X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=Mesa.spec;h=162c55527c6811f45dcbe3f55704595c5d14cb97;hb=f290281d0324989abed3944dbb3a21479dcde086;hp=1cb62b031708b32e55604ef244863ca694efc052;hpb=a91ec32a323903a1bd80b9af8edb64234c6f1713;p=packages%2FMesa.git

diff --git a/Mesa.spec b/Mesa.spec
index 1cb62b0..162c555 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -2,13 +2,17 @@
 # TODO:
 # - subpackage with non-dri libGL for use with X-servers with missing GLX extension?
 # - resurrect static if it's useful
+# - subpackage egl?
 #
 # Conditional build:
 %bcond_without	demos	# don't build demos
-%bcond_without	motif	# build static libGLw without Motif interface
-%bcond_without	gallium
+%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
 %bcond_with	static
 #
 # minimal supported xserver version
@@ -18,37 +22,42 @@
 # (until they start to be somehow versioned themselves)
 %define		glapi_ver	7.1.0
 #
+%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.5
-Release:	6%{?with_multigl:.mgl}
+Version:	7.7
+Release:	3%{?with_multigl:.mgl}
 License:	MIT (core), SGI (GLU,libGLw) and others - see license.html file
 Group:		X11/Libraries
-Source0:	http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2
-# Source0-md5:	459f332551f6ebb86f384d21dd15e1f0
-Source1:	http://dl.sourceforge.net/mesa3d/%{name}Demos-%{version}.tar.bz2
-# Source1-md5:	398ee8801814a00e47f6c2314e3dfddc
-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}-noveau-abi-0.0.15.patch
-Patch2:		%{name}-sparc64.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
 %{?with_motif:BuildRequires:	motif-devel}
+BuildRequires:	pkgconfig
+BuildRequires:	python
 BuildRequires:	rpmbuild(macros) >= 1.470
 BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libXdamage-devel
-BuildRequires:	xorg-lib-libXext-devel >= 1.0.99.4
+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
@@ -78,7 +87,7 @@ Summary:	Free Mesa3D implementation of libGL OpenGL library
 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
@@ -115,7 +124,13 @@ License:	MIT
 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
@@ -374,6 +389,22 @@ X.org DRI driver for ATI R300 card family.
 %description dri-driver-ati-radeon-R300 -l pl.UTF-8
 Sterownik X.org DRI dla rodziny kart ATI R300.
 
+%package dri-driver-ati-radeon-R600
+Summary:	X.org DRI driver for ATI R600 card family
+Summary(pl.UTF-8):	Sterownik X.org DRI dla rodziny kart ATI R600
+License:	MIT
+Group:		X11/Libraries
+Requires:	radeon-ucode
+Requires:	xorg-driver-video-ati
+Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
+Requires:	xorg-xserver-server >= %{xserver_ver}
+
+%description dri-driver-ati-radeon-R600
+X.org DRI driver for ATI R600 card family.
+
+%description dri-driver-ati-radeon-R600 -l pl.UTF-8
+Sterownik X.org DRI dla rodziny kart ATI R600.
+
 %package dri-driver-ati-rage128
 Summary:	X.org DRI driver for ATI Rage128 card family
 Summary(pl.UTF-8):	Sterownik X.org DRI dla rodziny kart ATI Rage128
@@ -502,21 +533,6 @@ X.org DRI drivers for NVIDIA card family.
 %description dri-driver-nouveau -l pl.UTF-8
 Sterowniki X.org DRI dla rodziny kart NVIDIA.
 
-%package dri-driver-s3virge
-Summary:	X.org DRI driver for S3 Virge card family
-Summary(pl.UTF-8):	Sterownik X.org DRI dla rodziny kart S3 Virge
-License:	MIT
-Group:		X11/Libraries
-Requires:	xorg-driver-video-s3virge
-Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
-Requires:	xorg-xserver-server >= %{xserver_ver}
-
-%description dri-driver-s3virge
-X.org DRI driver for S3 Virge card family.
-
-%description dri-driver-s3virge -l pl.UTF-8
-Sterownik X.org DRI dla rodziny kart S3 Virge.
-
 %package dri-driver-savage
 Summary:	X.org DRI driver for S3 Savage card family
 Summary(pl.UTF-8):	Sterownik X.org DRI dla rodziny kart S3 Savage
@@ -581,21 +597,6 @@ and Velocity 100/200).
 Sterownik X.org DRI dla rodziny kart 3DFX Voodoo. (Voodoo 3,4,5,
 Banshee i Velocity 100/200).
 
-%package dri-driver-trident
-Summary:	X.org DRI driver for Trident card family
-Summary(pl.UTF-8):	Sterownik X.org DRI dla rodziny kart Trident
-License:	MIT
-Group:		X11/Libraries
-Requires:	xorg-driver-video-trident
-Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
-Requires:	xorg-xserver-server >= %{xserver_ver}
-
-%description dri-driver-trident
-X.org DRI drivers for Trident card family.
-
-%description dri-driver-trident -l pl.UTF-8
-Sterowniki X.org DRI dla rodziny kart Trident.
-
 %package dri-driver-via-unichrome
 Summary:	X.org DRI driver for VIA Unichrome card family
 Summary(pl.UTF-8):	Sterownik X.org DRI dla rodziny kart VIA Unichrome
@@ -611,19 +612,33 @@ X.org DRI driver for VIA Unichrome card family.
 %description dri-driver-via-unichrome -l pl.UTF-8
 Sterownik X.org DRI dla rodziny kart VIA Unichrome.
 
+%package dri-driver-vmwgfx
+Summary:	X.org DRI driver for VMware
+Summary(pl.UTF-8):	Sterownik X.org DRI dla VMware
+License:	MIT
+Group:		X11/Libraries
+Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
+Requires:	xorg-xserver-server >= %{xserver_ver}
+
+%description dri-driver-vmwgfx
+X.org DRI driver for VMWare.
+
+%description dri-driver-vmwgfx -l pl.UTF-8
+Sterownik X.org DRI dla VMware.
+
 %prep
-%setup -q -b1 -a2
+%setup -q -b1
 %patch0 -p0
 %patch1 -p1
-%patch2 -p1
 
 # fix demos
 find progs -type f|xargs sed -i -e "s,\.\./images/,%{_examplesdir}/%{name}-%{version}/images/,g"
 
 %build
-[ ! -f configure ] && ./autogen.sh
+%{__aclocal}
+%{__autoconf}
 
-dri_drivers="i810 i965 mach64 mga r128 r200 r300 radeon savage s3v trident \
+dri_drivers="i810 i965 mach64 mga r128 r200 r300 r600 radeon savage \
 %if %{without gallium_intel}
 i915 \
 %endif
@@ -641,9 +656,11 @@ common_flags="\
 	--enable-shared \
 	--enable-selinux \
 	--enable-pic \
-	--disable-egl \
+	--enable-glx-tls \
+	--%{?with_egl:en}%{!?with_egl:dis}able-egl \
 	--with%{!?with_demos:out}-demos"
 
+%if %{with osmesa}
 # osmesa variants
 %configure $common_flags \
 	--with-driver=osmesa \
@@ -671,6 +688,7 @@ mv %{_lib} osmesa16
 	SRC_DIRS=mesa
 mv %{_lib} osmesa32
 %{__make} clean
+%endif
 
 %configure $common_flags \
 	--enable-glu \
@@ -679,7 +697,8 @@ mv %{_lib} osmesa32
 %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 \
@@ -694,10 +713,6 @@ mv %{_lib} osmesa32
 %{__make} -C progs/demos
 %endif
 
-cd gl-manpages-*
-%configure
-%{__make}
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -707,12 +722,9 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_examplesdir}/%{name}-%{version}}
 %{__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
 
 install progs/xdemos/{glxgears,glxinfo} $RPM_BUILD_ROOT%{_bindir}
 # work on copy to keep -bi --short-circuit working
@@ -790,8 +802,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
@@ -810,7 +820,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/GL/glu.h
 %{_includedir}/GL/glu_mangle.h
 %{_pkgconfigdir}/glu.pc
-%{_mandir}/man3/glu*.3gl*
 
 %if %{with static}
 %files libGLU-static
@@ -838,6 +847,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libGLw.a
 %endif
 
+%if %{with osmesa}
 %files libOSMesa
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libOSMesa*.so.*.*
@@ -853,6 +863,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libOSMesa*.a
 %endif
+%endif
 
 %files utils
 %defattr(644,root,root,755)
@@ -875,6 +886,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/r300_dri.so
 
+%files dri-driver-ati-radeon-R600
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/r600_dri.so
+
 %files dri-driver-ati-rage128
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/r128_dri.so
@@ -910,15 +925,12 @@ rm -rf $RPM_BUILD_ROOT
 %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
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/nouveau_dri2.so
 %endif
-
-%files dri-driver-s3virge
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/s3v_dri.so
+%endif
 
 %files dri-driver-savage
 %defattr(644,root,root,755)
@@ -938,14 +950,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/tdfx_dri.so
 
-%files dri-driver-trident
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/trident_dri.so
-
 %files dri-driver-via-unichrome
 %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.so
+%endif
+
 %if %{with demos}
 %files demos
 %defattr(644,root,root,755)