summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Jackson <ajax@fedoraproject.org>2008-02-21 02:31:49 +0000
committerAdam Jackson <ajax@fedoraproject.org>2008-02-21 02:31:49 +0000
commit831986639fb5f3be685ab44ee7b70930b2398600 (patch)
tree4c1a171bb95b42dd0cd7f80972159519d85e69eb
parent3e8621714a197c7724dd72ed7c39386ffa974977 (diff)
downloadmesa-831986639fb5f3be685ab44ee7b70930b2398600.tar.gz
mesa-831986639fb5f3be685ab44ee7b70930b2398600.tar.xz
mesa-831986639fb5f3be685ab44ee7b70930b2398600.zip
- Fix build on powerpc and amd64.
-rw-r--r--mesa-7.1-dri-drivers.patch11
-rw-r--r--mesa.spec6
2 files changed, 13 insertions, 4 deletions
diff --git a/mesa-7.1-dri-drivers.patch b/mesa-7.1-dri-drivers.patch
index 706d235..ffb9fa3 100644
--- a/mesa-7.1-dri-drivers.patch
+++ b/mesa-7.1-dri-drivers.patch
@@ -1,6 +1,15 @@
diff -up mesa-20080218/configure.ac.jx mesa-20080218/configure.ac
--- mesa-20080218/configure.ac.jx 2008-02-18 12:01:51.000000000 -0500
-+++ mesa-20080218/configure.ac 2008-02-20 20:54:55.000000000 -0500
++++ mesa-20080218/configure.ac 2008-02-20 21:30:47.000000000 -0500
+@@ -475,7 +475,7 @@ if test "$mesa_driver" = dri; then
+ fi
+
+ case "$host_cpu" in
+- x86_64)
++ x86_64*)
+ # ffb, gamma, and sis are missing because they have not be
+ # converted to use the new interface. i810 are missing
+ # because there is no x86-64 system where they could *ever*
@@ -484,6 +484,7 @@ if test "$mesa_driver" = dri; then
DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 radeon \
savage tdfx unichrome"
diff --git a/mesa.spec b/mesa.spec
index 8f6c0f5..c1ca710 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -195,7 +195,7 @@ make clean
--with-dri-driverdir=%{_libdir}/dri
echo "--- MESA CONFIGURATION ---"
-cat configs/default
+cat configs/current
echo "--- END MESA CONFIGURATION ---"
make %{?_smp_mflags}
@@ -218,7 +218,7 @@ make install DESTDIR=$RPM_BUILD_ROOT DRI_DIRS=
%if %{with_dri}
install -d $RPM_BUILD_ROOT%{_libdir}/dri
for f in i810 i915 i965 mach64 mga r128 r200 r300 radeon savage sis tdfx unichrome; do
- so=lib/${f}_dri.so
+ so=%{_lib}/${f}_dri.so
test -e $so && echo $so
done | xargs install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri >& /dev/null || :
%endif
@@ -399,7 +399,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Feb 20 2008 Adam Jackson <ajax@redhat.com> 7.1-0.16
-- Fix build on powerpc.
+- Fix build on powerpc and amd64.
* Mon Feb 18 2008 Adam Jackson <ajax@redhat.com> 7.1-0.15
- Today's git snapshot, additional headers for DRI2 love.