xserver-xorg-1.5.3: Fix the build with nptl

* These two patches are ported from
  http://bugs.gentoo.org/show_bug.cgi?id=263679#c13
  it fixes the following error.

  ../../glx/.libs/libglx.a(glapi.o): In function `_glapi_set_dispatch':
  glapi.c:(.text+0x117ac): undefined reference to `pthread_once'
  collect2: ld returned 1 exit status
  make[3]: *** [Xvfb] Error 1

Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch b/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch
new file mode 100644 (file)
index 0000000..85db023
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch
@@ -0,0 +1,38 @@
+From ddb265e3c5e99065ceeef92ecb9fd94b4c3e169e Mon Sep 17 00:00:00 2001
+From: Daniel Stone <daniel@fooishbar.org>
+Date: Thu, 7 May 2009 14:23:25 +0200
+Subject: [PATCH 36/78] configure.ac: Add GLX_SYS_LIBS for Xvfb and Xnest
+
+This fixes the linking for these two when using DRI2, which requires
+DLOPEN_LIBS.
+(cherry picked from commit ae38151ddda9984effca5bb7c582540061201dce)
+
+Conflicts:
+
+       configure.ac
+---
+ configure.ac |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: xorg-server-1.5.3/configure.ac
+===================================================================
+--- xorg-server-1.5.3.orig/configure.ac        2008-11-05 11:46:15.000000000 -0800
++++ xorg-server-1.5.3/configure.ac     2009-09-14 19:48:11.043879237 -0700
+@@ -1215,7 +1215,7 @@
+ 
+ if test "x$XVFB" = xyes; then
+       XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"
+-      XVFB_SYS_LIBS="$XVFBMODULES_LIBS"
++      XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"
+       AC_SUBST([XVFB_LIBS])
+       AC_SUBST([XVFB_SYS_LIBS])
+ fi
+@@ -1233,7 +1233,7 @@
+ 
+ if test "x$XNEST" = xyes; then
+       XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DIX_LIB $OS_LIB $CONFIG_LIB"
+-      XNEST_SYS_LIBS="$XNESTMODULES_LIBS"
++      XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"
+       AC_SUBST([XNEST_LIBS])
+       AC_SUBST([XNEST_SYS_LIBS])
+ fi

