x11proto-gl: Changes to 'upstream-unstable'
autogen.sh | 4 +++-
configure.ac | 6 +++---
glxtokens.h | 2 ++
3 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit f84853d97d5749308992412a215fa518b6536eb3
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 10 07:03:55 2013 -0800
glproto: bump version to 1.4.17 for release
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/configure.ac b/configure.ac
index 0451193..7b0c608 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([GLProto], [1.4.16], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([GLProto], [1.4.17], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_DEFAULT_OPTIONS
commit 7adf6d08b7d9fe1304f8c37f5a9152df97a6344d
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 4 10:20:12 2013 -0800
Add defines for float renderType bits
These were added to mesa's glxext.h, but not duplicated here.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
diff --git a/glxtokens.h b/glxtokens.h
index 5e6bbea..a95082e 100644
--- a/glxtokens.h
+++ b/glxtokens.h
@@ -107,6 +107,8 @@ extern "C" {
/* GLX_RENDER_TYPE bits */
#define GLX_RGBA_BIT 0x00000001
#define GLX_COLOR_INDEX_BIT 0x00000002
+#define GLX_RGBA_FLOAT_BIT_ARB 0x00000004
+#define GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT 0x00000008
/* GLX_DRAWABLE_TYPE bits */
#define GLX_WINDOW_BIT 0x00000001
commit aacc7a51b6161c765b04524e0d2ab31e5e586834
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Oct 26 09:42:05 2013 -0400
config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
Fix Automake warning: AC_OUTPUT should be used without arguments.
www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Files
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index f522b46..0451193 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,5 +8,6 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.3)
XORG_DEFAULT_OPTIONS
-AC_OUTPUT([Makefile
+AC_CONFIG_FILES([Makefile
glproto.pc])
+AC_OUTPUT
commit 8e3407e02980d088e20041e79bdcdd3737e7827e
Author: Colin Walters <walters@verbum.org>
Date: Wed Jan 4 17:37:06 2012 -0500
autogen.sh: Implement GNOME Build API
http://people.gnome.org/~walters/docs/build-api.txt
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/autogen.sh b/autogen.sh
index 904cd67..fc34bd5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,4 +9,6 @@ cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
-$srcdir/configure --enable-maintainer-mode "$@"
+if test -z "$NOCONFIGURE"; then
+ $srcdir/configure "$@"
+fi
commit 223af08767d504b32c4852961d70ad3130d2243f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 15 14:01:10 2013 -0500
configure: Remove AM_MAINTAINER_MODE
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index 58d60fa..f522b46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,6 @@
AC_PREREQ([2.60])
AC_INIT([GLProto], [1.4.16], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
Reply to: