mesa: Changes to 'debian-experimental'
Rebased ref, commits from common ancestor:
commit c2e73526435eee9b92d50efd4a97c80536e03e4b
Author: Sven Joachim <svenjoac@gmx.de>
Date: Wed Jan 18 19:38:33 2012 +0100
Remove reference to i810 from debian/rules
Missed in commit 37efab84461729859f7606e39f687905a3f1cc6a.
diff --git a/debian/rules b/debian/rules
index 1c00eb4..b340a18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,7 +88,7 @@ else
DRI_DRIVERS += r200 radeon
endif
ifeq ($(DEB_HOST_ARCH_CPU), i386)
- DRI_DRIVERS += i810 i915 i965
+ DRI_DRIVERS += i915 i965
else ifeq ($(DEB_HOST_ARCH_CPU), amd64)
DRI_DRIVERS += i915 i965
endif
commit 9aa3379944040fc796c472722e816f2b2a2ea933
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Jan 18 18:30:25 2012 +0100
Drop debian revision from symbols files.
diff --git a/debian/libegl1-mesa.symbols b/debian/libegl1-mesa.symbols
index d843f60..4a405b0 100644
--- a/debian/libegl1-mesa.symbols
+++ b/debian/libegl1-mesa.symbols
@@ -40,7 +40,7 @@ libEGL.so.1 libegl1-mesa #MINVER# | libegl1-x11
eglGetScreensMESA@Base 7.8.1
eglInitialize@Base 7.8.1
eglMakeCurrent@Base 7.8.1
- eglPostSubBufferNV@Base 8.0~rc1-1
+ eglPostSubBufferNV@Base 8.0~rc1
eglQueryAPI@Base 7.8.1
eglQueryContext@Base 7.8.1
eglQueryModeStringMESA@Base 7.8.1
diff --git a/debian/libgles2-mesa.symbols b/debian/libgles2-mesa.symbols
index 7a69f9b..034eb3b 100644
--- a/debian/libgles2-mesa.symbols
+++ b/debian/libgles2-mesa.symbols
@@ -43,7 +43,7 @@ libGLESv2.so.2 libgles2-mesa #MINVER# | libgles2
glDisable@Base 7.8.1
glDisableVertexAttribArray@Base 7.8.1
glDrawArrays@Base 7.8.1
- glDrawBuffersNV@Base 8.0~rc1-1
+ glDrawBuffersNV@Base 8.0~rc1
glDrawElements@Base 7.8.1
glEGLImageTargetRenderbufferStorageOES@Base 7.8.1
glEGLImageTargetTexture2DOES@Base 7.8.1
commit 7431c2d289abff89fbacf8b9f797de424ae3a5c4
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 18 18:32:02 2012 +0200
rules: Drop obsolete configure options.
diff --git a/debian/changelog b/debian/changelog
index a90db55..4bfd937 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ mesa (8.0~rc1-1) UNRELEASED; urgency=low
* control: Drop libglw1-mesa, libglw1-mesa-dev, glw got moved to a
separate source package.
* libegl-mesa.symbols, libgles2-mesa.symbols: Add new symbols.
+ * rules: Drop obsolete configure options.
-- Cyril Brulebois <kibi@debian.org> Fri, 23 Dec 2011 14:13:28 +0100
diff --git a/debian/rules b/debian/rules
index 732e6b3..1c00eb4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,7 +60,6 @@ include /usr/share/quilt/quilt.make
confflags-common = \
--disable-glu \
- --disable-glut \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
@@ -168,9 +167,7 @@ confflags-swx11+glu = \
--disable-egl \
--with-gallium-drivers= \
--with-driver=xlib \
- --disable-gl-osmesa \
--disable-egl \
- --disable-glut \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
@@ -178,10 +175,8 @@ confflags-swx11+glu-static = \
--disable-egl \
--with-gallium-drivers= \
--with-driver=xlib \
- --disable-gl-osmesa \
--enable-static \
--disable-egl \
- --disable-glut \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
@@ -189,8 +184,6 @@ confflags-swx11+glu-i386-i686 = \
--disable-egl \
--with-gallium-drivers= \
--with-driver=xlib \
- --disable-gl-osmesa \
- --disable-glut \
--disable-egl \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov \
CFLAGS="$(CFLAGS) -march=i686" \
commit 7e4b013867ce453879ce47e896d2c9c1e825fec1
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 18 18:08:07 2012 +0200
rules: clean up --enable-motif
diff --git a/debian/rules b/debian/rules
index 547bbbd..732e6b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -171,7 +171,6 @@ confflags-swx11+glu = \
--disable-gl-osmesa \
--disable-egl \
--disable-glut \
- --enable-motif \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
@@ -183,7 +182,6 @@ confflags-swx11+glu-static = \
--enable-static \
--disable-egl \
--disable-glut \
- --enable-motif \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
@@ -194,7 +192,6 @@ confflags-swx11+glu-i386-i686 = \
--disable-gl-osmesa \
--disable-glut \
--disable-egl \
- --enable-motif \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov \
CFLAGS="$(CFLAGS) -march=i686" \
CXXFLAGS="$(CXXFLAGS) -march=i686"
commit 34e982a0b24f04b1d7f25e99fb80c9290284533d
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 18 17:47:26 2012 +0200
remove rest of libglw1*
diff --git a/debian/libglw1-mesa-dev.install.in b/debian/libglw1-mesa-dev.install.in
deleted file mode 100644
index 822fa4a..0000000
--- a/debian/libglw1-mesa-dev.install.in
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/GL/GLw*A.h
-usr/lib/${DEB_HOST_MULTIARCH}/libGLw.a
-usr/lib/${DEB_HOST_MULTIARCH}/libGLw.so
-usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glw.pc
diff --git a/debian/libglw1-mesa.install.in b/debian/libglw1-mesa.install.in
deleted file mode 100644
index 14036ee..0000000
--- a/debian/libglw1-mesa.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libGLw.so.*
diff --git a/debian/libglw1-mesa.lintian-overrides b/debian/libglw1-mesa.lintian-overrides
deleted file mode 100644
index 7d53dee..0000000
--- a/debian/libglw1-mesa.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-package-name-doesnt-match-sonames libGLw1
diff --git a/debian/libglw1-mesa.shlibs b/debian/libglw1-mesa.shlibs
deleted file mode 100644
index 488d4da..0000000
--- a/debian/libglw1-mesa.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libGLw 1 libglw1-mesa | libglw1
diff --git a/debian/not-installed b/debian/not-installed
index 0bb613e..da26519 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -26,10 +26,6 @@ NOT_INSTALLED_i386 = \
usr/lib/*/i686/cmov/libGLU.so \
usr/lib/*/i686/cmov/libGLU.so.1 \
usr/lib/*/i686/cmov/libGLU.so.1.* \
- usr/lib/*/i686/cmov/libGLw.so \
- usr/lib/*/i686/cmov/libGLw.so.1 \
- usr/lib/*/i686/cmov/libGLw.so.1.* \
- usr/lib/*/i686/cmov/pkgconfig/glw.pc \
usr/lib/*/i686/cmov/pkgconfig/glu.pc \
usr/lib/*/i686/cmov/pkgconfig/gl.pc
commit 963917cccab0fda25b7c45ef755991730e6ccd55
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 18 17:45:43 2012 +0200
libegl-mesa.symbols, libgles2-mesa.symbols: Add new symbols.
diff --git a/debian/changelog b/debian/changelog
index 8a35413..a90db55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ mesa (8.0~rc1-1) UNRELEASED; urgency=low
* control: Add libxcb-glx0-dev to build-depends.
* control: Drop libglw1-mesa, libglw1-mesa-dev, glw got moved to a
separate source package.
+ * libegl-mesa.symbols, libgles2-mesa.symbols: Add new symbols.
-- Cyril Brulebois <kibi@debian.org> Fri, 23 Dec 2011 14:13:28 +0100
diff --git a/debian/libegl1-mesa.symbols b/debian/libegl1-mesa.symbols
index c229766..d843f60 100644
--- a/debian/libegl1-mesa.symbols
+++ b/debian/libegl1-mesa.symbols
@@ -40,6 +40,7 @@ libEGL.so.1 libegl1-mesa #MINVER# | libegl1-x11
eglGetScreensMESA@Base 7.8.1
eglInitialize@Base 7.8.1
eglMakeCurrent@Base 7.8.1
+ eglPostSubBufferNV@Base 8.0~rc1-1
eglQueryAPI@Base 7.8.1
eglQueryContext@Base 7.8.1
eglQueryModeStringMESA@Base 7.8.1
diff --git a/debian/libgles2-mesa.symbols b/debian/libgles2-mesa.symbols
index 8108fff..7a69f9b 100644
--- a/debian/libgles2-mesa.symbols
+++ b/debian/libgles2-mesa.symbols
@@ -43,6 +43,7 @@ libGLESv2.so.2 libgles2-mesa #MINVER# | libgles2
glDisable@Base 7.8.1
glDisableVertexAttribArray@Base 7.8.1
glDrawArrays@Base 7.8.1
+ glDrawBuffersNV@Base 8.0~rc1-1
glDrawElements@Base 7.8.1
glEGLImageTargetRenderbufferStorageOES@Base 7.8.1
glEGLImageTargetTexture2DOES@Base 7.8.1
commit d23d840c15a1a5517f225fe970038e3c03a3885d
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 18 17:43:10 2012 +0200
control: Drop libglw1-mesa, libglw1-mesa-dev
glw got moved to a separate source package.
diff --git a/debian/changelog b/debian/changelog
index 74b687d..8a35413 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ mesa (8.0~rc1-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* Refresh patches.
* control: Add libxcb-glx0-dev to build-depends.
+ * control: Drop libglw1-mesa, libglw1-mesa-dev, glw got moved to a
+ separate source package.
-- Cyril Brulebois <kibi@debian.org> Fri, 23 Dec 2011 14:13:28 +0100
diff --git a/debian/control b/debian/control
index 33ac547..08b118a 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends:
x11proto-gl-dev (>= 1.4.11),
libxxf86vm-dev,
libexpat1-dev,
- lesstif2-dev,
dpkg-dev (>= 1.15.6),
libxfixes-dev,
libxdamage-dev,
@@ -754,47 +753,4 @@ Description: Mesa OpenGL utility library -- development files
For a complete description of GLU, please look at the libglu1-mesa
package.
-Package: libglw1-mesa
-Section: libs
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Provides: libglw1
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: free implementation of the OpenGL API -- runtime
- Mesa is a 3-D graphics library with an API which is very similar to
- that of OpenGL. To the extent that Mesa utilizes the OpenGL command
- syntax or state machine, it is being used with authorization from
- Silicon Graphics, Inc. However, the author makes no claim that Mesa
- is in any way a compatible replacement for OpenGL or associated with
- Silicon Graphics, Inc.
- .
- This package provides a simple widgets library, libGLw, which
- allows Motif-based applications to embed an OpenGL drawing context.
- .
- On Linux, this library is also known as libGLw or libGLw.so.1.
-
-Package: libglw1-mesa-dev
-Section: libdevel
-Architecture: any
-Depends:
- libglw1-mesa (= ${binary:Version}),
- libx11-dev,
- libxt-dev,
- lesstif2-dev | libmotif-dev,
- mesa-common-dev (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends},
-Provides: mesag3-widgets, mesag-widgets-dev, libglw-dev
-Conflicts: libglw-dev, libgl1-mesa-swx11-dev (<< 6.5.2-4)
-Replaces: libglw-dev
-Description: free implementation of the OpenGL API -- development files
- This package provides the development environment required for
- compiling programs with the Mesa widgets library, libGLw, which
- allows Motif-based applications to embed an OpenGL drawing context.
- The headers and static libraries for compiling programs that use this
- library are included.
-
# vim: tw=0
diff --git a/debian/rules b/debian/rules
index 449f72a..547bbbd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,7 +61,6 @@ include /usr/share/quilt/quilt.make
confflags-common = \
--disable-glu \
--disable-glut \
- --disable-glw \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
commit dd0f84df69181ce92ce63dd785a84c2babc5da1f
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 18 17:40:48 2012 +0200
control: Add libxcb-glx0-dev to build-depends.
diff --git a/debian/changelog b/debian/changelog
index 1d03f1d..74b687d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ mesa (8.0~rc1-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* Refresh patches.
+ * control: Add libxcb-glx0-dev to build-depends.
-- Cyril Brulebois <kibi@debian.org> Fri, 23 Dec 2011 14:13:28 +0100
diff --git a/debian/control b/debian/control
index f58696c..33ac547 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Build-Depends:
linux-libc-dev (>= 2.6.31) [linux-any],
libx11-xcb-dev,
libxcb-dri2-0-dev,
+ libxcb-glx0-dev,
libxcb-xfixes0-dev,
python-libxml2,
libudev-dev [linux-any],
commit c01004838e64e875d764b575fd2bfa575c65c65b
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 18 16:07:21 2012 +0200
Refresh patches.
diff --git a/debian/changelog b/debian/changelog
index 665574e..1d03f1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
mesa (8.0~rc1-1) UNRELEASED; urgency=low
+ [ Cyril Brulebois ]
* New upstream snapshot.
* Disable patch temporarily (needs a refresh):
- 11-hurd-ftbfs-again.diff
@@ -12,6 +13,9 @@ mesa (8.0~rc1-1) UNRELEASED; urgency=low
* Stop trying to ship swrastg through libgl1-mesa-dri-experimental,
it replaced the non-gallium variant.
+ [ Timo Aaltonen ]
+ * Refresh patches.
+
-- Cyril Brulebois <kibi@debian.org> Fri, 23 Dec 2011 14:13:28 +0100
mesa (7.11.2-1) unstable; urgency=low
diff --git a/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch b/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
index 92c7f62..d2376e2 100644
--- a/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
+++ b/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
@@ -8,9 +8,9 @@ This patch by David Nusinow.
Index: mesa/src/mesa/main/compiler.h
===================================================================
---- mesa.orig/src/mesa/main/compiler.h
-+++ mesa/src/mesa/main/compiler.h
-@@ -375,8 +375,9 @@ static INLINE GLuint CPU_TO_LE32(GLuint
+--- mesa.orig/src/mesa/main/compiler.h 2012-01-18 16:04:58.338654818 +0200
++++ mesa/src/mesa/main/compiler.h 2012-01-18 16:05:00.930732513 +0200
+@@ -369,8 +369,9 @@
* USE_IEEE: Determine if we're using IEEE floating point
*/
#if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
diff --git a/debian/patches/05_kfreebsd-egl-x11.diff b/debian/patches/05_kfreebsd-egl-x11.diff
index 1bedcd6..3a050b4 100644
--- a/debian/patches/05_kfreebsd-egl-x11.diff
+++ b/debian/patches/05_kfreebsd-egl-x11.diff
@@ -8,11 +8,11 @@ Not that dri2 is going to work there, but well.
src/egl/drivers/dri2/platform_x11.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
-diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
-index 4e00c95..f38d6c0 100644
---- a/src/egl/drivers/dri2/platform_x11.c
-+++ b/src/egl/drivers/dri2/platform_x11.c
-@@ -997,7 +997,13 @@ dri2_initialize_x11_dri2(_EGLDriver *drv, _EGLDisplay *disp)
+Index: mesa/src/egl/drivers/dri2/platform_x11.c
+===================================================================
+--- mesa.orig/src/egl/drivers/dri2/platform_x11.c 2012-01-18 16:04:58.294653499 +0200
++++ mesa/src/egl/drivers/dri2/platform_x11.c 2012-01-18 16:05:08.790968112 +0200
+@@ -1083,7 +1083,13 @@
if (!dri2_load_driver(disp))
goto cleanup_conn;
@@ -26,6 +26,3 @@ index 4e00c95..f38d6c0 100644
if (dri2_dpy->fd == -1) {
_eglLog(_EGL_WARNING,
"DRI2: could not open %s (%s)", dri2_dpy->device_name,
---
-1.7.2.5
-
diff --git a/debian/patches/06_kfreebsd-ftbfs.diff b/debian/patches/06_kfreebsd-ftbfs.diff
index 9395d9d..66b3842 100644
--- a/debian/patches/06_kfreebsd-ftbfs.diff
+++ b/debian/patches/06_kfreebsd-ftbfs.diff
@@ -5,9 +5,11 @@ mesa fails to build on GNU/kFreeBSD, since some parts are not enabled.
Debian bug: http://bugs.debian.org/524690
---- a/configure.ac
-+++ b/configure.ac
-@@ -1024,7 +1024,7 @@ if test "$mesa_driver" = dri -o "$mesa_driver" = no; then
+Index: mesa/configure.ac
+===================================================================
+--- mesa.orig/configure.ac 2012-01-18 16:04:58.270652780 +0200
++++ mesa/configure.ac 2012-01-18 16:05:57.376424418 +0200
+@@ -1218,7 +1218,7 @@
;;
esac
;;
@@ -15,4 +17,4 @@ Debian bug: http://bugs.debian.org/524690
+ freebsd* | dragonfly* | *netbsd* | kfreebsd*-gnu*)
DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
- DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"
+
diff --git a/debian/patches/08-kfreebsd-gallium.diff b/debian/patches/08-kfreebsd-gallium.diff
index 91126b8..ed626c1 100644
--- a/debian/patches/08-kfreebsd-gallium.diff
+++ b/debian/patches/08-kfreebsd-gallium.diff
@@ -1,5 +1,7 @@
---- a/src/gallium/auxiliary/rtasm/rtasm_execmem.c
-+++ b/src/gallium/auxiliary/rtasm/rtasm_execmem.c
+Index: mesa/src/gallium/auxiliary/rtasm/rtasm_execmem.c
+===================================================================
+--- mesa.orig/src/gallium/auxiliary/rtasm/rtasm_execmem.c 2012-01-18 16:04:58.230651581 +0200
++++ mesa/src/gallium/auxiliary/rtasm/rtasm_execmem.c 2012-01-18 16:06:09.872798989 +0200
@@ -37,7 +37,7 @@
#include "rtasm_execmem.h"
@@ -9,10 +11,12 @@
#define MAP_ANONYMOUS MAP_ANON
#endif
---- a/src/gallium/include/pipe/p_config.h
-+++ b/src/gallium/include/pipe/p_config.h
-@@ -147,7 +147,7 @@
- #define PIPE_OS_UNIX
+Index: mesa/src/gallium/include/pipe/p_config.h
+===================================================================
+--- mesa.orig/src/gallium/include/pipe/p_config.h 2012-01-18 16:04:58.238651821 +0200
++++ mesa/src/gallium/include/pipe/p_config.h 2012-01-18 16:06:09.872798989 +0200
+@@ -171,7 +171,7 @@
+ #define PIPE_OS_ANDROID
#endif
-#if defined(__FreeBSD__)
diff --git a/debian/patches/10-hurd-configure-tweaks.diff b/debian/patches/10-hurd-configure-tweaks.diff
index 60b0518..3dbfa92 100644
--- a/debian/patches/10-hurd-configure-tweaks.diff
+++ b/debian/patches/10-hurd-configure-tweaks.diff
@@ -1,9 +1,11 @@
Enable x86 assembler on Hurd.
Thanks to Pino Toscano.
---- a/configure.ac
-+++ b/configure.ac
-@@ -419,7 +419,7 @@ if test "x$enable_asm" = xyes; then
+Index: mesa/configure.ac
+===================================================================
+--- mesa.orig/configure.ac 2012-01-18 16:05:57.376424418 +0200
++++ mesa/configure.ac 2012-01-18 16:06:14.824947429 +0200
+@@ -473,7 +473,7 @@
case "$host_cpu" in
i?86)
case "$host_os" in
diff --git a/debian/patches/13-llvm-config-pick-a-version.diff b/debian/patches/13-llvm-config-pick-a-version.diff
index 0007d48..a4ad365 100644
--- a/debian/patches/13-llvm-config-pick-a-version.diff
+++ b/debian/patches/13-llvm-config-pick-a-version.diff
@@ -3,9 +3,9 @@ writing, 2.8 and 2.9), so pick a version. Let's assume the last version
receives bug fixes quickly, so pick 2.9 for now.
Index: mesa/configure.ac
===================================================================
---- mesa.orig/configure.ac 2011-08-01 17:04:54.000000000 +1000
-+++ mesa/configure.ac 2011-08-01 17:05:08.080884291 +1000
-@@ -1731,7 +1731,7 @@
+--- mesa.orig/configure.ac 2012-01-18 16:06:14.824947429 +0200
++++ mesa/configure.ac 2012-01-18 16:06:19.117076083 +0200
+@@ -1765,7 +1765,7 @@
esac
fi
if test "x$enable_gallium_llvm" = xyes; then
@@ -13,4 +13,4 @@ Index: mesa/configure.ac
+ AC_PATH_PROG([LLVM_CONFIG], [llvm-config-2.9], [no])
if test "x$LLVM_CONFIG" != xno; then
- LLVM_VERSION=`$LLVM_CONFIG --version`
+ LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/svn.*//g'`
commit 794db82014b9d08e122e1c76c9b66ba9ddda10c0
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 18 16:04:27 2012 +0200
update the version
diff --git a/debian/changelog b/debian/changelog
index 9ba5f04..665574e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.12~0-1) UNRELEASED; urgency=low
+mesa (8.0~rc1-1) UNRELEASED; urgency=low
* New upstream snapshot.
* Disable patch temporarily (needs a refresh):
commit 760ae1c2a9de9c6ac253d357f631b295a2a8b246
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Dec 23 15:08:27 2011 +0100
Stop trying to ship swrastg through libgl1-mesa-dri-experimental, it replaced the non-gallium variant.
diff --git a/debian/changelog b/debian/changelog
index e83a987..9ba5f04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ mesa (7.12~0-1) UNRELEASED; urgency=low
with the following upstream commit:
- dri: Remove all DRI1 drivers (e4344161bd).
* Update not-installed for removed files.
+ * Stop trying to ship swrastg through libgl1-mesa-dri-experimental,
+ it replaced the non-gallium variant.
-- Cyril Brulebois <kibi@debian.org> Fri, 23 Dec 2011 14:13:28 +0100
diff --git a/debian/libgl1-mesa-dri-experimental.install.in b/debian/libgl1-mesa-dri-experimental.install.in
index e36377f..5d13ab2 100644
--- a/debian/libgl1-mesa-dri-experimental.install.in
+++ b/debian/libgl1-mesa-dri-experimental.install.in
@@ -1 +1 @@
-build/dri/${DEB_HOST_MULTIARCH}/gallium/swrastg_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
+# empty for now.
commit c16e18542d3c3d619c6aec541c460449869c8a7a
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Dec 23 15:06:17 2011 +0100
Update not-installed for removed files.
diff --git a/debian/changelog b/debian/changelog
index 9f3098e..e83a987 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ mesa (7.12~0-1) UNRELEASED; urgency=low
* Update rules file to strop building DRI1 drivers, they went away
with the following upstream commit:
- dri: Remove all DRI1 drivers (e4344161bd).
+ * Update not-installed for removed files.
-- Cyril Brulebois <kibi@debian.org> Fri, 23 Dec 2011 14:13:28 +0100
diff --git a/debian/not-installed b/debian/not-installed
index 44b5821..0bb613e 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -2,10 +2,8 @@
# Common list:
NOT_INSTALLED := \
- dri/usr/include/GL/glfbdev.h \
dri/usr/include/GL/glu.h \
dri/usr/include/GL/glu_mangle.h \
- dri/usr/include/GL/mesa_wgl.h \
dri/usr/include/GL/osmesa.h \
dri/usr/include/GL/vms_x_fix.h \
dri/usr/include/GL/wglext.h \
@@ -13,15 +11,11 @@ NOT_INSTALLED := \
dri/usr/lib/*/libGL.so \
dri/usr/lib/*/pkgconfig/gl.pc \
usr/include/GL/glext.h \
- usr/include/GL/glfbdev.h \
usr/include/GL/gl.h \
usr/include/GL/gl_mangle.h \
- usr/include/GL/GLwDrawAP.h \
- usr/include/GL/GLwMDrawAP.h \
usr/include/GL/glxext.h \
usr/include/GL/glx.h \
usr/include/GL/glx_mangle.h \
- usr/include/GL/mesa_wgl.h \
usr/include/GL/vms_x_fix.h \
usr/include/GL/wglext.h \
usr/include/GL/wmesa.h
commit 2eea0d9c46bca0d9aabb799bd93980c26e8a5561
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Dec 23 14:58:15 2011 +0100
Kiss good-bye to DRI1 drivers.
diff --git a/debian/changelog b/debian/changelog
index f3a946d..9f3098e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ mesa (7.12~0-1) UNRELEASED; urgency=low
- 11-hurd-ftbfs-again.diff
* Drop patch, no longer needed since swrastg was renamed to swrast:
- 14-load-swrastg-before-swrast.diff
+ * Update rules file to strop building DRI1 drivers, they went away
+ with the following upstream commit:
+ - dri: Remove all DRI1 drivers (e4344161bd).
-- Cyril Brulebois <kibi@debian.org> Fri, 23 Dec 2011 14:13:28 +0100
diff --git a/debian/rules b/debian/rules
index 639167e..449f72a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,12 +87,12 @@ else
endif
ifneq ($(DEB_HOST_ARCH), s390)
- DRI_DRIVERS += mach64 mga r128 r200 r300 r600 radeon savage tdfx
+ DRI_DRIVERS += r200 radeon
endif
ifeq ($(DEB_HOST_ARCH_CPU), i386)
- DRI_DRIVERS += i810 i915 i965 sis unichrome
+ DRI_DRIVERS += i810 i915 i965
else ifeq ($(DEB_HOST_ARCH_CPU), amd64)
- DRI_DRIVERS += i915 i965 sis unichrome
+ DRI_DRIVERS += i915 i965
endif
# LLVM is required for r300g and recommended for swrastg on x86:
commit 60f84301f49665001ff64e974414707ccdb7d7b4
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Dec 23 14:19:15 2011 +0100
Refresh patches.
diff --git a/debian/changelog b/debian/changelog
index cebc82a..f3a946d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
mesa (7.12~0-1) UNRELEASED; urgency=low
* New upstream snapshot.
+ * Disable patch temporarily (needs a refresh):
+ - 11-hurd-ftbfs-again.diff
+ * Drop patch, no longer needed since swrastg was renamed to swrast:
+ - 14-load-swrastg-before-swrast.diff
-- Cyril Brulebois <kibi@debian.org> Fri, 23 Dec 2011 14:13:28 +0100
diff --git a/debian/patches/14-load-swrastg-before-swrast.diff b/debian/patches/14-load-swrastg-before-swrast.diff
deleted file mode 100644
index 58072a2..0000000
--- a/debian/patches/14-load-swrastg-before-swrast.diff
+++ /dev/null
@@ -1,19 +0,0 @@
----
- src/glx/drisw_glx.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/glx/drisw_glx.c
-+++ b/src/glx/drisw_glx.c
-@@ -430,10 +430,10 @@
- void *driver = NULL;
-
- if (driver == NULL)
-- driver = driOpenDriver("swrast");
-+ driver = driOpenDriver("swrastg");
-
- if (driver == NULL)
-- driver = driOpenDriver("swrastg");
-+ driver = driOpenDriver("swrast");
-
- return driver;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 6f53c26..5746454 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,5 @@
06_kfreebsd-ftbfs.diff
08-kfreebsd-gallium.diff
10-hurd-configure-tweaks.diff
-11-hurd-ftbfs-again.diff
+#11-hurd-ftbfs-again.diff
13-llvm-config-pick-a-version.diff
-14-load-swrastg-before-swrast.diff
commit d87f5cfffa844d94659b36897f886b41d4b2497b
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Dec 23 14:13:58 2011 +0100
Bump changelog.
diff --git a/debian/changelog b/debian/changelog
index 3a0904b..cebc82a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (7.12~0-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 23 Dec 2011 14:13:28 +0100
+
mesa (7.11.2-1) unstable; urgency=low
* New upstream release:
commit 65effe37ccb8e2c2f76b43af2742837dc867a92a
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 18 23:47:08 2012 +0200
Revert "Delete a few files not present in the 7.11.1 tarball"
This reverts commit 1a03a88bf248c05cfce5f60c8a750ad71f761588.
diff --git a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c b/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c
new file mode 100644
index 0000000..0f46835
--- /dev/null
+++ b/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c
@@ -0,0 +1,3 @@
+#define PASTE_MACRO one ## token
+PASTE_MACRO
+
diff --git a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected b/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected
new file mode 100644
index 0000000..af92187
--- /dev/null
+++ b/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected
@@ -0,0 +1,4 @@
+
+onetoken
+
+
diff --git a/src/glsl/glcpp/tests/098-elif-undefined.c b/src/glsl/glcpp/tests/098-elif-undefined.c
new file mode 100644
index 0000000..52a331c
--- /dev/null
+++ b/src/glsl/glcpp/tests/098-elif-undefined.c
@@ -0,0 +1,3 @@
+#if 0
+#elif UNDEFINED_MACRO
+#endif
diff --git a/src/glsl/glcpp/tests/098-elif-undefined.c.expected b/src/glsl/glcpp/tests/098-elif-undefined.c.expected
new file mode 100644
index 0000000..de967ea
--- /dev/null
+++ b/src/glsl/glcpp/tests/098-elif-undefined.c.expected
@@ -0,0 +1,5 @@
+0:2(22): preprocessor error: syntax error, unexpected IDENTIFIER
+0:1(7): preprocessor error: Unterminated #if
+
+
+
commit 7cc08c02b8c314295c30e6928c48c6c6da9fc1b7
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 18 23:43:07 2012 +0200
Revert "Run git-cleanup.sh on new tarball"
This reverts commit f69d962126e014874880ae5541502eda06038a4a.
diff --git a/.emacs-dirvars b/.emacs-dirvars
new file mode 100644
index 0000000..33945f9
--- /dev/null
+++ b/.emacs-dirvars
@@ -0,0 +1,10 @@
+;; -*- emacs-lisp -*-
+;;
+;; This file is processed by the dirvars emacs package. Each variable
+;; setting below is performed when this dirvars file is loaded.
+;;
+indent-tabs-mode: nil
+tab-width: 8
+c-basic-offset: 3
+kde-emacs-after-parent-string: ""
+evaluate: (c-set-offset 'inline-open '0)
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..23c6280
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+*.dsp -crlf
+*.dsw -crlf
+*.sln -crlf
+*.vcproj -crlf
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e48dd3b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,28 @@
+*.a
+*.dll
+*.exe
+*.ilk
+*.o
+*.obj
+*.os
+*.pc
+*.pdb
+*.pyc
+*.pyo
+*.so
+*.sw[a-z]
+*~
+depend
+depend.bak
+lib
+lib64
+configure
+autom4te.cache
+aclocal.m4
+config.log
+config.status
+cscope*
+.scon*
+config.py
+build
+.dir-locals.el
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..c76bf8b
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,18 @@
+#! /bin/sh
+
+srcdir=`dirname "$0"`
+test -z "$srcdir" && srcdir=.
+
+SRCDIR=`(cd "$srcdir" && pwd)`
+ORIGDIR=`pwd`
+
+if test "x$SRCDIR" != "x$ORIGDIR"; then
+ echo "Mesa cannot be built when srcdir != builddir" 1>&2
+ exit 1
+fi
+
+MAKEFLAGS=""
+
+autoreconf -v --install || exit 1
+
+"$srcdir"/configure "$@"
diff --git a/bin/confdiff.sh b/bin/confdiff.sh
new file mode 100755
index 0000000..568fcd6
--- /dev/null
+++ b/bin/confdiff.sh
@@ -0,0 +1,48 @@
+#!/bin/bash -e
+
+usage()
+{
+ echo "Usage: $0 <target1> <target2>"
+ echo "Highlight differences between Mesa configs"
+ echo "Example:"
+ echo " $0 linux linux-x86"
+}
+
+die()
+{
+ echo "$@" >&2
+ return 1
+}
+
+case "$1" in
+-h|--help) usage; exit 0;;
+esac
+
+[ $# -lt 2 ] && die 2 targets needed. See $0 --help
+target1=$1
+target2=$2
+
+topdir=$(cd "`dirname $0`"/..; pwd)
+cd "$topdir"
+
+[ -f "./configs/$target1" ] || die Missing configs/$target1
+[ -f "./configs/$target2" ] || die Missing configs/$target2
+
+trap 'rm -f "$t1" "$t2"' 0
+
+t1=$(mktemp)
+t2=$(mktemp)
+
+make -f- -n -p <<EOF | sed '/^# Not a target/,/^$/d' > $t1
+TOP = .
+include \$(TOP)/configs/$target1
+default:
+EOF
+
+make -f- -n -p <<EOF | sed '/^# Not a target/,/^$/d' > $t2
+TOP = .
+include \$(TOP)/configs/$target2
+default:
+EOF
+
+diff -pu -I'^#' $t1 $t2
diff --git a/bin/installmesa b/bin/installmesa
new file mode 100755
index 0000000..1e24c05
--- /dev/null
+++ b/bin/installmesa
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+#
+# Simple shell script for installing Mesa's header and library files.
+# If the copy commands below don't work on a particular system (i.e. the
+# -f or -d flags), we may need to branch on `uname` to do the right thing.
+#
+
+
+TOP=.
+
+INCLUDE_DIR="/usr/local/include"
+LIB_DIR="/usr/local/lib"
+
+if [ "x$#" = "x0" ] ; then
+echo
+echo "***** Mesa installation - You may need root privileges to do this *****"
+echo
+echo "Default directory for header files is:" ${INCLUDE_DIR}
+echo "Enter new directory or press <Enter> to accept this default."
+
+read INPUT
+if [ "x${INPUT}" != "x" ] ; then
+ INCLUDE_DIR=${INPUT}
+fi
+
+echo
+echo "Default directory for library files is:" ${LIB_DIR}
+echo "Enter new directory or press <Enter> to accept this default."
+
+read INPUT
+if [ "x${INPUT}" != "x" ] ; then
+ LIB_DIR=${INPUT}
+fi
+
+echo
+echo "About to install Mesa header files (GL/*.h) in: " ${INCLUDE_DIR}/GL
+echo "and Mesa library files (libGL.*, etc) in: " ${LIB_DIR}
+echo "Press <Enter> to continue, or <ctrl>-C to abort."
+
+read INPUT
Reply to: