mesa: Changes to 'debian-unstable'
ChangeLog | 18 ++++++++++++++
Makefile | 9 ++++++-
configs/default | 2 -
debian/changelog | 10 +++++++
debian/control | 6 ++--
debian/rules | 3 +-
debian/scripts/choose-configs | 2 -
docs/relnotes-7.5.1.html | 54 ++++++++++++++++++++++++++++++++++++++++++
docs/relnotes.html | 1
src/mesa/main/version.h | 8 +++---
10 files changed, 102 insertions(+), 11 deletions(-)
New commits:
commit 3c4727a4e9d18781cd9a7bc5340cab79a85b1650
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri Jul 24 00:29:35 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index e8294fc..17ab94c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.5-3) UNRELEASED; urgency=low
+mesa (7.5-3) unstable; urgency=low
* Pull from upstream mesa_7_5_branch up to commit b4ba6a66
(early 7.5.1 release snapshot).
@@ -6,7 +6,7 @@ mesa (7.5-3) UNRELEASED; urgency=low
closes: #538094.
* Enable i686 optimized libraries on hurd-i386.
- -- Brice Goglin <bgoglin@debian.org> Fri, 24 Jul 2009 00:28:46 +0200
+ -- Brice Goglin <bgoglin@debian.org> Fri, 24 Jul 2009 00:29:28 +0200
mesa (7.5-2) unstable; urgency=low
commit 40f217aea75b6c8e1d9836008ef73cc5e3595554
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri Jul 24 00:29:25 2009 +0200
Enable i686 optimized libraries on hurd-i386
diff --git a/debian/changelog b/debian/changelog
index 1c53d0d..e8294fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ mesa (7.5-3) UNRELEASED; urgency=low
(early 7.5.1 release snapshot).
* Only install the huge upstream changelog in mesa-common-dev,
closes: #538094.
+ * Enable i686 optimized libraries on hurd-i386.
- -- Brice Goglin <bgoglin@debian.org> Thu, 23 Jul 2009 21:12:20 +0200
+ -- Brice Goglin <bgoglin@debian.org> Fri, 24 Jul 2009 00:28:46 +0200
mesa (7.5-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 461a768..50efb41 100644
--- a/debian/control
+++ b/debian/control
@@ -64,7 +64,7 @@ Description: A free implementation of the OpenGL API -- debugging symbols
Package: libgl1-mesa-swx11-i686
Section: libs
Priority: extra
-Architecture: i386 kfreebsd-i386
+Architecture: i386 kfreebsd-i386 hurd-i386
Depends: libgl1-mesa-swx11 (= ${binary:Version}), ${shlibs:Depends}
Description: Mesa OpenGL runtime [i686 optimized]
Mesa is a 3-D graphics library with an API which is very similar to
@@ -143,7 +143,7 @@ Description: Debugging symbols for the Mesa GLX runtime
#Package: libgl1-mesa-glx-i686
#Section: libs
#Priority: extra
-#Architecture: i386 kfreebsd-i386
+#Architecture: i386 kfreebsd-i386 hurd-i386
#Pre-Depends: libgl1-mesa-glx
#Description: A free implementation of the OpenGL API -- GLX runtime [i686 optimized]
# This version of Mesa provides GLX and DRI capabilities: it is capable of
@@ -204,7 +204,7 @@ Description: Debugging symbols for the Mesa DRI modules
#Package: libgl1-mesa-dri-i686
#Section: libs
#Priority: extra
-#Architecture: i386 kfreebsd-i386
+#Architecture: i386 kfreebsd-i386 hurd-i386
#Pre-Depends: libgl1-mesa-dri
#Description: A free implementation of the OpenGL API -- DRI modules [i686 optimized]
# This version of Mesa provides GLX and DRI capabilities: it is capable of
diff --git a/debian/scripts/choose-configs b/debian/scripts/choose-configs
index 1ad21fc..b7d68e2 100644
--- a/debian/scripts/choose-configs
+++ b/debian/scripts/choose-configs
@@ -37,7 +37,7 @@ endif
##############################################################################
## CPU-optimized configurations ##############################################
-ifneq (,$(filter $(DEB_BUILD_ARCH), i386 kfreebsd-i386))
+ifneq (,$(filter $(DEB_BUILD_ARCH), i386 kfreebsd-i386 hurd-i386))
SWX11_GLU_CONFIGS += swx11+glu-i386-i686
# DRI_CONFIGS += debian-dri-i386-i686
endif
commit d3403389cd4a85f1cbdbdfed8a5fcd2be240af0f
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Jul 23 21:13:37 2009 +0200
Only install the huge upstream changelog in mesa-common-dev
diff --git a/debian/changelog b/debian/changelog
index 9bdbfbc..1c53d0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ mesa (7.5-3) UNRELEASED; urgency=low
* Pull from upstream mesa_7_5_branch up to commit b4ba6a66
(early 7.5.1 release snapshot).
+ * Only install the huge upstream changelog in mesa-common-dev,
+ closes: #538094.
- -- Brice Goglin <bgoglin@debian.org> Thu, 23 Jul 2009 21:10:12 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 23 Jul 2009 21:12:20 +0200
mesa (7.5-2) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 7a93950..75d2dc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -222,7 +222,8 @@ binary-indep: install
binary-arch: install
dh_testdir
dh_testroot
- dh_installchangelogs -s ChangeLog
+ dh_installchangelogs -s
+ dh_installchangelogs -pmesa-common-dev ChangeLog
dh_installdocs -s
dh_installexamples -s
dh_install -s --sourcedir=debian/tmp --list-missing
commit a70d1eb1ee8e81d8fa6efc7a0ce5810fe8d25ca8
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Jul 23 21:11:22 2009 +0200
Pull from upstream mesa_7_5_branch
diff --git a/ChangeLog b/ChangeLog
index 0f93384..c8e12db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+commit b4ba6a66b70b89e9c049f6ce9b65c1edda118651
+Author: Brian Paul <brianp@vmware.com>
+Date: Wed Jul 22 12:49:34 2009 -0600
+
+ docs: initial release notes for 7.5.1
+
+commit 9c4b877519f73f46eac35885d3b8801753168e14
+Author: Brian Paul <brianp@vmware.com>
+Date: Wed Jul 22 12:46:53 2009 -0600
+
+ mesa: bump version to 7.5.1
+
+commit b9e2e32daf5505896a662dc8df60104c0f51b4b9
+Author: Brian Paul <brianp@vmware.com>
+Date: Wed Jul 22 12:34:07 2009 -0600
+
+ mesa: include GLEW sources in MesaDemos tarball
+
commit a6b314150c141f4c73e408b114181e57237540d9
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jul 2 19:21:22 2009 -0700
diff --git a/debian/changelog b/debian/changelog
index b5df900..9bdbfbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.5-3) UNRELEASED; urgency=low
+
+ * Pull from upstream mesa_7_5_branch up to commit b4ba6a66
+ (early 7.5.1 release snapshot).
+
+ -- Brice Goglin <bgoglin@debian.org> Thu, 23 Jul 2009 21:10:12 +0200
+
mesa (7.5-2) unstable; urgency=low
* Pull from upstream mesa_7_5_branch up to commit a6b31415
commit b4ba6a66b70b89e9c049f6ce9b65c1edda118651
Author: Brian Paul <brianp@vmware.com>
Date: Wed Jul 22 12:49:34 2009 -0600
docs: initial release notes for 7.5.1
diff --git a/docs/relnotes-7.5.1.html b/docs/relnotes-7.5.1.html
new file mode 100644
index 0000000..0f475ad
--- /dev/null
+++ b/docs/relnotes-7.5.1.html
@@ -0,0 +1,54 @@
+<HTML>
+
+<TITLE>Mesa Release Notes</TITLE>
+
+<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>
+
+<BODY>
+
+<body bgcolor="#eeeeee">
+
+<H1>Mesa 7.5.1 Release Notes / (date TBD)</H1>
+
+<p>
+Mesa 7.5.1 is a bug-fix release fixing issues found since the 7.5 release.
+</p>
+<p>
+The main new feature of Mesa 7.5.x is the
+<a href="http://wiki.freedesktop.org/wiki/Software/gallium";
+target="_parent">Gallium3D</a> infrastructure.
+</p>
+<p>
+Mesa 7.5.1 implements the OpenGL 2.1 API, but the version reported by
+glGetString(GL_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 2.1.
+</p>
+<p>
+See the <a href="install.html">Compiling/Installing page</a> for prerequisites
+for DRI hardware acceleration.
+</p>
+
+
+<h2>MD5 checksums</h2>
+<pre>
+tbd
+</pre>
+
+
+<h2>New features</h2>
+<ul>
+</ul>
+
+
+<h2>Bug fixes</h2>
+<ul>
+<li>Added missing GLEW library to MesaDemos tarballs.
+</ul>
+
+
+<h2>Changes</h2>
+<ul>
+</ul>
+
+</body>
+</html>
diff --git a/docs/relnotes.html b/docs/relnotes.html
index 4764eb6..7b91a3d 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -13,6 +13,7 @@ The release notes summarize what's new or changed in each Mesa release.
</p>
<UL>
+<LI><A HREF="relnotes-7.5.1.html">7.5.1 release notes</A>
<LI><A HREF="relnotes-7.5.html">7.5 release notes</A>
<LI><A HREF="relnotes-7.4.4.html">7.4.4 release notes</A>
<LI><A HREF="relnotes-7.4.3.html">7.4.3 release notes</A>
commit 9c4b877519f73f46eac35885d3b8801753168e14
Author: Brian Paul <brianp@vmware.com>
Date: Wed Jul 22 12:46:53 2009 -0600
mesa: bump version to 7.5.1
diff --git a/Makefile b/Makefile
index 3c83160..9ac45bd 100644
--- a/Makefile
+++ b/Makefile
@@ -182,7 +182,7 @@ ultrix-gcc:
# Rules for making release tarballs
-VERSION=7.5
+VERSION=7.5.1
DIRECTORY = Mesa-$(VERSION)
LIB_NAME = MesaLib-$(VERSION)
DEMO_NAME = MesaDemos-$(VERSION)
diff --git a/configs/default b/configs/default
index b5ef80a..2981bb9 100644
--- a/configs/default
+++ b/configs/default
@@ -10,7 +10,7 @@ CONFIG_NAME = default
# Version info
MESA_MAJOR=7
MESA_MINOR=5
-MESA_TINY=0
+MESA_TINY=1
MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
# external projects. This should be useless now that we use libdrm.
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index ba02746..50c1143 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -1,8 +1,8 @@
/*
* Mesa 3-D graphics library
- * Version: 7.5
+ * Version: 7.5.1
*
- * Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2009 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -30,8 +30,8 @@
/* Mesa version */
#define MESA_MAJOR 7
#define MESA_MINOR 5
-#define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.5"
+#define MESA_PATCH 1
+#define MESA_VERSION_STRING "7.5.1"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
commit b9e2e32daf5505896a662dc8df60104c0f51b4b9
Author: Brian Paul <brianp@vmware.com>
Date: Wed Jul 22 12:34:07 2009 -0600
mesa: include GLEW sources in MesaDemos tarball
diff --git a/Makefile b/Makefile
index 91515d6..3c83160 100644
--- a/Makefile
+++ b/Makefile
@@ -388,7 +388,14 @@ GLW_FILES = \
$(DIRECTORY)/src/glw/glw.pc.in \
$(DIRECTORY)/src/glw/depend
+GLEW_FILES = \
+ $(DIRECTORY)/src/glew/*.c \
+ $(DIRECTORY)/src/glew/Makefile \
+ $(DIRECTORY)/src/glew/SConscript \
+ $(DIRECTORY)/src/glew/LICENSE.txt
+
DEMO_FILES = \
+ $(GLEW_FILES) \
$(DIRECTORY)/progs/beos/*.cpp \
$(DIRECTORY)/progs/beos/Makefile \
$(DIRECTORY)/progs/images/*.rgb \
Reply to: