rpms/mesa/devel mesa-6.5-texture-from-pixmap-fixes.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 mesa-modular-dri-dir.patch, 1.1, 1.2 mesa.spec, 1.46, 1.47 sources, 1.6, 1.7 mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch, 1.1, NONE mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Apr 1 06:05:14 UTC 2006
Author: krh
Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6192
Modified Files:
.cvsignore mesa-modular-dri-dir.patch mesa.spec sources
Added Files:
mesa-6.5-texture-from-pixmap-fixes.patch
Removed Files:
mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch
mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch
Log Message:
* Sat Apr 1 2006 Kristian Høgsberg <krh at redhat.com> 6.5-1
- Update to mesa 6.5 snapshot.
- Drop mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch and
mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch
as these are upstream now.
- Drop mesa-6.4.1-texture-from-drawable.patch and add
mesa-6.5-texture-from-pixmap-fixes.patch.
- Update mesa-modular-dri-dir.patch to apply.
mesa-6.5-texture-from-pixmap-fixes.patch:
include/GL/glx.h | 25 +++++++++----------------
src/glx/x11/glxcmds.c | 3 ++-
2 files changed, 11 insertions(+), 17 deletions(-)
--- NEW FILE mesa-6.5-texture-from-pixmap-fixes.patch ---
Index: include/GL/glx.h
===================================================================
RCS file: /cvs/mesa/Mesa/include/GL/glx.h,v
retrieving revision 1.49
diff -u -p -r1.49 glx.h
--- include/GL/glx.h 26 Mar 2006 05:09:03 -0000 1.49
+++ include/GL/glx.h 31 Mar 2006 18:09:02 -0000
@@ -355,20 +355,6 @@ typedef GLuint (* PFNGLXGETMEMORYOFFSETM
/*
- * ARB ?. GLX_ARB_render_texture
- * XXX This was never finalized!
- */
-#ifndef GLX_ARB_render_texture
-#define GLX_ARB_render_texture 1
-
-extern Bool glXBindTexImageARB(Display *dpy, GLXPbuffer pbuffer, int buffer);
-extern Bool glXReleaseTexImageARB(Display *dpy, GLXPbuffer pbuffer, int buffer);
-extern Bool glXDrawableAttribARB(Display *dpy, GLXDrawable draw, const int *attribList);
-
-#endif /* GLX_ARB_render_texture */
-
-
-/*
* Remove this when glxext.h is updated.
*/
#ifndef GLX_NV_float_buffer
@@ -423,9 +409,16 @@ typedef int (*PFNGLXGETSWAPINTERVALMESAP
#ifndef GLX_EXT_texture_from_pixmap
#define GLX_EXT_texture_from_pixmap 1
-/* XXX need enums/tokens! */
+/* XXX need real enums/tokens, these are just place holders! */
+
+#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_Y_INVERTED_EXT 0x6006
-extern Bool glXBindTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer);
+extern Bool glXBindTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer, const int *attribList);
extern Bool glXReleaseTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer);
#endif /* GLX_EXT_texture_from_pixmap */
Index: src/glx/x11/glxcmds.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/glx/x11/glxcmds.c,v
retrieving revision 1.13
diff -u -p -r1.13 glxcmds.c
--- src/glx/x11/glxcmds.c 9 Mar 2006 16:25:46 -0000 1.13
+++ src/glx/x11/glxcmds.c 31 Mar 2006 18:09:07 -0000
@@ -2592,7 +2592,8 @@ PUBLIC Bool glXSet3DfxModeMESA( int mode
PUBLIC Bool glXBindTexImageEXT(Display *dpy,
GLXDrawable drawable,
- int buffer)
+ int buffer,
+ const int *attribList)
{
xGLXVendorPrivateReq *req;
GLXContext gc = __glXGetCurrentContext();
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 7 Feb 2006 11:05:09 -0000 1.6
+++ .cvsignore 1 Apr 2006 06:05:02 -0000 1.7
@@ -1,3 +1,2 @@
-*.tar.bz2
-*.tar.gz
-clog
+MesaDemos-6.5.tar.bz2
+MesaLib-6.5.tar.bz2
mesa-modular-dri-dir.patch:
Makefile | 1 +
1 files changed, 1 insertion(+)
Index: mesa-modular-dri-dir.patch
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa-modular-dri-dir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-modular-dri-dir.patch 20 Nov 2005 20:49:23 -0000 1.1
+++ mesa-modular-dri-dir.patch 1 Apr 2006 06:05:02 -0000 1.2
@@ -3,8 +3,8 @@
@@ -2,6 +2,7 @@
include $(TOP)/configs/current
- DEFINES += -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER
-+DEFINES += -DDEFAULT_DRIVER_DIR='"$(DRI_DRIVER_DIR)"'
+ EXTRA_DEFINES = -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER
++EXTRA_DEFINES += -DDEFAULT_DRIVER_DIR='"$(DRI_DRIVER_DIR)"'
- C_SOURCES = \
- $(TOP)/src/mesa/glapi/glapi.c \
+ SOURCES = \
+ glcontextmodes.c \
Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- mesa.spec 1 Mar 2006 13:01:51 -0000 1.46
+++ mesa.spec 1 Apr 2006 06:05:02 -0000 1.47
@@ -52,8 +52,8 @@
Summary: Mesa graphics libraries
Name: mesa
-Version: 6.4.2
-Release: 6
+Version: 6.5
+Release: 1
License: MIT/X11
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -67,20 +67,16 @@
Source10: redhat-mesa-target
Source11: redhat-mesa-driver-install
Source12: redhat-mesa-source-filelist-generator
-#Patch0: mesa-6.3.2-makedepend.patch
Patch0: mesa-6.3.2-build-configuration-v4.patch
Patch1: mesa-6.3.2-fix-installmesa.patch
Patch2: mesa-6.4-multilib-fix.patch
Patch3: mesa-modular-dri-dir.patch
Patch4: mesa-6.4.1-libGLw-enable-motif-support.patch
-Patch5: mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch
-Patch6: mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch
-#Patch4: mesa-6.4.1-enable-osmesa.patch
# General patches from upstream go here:
# Red Hat custom patches, feature development
-Patch200: mesa-6.4.1-texture-from-drawable.patch
+Patch200: mesa-6.5-texture-from-pixmap-fixes.patch
Patch201: mesa-6.4.1-radeon-use-right-texture-format.patch
BuildRequires: pkgconfig
@@ -241,16 +237,12 @@
%if %{with_motif}
%patch4 -p0 -b .libGLw-enable-motif-support
%endif
-%patch5 -p1 -b .dprintf-to-debugprintf-for-bug180122
-%patch6 -p0 -b .xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835
-# NOT NEEDED NOW%patch100 -p1 -b .amd64-assyntax-fix
-
-%patch200 -p0 -b .texture-from-drawable
# According to Adam, this patch makes metacity's compositing
# manager noticeably faster, but also may be a little too big of
# a change for post feature freeze. Leaving off for now...
-#%patch201 -p1 -b .radeon-use-right-format
+%patch200 -p0 -b texture-from-pixmap-fixes
+%patch201 -p1 -b .radeon-use-right-format
# WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
# license and are not open source/free software, so we remove them.
@@ -259,7 +251,7 @@
#-- Build ------------------------------------------------------------
%build
# Macroize this to simplify things
-%define makeopts MKDEP="gcc -M" MKDEP_OPTIONS="-MF depend"
+%define makeopts MKDEP="gcc -M" MKDEP_OPTIONS="-MF depend" ARCH_FLAGS=-DGLX_USE_TLS
export CFLAGS="$RPM_OPT_FLAGS"
export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
export INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir}
@@ -438,6 +430,18 @@
%{_bindir}/glxinfo
%changelog
+* Sat Apr 1 2006 Kristian Høgsberg <krh at redhat.com> 6.5-1
+- Update to mesa 6.5 snapshot.
+- Drop mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch and
+ mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch
+ as these are upstream now.
+- Drop mesa-6.4.1-texture-from-drawable.patch and add
+ mesa-6.5-texture-from-pixmap-fixes.patch.
+- Update mesa-modular-dri-dir.patch to apply.
+
+* Fri Mar 24 2006 Kristian Høgsberg <krh at redhat.com> 6.4.2-7
+- Set ARCH_FLAGS=-DGLX_USE_TLS to enable TLS for GL contexts.
+
* Wed Mar 01 2006 Karsten Hopp <karsten at redhat.de> 6.4.2-6
- Buildrequires: libXt-devel (#183479)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 7 Feb 2006 11:06:42 -0000 1.6
+++ sources 1 Apr 2006 06:05:02 -0000 1.7
@@ -1,2 +1,2 @@
-7674d2c603b5834259e4e5a820cefd5b MesaLib-6.4.2.tar.bz2
-9cae1ab874af533ce356bd7dfe2e0bb0 MesaDemos-6.4.2.tar.bz2
+ab95b590dcd640726a2d89e62068c66e MesaDemos-6.5.tar.bz2
+61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2
--- mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch DELETED ---
--- mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch DELETED ---
More information about the fedora-cvs-commits
mailing list