Pandora Sourcecodes - openembedded.git/blob

   1 From 70df9cb2b93ed3d4b7d6e201a58951c9981bbc93 Mon Sep 17 00:00:00 2001
   2 From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
   3 Date: Thu, 7 May 2009 14:19:22 +0200
   4 Subject: [PATCH 35/78] cherry-pick the rest of "glcore: prepare for dynamic loading"
   5
   6 When f2c30a57e3c6169fbecdbb60ac24ad2a5e9aa8a4 was cherry-picked into the
   7 1.5 branch, some parts were lost. This commit brings the missing bits.
   8
   9 Conflicts:
  10
  11         configure.ac
  12 ---
  13  configure.ac                |    2 +-
  14  hw/kdrive/ephyr/Makefile.am |    4 ++++
  15  hw/kdrive/fake/Makefile.am  |    4 ++++
  16  hw/kdrive/fbdev/Makefile.am |    4 ++++
  17  hw/kdrive/sdl/Makefile.am   |    4 ++++
  18  hw/kdrive/vesa/Makefile.am  |    4 ++++
  19  6 files changed, 21 insertions(+), 1 deletions(-)
  20
  21 Index: xorg-server-1.5.3/configure.ac
  22 ===================================================================
  23 --- xorg-server-1.5.3.orig/configure.ac 2009-09-14 19:48:11.043879237 -0700
  24 +++ xorg-server-1.5.3/configure.ac      2009-09-14 19:49:34.903881120 -0700
  25 @@ -1964,7 +1964,7 @@
  26      KDRIVE_LOCAL_LIBS="$TSLIB_LIBS $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
  27      KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
  28      KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
  29 -    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS"
  30 +    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS"
  31
  32      # check if we can build Xephyr
  33      PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])
  34 Index: xorg-server-1.5.3/hw/kdrive/ephyr/Makefile.am
  35 ===================================================================
  36 --- xorg-server-1.5.3.orig/hw/kdrive/ephyr/Makefile.am  2008-11-05 08:52:17.000000000 -0800
  37 +++ xorg-server-1.5.3/hw/kdrive/ephyr/Makefile.am       2009-09-14 19:49:34.903881120 -0700
  38 @@ -67,6 +67,10 @@
  39  Xephyr_SOURCES = \
  40         ephyrinit.c
  41
  42 +if GLX
  43 +Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
  44 +endif
  45 +
  46  Xephyr_LDADD =                                                 \
  47         libxephyr.a                                     \
  48         libxephyr-hostx.a                               \
  49 Index: xorg-server-1.5.3/hw/kdrive/fake/Makefile.am
  50 ===================================================================
  51 --- xorg-server-1.5.3.orig/hw/kdrive/fake/Makefile.am   2008-07-11 08:12:13.000000000 -0700
  52 +++ xorg-server-1.5.3/hw/kdrive/fake/Makefile.am        2009-09-14 19:49:34.903881120 -0700
  53 @@ -16,6 +16,10 @@
  54  Xfake_SOURCES = \
  55         fakeinit.c
  56
  57 +if GLX
  58 +Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
  59 +endif
  60 +
  61  Xfake_LDADD =                                          \
  62         libfake.a                                       \
  63         @KDRIVE_LIBS@                                   \
  64 Index: xorg-server-1.5.3/hw/kdrive/fbdev/Makefile.am
  65 ===================================================================
  66 --- xorg-server-1.5.3.orig/hw/kdrive/fbdev/Makefile.am  2008-07-11 08:12:13.000000000 -0700
  67 +++ xorg-server-1.5.3/hw/kdrive/fbdev/Makefile.am       2009-09-14 19:49:34.903881120 -0700
  68 @@ -14,6 +14,10 @@
  69  Xfbdev_SOURCES = \
  70         fbinit.c
  71
  72 +if GLX
  73 +Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
  74 +endif
  75 +
  76  Xfbdev_LDADD =                                                 \
  77         libfbdev.a                                      \
  78         @KDRIVE_LIBS@
  79 Index: xorg-server-1.5.3/hw/kdrive/sdl/Makefile.am
  80 ===================================================================
  81 --- xorg-server-1.5.3.orig/hw/kdrive/sdl/Makefile.am    2008-07-11 08:12:13.000000000 -0700
  82 +++ xorg-server-1.5.3/hw/kdrive/sdl/Makefile.am 2009-09-14 19:49:34.903881120 -0700
  83 @@ -7,6 +7,10 @@
  84
  85  Xsdl_SOURCES = sdl.c
  86
  87 +if GLX
  88 +Xsdl_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
  89 +endif
  90 +
  91  Xsdl_LDADD = \
  92         @KDRIVE_LIBS@                                  \
  93         @XSDL_LIBS@
  94 Index: xorg-server-1.5.3/hw/kdrive/vesa/Makefile.am
  95 ===================================================================
  96 --- xorg-server-1.5.3.orig/hw/kdrive/vesa/Makefile.am   2008-11-05 08:52:17.000000000 -0800
  97 +++ xorg-server-1.5.3/hw/kdrive/vesa/Makefile.am        2009-09-14 19:49:34.903881120 -0700
  98 @@ -19,6 +19,10 @@
  99  Xvesa_SOURCES = \
 100         vesainit.c
 101
 102 +if GLX
 103 +Xvesa_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
 104 +endif
 105 +
 106  Xvesa_LDADD = \
 107         libvesa.a                               \
 108         @KDRIVE_LIBS@