git update libX11 mesa libxcb xkeyboard-config 23 jan 2012

2 files changed, 64 insertions, 83 deletions

diff --git a/mesalib/src/mapi/glapi/Makefile b/mesalib/src/mapi/glapi/Makefile
index 9f1d42f88..37b178eee 100644
--- a/mesalib/src/mapi/glapi/Makefile
+++ b/mesalib/src/mapi/glapi/Makefile
@@ -1,77 +1,64 @@
-# src/mapi/glapi/Makefile

-

-TOP = ../../..

-include $(TOP)/configs/current

-

-TARGET = glapi

-

-MAPI = $(TOP)/src/mapi/mapi

-

-include sources.mak

-include $(MAPI)/sources.mak

-

-glapi_CPPFLAGS := \

-	-I$(TOP)/include \

-	-I$(TOP)/src/mapi \

-	-I$(TOP)/src/mesa

-

-ifeq ($(SHARED_GLAPI),1)

-glapi_CPPFLAGS += \

-	-DMAPI_MODE_BRIDGE \

-	-DMAPI_ABI_HEADER=\"glapi/glapi_mapi_tmp.h\"

-glapi_SOURCES := $(addprefix $(MAPI)/, $(MAPI_BRIDGE_SOURCES))

-

-glapi_GLAPI_OBJECTS :=

-glapi_ASM_OBJECTS :=

-glapi_MAPI_OBJECTS := $(MAPI_BRIDGE_SOURCES:.c=.o)

-else

-glapi_CPPFLAGS += -DMAPI_MODE_UTIL

-glapi_SOURCES := $(GLAPI_SOURCES) $(addprefix $(MAPI)/, $(MAPI_UTIL_SOURCES))

-

-glapi_GLAPI_OBJECTS := $(GLAPI_SOURCES:.c=.o)

-glapi_ASM_OBJECTS := $(GLAPI_ASM_SOURCES:.S=.o)

-glapi_MAPI_OBJECTS := $(MAPI_UTIL_SOURCES:.c=.o)

-endif # SHARED_GLAPI

-

-glapi_OBJECTS := \

-	$(glapi_GLAPI_OBJECTS) \

-	$(glapi_ASM_OBJECTS) \

-	$(glapi_MAPI_OBJECTS)

-

-default: depend lib$(TARGET).a

-

-lib$(TARGET).a: $(glapi_OBJECTS)

-	@$(MKLIB) -o $(TARGET) -static $(glapi_OBJECTS)

-

-$(glapi_GLAPI_OBJECTS): %.o: %.c

-	$(CC) -c $(glapi_CPPFLAGS) $(CFLAGS) $< -o $@

-

-$(glapi_ASM_OBJECTS): %.o: %.S

-	$(CC) -c $(glapi_CPPFLAGS) $(CFLAGS) $< -o $@

-

-$(glapi_MAPI_OBJECTS): %.o: $(MAPI)/%.c

-	$(CC) -c $(glapi_CPPFLAGS) $(CFLAGS) $< -o $@

-

-install:

-

-clean:

-	-rm -f $(glapi_OBJECTS)

-	-rm -f lib$(TARGET).a

-	-rm -f depend depend.bak

-

-ifeq ($(SHARED_GLAPI),1)

-# workaround a bug in makedepend

-makedepend_CPPFLAGS := \

-	$(filter-out -DMAPI_ABI_HEADER=%, $(glapi_CPPFLAGS))

-$(glapi_OBJECTS): glapi_mapi_tmp.h

-else

-makedepend_CPPFLAGS := $(glapi_CPPFLAGS)

-endif

-

-depend: $(glapi_SOURCES)

-	@ echo "running $(MKDEP)"

-	@ touch depend

-	@$(MKDEP) $(MKDEP_OPTIONS) -f- $(DEFINES) $(makedepend_CPPFLAGS) \

-		$(glapi_SOURCES) 2>/dev/null | sed -e 's,^$(MAPI)/,,' > depend

