From 9b7fed477b467c0b13ed4da24afdfad804f7e1a8b500c5f0a56f44441f26d062 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 5 Nov 2007 22:50:25 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=26 --- Mesa.changes | 6 ++++++ Mesa.spec | 7 ++++++- pic.diff | 17 +++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pic.diff diff --git a/Mesa.changes b/Mesa.changes index 5fa871f..55fc002 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Nov 4 22:46:31 CET 2007 - sndirsch@suse.de + +- pic.diff + * fixes shared lib on i386 (X.Org Bug #1809) + ------------------------------------------------------------------- Wed Oct 31 08:53:24 CET 2007 - sndirsch@suse.de diff --git a/Mesa.spec b/Mesa.spec index 9c346c3..b3bc4f4 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -19,7 +19,7 @@ Provides: xorg-x11-Mesa Obsoletes: xorg-x11-Mesa AutoReqProv: on Version: 7.0.2 -Release: 1 +Release: 3 Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.* Source: MesaLib-%{version}-rc1.tar.bz2 Source1: MesaDemos-%{version}-rc1.tar.bz2 @@ -33,6 +33,7 @@ Patch2: i915-crossbar.diff Patch4: libIndirectGL.diff Patch5: static.diff Patch6: link-shared.diff +Patch7: pic.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -120,6 +121,7 @@ rm -rf src/glw/ %ifarch %ix86 x86_64 ppc %patch6 %endif +%patch7 %build @@ -267,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT /usr/%{_lib}/libGLU.a /usr/%{_lib}/libMesaGL.a %changelog +* Sun Nov 04 2007 - sndirsch@suse.de +- pic.diff + * fixes shared lib on i386 (X.Org Bug #1809) * Wed Oct 31 2007 - sndirsch@suse.de - updated to Mesa 7.0.2 RC1 - obsoletes disable-libGL-warning.diff, i915-g33.diff and diff --git a/pic.diff b/pic.diff new file mode 100644 index 0000000..6f1c88d --- /dev/null +++ b/pic.diff @@ -0,0 +1,17 @@ +--- configs/linux-dri-x86.orig 2007-11-04 23:50:05.256747500 +0100 ++++ configs/linux-dri-x86 2007-11-04 23:54:25.549014750 +0100 +@@ -5,9 +5,6 @@ + + CONFIG_NAME = linux-dri-x86 + +-# Unnecessary on x86, generally. +-PIC_FLAGS = +- + # Add -m32 to CFLAGS: + ARCH_FLAGS = -m32 + +@@ -15,3 +12,4 @@ + ASM_SOURCES = $(X86_SOURCES) + ASM_API = $(X86_API) + ++DEFINES += -DPIC