commit xgl

3 May 2006

Hello community,

here is the log from the commit of package xgl
checked in at Wed May 3 10:33:53 CEST 2006.

--------

--- xgl/xgl.changes	2006-04-30 15:09:19.000000000 +0200
+++ STABLE/xgl/xgl.changes	2006-05-03 00:01:11.000000000 +0200
@@ -1,0 +2,5 @@
+Wed May  3 00:00:21 CEST 2006 - dreveman@suse.de
+
+- Update to final enums for GLX_EXT_texture_from_pixmap.
+
+-------------------------------------------------------------------

Old:
----
  Mesa-CVS-20060413.tar.bz2
  glproto-1.4.6.tar.bz2

New:
----
  Mesa-CVS-20060502.tar.bz2
  glproto-1.4.7.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xgl.spec ++++++
--- /var/tmp/diff_new_pack.W1dyBY/_old	2006-05-03 10:32:33.000000000 +0200
+++ /var/tmp/diff_new_pack.W1dyBY/_new	2006-05-03 10:32:33.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package xgl (Version cvs_060430)
+# spec file for package xgl (Version cvs_060503)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -23,7 +23,7 @@
 PreReq:         %fillup_prereq
 Requires:       xgl-hardware-list
 Autoreqprov:    on
-Version:        cvs_060430
+Version:        cvs_060503
 Release:        1
 Summary:        Xserver that uses OpenGL for its drawing operations.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -32,11 +32,11 @@
 Source1:        glitz-0.5.4.tar.gz
 Source2:        README.SUSE
 Source3:        sysconfig.displaymanager.template
-Source4:        Mesa-CVS-20060413.tar.bz2 
+Source4:        Mesa-CVS-20060502.tar.bz2 
 Source6:        fixesproto-4.0.tar.bz2
 Source7:        compositeproto-0.3.tar.bz2
 Source8:        scrnsaverproto-1.1.0.tar.bz2
-Source9:        glproto-1.4.6.tar.bz2
+Source9:        glproto-1.4.7.tar.bz2
 ### /bin/ls *.{diff,patch} 2>/dev/null | perl -ne 'print "Patch$n: ".$_; $n++;'
 Patch:          Xserver-suse-sysconfig.diff
 Patch1:         xgl-security-file-dir.diff
@@ -143,6 +143,8 @@
 /var/adm/fillup-templates/sysconfig.displaymanager-%name
 
 %changelog -n xgl
+* Wed May 03 2006 - dreveman@suse.de
+- Update to final enums for GLX_EXT_texture_from_pixmap.
 * Sun Apr 30 2006 - dreveman@suse.de
 - Fix so events are correctly delivered when warping the pointer.
 * Mon Apr 24 2006 - jpr@suse.de

++++++ Mesa-CVS-20060413.tar.bz2 -> Mesa-CVS-20060502.tar.bz2 ++++++
++++   46393 lines of diff (skipped)


++++++ glproto-1.4.6.tar.bz2 -> glproto-1.4.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glproto-1.4.6/ChangeLog new/glproto-1.4.7/ChangeLog
--- old/glproto-1.4.6/ChangeLog	2006-03-17 01:28:43.000000000 +0100
+++ new/glproto-1.4.7/ChangeLog	2006-05-01 03:11:46.000000000 +0200
@@ -1,3 +1,8 @@
+2006-04-30  Adam Jackson  <ajax@freedesktop.org>
+
+	* glxtokens.h:
+	Bump to 1.4.7 for final EXT_tfp tokens.
+
 2006-03-16  Kristian Høgsberg  <krh@redhat.com>
 
 	* configure.ac: Bump to 1.4.6 for FBO opcodes.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glproto-1.4.6/configure new/glproto-1.4.7/configure
