summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Jackson <ajax@fedoraproject.org>2010-02-17 17:52:43 +0000
committerAdam Jackson <ajax@fedoraproject.org>2010-02-17 17:52:43 +0000
commit672b4d9a17a4d7d3eced7bed351e8078ccc6eca8 (patch)
treef41b43f52b789f772b5a6875c3f090fe951dc2a8
parentef30d831a89fba5b2ada618d62636e9f1ba05b2d (diff)
downloadmesa-672b4d9a17a4d7d3eced7bed351e8078ccc6eca8.tar.gz
mesa-672b4d9a17a4d7d3eced7bed351e8078ccc6eca8.tar.xz
mesa-672b4d9a17a4d7d3eced7bed351e8078ccc6eca8.zip
- Enable legacy nouveau build on ppc too, on the off chance that it works
(#564346)
-rw-r--r--mesa.spec6
-rw-r--r--nouveau-legacy-enable.patch17
2 files changed, 17 insertions, 6 deletions
diff --git a/mesa.spec b/mesa.spec
index 3e231fe..2cf9372 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -21,7 +21,7 @@
Summary: Mesa graphics libraries
Name: mesa
Version: 7.8
-Release: 0.17%{?dist}
+Release: 0.18%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -404,6 +404,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/xorg/modules/drivers/vmwgfx_drv.so
%changelog
+* Wed Feb 17 2010 Adam Jackson <ajax@redhat.com> 7.8-0.18
+- Enable legacy nouveau build on ppc too, on the off chance that it works
+ (#564346)
+
* Wed Feb 17 2010 Ben Skeggs <bskeggs@redhat.com> 7.8-0.17
- rebase + rebuild for nouveau interface changes
diff --git a/nouveau-legacy-enable.patch b/nouveau-legacy-enable.patch
index ad0748c..e57bee9 100644
--- a/nouveau-legacy-enable.patch
+++ b/nouveau-legacy-enable.patch
@@ -1,8 +1,7 @@
-diff --git a/configure.ac b/configure.ac
-index b6c6535..589b97c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -723,7 +723,7 @@ if test "$mesa_driver" = dri; then
+diff -up mesa-20100217/configure.ac.nouveau-legacy mesa-20100217/configure.ac
+--- mesa-20100217/configure.ac.nouveau-legacy 2010-02-17 12:50:36.000000000 -0500
++++ mesa-20100217/configure.ac 2010-02-17 12:51:34.000000000 -0500
+@@ -723,14 +723,14 @@ if test "$mesa_driver" = dri; then
# be used.
if test "x$DRI_DIRS" = "xyes"; then
DRI_DIRS="i915 i965 mga r128 r200 r300 r600 radeon \
@@ -11,6 +10,14 @@ index b6c6535..589b97c 100644
fi
;;
powerpc*)
+ # Build only the drivers for cards that exist on PowerPC.
+ # At some point MGA will be added, but not yet.
+ if test "x$DRI_DIRS" = "xyes"; then
+- DRI_DIRS="r128 r200 r300 r600 radeon tdfx swrast"
++ DRI_DIRS="r128 r200 r300 r600 radeon tdfx swrast nouveau"
+ fi
+ ;;
+ sparc*)
@@ -775,7 +775,7 @@ if test "$mesa_driver" = dri; then
# default drivers
if test "x$DRI_DIRS" = "xyes"; then