Attachment 16189 Details for Bug 6355 – dan replay

[patch] dan replay

glcore-autoconf.patch (text/plain), 2.95 KB, created by George - on 2008-04-26 02:54:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George -

Created: 2008-04-26 02:54:07 UTC

Size: 2.95 KB

patch

obsolete

>commit af93660af7678886b84c9c80064dd442fc5cc8fd
>Author: George Sapountzis <gsap7@yahoo.gr>
>Date:   Sat Apr 26 12:34:11 2008 +0300
>
>    glcore: dbn reply
>
>diff --git a/configs/autoconf.in b/configs/autoconf.in
>index 1bf655f..fe9c89c 100644
>--- a/configs/autoconf.in
>+++ b/configs/autoconf.in
>@@ -84,6 +84,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \
> APP_LIB_DEPS = $(EXTRA_LIB_PATH) @APP_LIB_DEPS@
> 
> # GLcore dependencies
>+XORG_CFLAGS = @XORG_CFLAGS@
> GLCORE_LIB_DEPS = $(EXTRA_LIB_PATH) @GLCORE_LIB_DEPS@
> 
> # DRI dependencies
>diff --git a/configs/default b/configs/default
>index 9705d6b..cbdb3b2 100644
>--- a/configs/default
>+++ b/configs/default
>@@ -80,6 +80,9 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
> # Program dependencies - specific GL/glut libraries added in Makefiles
> APP_LIB_DEPS = -lm
> 
>+# GLcore dependencies
>+XORG_CFLAGS = `pkg-config --cflags xorg-server`
>+GLCORE_LIB_DEPS = -lm -lpthread
> 
> 
> # Installation directories (for make install)
>diff --git a/configure.ac b/configure.ac
>index 8f5f0a7..dc1810e 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -387,7 +387,6 @@ xlib)
>         GL_LIB_DEPS="$X_LIBS -lX11 -lXext"
>     fi
>     GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread"
>-    GLCORE_LIB_DEPS=""
> 
>     # if static, move the external libraries to the programs
>     # and empty the libraries for libGL
>@@ -419,16 +418,13 @@ dri)
> 
>     # need DRM libs, -lpthread, etc.
>     GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
>-    GLCORE_LIB_DEPS="-lm -lpthread $DLOPEN_LIBS"
>     ;;
> osmesa)
>     # No libGL for osmesa
>     GL_LIB_DEPS=""
>-    GLCORE_LIB_DEPS=""
>     ;;
> esac
> AC_SUBST(GL_LIB_DEPS)
>-AC_SUBST(GLCORE_LIB_DEPS)
> 
> dnl
> dnl More X11 setup
>@@ -648,6 +644,18 @@ AC_SUBST(OSMESA_LIB_DEPS)
> AC_SUBST(OSMESA_MESA_DEPS)
> 
> dnl
>+dnl GLcore configuration
>+dnl
>+# delay pkg-config checks until `make glcore' run
>+XORG_CFLAGS='`pkg-config --cflags xorg-server`'
>+GLCORE_LIB_DEPS='-lm -lpthread'
>+if test "$mesa_driver" = dri; then
>+    GLCORE_LIB_DEPS="$GLCORE_LIB_DEPS $DLOPEN_LIBS"
>+fi
>+AC_SUBST(XORG_CFLAGS)
>+AC_SUBST(GLCORE_LIB_DEPS)
>+
>+dnl
> dnl GLU configuration
> dnl
> AC_ARG_ENABLE(glu,
>diff --git a/src/mesa/drivers/xorg/Makefile b/src/mesa/drivers/xorg/Makefile
>index 7278182..05ca7d6 100644
>--- a/src/mesa/drivers/xorg/Makefile
>+++ b/src/mesa/drivers/xorg/Makefile
>@@ -32,7 +32,7 @@ C_SOURCES =		\
> MESA_MODULES = $(TOP)/src/mesa/libmesa.a
> 
> C_SOURCES += ../common/driverfuncs.c
>-ifeq ("${DRIVER_DIRS}", "dri")
>+ifeq ($(WINDOW_SYSTEM),dri)
> C_SOURCES += ../dri/common/utils.c
> endif
> 
>@@ -46,12 +46,12 @@ INCLUDES = \
> 	-I$(TOP)/src/mesa \
> 	-I$(TOP)/src/mesa/main \
> 	-I$(TOP)/src/mesa/glapi \
>-	`pkg-config --cflags xorg-server`
>+	$(XORG_CFLAGS)
> 
>-ifeq ("${DRIVER_DIRS}", "dri")
>+ifeq ($(WINDOW_SYSTEM),dri)
> INCLUDES += \
> 	-I$(TOP)/src/mesa/drivers/dri/common \
>-	`pkg-config --cflags libdrm`
>+	$(LIBDRM_CFLAGS)
> endif
> 
> # undef 'USE_XSHM' to make it explicit that 'XFree86Server' takes precedence

Actions: View | Splinter Review

Attachments on bug 6355: 5021 | 5022 | 5023 | 5135 | 9387 | 9388 | 9512 | 9513 | 9524 | 9604 | 9605 | 9612 | 16183 | 16189

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.