commit xgl

28 Mar 2006

Hello community,

here is the log from the commit of package xgl
checked in at Tue Mar 28 17:05:47 CEST 2006.

--------

--- /work/SRC/all/xgl/xgl.changes	2006-03-22 17:42:19.000000000 +0100
+++ /work/src/done/STABLE/xgl/xgl.changes	2006-03-28 13:33:40.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Mar 28 13:33:04 CEST 2006 - mhopf@suse.de
+
+- Fix for #159733 from David: libglx -> libglxext.
+
+-------------------------------------------------------------------

New:
----
  xgl-libglx-to-libglxext-1.diff

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

Other differences:
------------------
++++++ xgl.spec ++++++
--- /var/tmp/diff_new_pack.qlHvgO/_old	2006-03-28 17:05:19.000000000 +0200
+++ /var/tmp/diff_new_pack.qlHvgO/_new	2006-03-28 17:05:19.000000000 +0200
@@ -22,7 +22,7 @@
 PreReq:         %fillup_prereq
 Autoreqprov:    on
 Version:        cvs_060313
-Release:        7
+Release:        9
 Summary:        Xserver that uses OpenGL for its drawing operations.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64
@@ -38,6 +38,7 @@
 Patch2:         xgl-schedyield.diff
 Patch3:         xgl-security-file-dir.diff
 Patch4:         xgl-xkb-initialization.diff
+Patch5:         xgl-libglx-to-libglxext-1.diff
 
 %description
 Xgl is an Xserver that uses OpenGL for its drawing operations. Some
@@ -78,6 +79,7 @@
 patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-schedyield.diff
 patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-xkb-initialization.diff
 patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-security-file-dir.diff
+patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-libglx-to-libglxext-1.diff
 
 %build
 PREFIX=/usr/X11R6/lib/xgl
@@ -141,6 +143,8 @@
 /etc/X11/xgl-cards-white-list
 
 %changelog -n xgl
+* Tue Mar 28 2006 - mhopf@suse.de
+- Fix for #159733 from David: libglx -> libglxext.
 * Wed Mar 22 2006 - mhopf@suse.de
 - Fix from CVS for #152401, #154663: Fixed XKB support.
 - Fixed location of SecurityPolicy.




++++++ xgl-libglx-to-libglxext-1.diff ++++++
Only in .: autom4te.cache
diff -ru ../xorg-server-1.0.1-orig/hw/xgl/glxext/module/Makefile.am ./hw/xgl/glxext/module/Makefile.am
--- ../xorg-server-1.0.1-orig/hw/xgl/glxext/module/Makefile.am	2006-03-09 11:39:54.000000000 +0100
+++ ./hw/xgl/glxext/module/Makefile.am	2006-03-28 15:14:02.000000000 +0200
@@ -5,12 +5,12 @@
 	$(XGLMODULES_CFLAGS) \
 	-I$(top_srcdir)/hw/xgl 
 
-libglx_la_LDFLAGS = -avoid-version
-libglx_la_SOURCES = glxmodule.c
-libglx_la_LIBADD  = $(top_builddir)/GL/glx/libglx.la \
-		    $(top_builddir)/GL/mesa/libGLcore.la
-libglx_modules    = libglx.la
+libglxext_la_LDFLAGS = -avoid-version
+libglxext_la_SOURCES = glxmodule.c
+libglxext_la_LIBADD  = $(top_builddir)/GL/glx/libglx.la \
+		       $(top_builddir)/GL/mesa/libGLcore.la
+libglxext_modules    = libglxext.la
 
 moduledir = @XGL_MODULE_PATH@
 
-module_LTLIBRARIES = $(libglx_modules)
+module_LTLIBRARIES = $(libglxext_modules)
diff -ru ../xorg-server-1.0.1-orig/hw/xgl/glxext/module/Makefile.in ./hw/xgl/glxext/module/Makefile.in
--- ../xorg-server-1.0.1-orig/hw/xgl/glxext/module/Makefile.in	2006-03-10 12:09:45.000000000 +0100
+++ ./hw/xgl/glxext/module/Makefile.in	2006-03-28 15:14:49.000000000 +0200
@@ -62,10 +62,10 @@
 am__installdirs = "$(DESTDIR)$(moduledir)"
 moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(module_LTLIBRARIES)
-libglx_la_DEPENDENCIES = $(top_builddir)/GL/glx/libglx.la \
+libglxext_la_DEPENDENCIES = $(top_builddir)/GL/glx/libglx.la \
 	$(top_builddir)/GL/mesa/libGLcore.la
-am_libglx_la_OBJECTS = glxmodule.lo
-libglx_la_OBJECTS = $(am_libglx_la_OBJECTS)
+am_libglxext_la_OBJECTS = glxmodule.lo
+libglxext_la_OBJECTS = $(am_libglxext_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -77,8 +77,8 @@
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libglx_la_SOURCES)
-DIST_SOURCES = $(libglx_la_SOURCES)
+SOURCES = $(libglxext_la_SOURCES)
+DIST_SOURCES = $(libglxext_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -528,13 +528,13 @@
 	$(XGLMODULES_CFLAGS) \
 	-I$(top_srcdir)/hw/xgl 
 
-libglx_la_LDFLAGS = -avoid-version
-libglx_la_SOURCES = glxmodule.c
-libglx_la_LIBADD = $(top_builddir)/GL/glx/libglx.la \
-		    $(top_builddir)/GL/mesa/libGLcore.la
+libglxext_la_LDFLAGS = -avoid-version
+libglxext_la_SOURCES = glxmodule.c
+libglxext_la_LIBADD = $(top_builddir)/GL/glx/libglx.la \
+		       $(top_builddir)/GL/mesa/libGLcore.la
 
-libglx_modules = libglx.la
-module_LTLIBRARIES = $(libglx_modules)
+libglxext_modules = libglxext.la
+module_LTLIBRARIES = $(libglxext_modules)
 all: all-am
 
 .SUFFIXES:
@@ -595,8 +595,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libglx.la: $(libglx_la_OBJECTS) $(libglx_la_DEPENDENCIES) 
-	$(LINK) -rpath $(moduledir) $(libglx_la_LDFLAGS) $(libglx_la_OBJECTS) $(libglx_la_LIBADD) $(LIBS)
+libglxext.la: $(libglxext_la_OBJECTS) $(libglxext_la_DEPENDENCIES) 
+	$(LINK) -rpath $(moduledir) $(libglxext_la_LDFLAGS) $(libglxext_la_OBJECTS) $(libglxext_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
diff -ru ../xorg-server-1.0.1-orig/hw/xgl/xglglx.c ./hw/xgl/xglglx.c
--- ../xorg-server-1.0.1-orig/hw/xgl/xglglx.c	2006-03-09 11:39:53.000000000 +0100
+++ ./hw/xgl/xglglx.c	2006-03-28 15:14:02.000000000 +0200
@@ -157,7 +157,7 @@
 	    SYM (__GlxGetMesaProvider, "GlxGetMesaProvider")
 	};
 
-	glXHandle = xglLoadModule ("glx", RTLD_NOW | RTLD_LOCAL);
+	glXHandle = xglLoadModule ("glxext", RTLD_NOW | RTLD_LOCAL);
 	if (!glXHandle)
 	    return FALSE;
 

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



Remember to have fun...

    

root＠suse.de

tags

participants (1)