- mesa-7.1-ia64-build-fix.patch: Fix build on ia64. (#427558)
This commit is contained in:
parent
41185a9826
commit
8ff20d7c3e
21
mesa-7.1-ia64-build-fix.patch
Normal file
21
mesa-7.1-ia64-build-fix.patch
Normal file
@ -0,0 +1,21 @@
|
||||
diff -up mesa-20071127/src/mesa/drivers/dri/i915/intel_tex.c.jx mesa-20071127/src/mesa/drivers/dri/i915/intel_tex.c
|
||||
--- mesa-20071127/src/mesa/drivers/dri/i915/intel_tex.c.jx 2007-11-27 14:33:54.000000000 -0500
|
||||
+++ mesa-20071127/src/mesa/drivers/dri/i915/intel_tex.c 2008-02-11 15:49:16.000000000 -0500
|
||||
@@ -98,7 +98,7 @@ do_memcpy(void *dest, const void *src, s
|
||||
}
|
||||
|
||||
|
||||
-#if DO_DEBUG
|
||||
+#if defined(DO_DEBUG) && !defined(__ia64__)
|
||||
|
||||
#ifndef __x86_64__
|
||||
static unsigned
|
||||
@@ -183,7 +183,7 @@ intelInitTextureFuncs(struct dd_function
|
||||
functions->UpdateTexturePalette = 0;
|
||||
functions->IsTextureResident = intelIsTextureResident;
|
||||
|
||||
-#if DO_DEBUG
|
||||
+#if defined(DO_DEBUG) && !defined(__ia64__)
|
||||
if (INTEL_DEBUG & DEBUG_BUFMGR)
|
||||
functions->TextureMemCpy = timed_memcpy;
|
||||
else
|
@ -35,7 +35,7 @@
|
||||
Summary: Mesa graphics libraries
|
||||
Name: mesa
|
||||
Version: 7.1
|
||||
Release: 0.8%{?dist}
|
||||
Release: 0.9%{?dist}
|
||||
License: MIT
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.mesa3d.org
|
||||
@ -54,6 +54,7 @@ Patch18: mesa-7.0-selinux-awareness.patch
|
||||
Patch25: mesa-7.0-symlinks-before-depend.patch
|
||||
Patch26: mesa-7.1-remove-getid-i915.patch
|
||||
Patch27: mesa-7.1-e7221.patch
|
||||
Patch28: mesa-7.1-ia64-build-fix.patch
|
||||
|
||||
BuildRequires: pkgconfig
|
||||
%if %{with_dri}
|
||||
@ -184,6 +185,7 @@ chmod a-x progs/demos/glslnoise.c
|
||||
%patch25 -p1 -b .makej
|
||||
%patch26 -p1 -b .fixi915
|
||||
%patch27 -p1 -b .e7221
|
||||
%patch28 -p1 -b .ia64
|
||||
|
||||
# WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
|
||||
# license and are not open source/free software, so we remove them.
|
||||
@ -415,6 +417,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_libdir}/mesa-demos-data
|
||||
|
||||
%changelog
|
||||
* Mon Feb 11 2008 Adam Jackson <ajax@redhat.com> 7.1-0.9
|
||||
- mesa-7.1-ia64-build-fix.patch: Fix build on ia64. (#427558)
|
||||
|
||||
* Tue Jan 22 2008 Adam Jackson <ajax@redhat.com> 7.1-0.8
|
||||
- Enable i915 DRI on E7221. (Carlos Martín, #425790)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user