--- old/glproto-1.4.6/configure	2006-03-17 01:29:43.000000000 +0100
+++ new/glproto-1.4.7/configure	2006-05-02 00:20:52.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for GLProto 1.4.6.
+# Generated by GNU Autoconf 2.59 for GLProto 1.4.7.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -269,8 +269,8 @@
 # Identity of this package.
 PACKAGE_NAME='GLProto'
 PACKAGE_TARNAME='glproto'
-PACKAGE_VERSION='1.4.6'
-PACKAGE_STRING='GLProto 1.4.6'
+PACKAGE_VERSION='1.4.7'
+PACKAGE_STRING='GLProto 1.4.7'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar LIBOBJS LTLIBOBJS'
@@ -722,7 +722,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GLProto 1.4.6 to adapt to many kinds of systems.
+\`configure' configures GLProto 1.4.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -784,7 +784,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GLProto 1.4.6:";;
+     short | recursive ) echo "Configuration of GLProto 1.4.7:";;
    esac
   cat <<\_ACEOF
 
@@ -890,7 +890,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-GLProto configure 1.4.6
+GLProto configure 1.4.7
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -904,7 +904,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GLProto $as_me 1.4.6, which was
+It was created by GLProto $as_me 1.4.7, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1547,7 +1547,7 @@
 
 # Define the identity of the package.
  PACKAGE='glproto'
- VERSION='1.4.6'
+ VERSION='1.4.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2089,7 +2089,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by GLProto $as_me 1.4.6, which was
+This file was extended by GLProto $as_me 1.4.7, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2144,7 +2144,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GLProto config.status 1.4.6
+GLProto config.status 1.4.7
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glproto-1.4.6/configure.ac new/glproto-1.4.7/configure.ac
--- old/glproto-1.4.6/configure.ac	2006-03-17 01:27:45.000000000 +0100
+++ new/glproto-1.4.7/configure.ac	2006-05-01 03:10:45.000000000 +0200
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([GLProto], [1.4.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([GLProto], [1.4.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glproto-1.4.6/glxtokens.h new/glproto-1.4.7/glxtokens.h
--- old/glproto-1.4.6/glxtokens.h	2006-03-17 01:25:26.000000000 +0100
+++ new/glproto-1.4.7/glxtokens.h	2006-05-01 03:10:33.000000000 +0200
@@ -234,7 +234,44 @@
 /*
 ** GLX_EXT_texture_from_pixmap
 */
-#define GLX_FRONT_LEFT_EXT      0x6005
+#define GLX_BIND_TO_TEXTURE_RGB_EXT        0x20D0
+#define GLX_BIND_TO_TEXTURE_RGBA_EXT       0x20D1
+#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT     0x20D2
+#define GLX_BIND_TO_TEXTURE_TARGETS_EXT    0x20D3
+#define GLX_Y_INVERTED_EXT                 0x20D4
+
+#define GLX_TEXTURE_FORMAT_EXT             0x20D5
+#define GLX_TEXTURE_TARGET_EXT             0x20D6
+#define GLX_MIPMAP_TEXTURE_EXT             0x20D7
+
+#define GLX_TEXTURE_FORMAT_NONE_EXT        0x20D8
+#define GLX_TEXTURE_FORMAT_RGB_EXT         0x20D9
+#define GLX_TEXTURE_FORMAT_RGBA_EXT        0x20DA
+
+#define GLX_TEXTURE_1D_BIT_EXT             0x00000001
+#define GLX_TEXTURE_2D_BIT_EXT             0x00000002
+#define GLX_TEXTURE_RECTANGLE_BIT_EXT      0x00000004
+
+#define GLX_TEXTURE_1D_EXT                 0x20DB
+#define GLX_TEXTURE_2D_EXT                 0x20DC
+#define GLX_TEXTURE_RECTANGLE_EXT          0x20DD
+
+#define GLX_FRONT_LEFT_EXT                 0x20DE
+#define GLX_FRONT_RIGHT_EXT                0x20DF
+#define GLX_BACK_LEFT_EXT                  0x20E0
+#define GLX_BACK_RIGHT_EXT                 0x20E1
+#define GLX_FRONT_EXT                      GLX_FRONT_LEFT_EXT
+#define GLX_BACK_EXT                       GLX_BACK_LEFT_EXT
+#define GLX_AUX0_EXT                       0x20E2
+#define GLX_AUX1_EXT                       0x20E3 
+#define GLX_AUX2_EXT                       0x20E4 
+#define GLX_AUX3_EXT                       0x20E5 
+#define GLX_AUX4_EXT                       0x20E6 
+#define GLX_AUX5_EXT                       0x20E7 
+#define GLX_AUX6_EXT                       0x20E8
+#define GLX_AUX7_EXT                       0x20E9 
+#define GLX_AUX8_EXT                       0x20EA 
+#define GLX_AUX9_EXT                       0x20EB
 
 /*
  * GLX 1.4 and later:


++++++ xorg-server-1.1.99.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/GL/glx/glxcmds.c new/xorg-server-1.1.99.1/GL/glx/glxcmds.c
--- old/xorg-server-1.1.99.1/GL/glx/glxcmds.c	2006-04-09 16:59:20.000000000 +0200
+++ new/xorg-server-1.1.99.1/GL/glx/glxcmds.c	2006-05-02 01:48:07.000000000 +0200
@@ -1681,7 +1681,7 @@
     reply.numAttribs = numAttribs;
 
     attributes[0] = GLX_TEXTURE_TARGET_EXT;
-    attributes[1] = GLX_NO_TEXTURE_EXT;
+    attributes[1] = GLX_TEXTURE_RECTANGLE_EXT;
 
     glxScreen = glxPixmap->pGlxScreen;
     if (glxScreen->textureFromPixmap)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/GL/glx/glxdri.c new/xorg-server-1.1.99.1/GL/glx/glxdri.c
--- old/xorg-server-1.1.99.1/GL/glx/glxdri.c	2006-03-30 18:38:10.000000000 +0200
+++ new/xorg-server-1.1.99.1/GL/glx/glxdri.c	2006-05-02 01:54:31.000000000 +0200
@@ -35,6 +35,7 @@
 #include <drm.h>
 #include <GL/gl.h>
 #include <GL/internal/dri_interface.h>
+#include <GL/glxtokens.h>
 
 #include <windowstr.h>
 #include <os.h>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/GL/glx/glxserver.h new/xorg-server-1.1.99.1/GL/glx/glxserver.h
--- old/xorg-server-1.1.99.1/GL/glx/glxserver.h	2006-04-08 21:43:29.000000000 +0200
+++ new/xorg-server-1.1.99.1/GL/glx/glxserver.h	2006-05-02 01:04:27.000000000 +0200
@@ -63,22 +63,6 @@
 #include <GL/glxproto.h>
 #include <GL/glxint.h>
 
-#ifndef GLX_TEXTURE_TARGET_EXT
-#define GLX_TEXTURE_TARGET_EXT              0x6001
-#define GLX_TEXTURE_2D_EXT                  0x6002
-#define GLX_TEXTURE_RECTANGLE_EXT           0x6003
-#define GLX_NO_TEXTURE_EXT                  0x6004
-#define GLX_FRONT_LEFT_EXT                  0x6005
-#define GLX_TEXTURE_FORMAT_EXT              0x6006
-#define GLX_TEXTURE_FORMAT_RGB_EXT          0x6007
-#define GLX_TEXTURE_FORMAT_RGBA_EXT         0x6008
-#define GLX_Y_INVERTED_EXT                  0x6009
-#define GLX_BIND_TO_TEXTURE_RGB_EXT         0x600A
-#define GLX_BIND_TO_TEXTURE_RGBA_EXT        0x600B
-#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT      0x600C
-#define GLX_MIPMAP_TEXTURE_EXT              0x600D
-#endif
-
 /* For glxscreens.h */
 typedef struct __GLXdrawable __GLXdrawable;
 typedef struct __GLXcontext __GLXcontext;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/configure new/xorg-server-1.1.99.1/configure
--- old/xorg-server-1.1.99.1/configure	2006-04-03 01:57:46.000000000 +0200
+++ new/xorg-server-1.1.99.1/configure	2006-05-02 01:29:06.000000000 +0200
@@ -26670,12 +26670,12 @@
         pkg_cv_GL_CFLAGS="$GL_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.6\"") >&5
-  ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.6") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.7\"") >&5
+  ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.7") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "glproto >= 1.4.6" 2>/dev/null`
+  pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "glproto >= 1.4.7" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -26688,12 +26688,12 @@
         pkg_cv_GL_LIBS="$GL_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.6\"") >&5