diff --git a/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch b/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch
new file mode 100644 (file)
index 0000000..17eb0f5
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch
@@ -0,0 +1,108 @@
+From 70df9cb2b93ed3d4b7d6e201a58951c9981bbc93 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
+Date: Thu, 7 May 2009 14:19:22 +0200
+Subject: [PATCH 35/78] cherry-pick the rest of "glcore: prepare for dynamic loading"
+
+When f2c30a57e3c6169fbecdbb60ac24ad2a5e9aa8a4 was cherry-picked into the
+1.5 branch, some parts were lost. This commit brings the missing bits.
+
+Conflicts:
+
+       configure.ac
+---
+ configure.ac                |    2 +-
+ hw/kdrive/ephyr/Makefile.am |    4 ++++
+ hw/kdrive/fake/Makefile.am  |    4 ++++
+ hw/kdrive/fbdev/Makefile.am |    4 ++++
+ hw/kdrive/sdl/Makefile.am   |    4 ++++
+ hw/kdrive/vesa/Makefile.am  |    4 ++++
+ 6 files changed, 21 insertions(+), 1 deletions(-)
+
+Index: xorg-server-1.5.3/configure.ac
+===================================================================
+--- xorg-server-1.5.3.orig/configure.ac        2009-09-14 19:48:11.043879237 -0700
++++ xorg-server-1.5.3/configure.ac     2009-09-14 19:49:34.903881120 -0700
+@@ -1964,7 +1964,7 @@
+     KDRIVE_LOCAL_LIBS="$TSLIB_LIBS $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
+     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
+     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
+-    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS"
++    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS"
+ 
+     # check if we can build Xephyr
+     PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])
+Index: xorg-server-1.5.3/hw/kdrive/ephyr/Makefile.am
+===================================================================
+--- xorg-server-1.5.3.orig/hw/kdrive/ephyr/Makefile.am 2008-11-05 08:52:17.000000000 -0800
++++ xorg-server-1.5.3/hw/kdrive/ephyr/Makefile.am      2009-09-14 19:49:34.903881120 -0700
+@@ -67,6 +67,10 @@
+ Xephyr_SOURCES = \
+       ephyrinit.c
+ 
++if GLX
++Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
++endif
++
+ Xephyr_LDADD =                                                \
+       libxephyr.a                                     \
+       libxephyr-hostx.a                               \
+Index: xorg-server-1.5.3/hw/kdrive/fake/Makefile.am
+===================================================================
+--- xorg-server-1.5.3.orig/hw/kdrive/fake/Makefile.am  2008-07-11 08:12:13.000000000 -0700
++++ xorg-server-1.5.3/hw/kdrive/fake/Makefile.am       2009-09-14 19:49:34.903881120 -0700
+@@ -16,6 +16,10 @@
+ Xfake_SOURCES = \
+       fakeinit.c
+ 
++if GLX
++Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
++endif
++
+ Xfake_LDADD =                                                 \
+       libfake.a                                       \
+       @KDRIVE_LIBS@                                   \
+Index: xorg-server-1.5.3/hw/kdrive/fbdev/Makefile.am
+===================================================================
+--- xorg-server-1.5.3.orig/hw/kdrive/fbdev/Makefile.am 2008-07-11 08:12:13.000000000 -0700
++++ xorg-server-1.5.3/hw/kdrive/fbdev/Makefile.am      2009-09-14 19:49:34.903881120 -0700
+@@ -14,6 +14,10 @@
+ Xfbdev_SOURCES = \
+       fbinit.c
+ 
++if GLX
++Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
++endif
++
+ Xfbdev_LDADD =                                                \
+       libfbdev.a                                      \
+       @KDRIVE_LIBS@
+Index: xorg-server-1.5.3/hw/kdrive/sdl/Makefile.am
+===================================================================
+--- xorg-server-1.5.3.orig/hw/kdrive/sdl/Makefile.am   2008-07-11 08:12:13.000000000 -0700
++++ xorg-server-1.5.3/hw/kdrive/sdl/Makefile.am        2009-09-14 19:49:34.903881120 -0700
+@@ -7,6 +7,10 @@
+ 
+ Xsdl_SOURCES = sdl.c
+ 
++if GLX
++Xsdl_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
++endif
++
+ Xsdl_LDADD = \
+       @KDRIVE_LIBS@                                  \
+       @XSDL_LIBS@
+Index: xorg-server-1.5.3/hw/kdrive/vesa/Makefile.am
+===================================================================
+--- xorg-server-1.5.3.orig/hw/kdrive/vesa/Makefile.am  2008-11-05 08:52:17.000000000 -0800
++++ xorg-server-1.5.3/hw/kdrive/vesa/Makefile.am       2009-09-14 19:49:34.903881120 -0700
+@@ -19,6 +19,10 @@
+ Xvesa_SOURCES = \
+       vesainit.c
+ 
++if GLX
++Xvesa_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
++endif
++
+ Xvesa_LDADD = \
+       libvesa.a                               \
+       @KDRIVE_LIBS@

diff --git a/recipes/xorg-xserver/xserver-xorg_1.5.3.bb b/recipes/xorg-xserver/xserver-xorg_1.5.3.bb
index 3969724..879b516 100644 (file)
--- a/recipes/xorg-xserver/xserver-xorg_1.5.3.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.5.3.bb
@@ -4,11 +4,13 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl"
 RDEPENDS += "hal"
 PE = "2"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://sysroot_fix.patch;patch=1 \
             file://xorg-avr32-support.diff;patch=1 \
+           file://xorg-server-1.5.3-configure.patch;patch=1 \
+           file://xorg-server-1.5.3-glcore-prepare-for-dynamic.patch;patch=1 \
 "
 
 MESA_VER = "7.2"