ati-dri-git/mesa-7.1-link-shared.patch

   1 diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/mesa/drivers/dri/Makefile
   2 --- mesa-20080814/src/mesa/drivers/dri/Makefile.dricore 2008-08-14 02:28:38.000000000 +1000
   3 +++ mesa-20080814/src/mesa/drivers/dri/Makefile 2008-08-14 16:18:20.000000000 +1000
   4 @@ -6,12 +6,17 @@ include $(TOP)/configs/current
   5
   6
   7
   8 -default: $(TOP)/$(LIB_DIR) subdirs dri.pc
   9 +default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs dri.pc
  10
  11
  12  $(TOP)/$(LIB_DIR):
  13         -mkdir $(TOP)/$(LIB_DIR)
  14
  15 +libdricore.so:
  16 +       gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc
  17 +
  18 +$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
  19 +       $(INSTALL) libdricore.so $(TOP)/$(LIB_DIR)
  20
  21  subdirs:
  22         @for dir in $(DRI_DIRS) ; do \
  23 @@ -31,12 +36,14 @@ dri.pc: dri.pc.in
  24         $(pcedit) $< > $@
  25
  26
  27 -install: dri.pc
  28 +install: dri.pc $(TOP)/$(LIB_DIR)/libdricore.so
  29         @for dir in $(DRI_DIRS) ; do \
  30                 if [ -d $$dir ] ; then \
  31                         (cd $$dir && $(MAKE) install) || exit 1 ; \
  32                 fi \
  33         done
  34 +       $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
  35 +       $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
  36         $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
  37         $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
  38           $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
  39 @@ -52,5 +59,6 @@ clean:
  40                         (cd $$dir && $(MAKE) clean) ; \
  41                 fi \
  42         done
  43 +       -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
  44         -rm -f common/*.o
  45         -rm -f *.pc
  46 diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080814/src/mesa/drivers/dri/Makefile.template
  47 --- mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore        2008-08-14 02:28:38.000000000 +1000
  48 +++ mesa-20080814/src/mesa/drivers/dri/Makefile.template        2008-08-14 16:19:37.000000000 +1000
  49 @@ -1,6 +1,6 @@
  50  # -*-makefile-*-
  51
  52 -MESA_MODULES = $(TOP)/src/mesa/libmesa.a
  53 +MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
  54
  55  COMMON_SOURCES = \
  56          ../common/utils.c \
  57 @@ -64,7 +64,8 @@ default: symlinks depend $(LIBNAME) $(TO
  58
  59 $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) Makefile \
  60 $(TOP)/src/mesa/drivers/dri/Makefile.template
  61 $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
  62 - $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \
  63 + $(OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) \
  64 + -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
  65 $(DRI_LIB_DEPS)
  66
  67
  68 $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
  69
  70 diff -up mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080814/src/mesa/x86/read_rgba_span_x86.S
  71 --- mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore     2008-08-14 02:28:38.000000000 +1000
  72 +++ mesa-20080814/src/mesa/x86/read_rgba_span_x86.S     2008-08-14 16:16:49.000000000 +1000
  73 @@ -77,7 +77,6 @@
  74   */
  75
  76  .globl _generic_read_RGBA_span_BGRA8888_REV_MMX
  77 -.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
  78         .type   _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
  79  _generic_read_RGBA_span_BGRA8888_REV_MMX:
  80         pushl   %ebx
  81 @@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
  82   */
  83
  84  .globl _generic_read_RGBA_span_BGRA8888_REV_SSE
  85 -.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
  86         .type   _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
  87  _generic_read_RGBA_span_BGRA8888_REV_SSE:
  88         pushl   %esi
  89 @@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
  90
  91         .text
  92  .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
  93 -.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
  94         .type   _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
  95  _generic_read_RGBA_span_BGRA8888_REV_SSE2:
  96         pushl   %esi
  97 @@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
  98
  99         .text
 100         .globl  _generic_read_RGBA_span_RGB565_MMX
 101 -        .hidden _generic_read_RGBA_span_RGB565_MMX
 102         .type   _generic_read_RGBA_span_RGB565_MMX, @function
 103
 104  _generic_read_RGBA_span_RGB565_MMX: