summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorTimo Aaltonen <[email protected]>2009-05-25 12:47:02 +0300
committerTimo Aaltonen <[email protected]>2009-05-25 12:47:02 +0300
commit99b4daf5e19db13fa8d3cabb326a5def3918dc33 (patch)
tree55dba3eca0a80ef0e9a4da30999a5bb521e73057 /debian
parent73670d56e8a6e35204d228365f4c92dbc8511e0a (diff)
Disable EGL.
Update the changelog too.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rwxr-xr-xdebian/rules4
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 6cfe95add77..fd1f17f6421 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.4.1-2) UNRELEASED; urgency=low
+mesa (7.5~rc2-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Don't build hardware dri drivers on s390.
@@ -6,7 +6,11 @@ mesa (7.4.1-2) UNRELEASED; urgency=low
[ Brice Goglin ]
* Enable motif in GLw, closes: #527483.
- -- Brice Goglin <[email protected]> Sat, 09 May 2009 20:48:55 +0200
+ [ Timo Aaltonen ]
+ * New upstream release.
+ * rules: Disable EGL.
+
+ -- Timo Aaltonen <[email protected]> Mon, 18 May 2009 15:12:17 +0300
mesa (7.4.1-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 17ca3285c34..2636bf6bac0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,6 +51,7 @@ QUILT_STAMPFN = $(STAMP_DIR)/patch
include /usr/share/quilt/quilt.make
confflags-common = \
+ --disable-egl \
--disable-glu \
--disable-glut \
--disable-glw \
@@ -128,6 +129,7 @@ confflags-swx11+glu = \
--with-driver=xlib \
--disable-gl-osmesa \
--with-demos= \
+ --disable-egl \
--disable-glut \
--enable-motif \
CFLAGS="$(CFLAGS)"
@@ -137,6 +139,7 @@ confflags-swx11+glu-static = \
--disable-gl-osmesa \
--enable-static \
--with-demos= \
+ --disable-egl \
--disable-glut \
--enable-motif \
CFLAGS="$(CFLAGS)"
@@ -146,6 +149,7 @@ confflags-swx11+glu-i386-i686 = \
--disable-gl-osmesa \
--with-demos= \
--disable-glut \
+ --disable-egl \
--enable-motif \
--libdir=/usr/lib/i686/cmov \
CFLAGS="$(CFLAGS) -march=i686"