-

--include depend

+# src/mapi/glapi/Makefile
+
+TOP = ../../..
+include $(TOP)/configs/current
+
+TARGET = glapi
+
+MAPI = $(TOP)/src/mapi/mapi
+
+include sources.mak
+include $(MAPI)/sources.mak
+
+glapi_CPPFLAGS := \
+	-I$(TOP)/include \
+	-I$(TOP)/src/mapi \
+	-I$(TOP)/src/mesa
+
+glapi_CPPFLAGS += \
+	-DMAPI_MODE_BRIDGE \
+	-DMAPI_ABI_HEADER=\"glapi/glapi_mapi_tmp.h\"
+glapi_SOURCES := $(addprefix $(MAPI)/, $(MAPI_BRIDGE_SOURCES))
+
+glapi_GLAPI_OBJECTS :=
+glapi_ASM_OBJECTS :=
+glapi_MAPI_OBJECTS := $(MAPI_BRIDGE_SOURCES:.c=.o)
+
+glapi_OBJECTS := \
+	$(glapi_GLAPI_OBJECTS) \
+	$(glapi_ASM_OBJECTS) \
+	$(glapi_MAPI_OBJECTS)
+
+default: depend lib$(TARGET).a
+
+lib$(TARGET).a: $(glapi_OBJECTS)
+	@$(MKLIB) -o $(TARGET) -static $(glapi_OBJECTS)
+
+$(glapi_GLAPI_OBJECTS): %.o: %.c
+	$(CC) -c $(glapi_CPPFLAGS) $(CFLAGS) $< -o $@
+
+$(glapi_ASM_OBJECTS): %.o: %.S
+	$(CC) -c $(glapi_CPPFLAGS) $(CFLAGS) $< -o $@
+
+$(glapi_MAPI_OBJECTS): %.o: $(MAPI)/%.c
+	$(CC) -c $(glapi_CPPFLAGS) $(CFLAGS) $< -o $@
+
+install:
+
+clean:
+	-rm -f $(glapi_OBJECTS)
+	-rm -f lib$(TARGET).a
+	-rm -f depend depend.bak
+
+# workaround a bug in makedepend
+makedepend_CPPFLAGS := \
+	$(filter-out -DMAPI_ABI_HEADER=%, $(glapi_CPPFLAGS))
+$(glapi_OBJECTS): glapi_mapi_tmp.h
+
+depend: $(glapi_SOURCES)
+	@ echo "running $(MKDEP)"
+	@ touch depend
+	@$(MKDEP) $(MKDEP_OPTIONS) -f- $(DEFINES) $(makedepend_CPPFLAGS) \
+		$(glapi_SOURCES) 2>/dev/null | sed -e 's,^$(MAPI)/,,' > depend
+
+-include depend
diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_send.py b/mesalib/src/mapi/glapi/gen/glX_proto_send.py
index bec022218..29bf0808b 100644
--- a/mesalib/src/mapi/glapi/gen/glX_proto_send.py
+++ b/mesalib/src/mapi/glapi/gen/glX_proto_send.py
@@ -361,8 +361,6 @@ const GLuint __glXDefaultPixelStore[9] = { 0, 0, 0, 0, 0, 0, 0, 0, 1 };
 					procs[n] = func.static_glx_name(n)
 
 		print """
-#ifdef GLX_SHARED_GLAPI
-
 static const struct proc_pair
 {
    const char *name;
@@ -396,8 +394,6 @@ __indirect_get_proc_address(const char *name)
 
    return (pair) ? pair->proc : NULL;
 }
-
-#endif /* GLX_SHARED_GLAPI */
 """
 		return
 
@@ -1051,9 +1047,7 @@ extern _X_HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupVendorRequest(
 					break
 
 		print ''
-		print '#ifdef GLX_SHARED_GLAPI'
 		print 'extern _X_HIDDEN void (*__indirect_get_proc_address(const char *name))(void);'
-		print '#endif'
 
 
 def show_usage():