From 8060076fcb725b4e387c8e5cfded483e29e92f09 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Mon, 20 Jul 2009 19:32:58 +0000 Subject: [PATCH] - rel 5; disable i915 gallium - use standard one instead (gallium has problems with AIGLX) Changed files: Mesa.spec -> 1.212 --- Mesa.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Mesa.spec b/Mesa.spec index 56960bf..3948cb1 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -6,6 +6,7 @@ # Conditional build: %bcond_without motif # build static libGLw without Motif interface %bcond_without gallium +%bcond_with gallium_intel # gallium i915 driver (but doesn't work with AIGLX) %bcond_with multigl # package libGL in a way allowing concurrent install with nvidia/fglrx drivers %bcond_with static # @@ -20,7 +21,7 @@ Summary: Free OpenGL implementation Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL Name: Mesa Version: 7.5 -Release: 4%{?with_multigl:.mgl} +Release: 5%{?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 @@ -49,6 +50,10 @@ BuildRequires: xorg-proto-printproto-devel BuildRequires: xorg-util-makedepend BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%if %{without gallium} +%undefine with_gallium_intel +%endif + %description Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL(R). To the extent that Mesa utilizes the OpenGL command @@ -613,7 +618,7 @@ find progs -type f|xargs sed -i -e "s,\.\./images/,%{_examplesdir}/%{name}-%{ver [ ! -f configure ] && ./autogen.sh dri_drivers="i810 i965 mach64 mga r128 r200 r300 radeon savage s3v trident \ -%if %{without gallium} +%if %{without gallium_intel} i915 \ %endif %ifarch sparc sparcv9 sparc64 @@ -666,7 +671,7 @@ mv %{_lib} osmesa32 --disable-glut \ %if %{with gallium} --enable-gallium \ - --enable-gallium-intel \ + --%{?with_gallium_intel:en}%{!?with_gallium_intel:dis}able-gallium-intel \ --enable-gallium-nouveau \ --with-state-trackers=dri \ %else -- 2.44.0