-  ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.6") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.7\"") >&5
+  ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.7") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "glproto >= 1.4.6" 2>/dev/null`
+  pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "glproto >= 1.4.7" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -26712,14 +26712,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glproto >= 1.4.6"`
+	        GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glproto >= 1.4.7"`
         else
-	        GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glproto >= 1.4.6"`
+	        GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glproto >= 1.4.7"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GL_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (glproto >= 1.4.6) were not met:
+	{ { echo "$as_me:$LINENO: error: Package requirements (glproto >= 1.4.7) were not met:
 
 $GL_PKG_ERRORS
 
@@ -26730,7 +26730,7 @@
 and GL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&5
-echo "$as_me: error: Package requirements (glproto >= 1.4.6) were not met:
+echo "$as_me: error: Package requirements (glproto >= 1.4.7) were not met:
 
 $GL_PKG_ERRORS
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/configure.ac new/xorg-server-1.1.99.1/configure.ac
--- old/xorg-server-1.1.99.1/configure.ac	2006-04-03 01:53:54.000000000 +0200
+++ new/xorg-server-1.1.99.1/configure.ac	2006-05-02 01:05:37.000000000 +0200
@@ -565,7 +565,7 @@
 
 if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
 	PKG_CHECK_MODULES([XLIB], [x11])
-	PKG_CHECK_MODULES([GL], [glproto >= 1.4.6])
+	PKG_CHECK_MODULES([GL], [glproto >= 1.4.7])
 	AC_SUBST(XLIB_CFLAGS)
 	AC_DEFINE(GLXEXT, 1, [Build GLX extension])
 	GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la'
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/hw/xfree86/common/xf86Build.h new/xorg-server-1.1.99.1/hw/xfree86/common/xf86Build.h
--- old/xorg-server-1.1.99.1/hw/xfree86/common/xf86Build.h	2006-04-11 14:32:13.000000000 +0200
+++ new/xorg-server-1.1.99.1/hw/xfree86/common/xf86Build.h	2006-05-02 01:29:51.000000000 +0200
@@ -1 +1 @@
-#define BUILD_DATE 20060411
+#define BUILD_DATE 20060502
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/hw/xgl/glxext/xglglxext.c new/xorg-server-1.1.99.1/hw/xgl/glxext/xglglxext.c
--- old/xorg-server-1.1.99.1/hw/xgl/glxext/xglglxext.c	2006-04-05 23:09:25.000000000 +0200
+++ new/xorg-server-1.1.99.1/hw/xgl/glxext/xglglxext.c	2006-05-02 02:04:34.000000000 +0200
@@ -30,6 +30,7 @@
 #include <GL/gl.h>
 #include <GL/glext.h>
 #include <GL/internal/glcore.h>
+#include <GL/glxtokens.h>
 
 #include "glxserver.h"
 #include "glxdrawable.h"
@@ -6310,7 +6311,7 @@
 xglGetTexTarget (__GLXscreen *screen,
 		 __GLXpixmap *pixmap)
 {
-    int target = GLX_NO_TEXTURE_EXT;
+    int target = GLX_TEXTURE_2D_EXT;
 
     XGL_DRAWABLE_PIXMAP (pixmap->pDraw);
 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)