Hello community, here is the log from the commit of package xgl checked in at Thu Nov 16 12:07:48 CET 2006. -------- --- xgl/xgl.changes 2006-10-18 17:32:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/xgl/xgl.changes 2006-11-16 02:39:33.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 16 02:37:43 CET 2006 - dreveman@suse.de + +- Add glXGetProcAddressARB workaround to glitz so that + GLX_MESA_copy_sub_buffer is detected properly. #219114 + +------------------------------------------------------------------- New: ---- glitz-glx-get-proc-address.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xgl.spec ++++++ --- /var/tmp/diff_new_pack.mxr0Us/_old 2006-11-16 12:07:30.000000000 +0100 +++ /var/tmp/diff_new_pack.mxr0Us/_new 2006-11-16 12:07:30.000000000 +0100 @@ -24,7 +24,7 @@ Requires: xgl-hardware-list Autoreqprov: on Version: cvs_060522 -Release: 19 +Release: 31 Summary: Xserver that uses OpenGL for its drawing operations. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 @@ -44,6 +44,7 @@ Patch7: xgl-overflow-fix.diff Patch8: xgl-yuy2.diff Patch9: xgl-xkb.diff +Patch10: glitz-glx-get-proc-address.diff %description Xgl is an Xserver that uses OpenGL for its drawing operations. Some @@ -100,6 +101,7 @@ patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-overflow-fix.diff || exit 1 patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-yuy2.diff || exit 1 patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-xkb.diff || exit 1 +patch -d glitz-* -p0 < $RPM_SOURCE_DIR/glitz-glx-get-proc-address.diff || exit 1 %build PREFIX=$RPM_BUILD_ROOT/%{_xglprefix}/lib/xgl @@ -151,6 +153,9 @@ /var/adm/fillup-templates/sysconfig.displaymanager-%name %changelog -n xgl +* Thu Nov 16 2006 - dreveman@suse.de +- Add glXGetProcAddressARB workaround to glitz so that + GLX_MESA_copy_sub_buffer is detected properly. #219114 * Wed Oct 18 2006 - dreveman@suse.de - Update for modular X. * Tue Aug 22 2006 - dmueller@suse.de @@ -253,20 +258,20 @@ * Mon Mar 13 2006 - mhopf@suse.de - Together with Mesa update fixes most of bug #157051 - Xgl update to CVS 2006-03-13: -- Fix for TEXTURE_RECTANGLE (e.g. i915). -- GL_ARB_vertex_program and GL_ARB_fragment_program support. -- Remove renderbuffer from context. -- New automatically generated code that includes GenProgramsNV fix. -- Add GetProgramStringARB implementation. + - Fix for TEXTURE_RECTANGLE (e.g. i915). + - GL_ARB_vertex_program and GL_ARB_fragment_program support. + - Remove renderbuffer from context. + - New automatically generated code that includes GenProgramsNV fix. + - Add GetProgramStringARB implementation. * Fri Mar 10 2006 - mhopf@suse.de - Xgl and Mesa update to CVS 2006-03-10: -- Make sure that all preceding drawing commands are finished before + - Make sure that all preceding drawing commands are finished before switching context -- Build against mesa head -- Update to new GLX interface -- #155686: Set screen dpi correctly -- Make context current before we delete all gl objects -- Fix glx screen wrapping + - Build against mesa head + - Update to new GLX interface + - #155686: Set screen dpi correctly + - Make context current before we delete all gl objects + - Fix glx screen wrapping - Build system cleanup, now using xorg-x11-compat70-devel * Thu Feb 23 2006 - dreveman@suse.de - Update to glitz 0.5.4 with mipmap filter support. ++++++ glitz-glx-get-proc-address.diff ++++++ --- src/glx/glitz_glx_info.c 13 Mar 2006 14:23:44 -0000 1.7 +++ src/glx/glitz_glx_info.c 16 Nov 2006 00:09:16 -0000 @@ -137,8 +137,9 @@ if (screen_info->glx_feature_mask & GLITZ_GLX_FEATURE_GET_PROC_ADDRESS_MASK) - address = - screen_info->glx.get_proc_address ((glitz_gl_ubyte_t *) name); + { + address = glXGetProcAddressARB ((glitz_gl_ubyte_t *) name); + } if (!address) { if (!info->dlhand) @@ -158,6 +159,8 @@ static void _glitz_glx_proc_address_lookup (glitz_glx_screen_info_t *screen_info) { + screen_info->glx_feature_mask |= GLITZ_GLX_FEATURE_GET_PROC_ADDRESS_MASK; + if (screen_info->glx_feature_mask & GLITZ_GLX_FEATURE_FBCONFIG_MASK) { if (screen_info->glx_version >= 1.3f) { screen_info->glx.get_fbconfigs = (glitz_glx_get_fbconfigs_t) @@ -266,23 +269,6 @@ screen_info->glx_feature_mask &= ~GLITZ_GLX_FEATURE_COPY_SUB_BUFFER_MASK; } - - if (screen_info->glx_feature_mask & - GLITZ_GLX_FEATURE_GET_PROC_ADDRESS_MASK) { - if (screen_info->glx_version >= 1.4f) { - screen_info->glx.get_proc_address = (glitz_glx_get_proc_address_t) - glitz_glx_get_proc_address ("glXGetProcAddress", - (void *) screen_info); - } else { - screen_info->glx.get_proc_address = (glitz_glx_get_proc_address_t) - glitz_glx_get_proc_address ("glXGetProcAddressARB", - (void *) screen_info); - } - - if (!screen_info->glx.get_proc_address) - screen_info->glx_feature_mask &= - ~GLITZ_GLX_FEATURE_GET_PROC_ADDRESS_MASK; - } } static void ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org