diff options
Diffstat (limited to 'packages')
35 files changed, 244 insertions, 21 deletions
diff --git a/packages/xorg-lib/libice_1.0.4.bb b/packages/xorg-lib/libice_1.0.4.bb index 99f5dfa750..e4a6557397 100644 --- a/packages/xorg-lib/libice_1.0.4.bb +++ b/packages/xorg-lib/libice_1.0.4.bb @@ -3,7 +3,7 @@ require xorg-lib-common.inc DESCRIPTION = "X11 Inter-Client Exchange library" DEPENDS += "xproto xtrans" PROVIDES = "ice" -PR = "r0" +PR = "r1" PE = "1" XORG_PN = "libICE" diff --git a/packages/xorg-lib/libpciaccess/.mtn2git_empty b/packages/xorg-lib/libpciaccess/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xorg-lib/libpciaccess/.mtn2git_empty diff --git a/packages/xorg-lib/libpciaccess/fix-mtrr-check.patch b/packages/xorg-lib/libpciaccess/fix-mtrr-check.patch new file mode 100644 index 0000000000..e2d9f62318 --- /dev/null +++ b/packages/xorg-lib/libpciaccess/fix-mtrr-check.patch @@ -0,0 +1,19 @@ +--- + configure.ac | 2 -- + 1 file changed, 2 deletions(-) + +--- libpciaccess-0.10.3.orig/configure.ac ++++ libpciaccess-0.10.3/configure.ac +@@ -89,12 +89,10 @@ esac + AM_CONDITIONAL(LINUX, [test "x$linux" = xyes]) + AM_CONDITIONAL(FREEBSD, [test "x$freebsd" = xyes]) + AM_CONDITIONAL(OPENBSD, [test "x$openbsd" = xyes]) + AM_CONDITIONAL(SOLARIS, [test "x$solaris" = xyes]) + +-AC_CHECK_FILE([/usr/include/asm/mtrr.h], +- [have_mtrr_h="yes"], [have_mtrr_h="no"]) + if test "x$have_mtrr_h" = xyes; then + AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings]) + fi + + AC_SUBST(PCIACCESS_CFLAGS) diff --git a/packages/xorg-lib/libpciaccess_0.10.3.bb b/packages/xorg-lib/libpciaccess_0.10.3.bb new file mode 100644 index 0000000000..82ff529166 --- /dev/null +++ b/packages/xorg-lib/libpciaccess_0.10.3.bb @@ -0,0 +1,5 @@ +require xorg-lib-common.inc + +DEPENDS += "xproto virtual/libx11" + +SRC_URI += "file://fix-mtrr-check.patch;patch=1" diff --git a/packages/xorg-lib/libx11-sdk_1.1.4.bb b/packages/xorg-lib/libx11-sdk_1.1.4.bb new file mode 100644 index 0000000000..6140d13701 --- /dev/null +++ b/packages/xorg-lib/libx11-sdk_1.1.4.bb @@ -0,0 +1,8 @@ +require libx11_${PV}.bb + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + +DEPENDS = "xproto-sdk xextproto-sdk libxau-sdk xtrans-sdk libxdmcp-sdk xcmiscproto-sdk xf86bigfontproto-sdk kbproto-sdk inputproto-sdk bigreqsproto-sdk util-macros-sdk xproto-native" +PROVIDES = "" + +inherit sdk diff --git a/packages/xorg-lib/libx11-trim/.mtn2git_empty b/packages/xorg-lib/libx11-trim/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xorg-lib/libx11-trim/.mtn2git_empty diff --git a/packages/xorg-lib/libx11-trim/include_fix.patch b/packages/xorg-lib/libx11-trim/include_fix.patch new file mode 100644 index 0000000000..99ed57194e --- /dev/null +++ b/packages/xorg-lib/libx11-trim/include_fix.patch @@ -0,0 +1,23 @@ +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- libX11-1.1.5.orig/configure.ac ++++ libX11-1.1.5/configure.ac +@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS) + AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) + + # + # Find keysymdef.h + # +-AC_MSG_CHECKING([keysymdef.h]) +-dir=`pkg-config --variable=includedir xproto` +-KEYSYMDEF="$dir/X11/keysymdef.h" ++AC_ARG_WITH(keysymdef, ++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), ++ KEYSYMDEF=$withval, KEYSYMDEF="") + if test -f "$KEYSYMDEF"; then + AC_MSG_RESULT([$KEYSYMDEF]) + else + AC_MSG_ERROR([Cannot find keysymdef.h]) + fi diff --git a/packages/xorg-lib/libx11-trim_1.1.5.bb b/packages/xorg-lib/libx11-trim_1.1.5.bb new file mode 100644 index 0000000000..e99b2a07b0 --- /dev/null +++ b/packages/xorg-lib/libx11-trim_1.1.5.bb @@ -0,0 +1,33 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 protocol and utility library" +DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto" + +#FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" +#SRC_URI += "file://X18NCMSstubs.diff;patch=1 " + +PROVIDES = "virtual/libx11" + +PE = "1" +PR = "r1" + +XORG_PN = "libX11" +LEAD_SONAME = "libX11.so" + +SRC_URI += "file://include_fix.patch;patch=1" + +EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" +#EXTRA_OECONF += "--disable-xlocale --disable-xcms --with-xcb" +EXTRA_OECONF += "--disable-xcms --with-xcb" + +do_compile() { + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys + cd ../../ + ) || exit 1 + oe_runmake +} + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB " + diff --git a/packages/xorg-lib/libx11_1.1.4.bb b/packages/xorg-lib/libx11_1.1.4.bb index 88771558f8..7ab3a7bb94 100644 --- a/packages/xorg-lib/libx11_1.1.4.bb +++ b/packages/xorg-lib/libx11_1.1.4.bb @@ -2,7 +2,7 @@ require xorg-lib-common.inc DESCRIPTION = "Base X libs." DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto" + libxdmcp xf86bigfontproto kbproto inputproto xproto-native" PROVIDES = "virtual/libx11" PE = "1" PR = "r3" @@ -17,7 +17,9 @@ EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef. do_compile() { ( unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys + cd src/util; + mv makekeys.c.orig makekeys.c || true + touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys # mv to stop it getting rebuilt mv makekeys.c makekeys.c.orig cd ../../ diff --git a/packages/xorg-lib/libx11_git.bb b/packages/xorg-lib/libx11_git.bb index 422afc92e0..f2929624e8 100644 --- a/packages/xorg-lib/libx11_git.bb +++ b/packages/xorg-lib/libx11_git.bb @@ -5,7 +5,8 @@ SECTION = "x11/libs" LICENSE = "XFree86" DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" PROVIDES = "virtual/libx11" -PR = "r3" +RPROVIDES = "virtual/libx11" +PR = "r1" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" @@ -17,17 +18,14 @@ inherit autotools pkgconfig EXTRA_OECONF="--enable-malloc0returnsnull" - do_compile() { - ( - unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys - cd ../../ - ) || exit 1 - oe_runmake + ( + unset CC LD CXX CCLD + oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys + ) + oe_runmake } - do_stage() { autotools_stage_all } diff --git a/packages/xorg-lib/libxau-sdk_1.0.3.bb b/packages/xorg-lib/libxau-sdk_1.0.3.bb new file mode 100644 index 0000000000..64373f45a9 --- /dev/null +++ b/packages/xorg-lib/libxau-sdk_1.0.3.bb @@ -0,0 +1,6 @@ +require libxau_${PV}.bb + +DEPENDS = "xproto-sdk util-macros-sdk" +PROVIDES = "" + +inherit sdk diff --git a/packages/xorg-lib/libxau_1.0.4.bb b/packages/xorg-lib/libxau_1.0.4.bb new file mode 100644 index 0000000000..3a77534cff --- /dev/null +++ b/packages/xorg-lib/libxau_1.0.4.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "A Sample Authorization Protocol for X" +DEPENDS += " xproto" +PROVIDES = "xau" +PE = "1" + +XORG_PN = "libXau" diff --git a/packages/xorg-lib/libxaw_1.0.4.bb b/packages/xorg-lib/libxaw_1.0.4.bb index ebfb73b34a..f45431e79e 100644 --- a/packages/xorg-lib/libxaw_1.0.4.bb +++ b/packages/xorg-lib/libxaw_1.0.4.bb @@ -3,7 +3,7 @@ require xorg-lib-common.inc DESCRIPTION = "X Athena Widget Set" DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" PROVIDES = "xaw" -PR = "r0" +PR = "r1" PE = "1" XORG_PN = "libXaw" diff --git a/packages/xorg-lib/libxcomposite_0.4.0.bb b/packages/xorg-lib/libxcomposite_0.4.0.bb index 8921b927bf..b3b9d49d63 100644 --- a/packages/xorg-lib/libxcomposite_0.4.0.bb +++ b/packages/xorg-lib/libxcomposite_0.4.0.bb @@ -2,7 +2,7 @@ require xorg-lib-common.inc DESCRIPTION = "X Composite extension library." LICENSE= "BSD-X" -DEPENDS += " compositeproto virtual/libx11 libxfixes" +DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" PROVIDES = "xcomposite" PE = "1" diff --git a/packages/xorg-lib/libxcursor_1.1.9.bb b/packages/xorg-lib/libxcursor_1.1.9.bb index 620ab4a39b..4713eccc48 100644 --- a/packages/xorg-lib/libxcursor_1.1.9.bb +++ b/packages/xorg-lib/libxcursor_1.1.9.bb @@ -3,6 +3,7 @@ require xorg-lib-common.inc DESCRIPTION = "X cursor management library" LICENSE= "BSD-X" DEPENDS += "libxrender libxfixes" +PR = "r2" PE = "1" XORG_PN = "libXcursor" diff --git a/packages/xorg-lib/libxdmcp-sdk_1.0.2.bb b/packages/xorg-lib/libxdmcp-sdk_1.0.2.bb new file mode 100644 index 0000000000..d58bb07a8c --- /dev/null +++ b/packages/xorg-lib/libxdmcp-sdk_1.0.2.bb @@ -0,0 +1,6 @@ +require libxdmcp_${PV}.bb + +DEPENDS = "xproto-sdk util-macros-sdk" +PROVIDES = "" + +inherit sdk diff --git a/packages/xorg-lib/libxext-sdk_1.0.4.bb b/packages/xorg-lib/libxext-sdk_1.0.4.bb new file mode 100644 index 0000000000..267faa584e --- /dev/null +++ b/packages/xorg-lib/libxext-sdk_1.0.4.bb @@ -0,0 +1,6 @@ +require libxext_${PV}.bb + +DEPENDS = "xproto-sdk util-macros-sdk libx11-sdk libxau-sdk xextproto-sdk" +PROVIDES = "" + +inherit sdk diff --git a/packages/xorg-lib/libxext_1.0.4.bb b/packages/xorg-lib/libxext_1.0.4.bb index 3e8aa50f7c..81231a866c 100644 --- a/packages/xorg-lib/libxext_1.0.4.bb +++ b/packages/xorg-lib/libxext_1.0.4.bb @@ -3,6 +3,7 @@ require xorg-lib-common.inc DESCRIPTION = "X11 miscellaneous extension library" DEPENDS += "xproto virtual/libx11 xextproto libxau" PROVIDES = "xext" +PR = "r1" PE = "1" XORG_PN = "libXext" diff --git a/packages/xorg-lib/libxfont_1.3.3.bb b/packages/xorg-lib/libxfont_1.3.3.bb new file mode 100644 index 0000000000..a5afe7e956 --- /dev/null +++ b/packages/xorg-lib/libxfont_1.3.3.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 font rasterisation library" +LICENSE= "BSD-X" +DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc" +PROVIDES = "xfont" +PE = "1" + +#SRC_URI += "file://no-scalable-crash.patch;patch=1" + +XORG_PN = "libXfont" diff --git a/packages/xorg-lib/libxft_2.1.12.bb b/packages/xorg-lib/libxft_2.1.12.bb index 8e54dac01d..c113951406 100644 --- a/packages/xorg-lib/libxft_2.1.12.bb +++ b/packages/xorg-lib/libxft_2.1.12.bb @@ -14,7 +14,7 @@ python do_package() { bb.build.exec_func('package_do_package', d) } -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ +FILES_${PN} = "${libdir}/lib*${SOLIBS}" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ ${libdir}/*.a ${libdir}/pkgconfig \ ${datadir}/aclocal ${bindir} ${sbindir}" diff --git a/packages/xorg-lib/libxi_1.1.3.bb b/packages/xorg-lib/libxi_1.1.3.bb index 492d62af89..31e3b4906d 100644 --- a/packages/xorg-lib/libxi_1.1.3.bb +++ b/packages/xorg-lib/libxi_1.1.3.bb @@ -2,6 +2,7 @@ require xorg-lib-common.inc DESCRIPTION = "X11 Input extension library" DEPENDS += "libxext inputproto" +PR = "r1" PE = "1" XORG_PN = "libXi" diff --git a/packages/xorg-lib/libxkbfile_1.0.5.bb b/packages/xorg-lib/libxkbfile_1.0.5.bb index 6229952548..a404180d49 100644 --- a/packages/xorg-lib/libxkbfile_1.0.5.bb +++ b/packages/xorg-lib/libxkbfile_1.0.5.bb @@ -3,4 +3,5 @@ require xorg-lib-common.inc DESCRIPTION = "X11 keyboard file manipulation library" LICENSE= "GPL" DEPENDS += "virtual/libx11 kbproto" +PR = "r1" PE = "1" diff --git a/packages/xorg-lib/libxmu_1.0.4.bb b/packages/xorg-lib/libxmu_1.0.4.bb index 396e2a2d4b..9a02bf82be 100644 --- a/packages/xorg-lib/libxmu_1.0.4.bb +++ b/packages/xorg-lib/libxmu_1.0.4.bb @@ -3,6 +3,7 @@ require xorg-lib-common.inc DESCRIPTION = "X11 miscellaneous utility library" DEPENDS += "libxt libxext" PROVIDES = "xmu" +PR = "r1" PE = "1" XORG_PN = "libXmu" diff --git a/packages/xorg-lib/libxpm_3.5.7.bb b/packages/xorg-lib/libxpm_3.5.7.bb index caf8b365ee..75c10bf2c9 100644 --- a/packages/xorg-lib/libxpm_3.5.7.bb +++ b/packages/xorg-lib/libxpm_3.5.7.bb @@ -2,8 +2,8 @@ require xorg-lib-common.inc DESCRIPTION = "X11 Pixmap library" LICENSE = "X-BSD" -DEPENDS += "libxt libxext libsm" -PR = "r0" +DEPENDS += "libxext libsm libxt" +PR = "r3" PE = "1" XORG_PN = "libXpm" diff --git a/packages/xorg-lib/libxrandr-sdk_1.2.2.bb b/packages/xorg-lib/libxrandr-sdk_1.2.2.bb new file mode 100644 index 0000000000..1f7d30dd06 --- /dev/null +++ b/packages/xorg-lib/libxrandr-sdk_1.2.2.bb @@ -0,0 +1,5 @@ +require libxrandr_${PV}.bb + +DEPENDS = "randrproto-sdk util-macros-sdk libxext-sdk libxrender-sdk" + +inherit sdk diff --git a/packages/xorg-lib/libxrandr_1.2.2.bb b/packages/xorg-lib/libxrandr_1.2.2.bb index 5a8ffb2b51..611859fd52 100644 --- a/packages/xorg-lib/libxrandr_1.2.2.bb +++ b/packages/xorg-lib/libxrandr_1.2.2.bb @@ -3,6 +3,7 @@ require xorg-lib-common.inc DESCRIPTION = "X11 Resize and Rotate extension library" LICENSE = "BSD-X" DEPENDS += "randrproto libxrender libxext" +PR = "r1" PE = "1" XORG_PN = "libXrandr" diff --git a/packages/xorg-lib/libxrender-sdk_0.9.4.bb b/packages/xorg-lib/libxrender-sdk_0.9.4.bb new file mode 100644 index 0000000000..3765c8a279 --- /dev/null +++ b/packages/xorg-lib/libxrender-sdk_0.9.4.bb @@ -0,0 +1,5 @@ +require libxrender_${PV}.bb + +DEPENDS = "xproto-sdk renderproto-sdk util-macros-sdk libx11-sdk" + +inherit sdk diff --git a/packages/xorg-lib/libxrender_0.9.4.bb b/packages/xorg-lib/libxrender_0.9.4.bb index ccf7b667f6..ad833a8259 100644 --- a/packages/xorg-lib/libxrender_0.9.4.bb +++ b/packages/xorg-lib/libxrender_0.9.4.bb @@ -2,7 +2,8 @@ require xorg-lib-common.inc DESCRIPTION = "X11 Rendering Extension client library" LICENSE = "BSD-X" -DEPENDS += "virtual/libx11 renderproto xproto" +DEPENDS += "virtual/libx11 renderproto xproto xdmcp" +PR = "r1" PE = "1" XORG_PN = "libXrender" diff --git a/packages/xorg-lib/libxt_1.0.5.bb b/packages/xorg-lib/libxt_1.0.5.bb index 5b25c4b3a5..1c215da51d 100644 --- a/packages/xorg-lib/libxt_1.0.5.bb +++ b/packages/xorg-lib/libxt_1.0.5.bb @@ -13,7 +13,7 @@ EXTRA_OECONF += "--disable-install-makestrs --disable-xkb" do_compile() { ( unset CC LD CXX CCLD - oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs + oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE -I${STAGING_INCDIR} ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs ) || exit 1 oe_runmake } diff --git a/packages/xorg-lib/libxtst_1.0.3.bb b/packages/xorg-lib/libxtst_1.0.3.bb index 8d92200775..14e10ff285 100644 --- a/packages/xorg-lib/libxtst_1.0.3.bb +++ b/packages/xorg-lib/libxtst_1.0.3.bb @@ -3,7 +3,7 @@ require xorg-lib-common.inc DESCRIPTION = "X Test Extension: client side library" DEPENDS += "libxext recordproto inputproto" PROVIDES = "xtst" -PR = "r0" +PR = "r1" PE = "1" XORG_PN = "libXtst" diff --git a/packages/xorg-lib/libxxf86dga_1.0.2.bb b/packages/xorg-lib/libxxf86dga_1.0.2.bb index 931f0d9d13..47492d7108 100644 --- a/packages/xorg-lib/libxxf86dga_1.0.2.bb +++ b/packages/xorg-lib/libxxf86dga_1.0.2.bb @@ -2,6 +2,7 @@ require xorg-lib-common.inc DESCRIPTION = "X11 Direct Graphics Access extension library" DEPENDS += "libxext xf86dgaproto" +PR = "r1" PE = "1" XORG_PN = "libXxf86dga" diff --git a/packages/xorg-lib/xtrans-native_1.0.4.bb b/packages/xorg-lib/xtrans-native_1.0.4.bb new file mode 100644 index 0000000000..c7988c7264 --- /dev/null +++ b/packages/xorg-lib/xtrans-native_1.0.4.bb @@ -0,0 +1,5 @@ +require xtrans_${PV}.bb + +DEPENDS = "util-macros-native" + +inherit native diff --git a/packages/xorg-lib/xtrans-sdk_1.0.4.bb b/packages/xorg-lib/xtrans-sdk_1.0.4.bb new file mode 100644 index 0000000000..9f671180b2 --- /dev/null +++ b/packages/xorg-lib/xtrans-sdk_1.0.4.bb @@ -0,0 +1,5 @@ +require xtrans_${PV}.bb + +DEPENDS = "util-macros-sdk" + +inherit sdk diff --git a/packages/xorg-lib/xtrans/abstract_socket_fix.patch b/packages/xorg-lib/xtrans/abstract_socket_fix.patch new file mode 100644 index 0000000000..197da0735d --- /dev/null +++ b/packages/xorg-lib/xtrans/abstract_socket_fix.patch @@ -0,0 +1,58 @@ +From 556a351de83fc6f401b02213dae95731553c216d Mon Sep 17 00:00:00 2001 +From: Loïc Minier <lool@dooz.org> +Date: Mon, 24 Mar 2008 19:38:27 +0000 +Subject: Bug #10489: Don't retry unix socket connect()s on ENOENT. + +If the socket isn't there, it's not gonna magically appear. Either it's +a server socket and you should have just waited for the SIGUSR1 from the +server, or it's a stale reference to an ICE socket. + +However, do retry once, so fallback from abstract to filesystem namespace +works. + +Originally Debian bug #385976. +--- +diff --git a/Xtranssock.c b/Xtranssock.c +index 8a7d2ec..da4afe9 100644 +--- a/Xtranssock.c ++++ b/Xtranssock.c +@@ -2146,8 +2146,13 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port) + errno = olderrno; + + /* +- * If the error was ENOENT, the server may be starting up +- * and we should try again. ++ * If the error was ENOENT, the server may be starting up; we used ++ * to suggest to try again in this case with ++ * TRANS_TRY_CONNECT_AGAIN, but this introduced problems for ++ * processes still referencing stale sockets in their environment. ++ * Hence, we now return a hard error, TRANS_CONNECT_FAILED, and it ++ * is suggested that higher level stacks handle retries on their ++ * level when they face a slow starting server. + * + * If the error was EWOULDBLOCK or EINPROGRESS then the socket + * was non-blocking and we should poll using select +@@ -2161,14 +2166,14 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port) + else if (olderrno == EINTR) + return TRANS_TRY_CONNECT_AGAIN; + else if (olderrno == ENOENT) { +- /* +- * If opening as abstract socket failed, try again "normally" +- */ +- if (abstract) ++ /* If opening as abstract socket failed, try again normally */ ++ if (abstract) { + ciptr->transptr->flags &= ~(TRANS_ABSTRACT); +- return TRANS_TRY_CONNECT_AGAIN; +- } +- else { ++ return TRANS_TRY_CONNECT_AGAIN; ++ } else { ++ return TRANS_CONNECT_FAILED; ++ } ++ } else { + PRMSG (2,"SocketUNIXConnect: Can't connect: errno = %d\n", + EGET(),0, 0); + +-- +cgit v0.7.2-37-g538c diff --git a/packages/xorg-lib/xtrans_1.2.1.bb b/packages/xorg-lib/xtrans_1.2.1.bb new file mode 100644 index 0000000000..75ba93c783 --- /dev/null +++ b/packages/xorg-lib/xtrans_1.2.1.bb @@ -0,0 +1,12 @@ +require xorg-lib-common.inc + +DESCRIPTION = "network API translation layer to insulate X applications and \ +libraries from OS network vageries." +PE = "1" +PR = "r0" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xtrans" + +RDEPENDS_${PN}-dev = "" + +XORG_PN = "xtrans" |