From c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 25 Mar 2006 23:31:04 +0000 Subject: Update xlibs to follow restructuring in OE (in preparation for X11R7) git-svn-id: https://svn.o-hand.com/repos/poky/trunk@341 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- openembedded/conf/distro/familiar-unstable.conf | 18 ++++-- openembedded/conf/distro/familiar.conf | 9 ++- openembedded/conf/distro/maemo-1.0.conf | 2 +- openembedded/conf/distro/openzaurus-unstable.conf | 2 +- openembedded/conf/distro/poky.conf | 12 ++-- openembedded/conf/documentation.conf | 1 + openembedded/conf/machine/nokia770.conf | 2 +- openembedded/conf/machine/spitz.conf | 2 +- openembedded/packages/cairo/cairo_1.0.0.bb | 2 +- openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb | 2 +- openembedded/packages/gtk+/gtk+_2.6.7.bb | 2 +- openembedded/packages/gtk+/gtk+_2.8.16.bb | 2 +- openembedded/packages/libfakekey/libfakekey_svn.bb | 2 +- openembedded/packages/libmatchbox/libmatchbox.inc | 2 +- .../libxsettings-client_0.14.bb | 2 +- .../packages/libxsettings/libxsettings_0.11.bb | 2 +- openembedded/packages/lirc/lirc_0.7.1.bb | 2 +- openembedded/packages/maemo/xpext_1.0-5.bb | 2 +- openembedded/packages/maemo/xsp_1.0.0-8.bb | 2 +- .../packages/matchbox-panel/matchbox-panel.inc | 2 +- .../packages/matchbox-wm/matchbox-wm_0.9.5.bb | 2 +- .../packages/matchbox-wm/matchbox-wm_svn.bb | 2 +- openembedded/packages/pango/pango_1.10.0.bb | 2 +- openembedded/packages/pango/pango_1.12.0.bb | 2 +- openembedded/packages/pango/pango_1.9.1.bb | 2 +- .../packages/rxvt-unicode/rxvt-unicode_5.6.bb | 2 +- .../startup-notification_0.8.bb | 2 +- openembedded/packages/x11/diet-x11_6.2.1.bb | 8 --- openembedded/packages/x11/files/autofoo.patch | 22 -------- .../x11/files/errordb-keysymdb-path-fix.patch | 22 -------- .../packages/x11/files/fix-utf8-wrong-define.patch | 16 ------ openembedded/packages/x11/x11-native_6.2.1.bb | 5 -- openembedded/packages/x11/x11_6.2.1.bb | 40 ------------- openembedded/packages/xauth/xauth_cvs.bb | 2 +- openembedded/packages/xcalibrate/xcalibrate_cvs.bb | 2 +- openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb | 2 +- openembedded/packages/xhost/xhost_20040413.bb | 2 +- openembedded/packages/xlibs/diet-x11_6.2.1.bb | 10 ++++ openembedded/packages/xlibs/ice/autofoo.patch | 21 ------- openembedded/packages/xlibs/ice_6.3.3.bb | 17 ------ openembedded/packages/xlibs/libice/autofoo.patch | 21 +++++++ openembedded/packages/xlibs/libice_6.3.3.bb | 18 ++++++ openembedded/packages/xlibs/libsm_6.0.3.bb | 4 +- openembedded/packages/xlibs/libx11-native_6.2.1.bb | 6 ++ openembedded/packages/xlibs/libx11/autofoo.patch | 22 ++++++++ .../xlibs/libx11/errordb-keysymdb-path-fix.patch | 22 ++++++++ .../xlibs/libx11/fix-utf8-wrong-define.patch | 16 ++++++ openembedded/packages/xlibs/libx11_6.2.1.bb | 40 +++++++++++++ openembedded/packages/xlibs/libxau-native_0.1.1.bb | 6 ++ openembedded/packages/xlibs/libxau-native_cvs.bb | 6 ++ openembedded/packages/xlibs/libxau/autofoo.patch | 21 +++++++ openembedded/packages/xlibs/libxau_0.1.1.bb | 18 ++++++ openembedded/packages/xlibs/libxau_cvs.bb | 18 ++++++ .../xlibs/libxcomposite-1.0.1/autofoo.patch | 17 ++++++ openembedded/packages/xlibs/libxcomposite_1.0.1.bb | 16 ++++++ openembedded/packages/xlibs/libxcomposite_cvs.bb | 15 +++++ .../packages/xlibs/libxdamage-1.0.1/autofoo.patch | 17 ++++++ openembedded/packages/xlibs/libxdamage/m4.patch | 65 ++++++++++++++++++++++ openembedded/packages/xlibs/libxdamage_1.0.1.bb | 17 ++++++ openembedded/packages/xlibs/libxdamage_cvs.bb | 16 ++++++ .../packages/xlibs/libxdmcp-native_0.1.3.bb | 2 - openembedded/packages/xlibs/libxext-native_cvs.bb | 6 ++ openembedded/packages/xlibs/libxext/autofoo.patch | 18 ++++++ openembedded/packages/xlibs/libxext_cvs.bb | 16 ++++++ openembedded/packages/xlibs/libxfixes_2.0.1.bb | 2 +- openembedded/packages/xlibs/libxfixes_cvs.bb | 2 +- openembedded/packages/xlibs/libxfont/autofoo.patch | 18 ++++++ .../packages/xlibs/libxfont/scalable.patch | 27 +++++++++ openembedded/packages/xlibs/libxfont_1.4.2.bb | 19 +++++++ openembedded/packages/xlibs/libxfont_cvs.bb | 18 ++++++ openembedded/packages/xlibs/libxft_2.1.6.bb | 2 +- openembedded/packages/xlibs/libxft_cvs.bb | 2 +- openembedded/packages/xlibs/libxi_6.0.1.bb | 2 +- openembedded/packages/xlibs/libxmu_cvs.bb | 21 +++++++ openembedded/packages/xlibs/libxpm/autofoo.patch | 18 ++++++ openembedded/packages/xlibs/libxpm_3.5.1.bb | 19 +++++++ openembedded/packages/xlibs/libxpm_cvs.bb | 19 +++++++ openembedded/packages/xlibs/libxrandr_1.0.2.bb | 2 +- openembedded/packages/xlibs/libxrender_cvs.bb | 2 +- openembedded/packages/xlibs/libxt/autofoo.patch | 20 +++++++ openembedded/packages/xlibs/libxt_0.1.5.bb | 29 ++++++++++ openembedded/packages/xlibs/libxtst_cvs.bb | 17 ++++++ openembedded/packages/xlibs/xau-native_0.1.1.bb | 7 --- openembedded/packages/xlibs/xau-native_cvs.bb | 7 --- openembedded/packages/xlibs/xau/autofoo.patch | 21 ------- openembedded/packages/xlibs/xau_0.1.1.bb | 17 ------ openembedded/packages/xlibs/xau_cvs.bb | 17 ------ .../packages/xlibs/xcomposite-1.0.1/autofoo.patch | 17 ------ openembedded/packages/xlibs/xcomposite_1.0.1.bb | 19 ------- openembedded/packages/xlibs/xcomposite_cvs.bb | 14 ----- .../packages/xlibs/xdamage-1.0.1/autofoo.patch | 17 ------ openembedded/packages/xlibs/xdamage/m4.patch | 65 ---------------------- openembedded/packages/xlibs/xdamage_1.0.1.bb | 16 ------ openembedded/packages/xlibs/xdamage_cvs.bb | 15 ----- openembedded/packages/xlibs/xext-native_cvs.bb | 6 -- openembedded/packages/xlibs/xext/autofoo.patch | 18 ------ openembedded/packages/xlibs/xext_cvs.bb | 15 ----- openembedded/packages/xlibs/xfont/autofoo.patch | 18 ------ openembedded/packages/xlibs/xfont/scalable.patch | 27 --------- openembedded/packages/xlibs/xfont_1.4.2.bb | 18 ------ openembedded/packages/xlibs/xfont_cvs.bb | 17 ------ openembedded/packages/xlibs/xmu_cvs.bb | 20 ------- openembedded/packages/xlibs/xpm/autofoo.patch | 18 ------ openembedded/packages/xlibs/xpm_3.5.1.bb | 18 ------ openembedded/packages/xlibs/xpm_cvs.bb | 18 ------ openembedded/packages/xlibs/xt/autofoo.patch | 20 ------- openembedded/packages/xlibs/xt_0.1.5.bb | 28 ---------- openembedded/packages/xmodmap/xmodmap_cvs.bb | 2 +- openembedded/packages/xrandr/xrandr_cvs.bb | 2 +- .../packages/xserver/xserver-kdrive-omap_6.6.3.bb | 2 +- .../packages/xserver/xserver-kdrive_20050207.bb | 2 +- .../packages/xserver/xserver-kdrive_20050624.bb | 2 +- .../packages/xserver/xserver-kdrive_cvs.bb | 2 +- .../packages/xserver/xserver-xorg_6.8.99.10.bb | 2 +- .../packages/xserver/xserver-xorg_6.8.99.11.bb | 2 +- openembedded/packages/xserver/xserver-xorg_cvs.bb | 2 +- openembedded/packages/xtscal/xtscal_0.6.3.bb | 2 +- openembedded/packages/xtst/xtst_cvs.bb | 16 ------ openembedded/site/arm-linux | 4 ++ 119 files changed, 728 insertions(+), 702 deletions(-) delete mode 100644 openembedded/packages/x11/diet-x11_6.2.1.bb delete mode 100644 openembedded/packages/x11/files/autofoo.patch delete mode 100644 openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch delete mode 100644 openembedded/packages/x11/files/fix-utf8-wrong-define.patch delete mode 100644 openembedded/packages/x11/x11-native_6.2.1.bb delete mode 100644 openembedded/packages/x11/x11_6.2.1.bb create mode 100644 openembedded/packages/xlibs/diet-x11_6.2.1.bb delete mode 100644 openembedded/packages/xlibs/ice/autofoo.patch delete mode 100644 openembedded/packages/xlibs/ice_6.3.3.bb create mode 100644 openembedded/packages/xlibs/libice/autofoo.patch create mode 100644 openembedded/packages/xlibs/libice_6.3.3.bb create mode 100644 openembedded/packages/xlibs/libx11-native_6.2.1.bb create mode 100644 openembedded/packages/xlibs/libx11/autofoo.patch create mode 100644 openembedded/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch create mode 100644 openembedded/packages/xlibs/libx11/fix-utf8-wrong-define.patch create mode 100644 openembedded/packages/xlibs/libx11_6.2.1.bb create mode 100644 openembedded/packages/xlibs/libxau-native_0.1.1.bb create mode 100644 openembedded/packages/xlibs/libxau-native_cvs.bb create mode 100644 openembedded/packages/xlibs/libxau/autofoo.patch create mode 100644 openembedded/packages/xlibs/libxau_0.1.1.bb create mode 100644 openembedded/packages/xlibs/libxau_cvs.bb create mode 100644 openembedded/packages/xlibs/libxcomposite-1.0.1/autofoo.patch create mode 100644 openembedded/packages/xlibs/libxcomposite_1.0.1.bb create mode 100644 openembedded/packages/xlibs/libxcomposite_cvs.bb create mode 100644 openembedded/packages/xlibs/libxdamage-1.0.1/autofoo.patch create mode 100644 openembedded/packages/xlibs/libxdamage/m4.patch create mode 100644 openembedded/packages/xlibs/libxdamage_1.0.1.bb create mode 100644 openembedded/packages/xlibs/libxdamage_cvs.bb create mode 100644 openembedded/packages/xlibs/libxext-native_cvs.bb create mode 100644 openembedded/packages/xlibs/libxext/autofoo.patch create mode 100644 openembedded/packages/xlibs/libxext_cvs.bb create mode 100644 openembedded/packages/xlibs/libxfont/autofoo.patch create mode 100644 openembedded/packages/xlibs/libxfont/scalable.patch create mode 100644 openembedded/packages/xlibs/libxfont_1.4.2.bb create mode 100644 openembedded/packages/xlibs/libxfont_cvs.bb create mode 100644 openembedded/packages/xlibs/libxmu_cvs.bb create mode 100644 openembedded/packages/xlibs/libxpm/autofoo.patch create mode 100644 openembedded/packages/xlibs/libxpm_3.5.1.bb create mode 100644 openembedded/packages/xlibs/libxpm_cvs.bb create mode 100644 openembedded/packages/xlibs/libxt/autofoo.patch create mode 100644 openembedded/packages/xlibs/libxt_0.1.5.bb create mode 100644 openembedded/packages/xlibs/libxtst_cvs.bb delete mode 100644 openembedded/packages/xlibs/xau-native_0.1.1.bb delete mode 100644 openembedded/packages/xlibs/xau-native_cvs.bb delete mode 100644 openembedded/packages/xlibs/xau/autofoo.patch delete mode 100644 openembedded/packages/xlibs/xau_0.1.1.bb delete mode 100644 openembedded/packages/xlibs/xau_cvs.bb delete mode 100644 openembedded/packages/xlibs/xcomposite-1.0.1/autofoo.patch delete mode 100644 openembedded/packages/xlibs/xcomposite_1.0.1.bb delete mode 100644 openembedded/packages/xlibs/xcomposite_cvs.bb delete mode 100644 openembedded/packages/xlibs/xdamage-1.0.1/autofoo.patch delete mode 100644 openembedded/packages/xlibs/xdamage/m4.patch delete mode 100644 openembedded/packages/xlibs/xdamage_1.0.1.bb delete mode 100644 openembedded/packages/xlibs/xdamage_cvs.bb delete mode 100644 openembedded/packages/xlibs/xext-native_cvs.bb delete mode 100644 openembedded/packages/xlibs/xext/autofoo.patch delete mode 100644 openembedded/packages/xlibs/xext_cvs.bb delete mode 100644 openembedded/packages/xlibs/xfont/autofoo.patch delete mode 100644 openembedded/packages/xlibs/xfont/scalable.patch delete mode 100644 openembedded/packages/xlibs/xfont_1.4.2.bb delete mode 100644 openembedded/packages/xlibs/xfont_cvs.bb delete mode 100644 openembedded/packages/xlibs/xmu_cvs.bb delete mode 100644 openembedded/packages/xlibs/xpm/autofoo.patch delete mode 100644 openembedded/packages/xlibs/xpm_3.5.1.bb delete mode 100644 openembedded/packages/xlibs/xpm_cvs.bb delete mode 100644 openembedded/packages/xlibs/xt/autofoo.patch delete mode 100644 openembedded/packages/xlibs/xt_0.1.5.bb delete mode 100644 openembedded/packages/xtst/xtst_cvs.bb (limited to 'openembedded') diff --git a/openembedded/conf/distro/familiar-unstable.conf b/openembedded/conf/distro/familiar-unstable.conf index 1d40bbac5..ab367378a 100644 --- a/openembedded/conf/distro/familiar-unstable.conf +++ b/openembedded/conf/distro/familiar-unstable.conf @@ -1,7 +1,6 @@ DISTRO = "familiar" DISTRO_NAME = "Familiar Linux" DISTRO_VERSION = "unstable-${DATE}" -MAINTAINER = "Koen Kooi " # Do not touch this file before notifying familiar-dev@handhelds.org include conf/distro/familiar.conf @@ -13,8 +12,12 @@ DISTRO_TYPE = "debug" FEED_URIS += " \ - base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ - updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" + base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ + ${MACHINE}##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/machine/${MACHINE} \ + updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates \ + locale-en##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/en \ + locale-fr##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/fr \ + locale-de##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/de" #SRCDATE = 20050331 #SRCDATE = "now" @@ -25,7 +28,6 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDER_virtual/libiconv=glibc PREFERRED_PROVIDER_virtual/libintl=glibc -PREFERRED_PROVIDER_x11=diet-x11 PREFERRED_VERSION_hostap-modules ?= "0.3.9" @@ -45,6 +47,12 @@ PREFERRED_VERSION_gcc ?= "3.4.4" PREFERRED_VERSION_gcc-cross ?= "3.4.4" PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" +# +# PIN the familiar build to a version +# +PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" +PREFERRED_VERSION_binutils ?= "2.15.94.0.1" + # # Opie # @@ -61,7 +69,7 @@ PREFERRED_VERSION_qte = "2.3.10" PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_x11 = "diet-x11" +PREFERRED_PROVIDER_libx11 = "diet-x11" include conf/distro/preferred-gpe-versions-2.8.inc diff --git a/openembedded/conf/distro/familiar.conf b/openembedded/conf/distro/familiar.conf index 99e501589..da5caa799 100644 --- a/openembedded/conf/distro/familiar.conf +++ b/openembedded/conf/distro/familiar.conf @@ -2,14 +2,17 @@ #@NAME: Familiar Linux #@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org) +MAINTAINER ?= "Familiar Developers " + INHERIT += "package_ipk debian" TARGET_OS = "linux" -PARALLEL_INSTALL_MODULES = "1" -UDEV_DEVFS_RULES = "1" +BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version" IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" -BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version" +ENABLE_BINARY_LOCALE_GENERATION ?= "1" +PARALLEL_INSTALL_MODULES = "1" +UDEV_DEVFS_RULES = "1" DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/openembedded/conf/distro/maemo-1.0.conf b/openembedded/conf/distro/maemo-1.0.conf index f83e4b1d9..d30ecc908 100644 --- a/openembedded/conf/distro/maemo-1.0.conf +++ b/openembedded/conf/distro/maemo-1.0.conf @@ -29,7 +29,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_x11 = "diet-x11" +PREFERRED_PROVIDER_libx11 = "diet-x11" include conf/distro/preferred-gpe-versions.inc diff --git a/openembedded/conf/distro/openzaurus-unstable.conf b/openembedded/conf/distro/openzaurus-unstable.conf index f424b1669..1143f1d94 100644 --- a/openembedded/conf/distro/openzaurus-unstable.conf +++ b/openembedded/conf/distro/openzaurus-unstable.conf @@ -57,7 +57,7 @@ PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" # GPE # PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDER_x11 = "diet-x11" +PREFERRED_PROVIDER_libx11 = "diet-x11" include conf/distro/preferred-gpe-versions-2.8.inc # diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf index ab115ac29..d734b64cd 100644 --- a/openembedded/conf/distro/poky.conf +++ b/openembedded/conf/distro/poky.conf @@ -55,7 +55,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDER_virtual/libiconv ?= glibc PREFERRED_PROVIDER_virtual/libintl ?= glibc PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive -PREFERRED_PROVIDER_x11 ?= "diet-x11" +PREFERRED_PROVIDER_libx11 ?= "diet-x11" PREFERRED_PROVIDER_gconf ?= gconf-dbus PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus @@ -89,7 +89,7 @@ SRCDATE_matchbox-themes-extra ?= "20051101" SRCDATE_matchbox-wm ?= "20060120" SRCDATE_libmatchbox ?= "20060120" SRCDATE_tslib ?= "20051101" -SRCDATE_xext ?= "20051101" +SRCDATE_libxext ?= "20051101" SRCDATE_renderext ?= "20051101" SRCDATE_libxrender ?= "20051101" SRCDATE_fixesext ?= "20051101" @@ -99,10 +99,10 @@ SRCDATE_xcalibrateext ?= "20051101" SRCDATE_recordext ?= "20051101" SRCDATE_libfakekey ?= "20051101" SRCDATE_xmodmap ?= "20051101" -SRCDATE_xrandr ?= "20051101" -SRCDATE_xtst ?= "20051101" -SRCDATE_xcalibrate ?= "20051101" -SRCDATE_xmu ?= "20051115" +SRCDATE_libxrandr ?= "20051101" +SRCDATE_libxtst ?= "20051101" +SRCDATE_libxcalibrate ?= "20051101" +SRCDATE_libxmu ?= "20051115" SRCDATE_xdpyinfo ?= "20051115" SRCDATE_xauth ?= "20060120" diff --git a/openembedded/conf/documentation.conf b/openembedded/conf/documentation.conf index 320361398..57ca4fe23 100644 --- a/openembedded/conf/documentation.conf +++ b/openembedded/conf/documentation.conf @@ -90,3 +90,4 @@ T[doc] = "Temporary directory within the WORKDIR." GROUP_locale[doc] = "Locale generation of the GNU libc implementation" ENABLE_BINARY_LOCALE_GENERATION[doc] = "Enable the use of qemu to generate locale information during build time on the host instead of runtime on the target. If you have trouble with qemu-native you should make this an empty var. @group locale" +PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slots (usually pcmcia-cs or pcmciautils)." diff --git a/openembedded/conf/machine/nokia770.conf b/openembedded/conf/machine/nokia770.conf index 3d6b7c0c3..41c485c01 100644 --- a/openembedded/conf/machine/nokia770.conf +++ b/openembedded/conf/machine/nokia770.conf @@ -2,7 +2,7 @@ #@NAME: Nokia 770 internet tablet #@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv4 armv5te nokia770" +IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap" PREFERRED_PROVIDER_virtual/bootloader = "" diff --git a/openembedded/conf/machine/spitz.conf b/openembedded/conf/machine/spitz.conf index e1cb468d8..212da5258 100644 --- a/openembedded/conf/machine/spitz.conf +++ b/openembedded/conf/machine/spitz.conf @@ -7,7 +7,7 @@ KERNEL_VERSION ?= "2.6" include conf/machine/include/zaurus-clamshell.conf include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf -PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs" +PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" PIVOTBOOT_EXTRA_RRECOMMENDS += "" # Useful things for the built-in Harddisk diff --git a/openembedded/packages/cairo/cairo_1.0.0.bb b/openembedded/packages/cairo/cairo_1.0.0.bb index 84cb58117..10603e3f2 100644 --- a/openembedded/packages/cairo/cairo_1.0.0.bb +++ b/openembedded/packages/cairo/cairo_1.0.0.bb @@ -1,7 +1,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell " -DEPENDS = "x11 libpng fontconfig libxrender" +DEPENDS = "libx11 libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" PR = "r1" diff --git a/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb b/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb index fbebed2e4..e2065b3fa 100644 --- a/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb +++ b/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Koen Kooi " -DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt" +DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt" PR = "r1" S = "${WORKDIR}/gtk+2.0-2.6.4/upstream/tarballs/gtk+-2.6.4/" diff --git a/openembedded/packages/gtk+/gtk+_2.6.7.bb b/openembedded/packages/gtk+/gtk+_2.6.7.bb index 260a03684..b27607231 100644 --- a/openembedded/packages/gtk+/gtk+_2.6.7.bb +++ b/openembedded/packages/gtk+/gtk+_2.6.7.bb @@ -4,7 +4,7 @@ set of widgets, GTK+ is suitable for projects ranging from small one-off project HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt" +DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt" PR = "r4" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ diff --git a/openembedded/packages/gtk+/gtk+_2.8.16.bb b/openembedded/packages/gtk+/gtk+_2.8.16.bb index 875efa8d3..acd3be5f2 100644 --- a/openembedded/packages/gtk+/gtk+_2.8.16.bb +++ b/openembedded/packages/gtk+/gtk+_2.8.16.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell " -DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt cairo" +DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo" PR = "r2" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \ diff --git a/openembedded/packages/libfakekey/libfakekey_svn.bb b/openembedded/packages/libfakekey/libfakekey_svn.bb index 7cdd55746..eec4d6506 100644 --- a/openembedded/packages/libfakekey/libfakekey_svn.bb +++ b/openembedded/packages/libfakekey/libfakekey_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Matchbox keyboard" LICENSE = "GPL" -DEPENDS = "xtst" +DEPENDS = "libxtst" SECTION = "x11/wm" PR="r1" PV = "0.0+svn${SRCDATE}" diff --git a/openembedded/packages/libmatchbox/libmatchbox.inc b/openembedded/packages/libmatchbox/libmatchbox.inc index e8700cb7b..974014f27 100644 --- a/openembedded/packages/libmatchbox/libmatchbox.inc +++ b/openembedded/packages/libmatchbox/libmatchbox.inc @@ -1,7 +1,7 @@ SECTION = "x11/libs" DESCRIPTION = "Matchbox window manager core library" LICENSE = "GPL" -DEPENDS = "x11 xext expat libxft jpeg libpng zlib libxsettings-client" +DEPENDS = "libx11 libxext expat libxft jpeg libpng zlib libxsettings-client" PR="r2" inherit autotools pkgconfig diff --git a/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb b/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb index 1ccb6e4eb..7e1b4df2c 100644 --- a/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb +++ b/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb @@ -1,7 +1,7 @@ SECTION = "gpe/libs" LICENSE = "BSD-X" PRIORITY = "optional" -DEPENDS = "libxsettings x11" +DEPENDS = "libxsettings libx11" PR = "r1" inherit autotools pkgconfig gpe diff --git a/openembedded/packages/libxsettings/libxsettings_0.11.bb b/openembedded/packages/libxsettings/libxsettings_0.11.bb index 6ff786e3b..caf2bc67a 100644 --- a/openembedded/packages/libxsettings/libxsettings_0.11.bb +++ b/openembedded/packages/libxsettings/libxsettings_0.11.bb @@ -3,7 +3,7 @@ SECTION = "gpe/libs" LICENSE = "BSD-X" PRIORITY = "optional" MAINTAINER = "Philip Blundell " -DEPENDS = "x11" +DEPENDS = "libx11" inherit gpe diff --git a/openembedded/packages/lirc/lirc_0.7.1.bb b/openembedded/packages/lirc/lirc_0.7.1.bb index c3eaa3aa8..cd65dceda 100644 --- a/openembedded/packages/lirc/lirc_0.7.1.bb +++ b/openembedded/packages/lirc/lirc_0.7.1.bb @@ -3,7 +3,7 @@ SECTION = "console/network" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" -DEPENDS = "virtual/kernel x11 xau libsm ice" +DEPENDS = "virtual/kernel libx11 libxau libsm libice" PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \ diff --git a/openembedded/packages/maemo/xpext_1.0-5.bb b/openembedded/packages/maemo/xpext_1.0-5.bb index cd5aec2d1..75b7903e8 100644 --- a/openembedded/packages/maemo/xpext_1.0-5.bb +++ b/openembedded/packages/maemo/xpext_1.0-5.bb @@ -3,7 +3,7 @@ LICENSE= "MIT" DESCRIPTION = "X Server Nokia 770 extensions library" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "x11 xextensions xext" +DEPENDS = "libx11 xextensions libxext" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${PN}/${PN}_${PV}.tar.gz \ file://auxdir.patch;patch=1;pnum=0" diff --git a/openembedded/packages/maemo/xsp_1.0.0-8.bb b/openembedded/packages/maemo/xsp_1.0.0-8.bb index 0c4a4c62f..068193c6a 100644 --- a/openembedded/packages/maemo/xsp_1.0.0-8.bb +++ b/openembedded/packages/maemo/xsp_1.0.0-8.bb @@ -3,7 +3,7 @@ LICENSE= "MIT" DESCRIPTION = "X Server Nokia 770 extensions library" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "x11 xextensions xext xpext" +DEPENDS = "libx11 xextensions libxext xpext" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz" S = "${WORKDIR}/Xsp" diff --git a/openembedded/packages/matchbox-panel/matchbox-panel.inc b/openembedded/packages/matchbox-panel/matchbox-panel.inc index 7ae9342b4..d5d355161 100644 --- a/openembedded/packages/matchbox-panel/matchbox-panel.inc +++ b/openembedded/packages/matchbox-panel/matchbox-panel.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Matchbox Window Manager Panel" LICENSE = "GPL" -DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel wireless-tools" +DEPENDS = "libmatchbox libx11 libxext libxpm apmd startup-notification virtual/kernel wireless-tools" SECTION = "x11/wm" inherit autotools pkgconfig gettext diff --git a/openembedded/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/openembedded/packages/matchbox-wm/matchbox-wm_0.9.5.bb index 69bddc354..c158f590c 100644 --- a/openembedded/packages/matchbox-wm/matchbox-wm_0.9.5.bb +++ b/openembedded/packages/matchbox-wm/matchbox-wm_0.9.5.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PR="r0" diff --git a/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb b/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb index c9e7ada22..ad37976dd 100644 --- a/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb +++ b/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox x11 xext libxrender startup-notification expat matchbox-common gconf" +DEPENDS = "libmatchbox libx11 libxext libxrender startup-notification expat matchbox-common gconf" RDEPENDS = "matchbox-common" PV = "0.9.5+svn${SRCDATE}" PR = "r4" diff --git a/openembedded/packages/pango/pango_1.10.0.bb b/openembedded/packages/pango/pango_1.10.0.bb index dda4df2fd..869b146d5 100644 --- a/openembedded/packages/pango/pango_1.10.0.bb +++ b/openembedded/packages/pango/pango_1.10.0.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy -DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc cairo" +DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." diff --git a/openembedded/packages/pango/pango_1.12.0.bb b/openembedded/packages/pango/pango_1.12.0.bb index 4b6459e03..e06e659b7 100644 --- a/openembedded/packages/pango/pango_1.12.0.bb +++ b/openembedded/packages/pango/pango_1.12.0.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy -DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc cairo" +DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." diff --git a/openembedded/packages/pango/pango_1.9.1.bb b/openembedded/packages/pango/pango_1.9.1.bb index e66b65f36..db01079fe 100644 --- a/openembedded/packages/pango/pango_1.9.1.bb +++ b/openembedded/packages/pango/pango_1.9.1.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy -DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc" +DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." diff --git a/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb index 2f3f56c2c..b224bb0c9 100644 --- a/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb +++ b/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "x11 xt libxft" +DEPENDS = "libx11 libxt libxft" DESCRIPTION = "rxvt-unicode is a clone of the well known \ terminal emulator rxvt, modified to store text in Unicode \ (either UCS-2 or UCS-4) and to use locale-correct input and \ diff --git a/openembedded/packages/startup-notification/startup-notification_0.8.bb b/openembedded/packages/startup-notification/startup-notification_0.8.bb index a505a5396..3db849d2c 100644 --- a/openembedded/packages/startup-notification/startup-notification_0.8.bb +++ b/openembedded/packages/startup-notification/startup-notification_0.8.bb @@ -3,7 +3,7 @@ LICENSE = "LGPL" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell " -DEPENDS = "x11" +DEPENDS = "libx11" PR = "r1" inherit autotools pkgconfig diff --git a/openembedded/packages/x11/diet-x11_6.2.1.bb b/openembedded/packages/x11/diet-x11_6.2.1.bb deleted file mode 100644 index 1313bd08d..000000000 --- a/openembedded/packages/x11/diet-x11_6.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -SECTION = "x11/base" -include x11_${PV}.bb - -EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" -CFLAGS += "-D_GNU_SOURCE" - -SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1" - diff --git a/openembedded/packages/x11/files/autofoo.patch b/openembedded/packages/x11/files/autofoo.patch deleted file mode 100644 index 8bdba0976..000000000 --- a/openembedded/packages/x11/files/autofoo.patch +++ /dev/null @@ -1,22 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libX11-6.2.1/configure.ac~autofoo -+++ libX11-6.2.1/configure.ac -@@ -7,12 +7,12 @@ - [jg@freedesktop.org], - libX11) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_INIT_AUTOMAKE([dist-bzip2]) -+AC_CONFIG_AUX_DIR(.) - -+AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER([src/config.h]) --AC_CONFIG_AUX_DIR(.) - - # Checks for programs. - AC_PROG_LIBTOOL diff --git a/openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch b/openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch deleted file mode 100644 index f43d38065..000000000 --- a/openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- X11/src/ErrDes.c.orig 2005-09-03 16:15:48 +0200 -+++ X11/src/ErrDes.c 2005-09-03 16:16:03 +0200 -@@ -56,7 +56,7 @@ - #include - - #ifndef ERRORDB --#define ERRORDB "/usr/lib/X11/XErrorDB" -+#define ERRORDB "/usr/share/X11/XErrorDB" - #endif - - /* ---- X11/src/StrKeysym.c.orig 2005-09-03 16:41:18 +0200 -+++ X11/src/StrKeysym.c 2005-09-03 16:41:33 +0200 -@@ -36,7 +36,7 @@ - #include "Key.h" - - #ifndef KEYSYMDB --#define KEYSYMDB "/usr/lib/X11/XKeysymDB" -+#define KEYSYMDB "/usr/share/X11/XKeysymDB" - #endif - - static Bool initialized; diff --git a/openembedded/packages/x11/files/fix-utf8-wrong-define.patch b/openembedded/packages/x11/files/fix-utf8-wrong-define.patch deleted file mode 100644 index dca88fba9..000000000 --- a/openembedded/packages/x11/files/fix-utf8-wrong-define.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libX11-6.2.1/include/X11/Xlib.h~fix-utf8-wrong-define -+++ libX11-6.2.1/include/X11/Xlib.h -@@ -100,7 +100,7 @@ - - /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in - November 2000. Its presence is indicated through the following macro. */ --#define X_HAVE_UTF8_STRING 1 -+#undef X_HAVE_UTF8_STRING - - typedef char *XPointer; - diff --git a/openembedded/packages/x11/x11-native_6.2.1.bb b/openembedded/packages/x11/x11-native_6.2.1.bb deleted file mode 100644 index cb44531b8..000000000 --- a/openembedded/packages/x11/x11-native_6.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -SECTION = "x11/base" -include x11_${PV}.bb -inherit native -DEPENDS = "xproto-native xextensions-native xau-native xtrans-native libxdmcp-native" -PROVIDES = "" diff --git a/openembedded/packages/x11/x11_6.2.1.bb b/openembedded/packages/x11/x11_6.2.1.bb deleted file mode 100644 index 121c1ddd9..000000000 --- a/openembedded/packages/x11/x11_6.2.1.bb +++ /dev/null @@ -1,40 +0,0 @@ -SECTION = "x11/libs" -LICENSE = "XFree86" -PRIORITY = "optional" -MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto xextensions xau xtrans xdmcp" -DESCRIPTION = "Base X libs." -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" -FILES_${PN}-locale += "${datadir}/X11/locale" -PROVIDES = "x11" -PR = "r3" - -SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \ - file://errordb-keysymdb-path-fix.patch;patch=1 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libX11-${PV}" - -inherit autotools pkgconfig - -do_compile() { - ( - unset CC LD CXX CCLD -# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake -C src/util 'CFLAGS= -D_GNU_SOURCE' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys - ) - oe_runmake -} - -do_stage() { - install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h - install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h - install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h - install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h - install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h - install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h - install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h - install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h - install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h - - oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR} -} diff --git a/openembedded/packages/xauth/xauth_cvs.bb b/openembedded/packages/xauth/xauth_cvs.bb index 1243fce1d..54700574b 100644 --- a/openembedded/packages/xauth/xauth_cvs.bb +++ b/openembedded/packages/xauth/xauth_cvs.bb @@ -1,6 +1,6 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" -DEPENDS = "x11 xau xmu xext" +DEPENDS = "libx11 libxau libxmu libxext" DESCRIPTION = "X authority file utility" MAINTAINER = "Rene Wagner " SECTION = "x11/base" diff --git a/openembedded/packages/xcalibrate/xcalibrate_cvs.bb b/openembedded/packages/xcalibrate/xcalibrate_cvs.bb index e254348e4..ab2b07607 100644 --- a/openembedded/packages/xcalibrate/xcalibrate_cvs.bb +++ b/openembedded/packages/xcalibrate/xcalibrate_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "BSD-X" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "x11 xcalibrateext xext" +DEPENDS = "libx11 xcalibrateext libxext" DESCRIPTION = "XCalibrate client-side library" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate" diff --git a/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb b/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb index bd1047c63..eb63ae7f4 100644 --- a/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb +++ b/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb @@ -1,6 +1,6 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" -DEPENDS = "x11 xext xtst" +DEPENDS = "libx11 libxext libxtst" DESCRIPTION = "X display information utility" MAINTAINER = "Phil Blundell " SECTION = "x11/base" diff --git a/openembedded/packages/xhost/xhost_20040413.bb b/openembedded/packages/xhost/xhost_20040413.bb index b3ca3c939..4d36e62be 100644 --- a/openembedded/packages/xhost/xhost_20040413.bb +++ b/openembedded/packages/xhost/xhost_20040413.bb @@ -1,7 +1,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" LICENSE = "MIT" PV = "0.0+cvs${FIXEDSRCDATE}" -DEPENDS = "x11 xext xmu" +DEPENDS = "libx11 libxext libxmu" DESCRIPTION = "server access control program for X" MAINTAINER = "Rene Wagner " SECTION = "x11/base" diff --git a/openembedded/packages/xlibs/diet-x11_6.2.1.bb b/openembedded/packages/xlibs/diet-x11_6.2.1.bb new file mode 100644 index 000000000..284fcc21c --- /dev/null +++ b/openembedded/packages/xlibs/diet-x11_6.2.1.bb @@ -0,0 +1,10 @@ +SECTION = "x11/base" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" +include libx11_${PV}.bb + +EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" +CFLAGS += "-D_GNU_SOURCE" + +SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1" + + diff --git a/openembedded/packages/xlibs/ice/autofoo.patch b/openembedded/packages/xlibs/ice/autofoo.patch deleted file mode 100644 index 8ab0585fb..000000000 --- a/openembedded/packages/xlibs/ice/autofoo.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libICE-6.3.3/configure.ac~autofoo 2004-05-11 01:50:07.000000000 -0400 -+++ libICE-6.3.3/configure.ac 2005-01-18 02:30:07.463895544 -0500 -@@ -8,12 +8,12 @@ - libICE) - - AC_CONFIG_SRCDIR([Makefile.am]) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER([config.h]) --AC_CONFIG_AUX_DIR(.) - - # Checks for programs. - AC_PROG_LIBTOOL diff --git a/openembedded/packages/xlibs/ice_6.3.3.bb b/openembedded/packages/xlibs/ice_6.3.3.bb deleted file mode 100644 index 7722bc4ae..000000000 --- a/openembedded/packages/xlibs/ice_6.3.3.bb +++ /dev/null @@ -1,17 +0,0 @@ -SECTION = "libs" -LICENSE= "MIT" -PRIORITY = "optional" -MAINTAINER = "Phil Blundell " -DEPENDS = "x11" -DESCRIPTION = "X11 ICE library" -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libICE-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libICE-${PV}" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} diff --git a/openembedded/packages/xlibs/libice/autofoo.patch b/openembedded/packages/xlibs/libice/autofoo.patch new file mode 100644 index 000000000..8ab0585fb --- /dev/null +++ b/openembedded/packages/xlibs/libice/autofoo.patch @@ -0,0 +1,21 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- libICE-6.3.3/configure.ac~autofoo 2004-05-11 01:50:07.000000000 -0400 ++++ libICE-6.3.3/configure.ac 2005-01-18 02:30:07.463895544 -0500 +@@ -8,12 +8,12 @@ + libICE) + + AC_CONFIG_SRCDIR([Makefile.am]) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER([config.h]) +-AC_CONFIG_AUX_DIR(.) + + # Checks for programs. + AC_PROG_LIBTOOL diff --git a/openembedded/packages/xlibs/libice_6.3.3.bb b/openembedded/packages/xlibs/libice_6.3.3.bb new file mode 100644 index 000000000..131114533 --- /dev/null +++ b/openembedded/packages/xlibs/libice_6.3.3.bb @@ -0,0 +1,18 @@ +SECTION = "libs" +LICENSE= "MIT" +PRIORITY = "optional" +MAINTAINER = "Phil Blundell " +DEPENDS = "libx11" +PROVIDES = "ice" +DESCRIPTION = "X11 ICE library" +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libICE-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libICE-${PV}" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/openembedded/packages/xlibs/libsm_6.0.3.bb b/openembedded/packages/xlibs/libsm_6.0.3.bb index 6a85eaf6c..08f959704 100644 --- a/openembedded/packages/xlibs/libsm_6.0.3.bb +++ b/openembedded/packages/xlibs/libsm_6.0.3.bb @@ -2,7 +2,7 @@ SECTION = "libs" LICENSE = "MIT-X" PRIORITY = "optional" MAINTAINER = "Phil Blundell " -DEPENDS = "x11 ice" +DEPENDS = "libx11 libice" DESCRIPTION = "Session management library" PR = "r1" @@ -13,5 +13,5 @@ S = "${WORKDIR}/libSM-${PV}" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/openembedded/packages/xlibs/libx11-native_6.2.1.bb b/openembedded/packages/xlibs/libx11-native_6.2.1.bb new file mode 100644 index 000000000..9513c4237 --- /dev/null +++ b/openembedded/packages/xlibs/libx11-native_6.2.1.bb @@ -0,0 +1,6 @@ +SECTION = "x11/base" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" +include libx11_${PV}.bb +inherit native +DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native" +PROVIDES = "" diff --git a/openembedded/packages/xlibs/libx11/autofoo.patch b/openembedded/packages/xlibs/libx11/autofoo.patch new file mode 100644 index 000000000..8bdba0976 --- /dev/null +++ b/openembedded/packages/xlibs/libx11/autofoo.patch @@ -0,0 +1,22 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libX11-6.2.1/configure.ac~autofoo ++++ libX11-6.2.1/configure.ac +@@ -7,12 +7,12 @@ + [jg@freedesktop.org], + libX11) + AC_CONFIG_SRCDIR([Makefile.am]) +-AM_INIT_AUTOMAKE([dist-bzip2]) ++AC_CONFIG_AUX_DIR(.) + ++AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER([src/config.h]) +-AC_CONFIG_AUX_DIR(.) + + # Checks for programs. + AC_PROG_LIBTOOL diff --git a/openembedded/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch b/openembedded/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch new file mode 100644 index 000000000..f43d38065 --- /dev/null +++ b/openembedded/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch @@ -0,0 +1,22 @@ +--- X11/src/ErrDes.c.orig 2005-09-03 16:15:48 +0200 ++++ X11/src/ErrDes.c 2005-09-03 16:16:03 +0200 +@@ -56,7 +56,7 @@ + #include + + #ifndef ERRORDB +-#define ERRORDB "/usr/lib/X11/XErrorDB" ++#define ERRORDB "/usr/share/X11/XErrorDB" + #endif + + /* +--- X11/src/StrKeysym.c.orig 2005-09-03 16:41:18 +0200 ++++ X11/src/StrKeysym.c 2005-09-03 16:41:33 +0200 +@@ -36,7 +36,7 @@ + #include "Key.h" + + #ifndef KEYSYMDB +-#define KEYSYMDB "/usr/lib/X11/XKeysymDB" ++#define KEYSYMDB "/usr/share/X11/XKeysymDB" + #endif + + static Bool initialized; diff --git a/openembedded/packages/xlibs/libx11/fix-utf8-wrong-define.patch b/openembedded/packages/xlibs/libx11/fix-utf8-wrong-define.patch new file mode 100644 index 000000000..dca88fba9 --- /dev/null +++ b/openembedded/packages/xlibs/libx11/fix-utf8-wrong-define.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libX11-6.2.1/include/X11/Xlib.h~fix-utf8-wrong-define ++++ libX11-6.2.1/include/X11/Xlib.h +@@ -100,7 +100,7 @@ + + /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in + November 2000. Its presence is indicated through the following macro. */ +-#define X_HAVE_UTF8_STRING 1 ++#undef X_HAVE_UTF8_STRING + + typedef char *XPointer; + diff --git a/openembedded/packages/xlibs/libx11_6.2.1.bb b/openembedded/packages/xlibs/libx11_6.2.1.bb new file mode 100644 index 000000000..901746baf --- /dev/null +++ b/openembedded/packages/xlibs/libx11_6.2.1.bb @@ -0,0 +1,40 @@ +SECTION = "x11/libs" +LICENSE = "XFree86" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto xextensions libxau xtrans libxdmcp" +PROVIDES = "x11" +DESCRIPTION = "Base X libs." +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" +FILES_${PN}-locale += "${datadir}/X11/locale" +PR = "r4" + +SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \ + file://errordb-keysymdb-path-fix.patch;patch=1 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libX11-${PV}" + +inherit autotools pkgconfig + +do_compile() { + ( + unset CC LD CXX CCLD +# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake -C src/util 'CFLAGS= -D_GNU_SOURCE' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys + ) + oe_runmake +} + +do_stage() { + install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h + install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h + install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h + install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h + install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h + install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h + install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h + install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h + install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h + + oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR} +} diff --git a/openembedded/packages/xlibs/libxau-native_0.1.1.bb b/openembedded/packages/xlibs/libxau-native_0.1.1.bb new file mode 100644 index 000000000..ecb71ce3d --- /dev/null +++ b/openembedded/packages/xlibs/libxau-native_0.1.1.bb @@ -0,0 +1,6 @@ +SECTION = "x11/base" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau" +include libxau_${PV}.bb +inherit native +DEPENDS = "xproto-native" +PROVIDES = "" diff --git a/openembedded/packages/xlibs/libxau-native_cvs.bb b/openembedded/packages/xlibs/libxau-native_cvs.bb new file mode 100644 index 000000000..cd070033c --- /dev/null +++ b/openembedded/packages/xlibs/libxau-native_cvs.bb @@ -0,0 +1,6 @@ +SECTION = "x11/base" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau" +include libxau_cvs.bb +inherit native +DEPENDS = "xproto-native" +PROVIDES = "" diff --git a/openembedded/packages/xlibs/libxau/autofoo.patch b/openembedded/packages/xlibs/libxau/autofoo.patch new file mode 100644 index 000000000..1e42eb974 --- /dev/null +++ b/openembedded/packages/xlibs/libxau/autofoo.patch @@ -0,0 +1,21 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libXau-0.1.1/configure.ac~autofoo ++++ libXau-0.1.1/configure.ac +@@ -25,11 +25,10 @@ + + AC_PREREQ([2.57]) + AC_INIT(libXau, [0.1.1], [keithp@keithp.com],libXau) +-AM_INIT_AUTOMAKE([dist-bzip2]) +-AM_MAINTAINER_MODE +- + AM_CONFIG_HEADER(config.h) + AC_CONFIG_AUX_DIR(.) ++AM_INIT_AUTOMAKE([dist-bzip2]) ++AM_MAINTAINER_MODE + + AC_PROG_CC + AC_PROG_INSTALL diff --git a/openembedded/packages/xlibs/libxau_0.1.1.bb b/openembedded/packages/xlibs/libxau_0.1.1.bb new file mode 100644 index 000000000..dc1a28171 --- /dev/null +++ b/openembedded/packages/xlibs/libxau_0.1.1.bb @@ -0,0 +1,18 @@ +SECTION = "x11/libs" +LICENSE= "MIT" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto" +PROVIDES = "xau" +DESCRIPTION = "Authorization Protocol for X." +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXau-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXau-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/openembedded/packages/xlibs/libxau_cvs.bb b/openembedded/packages/xlibs/libxau_cvs.bb new file mode 100644 index 000000000..518744816 --- /dev/null +++ b/openembedded/packages/xlibs/libxau_cvs.bb @@ -0,0 +1,18 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE= "MIT" +PR = "r1" +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto" +PROVIDES = "xau" +DESCRIPTION = "Authorization Protocol for X." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xau" +S = "${WORKDIR}/Xau" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/openembedded/packages/xlibs/libxcomposite-1.0.1/autofoo.patch b/openembedded/packages/xlibs/libxcomposite-1.0.1/autofoo.patch new file mode 100644 index 000000000..072cf2521 --- /dev/null +++ b/openembedded/packages/xlibs/libxcomposite-1.0.1/autofoo.patch @@ -0,0 +1,17 @@ +Index: libXcomposite-1.0.1/configure.ac +=================================================================== +--- libXcomposite-1.0.1.orig/configure.ac 2004-01-15 03:59:12.000000000 -0500 ++++ libXcomposite-1.0.1/configure.ac 2005-01-18 17:05:25.573929256 -0500 +@@ -33,11 +33,11 @@ + dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n + dnl + AC_INIT(libXcomposite, 1.0.1, [keithp@keithp.com], libXcomposite) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + + # Check for progs + AC_PROG_CC diff --git a/openembedded/packages/xlibs/libxcomposite_1.0.1.bb b/openembedded/packages/xlibs/libxcomposite_1.0.1.bb new file mode 100644 index 000000000..e2ca3bbc7 --- /dev/null +++ b/openembedded/packages/xlibs/libxcomposite_1.0.1.bb @@ -0,0 +1,16 @@ +SECTION = "x11/libs" +LICENSE= "BSD-X" +DEPENDS = "libx11 compositeext xextensions libxfixes" +PROVIDES = "xcomposite" +DESCRIPTION = "X Composite extension library." +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXcomposite-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXcomposite-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/openembedded/packages/xlibs/libxcomposite_cvs.bb b/openembedded/packages/xlibs/libxcomposite_cvs.bb new file mode 100644 index 000000000..1d8b69c8c --- /dev/null +++ b/openembedded/packages/xlibs/libxcomposite_cvs.bb @@ -0,0 +1,15 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE= "BSD-X" +SECTION = "x11/libs" +DEPENDS = "libx11 compositeext xextensions libxfixes" +PROVIDES = "xcomposite" +DESCRIPTION = "X Composite extension library." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcomposite" +S = "${WORKDIR}/Xcomposite" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/openembedded/packages/xlibs/libxdamage-1.0.1/autofoo.patch b/openembedded/packages/xlibs/libxdamage-1.0.1/autofoo.patch new file mode 100644 index 000000000..1e3ec45d4 --- /dev/null +++ b/openembedded/packages/xlibs/libxdamage-1.0.1/autofoo.patch @@ -0,0 +1,17 @@ +Index: libXdamage-1.0.1/configure.ac +=================================================================== +--- libXdamage-1.0.1.orig/configure.ac 2004-01-15 03:54:55.000000000 -0500 ++++ libXdamage-1.0.1/configure.ac 2005-01-18 19:07:16.951430928 -0500 +@@ -33,11 +33,11 @@ + dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n + dnl + AC_INIT(libXdamage, 1.0.1, [keithp@keithp.com], libXdamage) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + + # Check for progs + AC_PROG_CC diff --git a/openembedded/packages/xlibs/libxdamage/m4.patch b/openembedded/packages/xlibs/libxdamage/m4.patch new file mode 100644 index 000000000..393f3d13d --- /dev/null +++ b/openembedded/packages/xlibs/libxdamage/m4.patch @@ -0,0 +1,65 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- /dev/null ++++ Xdamage/m4/pkg.m4 +@@ -0,0 +1,57 @@ ++ ++dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) ++dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page ++dnl also defines GSTUFF_PKG_ERRORS on error ++AC_DEFUN(PKG_CHECK_MODULES, [ ++ succeeded=no ++ ++ if test -z "$PKG_CONFIG"; then ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ++ fi ++ ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** The pkg-config script could not be found. Make sure it is" ++ echo "*** in your path, or set the PKG_CONFIG environment variable" ++ echo "*** to the full path to pkg-config." ++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." ++ else ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ AC_MSG_CHECKING(for $2) ++ ++ if $PKG_CONFIG --exists "$2" ; then ++ AC_MSG_RESULT(yes) ++ succeeded=yes ++ ++ AC_MSG_CHECKING($1_CFLAGS) ++ $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` ++ AC_MSG_RESULT($$1_CFLAGS) ++ ++ AC_MSG_CHECKING($1_LIBS) ++ $1_LIBS=`$PKG_CONFIG --libs "$2"` ++ AC_MSG_RESULT($$1_LIBS) ++ else ++ $1_CFLAGS="" ++ $1_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ++ ifelse([$4], ,echo $$1_PKG_ERRORS,) ++ fi ++ ++ AC_SUBST($1_CFLAGS) ++ AC_SUBST($1_LIBS) ++ else ++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig" ++ fi ++ fi ++ ++ if test $succeeded = yes; then ++ ifelse([$3], , :, [$3]) ++ else ++ ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) ++ fi ++]) ++ ++ diff --git a/openembedded/packages/xlibs/libxdamage_1.0.1.bb b/openembedded/packages/xlibs/libxdamage_1.0.1.bb new file mode 100644 index 000000000..040e86344 --- /dev/null +++ b/openembedded/packages/xlibs/libxdamage_1.0.1.bb @@ -0,0 +1,17 @@ +SECTION = "x11/libs" +LICENSE= "BSD-X" +DEPENDS = "libx11 damageext libxfixes xproto" +PROVIDES = "xdamage" +DESCRIPTION = "X Damage extension library." +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXdamage-${PV}.tar.bz2 \ + file://m4.patch;patch=1 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXdamage-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/openembedded/packages/xlibs/libxdamage_cvs.bb b/openembedded/packages/xlibs/libxdamage_cvs.bb new file mode 100644 index 000000000..ba8a68033 --- /dev/null +++ b/openembedded/packages/xlibs/libxdamage_cvs.bb @@ -0,0 +1,16 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE= "BSD-X" +SECTION = "x11/libs" +DEPENDS = "libx11 damageext libxfixes xproto" +PROVIDES = "xdamage" +DESCRIPTION = "X Damage extension library." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdamage \ + file://m4.patch;patch=1" +S = "${WORKDIR}/Xdamage" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/openembedded/packages/xlibs/libxdmcp-native_0.1.3.bb b/openembedded/packages/xlibs/libxdmcp-native_0.1.3.bb index 90f5a33f2..8d7162b35 100644 --- a/openembedded/packages/xlibs/libxdmcp-native_0.1.3.bb +++ b/openembedded/packages/xlibs/libxdmcp-native_0.1.3.bb @@ -4,5 +4,3 @@ include libxdmcp_${PV}.bb inherit native DEPENDS = "xproto-native" PROVIDES = "" - - diff --git a/openembedded/packages/xlibs/libxext-native_cvs.bb b/openembedded/packages/xlibs/libxext-native_cvs.bb new file mode 100644 index 000000000..9294b080b --- /dev/null +++ b/openembedded/packages/xlibs/libxext-native_cvs.bb @@ -0,0 +1,6 @@ +SECTION = "unknown" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext" +include libxext_${PV}.bb +inherit native +DEPENDS = "libx11-native xextensions-native" +PROVIDES = "" diff --git a/openembedded/packages/xlibs/libxext/autofoo.patch b/openembedded/packages/xlibs/libxext/autofoo.patch new file mode 100644 index 000000000..c00688452 --- /dev/null +++ b/openembedded/packages/xlibs/libxext/autofoo.patch @@ -0,0 +1,18 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- Xext/configure.ac~autofoo ++++ Xext/configure.ac +@@ -8,9 +8,8 @@ + libXext) + + AC_CONFIG_SRCDIR([Makefile.am]) +-AM_INIT_AUTOMAKE([dist-bzip2]) +- + AC_CONFIG_AUX_DIR(.) ++AM_INIT_AUTOMAKE([dist-bzip2]) + + AM_MAINTAINER_MODE + diff --git a/openembedded/packages/xlibs/libxext_cvs.bb b/openembedded/packages/xlibs/libxext_cvs.bb new file mode 100644 index 000000000..0ef675ca7 --- /dev/null +++ b/openembedded/packages/xlibs/libxext_cvs.bb @@ -0,0 +1,16 @@ +PV = "0.0+cvs${SRCDATE}" +PR = "r1" +LICENSE= "MIT" +DESCRIPTION = "X Server Extension library" +SECTION = "x11/libs" +PRIORITY = "optional" +DEPENDS = "xproto libx11 xextensions" +PROVIDES = "xext" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext" +S = "${WORKDIR}/Xext" + +inherit autotools pkgconfig +do_stage() { + autotools_stage_all +} diff --git a/openembedded/packages/xlibs/libxfixes_2.0.1.bb b/openembedded/packages/xlibs/libxfixes_2.0.1.bb index 29e23e379..710fa1745 100644 --- a/openembedded/packages/xlibs/libxfixes_2.0.1.bb +++ b/openembedded/packages/xlibs/libxfixes_2.0.1.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE= "BSD-X" -DEPENDS = "x11 fixesext" +DEPENDS = "libx11 fixesext" DESCRIPTION = "X Fixes extension library." PR = "r1" diff --git a/openembedded/packages/xlibs/libxfixes_cvs.bb b/openembedded/packages/xlibs/libxfixes_cvs.bb index f02f9518c..4494dc932 100644 --- a/openembedded/packages/xlibs/libxfixes_cvs.bb +++ b/openembedded/packages/xlibs/libxfixes_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" -DEPENDS = "x11 fixesext" +DEPENDS = "libx11 fixesext" DESCRIPTION = "X Fixes extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfixes" diff --git a/openembedded/packages/xlibs/libxfont/autofoo.patch b/openembedded/packages/xlibs/libxfont/autofoo.patch new file mode 100644 index 000000000..4998625c2 --- /dev/null +++ b/openembedded/packages/xlibs/libxfont/autofoo.patch @@ -0,0 +1,18 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- libXfont-1.4.2/configure.ac~autofoo 2004-05-06 20:19:03.000000000 -0400 ++++ libXfont-1.4.2/configure.ac 2005-01-16 12:14:14.042598720 -0500 +@@ -35,9 +35,9 @@ + dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's + dnl not possible to extract the version number here from Xfont.h + dnl ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h]) + + # Check for progs diff --git a/openembedded/packages/xlibs/libxfont/scalable.patch b/openembedded/packages/xlibs/libxfont/scalable.patch new file mode 100644 index 000000000..7f97b9a8f --- /dev/null +++ b/openembedded/packages/xlibs/libxfont/scalable.patch @@ -0,0 +1,27 @@ +Index: fontfile/fontdir.c +=================================================================== +RCS file: /cvs/xlibs/Xfont/fontfile/fontdir.c,v +retrieving revision 3.22 +diff -u -r3.22 fontdir.c +--- xfont/fontfile/fontdir.c 7 Jul 2003 16:40:11 -0000 3.22 ++++ xfont/fontfile/fontdir.c 30 Dec 2004 20:37:12 -0000 +@@ -699,6 +699,11 @@ + */ + if (isscale) + { ++ /* If the fontname says it is scalable, make sure that the ++ * renderer supports OpenScalable and GetInfoScalable. ++ */ ++ if (renderer->OpenScalable && renderer->GetInfoScalable) ++ { + if (vals.values_supplied & SIZE_SPECIFY_MASK) + { + bzero((char *)&zeroVals, sizeof(zeroVals)); +@@ -798,6 +803,7 @@ + bitmap->name.name); + } + } ++ } + } + return TRUE; + } diff --git a/openembedded/packages/xlibs/libxfont_1.4.2.bb b/openembedded/packages/xlibs/libxfont_1.4.2.bb new file mode 100644 index 000000000..0cc45397f --- /dev/null +++ b/openembedded/packages/xlibs/libxfont_1.4.2.bb @@ -0,0 +1,19 @@ +SECTION = "x11/libs" +LICENSE = "BSD-X" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto xtrans zlib" +PROVIDES = "xfont" +DESCRIPTION = "X font library (used by the X server)." +PR = "r2" + +SRC_URI = "${XLIBS_MIRROR}/libXfont-${PV}.tar.bz2 \ + file://scalable.patch;patch=1 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXfont-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/openembedded/packages/xlibs/libxfont_cvs.bb b/openembedded/packages/xlibs/libxfont_cvs.bb new file mode 100644 index 000000000..bd21e0fd1 --- /dev/null +++ b/openembedded/packages/xlibs/libxfont_cvs.bb @@ -0,0 +1,18 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "BSD-X" +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto xtrans zlib" +PROVIDES = "xfont" +DESCRIPTION = "X font library (used by the X server)." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfont \ + file://scalable.patch;patch=1" +S = "${WORKDIR}/Xfont" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/openembedded/packages/xlibs/libxft_2.1.6.bb b/openembedded/packages/xlibs/libxft_2.1.6.bb index 12c8bdfb6..c3f1f74e4 100644 --- a/openembedded/packages/xlibs/libxft_2.1.6.bb +++ b/openembedded/packages/xlibs/libxft_2.1.6.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE = "MIT-X" -DEPENDS = "x11 xproto libxrender freetype fontconfig" +DEPENDS = "libx11 xproto libxrender freetype fontconfig" DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." PROVIDES = "xft" PR = "r1" diff --git a/openembedded/packages/xlibs/libxft_cvs.bb b/openembedded/packages/xlibs/libxft_cvs.bb index 01c53b47d..6c1a5f5c3 100644 --- a/openembedded/packages/xlibs/libxft_cvs.bb +++ b/openembedded/packages/xlibs/libxft_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "x11/libs" -DEPENDS = "x11 xproto libxrender freetype fontconfig" +DEPENDS = "libx11 xproto libxrender freetype fontconfig" DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." PROVIDES = "xft" diff --git a/openembedded/packages/xlibs/libxi_6.0.1.bb b/openembedded/packages/xlibs/libxi_6.0.1.bb index 05ad22989..5c44d06df 100644 --- a/openembedded/packages/xlibs/libxi_6.0.1.bb +++ b/openembedded/packages/xlibs/libxi_6.0.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "X Input Extension library" LICENSE = "MIT-X" SECTION = "x11/libs" -DEPENDS = "xproto x11 xextensions" +DEPENDS = "xproto libx11 xextensions" PR = "r1" SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \ diff --git a/openembedded/packages/xlibs/libxmu_cvs.bb b/openembedded/packages/xlibs/libxmu_cvs.bb new file mode 100644 index 000000000..500b373c3 --- /dev/null +++ b/openembedded/packages/xlibs/libxmu_cvs.bb @@ -0,0 +1,21 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "MIT" +SECTION = "x11/libs" +PRIORITY = "optional" +DEPENDS = "libxt libxext" +PROVIDES = "xmu" +PR = "r2" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xmu" +S = "${WORKDIR}/Xmu" + +PACKAGES =+ "xmuu xmuu-dev" + +FILES_xmuu = "${libdir}/libXmuu.so.*" +FILES_xmuu-dev = "${libdir}/libXmuu.so" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/openembedded/packages/xlibs/libxpm/autofoo.patch b/openembedded/packages/xlibs/libxpm/autofoo.patch new file mode 100644 index 000000000..6b2174bf0 --- /dev/null +++ b/openembedded/packages/xlibs/libxpm/autofoo.patch @@ -0,0 +1,18 @@ +Index: libXpm-3.5.1/configure.ac +=================================================================== +--- libXpm-3.5.1.orig/configure.ac 2004-05-11 02:00:35.000000000 -0400 ++++ libXpm-3.5.1/configure.ac 2005-01-19 18:35:57.187402008 -0500 +@@ -1,12 +1,12 @@ + AC_PREREQ(2.57) + AC_INIT([libXpm], 3.5.1, [daniel@freedesktop.org], libXpm) + AC_CONFIG_SRCDIR([Makefile.am]) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER([lib/config.h]) +-AC_CONFIG_AUX_DIR(.) + + # Checks for programs. + AC_PROG_LIBTOOL diff --git a/openembedded/packages/xlibs/libxpm_3.5.1.bb b/openembedded/packages/xlibs/libxpm_3.5.1.bb new file mode 100644 index 000000000..513261efd --- /dev/null +++ b/openembedded/packages/xlibs/libxpm_3.5.1.bb @@ -0,0 +1,19 @@ +SECTION = "x11/libs" +LICENSE = "X-BSD" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto libx11" +PROVIDES = "xpm" +DESCRIPTION = "X Pixmap library." +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXpm-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXpm-${PV}" + +inherit autotools pkgconfig + +do_stage () { + install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h + oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR} +} diff --git a/openembedded/packages/xlibs/libxpm_cvs.bb b/openembedded/packages/xlibs/libxpm_cvs.bb new file mode 100644 index 000000000..1b4685573 --- /dev/null +++ b/openembedded/packages/xlibs/libxpm_cvs.bb @@ -0,0 +1,19 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "X-BSD" +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto libx11" +PROVIDES = "xpm" +DESCRIPTION = "X Pixmap library." +PR = "r1" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xpm" +S = "${WORKDIR}/Xpm" + +inherit autotools pkgconfig + +do_stage () { + install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h + oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR} +} diff --git a/openembedded/packages/xlibs/libxrandr_1.0.2.bb b/openembedded/packages/xlibs/libxrandr_1.0.2.bb index ff32e0aa3..efd050554 100644 --- a/openembedded/packages/xlibs/libxrandr_1.0.2.bb +++ b/openembedded/packages/xlibs/libxrandr_1.0.2.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE = "BSD-X" -DEPENDS = "randrext x11 libxrender xext" +DEPENDS = "randrext libx11 libxrender libxext" DESCRIPTION = "X Resize and Rotate extension library." PR = "r1" diff --git a/openembedded/packages/xlibs/libxrender_cvs.bb b/openembedded/packages/xlibs/libxrender_cvs.bb index 76c4af5bb..ea6b1f460 100644 --- a/openembedded/packages/xlibs/libxrender_cvs.bb +++ b/openembedded/packages/xlibs/libxrender_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" PR = "r1" SECTION = "libs" -DEPENDS = "renderext x11" +DEPENDS = "renderext libx11" DESCRIPTION = "X Render extension library." LICENSE = "BSD" diff --git a/openembedded/packages/xlibs/libxt/autofoo.patch b/openembedded/packages/xlibs/libxt/autofoo.patch new file mode 100644 index 000000000..ff6dfdbbc --- /dev/null +++ b/openembedded/packages/xlibs/libxt/autofoo.patch @@ -0,0 +1,20 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- libXt-0.1.5/configure.ac~autofoo 2004-05-06 20:19:04.000000000 -0400 ++++ libXt-0.1.5/configure.ac 2005-01-18 13:10:13.683262728 -0500 +@@ -28,11 +28,11 @@ + dnl + dnl + AC_INIT(libXt, 0.1.5, [keithp@keithp.com], libXt) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + + # Check for progs + AC_PROG_CC diff --git a/openembedded/packages/xlibs/libxt_0.1.5.bb b/openembedded/packages/xlibs/libxt_0.1.5.bb new file mode 100644 index 000000000..00cbe9a3a --- /dev/null +++ b/openembedded/packages/xlibs/libxt_0.1.5.bb @@ -0,0 +1,29 @@ +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Phil Blundell " +DEPENDS = "libx11 libsm" +PROVIDES = "xt" +DESCRIPTION = "X Toolkit Intrinsics" +LICENSE = "X-MIT" +PR = "r1" +SRC_URI = "${XLIBS_MIRROR}/libXt-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXt-${PV}" + +PARALLEL_MAKE = "" + +inherit autotools pkgconfig + +#nasty hack as utils need to be native +do_compile() { + ( + unset CC LD CXX CCLD +# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake -C util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makestrs + ) + oe_runmake +} + +do_stage () { + autotools_stage_all +} diff --git a/openembedded/packages/xlibs/libxtst_cvs.bb b/openembedded/packages/xlibs/libxtst_cvs.bb new file mode 100644 index 000000000..c7c24d5d7 --- /dev/null +++ b/openembedded/packages/xlibs/libxtst_cvs.bb @@ -0,0 +1,17 @@ +LICENSE = "GPL" +PV = "0.0+cvs${SRCDATE}" +SECTION = "x11/libs" +PRIORITY = "optional" +DEPENDS = "libx11 recordext libxext" +PROVIDES = "xtst" +DESCRIPTION = "X Test Extension: client side library" +PR = "r3" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xtst" +S = "${WORKDIR}/Xtst" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/openembedded/packages/xlibs/xau-native_0.1.1.bb b/openembedded/packages/xlibs/xau-native_0.1.1.bb deleted file mode 100644 index e4d62da92..000000000 --- a/openembedded/packages/xlibs/xau-native_0.1.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -SECTION = "x11/base" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau" -include xau_${PV}.bb -inherit native -DEPENDS = "xproto-native" -PROVIDES = "" - diff --git a/openembedded/packages/xlibs/xau-native_cvs.bb b/openembedded/packages/xlibs/xau-native_cvs.bb deleted file mode 100644 index ac8b19c74..000000000 --- a/openembedded/packages/xlibs/xau-native_cvs.bb +++ /dev/null @@ -1,7 +0,0 @@ -SECTION = "x11/base" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau" -include xau_cvs.bb -inherit native -DEPENDS = "xproto-native" -PROVIDES = "" - diff --git a/openembedded/packages/xlibs/xau/autofoo.patch b/openembedded/packages/xlibs/xau/autofoo.patch deleted file mode 100644 index 1e42eb974..000000000 --- a/openembedded/packages/xlibs/xau/autofoo.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libXau-0.1.1/configure.ac~autofoo -+++ libXau-0.1.1/configure.ac -@@ -25,11 +25,10 @@ - - AC_PREREQ([2.57]) - AC_INIT(libXau, [0.1.1], [keithp@keithp.com],libXau) --AM_INIT_AUTOMAKE([dist-bzip2]) --AM_MAINTAINER_MODE -- - AM_CONFIG_HEADER(config.h) - AC_CONFIG_AUX_DIR(.) -+AM_INIT_AUTOMAKE([dist-bzip2]) -+AM_MAINTAINER_MODE - - AC_PROG_CC - AC_PROG_INSTALL diff --git a/openembedded/packages/xlibs/xau_0.1.1.bb b/openembedded/packages/xlibs/xau_0.1.1.bb deleted file mode 100644 index 3c8b4a030..000000000 --- a/openembedded/packages/xlibs/xau_0.1.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "MIT" -PRIORITY = "optional" -MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto" -DESCRIPTION = "Authorization Protocol for X." -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXau-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXau-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/openembedded/packages/xlibs/xau_cvs.bb b/openembedded/packages/xlibs/xau_cvs.bb deleted file mode 100644 index a0e2bd312..000000000 --- a/openembedded/packages/xlibs/xau_cvs.bb +++ /dev/null @@ -1,17 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "MIT" -PR = "r1" -SECTION = "x11/libs" -PRIORITY = "optional" -MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto" -DESCRIPTION = "Authorization Protocol for X." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xau" -S = "${WORKDIR}/Xau" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/openembedded/packages/xlibs/xcomposite-1.0.1/autofoo.patch b/openembedded/packages/xlibs/xcomposite-1.0.1/autofoo.patch deleted file mode 100644 index 072cf2521..000000000 --- a/openembedded/packages/xlibs/xcomposite-1.0.1/autofoo.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: libXcomposite-1.0.1/configure.ac -=================================================================== ---- libXcomposite-1.0.1.orig/configure.ac 2004-01-15 03:59:12.000000000 -0500 -+++ libXcomposite-1.0.1/configure.ac 2005-01-18 17:05:25.573929256 -0500 -@@ -33,11 +33,11 @@ - dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n - dnl - AC_INIT(libXcomposite, 1.0.1, [keithp@keithp.com], libXcomposite) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC diff --git a/openembedded/packages/xlibs/xcomposite_1.0.1.bb b/openembedded/packages/xlibs/xcomposite_1.0.1.bb deleted file mode 100644 index 1e8d96ce2..000000000 --- a/openembedded/packages/xlibs/xcomposite_1.0.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "BSD-X" -DEPENDS = "x11 compositeext xextensions libxfixes" -DESCRIPTION = "X Composite extension library." -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXcomposite-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXcomposite-${PV}" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/openembedded/packages/xlibs/xcomposite_cvs.bb b/openembedded/packages/xlibs/xcomposite_cvs.bb deleted file mode 100644 index c2ec718cd..000000000 --- a/openembedded/packages/xlibs/xcomposite_cvs.bb +++ /dev/null @@ -1,14 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "BSD-X" -SECTION = "x11/libs" -DEPENDS = "x11 compositeext xextensions libxfixes" -DESCRIPTION = "X Composite extension library." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcomposite" -S = "${WORKDIR}/Xcomposite" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/openembedded/packages/xlibs/xdamage-1.0.1/autofoo.patch b/openembedded/packages/xlibs/xdamage-1.0.1/autofoo.patch deleted file mode 100644 index 1e3ec45d4..000000000 --- a/openembedded/packages/xlibs/xdamage-1.0.1/autofoo.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: libXdamage-1.0.1/configure.ac -=================================================================== ---- libXdamage-1.0.1.orig/configure.ac 2004-01-15 03:54:55.000000000 -0500 -+++ libXdamage-1.0.1/configure.ac 2005-01-18 19:07:16.951430928 -0500 -@@ -33,11 +33,11 @@ - dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n - dnl - AC_INIT(libXdamage, 1.0.1, [keithp@keithp.com], libXdamage) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC diff --git a/openembedded/packages/xlibs/xdamage/m4.patch b/openembedded/packages/xlibs/xdamage/m4.patch deleted file mode 100644 index 393f3d13d..000000000 --- a/openembedded/packages/xlibs/xdamage/m4.patch +++ /dev/null @@ -1,65 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- /dev/null -+++ Xdamage/m4/pkg.m4 -@@ -0,0 +1,57 @@ -+ -+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -+dnl also defines GSTUFF_PKG_ERRORS on error -+AC_DEFUN(PKG_CHECK_MODULES, [ -+ succeeded=no -+ -+ if test -z "$PKG_CONFIG"; then -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ fi -+ -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** The pkg-config script could not be found. Make sure it is" -+ echo "*** in your path, or set the PKG_CONFIG environment variable" -+ echo "*** to the full path to pkg-config." -+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." -+ else -+ PKG_CONFIG_MIN_VERSION=0.9.0 -+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -+ AC_MSG_CHECKING(for $2) -+ -+ if $PKG_CONFIG --exists "$2" ; then -+ AC_MSG_RESULT(yes) -+ succeeded=yes -+ -+ AC_MSG_CHECKING($1_CFLAGS) -+ $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` -+ AC_MSG_RESULT($$1_CFLAGS) -+ -+ AC_MSG_CHECKING($1_LIBS) -+ $1_LIBS=`$PKG_CONFIG --libs "$2"` -+ AC_MSG_RESULT($$1_LIBS) -+ else -+ $1_CFLAGS="" -+ $1_LIBS="" -+ ## If we have a custom action on failure, don't print errors, but -+ ## do set a variable so people can do so. -+ $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -+ ifelse([$4], ,echo $$1_PKG_ERRORS,) -+ fi -+ -+ AC_SUBST($1_CFLAGS) -+ AC_SUBST($1_LIBS) -+ else -+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig" -+ fi -+ fi -+ -+ if test $succeeded = yes; then -+ ifelse([$3], , :, [$3]) -+ else -+ ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) -+ fi -+]) -+ -+ diff --git a/openembedded/packages/xlibs/xdamage_1.0.1.bb b/openembedded/packages/xlibs/xdamage_1.0.1.bb deleted file mode 100644 index 5b6c30137..000000000 --- a/openembedded/packages/xlibs/xdamage_1.0.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "BSD-X" -DEPENDS = "x11 damageext libxfixes xproto" -DESCRIPTION = "X Damage extension library." -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXdamage-${PV}.tar.bz2 \ - file://m4.patch;patch=1 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXdamage-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/openembedded/packages/xlibs/xdamage_cvs.bb b/openembedded/packages/xlibs/xdamage_cvs.bb deleted file mode 100644 index d7d9e33f8..000000000 --- a/openembedded/packages/xlibs/xdamage_cvs.bb +++ /dev/null @@ -1,15 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "BSD-X" -SECTION = "x11/libs" -DEPENDS = "x11 damageext libxfixes xproto" -DESCRIPTION = "X Damage extension library." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdamage \ - file://m4.patch;patch=1" -S = "${WORKDIR}/Xdamage" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/openembedded/packages/xlibs/xext-native_cvs.bb b/openembedded/packages/xlibs/xext-native_cvs.bb deleted file mode 100644 index b6e0673bb..000000000 --- a/openembedded/packages/xlibs/xext-native_cvs.bb +++ /dev/null @@ -1,6 +0,0 @@ -SECTION = "unknown" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext" -include xext_${PV}.bb -inherit native -DEPENDS = "x11-native xextensions-native" - diff --git a/openembedded/packages/xlibs/xext/autofoo.patch b/openembedded/packages/xlibs/xext/autofoo.patch deleted file mode 100644 index c00688452..000000000 --- a/openembedded/packages/xlibs/xext/autofoo.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- Xext/configure.ac~autofoo -+++ Xext/configure.ac -@@ -8,9 +8,8 @@ - libXext) - - AC_CONFIG_SRCDIR([Makefile.am]) --AM_INIT_AUTOMAKE([dist-bzip2]) -- - AC_CONFIG_AUX_DIR(.) -+AM_INIT_AUTOMAKE([dist-bzip2]) - - AM_MAINTAINER_MODE - diff --git a/openembedded/packages/xlibs/xext_cvs.bb b/openembedded/packages/xlibs/xext_cvs.bb deleted file mode 100644 index 4ea506126..000000000 --- a/openembedded/packages/xlibs/xext_cvs.bb +++ /dev/null @@ -1,15 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -PR = "r1" -LICENSE= "MIT" -DESCRIPTION = "X Server Extension library" -SECTION = "x11/libs" -PRIORITY = "optional" -DEPENDS = "xproto x11 xextensions" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext" -S = "${WORKDIR}/Xext" - -inherit autotools pkgconfig -do_stage() { - autotools_stage_all -} diff --git a/openembedded/packages/xlibs/xfont/autofoo.patch b/openembedded/packages/xlibs/xfont/autofoo.patch deleted file mode 100644 index 4998625c2..000000000 --- a/openembedded/packages/xlibs/xfont/autofoo.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libXfont-1.4.2/configure.ac~autofoo 2004-05-06 20:19:03.000000000 -0400 -+++ libXfont-1.4.2/configure.ac 2005-01-16 12:14:14.042598720 -0500 -@@ -35,9 +35,9 @@ - dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's - dnl not possible to extract the version number here from Xfont.h - dnl -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h]) - - # Check for progs diff --git a/openembedded/packages/xlibs/xfont/scalable.patch b/openembedded/packages/xlibs/xfont/scalable.patch deleted file mode 100644 index 7f97b9a8f..000000000 --- a/openembedded/packages/xlibs/xfont/scalable.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: fontfile/fontdir.c -=================================================================== -RCS file: /cvs/xlibs/Xfont/fontfile/fontdir.c,v -retrieving revision 3.22 -diff -u -r3.22 fontdir.c ---- xfont/fontfile/fontdir.c 7 Jul 2003 16:40:11 -0000 3.22 -+++ xfont/fontfile/fontdir.c 30 Dec 2004 20:37:12 -0000 -@@ -699,6 +699,11 @@ - */ - if (isscale) - { -+ /* If the fontname says it is scalable, make sure that the -+ * renderer supports OpenScalable and GetInfoScalable. -+ */ -+ if (renderer->OpenScalable && renderer->GetInfoScalable) -+ { - if (vals.values_supplied & SIZE_SPECIFY_MASK) - { - bzero((char *)&zeroVals, sizeof(zeroVals)); -@@ -798,6 +803,7 @@ - bitmap->name.name); - } - } -+ } - } - return TRUE; - } diff --git a/openembedded/packages/xlibs/xfont_1.4.2.bb b/openembedded/packages/xlibs/xfont_1.4.2.bb deleted file mode 100644 index 7ef1d2b17..000000000 --- a/openembedded/packages/xlibs/xfont_1.4.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "x11/libs" -LICENSE = "BSD-X" -PRIORITY = "optional" -MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto xtrans zlib" -DESCRIPTION = "X font library (used by the X server)." -PR = "r2" - -SRC_URI = "${XLIBS_MIRROR}/libXfont-${PV}.tar.bz2 \ - file://scalable.patch;patch=1 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXfont-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/openembedded/packages/xlibs/xfont_cvs.bb b/openembedded/packages/xlibs/xfont_cvs.bb deleted file mode 100644 index 49896ecd8..000000000 --- a/openembedded/packages/xlibs/xfont_cvs.bb +++ /dev/null @@ -1,17 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "BSD-X" -SECTION = "x11/libs" -PRIORITY = "optional" -MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto xtrans zlib" -DESCRIPTION = "X font library (used by the X server)." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfont \ - file://scalable.patch;patch=1" -S = "${WORKDIR}/Xfont" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/openembedded/packages/xlibs/xmu_cvs.bb b/openembedded/packages/xlibs/xmu_cvs.bb deleted file mode 100644 index 9420280ad..000000000 --- a/openembedded/packages/xlibs/xmu_cvs.bb +++ /dev/null @@ -1,20 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "MIT" -SECTION = "x11/libs" -PRIORITY = "optional" -DEPENDS = "xt xext" -PR = "r2" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xmu" -S = "${WORKDIR}/Xmu" - -PACKAGES =+ "xmuu xmuu-dev" - -FILES_xmuu = "${libdir}/libXmuu.so.*" -FILES_xmuu-dev = "${libdir}/libXmuu.so" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} diff --git a/openembedded/packages/xlibs/xpm/autofoo.patch b/openembedded/packages/xlibs/xpm/autofoo.patch deleted file mode 100644 index 6b2174bf0..000000000 --- a/openembedded/packages/xlibs/xpm/autofoo.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: libXpm-3.5.1/configure.ac -=================================================================== ---- libXpm-3.5.1.orig/configure.ac 2004-05-11 02:00:35.000000000 -0400 -+++ libXpm-3.5.1/configure.ac 2005-01-19 18:35:57.187402008 -0500 -@@ -1,12 +1,12 @@ - AC_PREREQ(2.57) - AC_INIT([libXpm], 3.5.1, [daniel@freedesktop.org], libXpm) - AC_CONFIG_SRCDIR([Makefile.am]) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER([lib/config.h]) --AC_CONFIG_AUX_DIR(.) - - # Checks for programs. - AC_PROG_LIBTOOL diff --git a/openembedded/packages/xlibs/xpm_3.5.1.bb b/openembedded/packages/xlibs/xpm_3.5.1.bb deleted file mode 100644 index ea863f1eb..000000000 --- a/openembedded/packages/xlibs/xpm_3.5.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "x11/libs" -LICENSE = "X-BSD" -PRIORITY = "optional" -MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto x11" -DESCRIPTION = "X Pixmap library." -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXpm-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXpm-${PV}" - -inherit autotools pkgconfig - -do_stage () { - install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h - oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR} -} diff --git a/openembedded/packages/xlibs/xpm_cvs.bb b/openembedded/packages/xlibs/xpm_cvs.bb deleted file mode 100644 index 78e44b3f9..000000000 --- a/openembedded/packages/xlibs/xpm_cvs.bb +++ /dev/null @@ -1,18 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "X-BSD" -SECTION = "x11/libs" -PRIORITY = "optional" -MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto x11" -DESCRIPTION = "X Pixmap library." -PR = "r1" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xpm" -S = "${WORKDIR}/Xpm" - -inherit autotools pkgconfig - -do_stage () { - install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h - oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR} -} diff --git a/openembedded/packages/xlibs/xt/autofoo.patch b/openembedded/packages/xlibs/xt/autofoo.patch deleted file mode 100644 index ff6dfdbbc..000000000 --- a/openembedded/packages/xlibs/xt/autofoo.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libXt-0.1.5/configure.ac~autofoo 2004-05-06 20:19:04.000000000 -0400 -+++ libXt-0.1.5/configure.ac 2005-01-18 13:10:13.683262728 -0500 -@@ -28,11 +28,11 @@ - dnl - dnl - AC_INIT(libXt, 0.1.5, [keithp@keithp.com], libXt) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC diff --git a/openembedded/packages/xlibs/xt_0.1.5.bb b/openembedded/packages/xlibs/xt_0.1.5.bb deleted file mode 100644 index 52235e2d9..000000000 --- a/openembedded/packages/xlibs/xt_0.1.5.bb +++ /dev/null @@ -1,28 +0,0 @@ -SECTION = "x11/libs" -PRIORITY = "optional" -MAINTAINER = "Phil Blundell " -DEPENDS = "x11 libsm" -DESCRIPTION = "X Toolkit Intrinsics" -LICENSE = "X-MIT" -PR = "r1" -SRC_URI = "${XLIBS_MIRROR}/libXt-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXt-${PV}" - -PARALLEL_MAKE = "" - -inherit autotools pkgconfig - -#nasty hack as utils need to be native -do_compile() { - ( - unset CC LD CXX CCLD -# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake -C util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makestrs - ) - oe_runmake -} - -do_stage () { - autotools_stage_all -} diff --git a/openembedded/packages/xmodmap/xmodmap_cvs.bb b/openembedded/packages/xmodmap/xmodmap_cvs.bb index 958263955..773466e6b 100644 --- a/openembedded/packages/xmodmap/xmodmap_cvs.bb +++ b/openembedded/packages/xmodmap/xmodmap_cvs.bb @@ -5,7 +5,7 @@ MAINTAINER = "Rene Wagner " SECTION = "x11/base" PR = "r1" -DEPENDS = "x11" +DEPENDS = "libx11" SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \ file://autofoo.patch;patch=1" diff --git a/openembedded/packages/xrandr/xrandr_cvs.bb b/openembedded/packages/xrandr/xrandr_cvs.bb index 1e6609384..0ab7c745f 100644 --- a/openembedded/packages/xrandr/xrandr_cvs.bb +++ b/openembedded/packages/xrandr/xrandr_cvs.bb @@ -1,6 +1,6 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" -DEPENDS = "libxrandr x11 xext" +DEPENDS = "libxrandr libx11 libxext" DESCRIPTION = "X Resize and Rotate extension command." SECTION = "x11/base" diff --git a/openembedded/packages/xserver/xserver-kdrive-omap_6.6.3.bb b/openembedded/packages/xserver/xserver-kdrive-omap_6.6.3.bb index fac7718a1..682490b3a 100644 --- a/openembedded/packages/xserver/xserver-kdrive-omap_6.6.3.bb +++ b/openembedded/packages/xserver/xserver-kdrive-omap_6.6.3.bb @@ -1,5 +1,5 @@ LICENSE = "MIT" -DEPENDS = "xsp tslib-maemo xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext" +DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" PROVIDES = "virtual/xserver" PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale" SECTION = "x11/base" diff --git a/openembedded/packages/xserver/xserver-kdrive_20050207.bb b/openembedded/packages/xserver/xserver-kdrive_20050207.bb index 9567863aa..2b007d480 100644 --- a/openembedded/packages/xserver/xserver-kdrive_20050207.bb +++ b/openembedded/packages/xserver/xserver-kdrive_20050207.bb @@ -3,7 +3,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" DEFAULT_PREFERENCE = "1" LICENSE = "MIT" -DEPENDS = "tslib xproto xdmcp xextensions-1.0.1 xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext" +DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" diff --git a/openembedded/packages/xserver/xserver-kdrive_20050624.bb b/openembedded/packages/xserver/xserver-kdrive_20050624.bb index fcabbd4d2..c2e44f783 100644 --- a/openembedded/packages/xserver/xserver-kdrive_20050624.bb +++ b/openembedded/packages/xserver/xserver-kdrive_20050624.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${FIXEDSRCDATE}" FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" LICENSE = "MIT" -DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext" +DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" diff --git a/openembedded/packages/xserver/xserver-kdrive_cvs.bb b/openembedded/packages/xserver/xserver-kdrive_cvs.bb index dd93ed541..f034fbfd7 100644 --- a/openembedded/packages/xserver/xserver-kdrive_cvs.bb +++ b/openembedded/packages/xserver/xserver-kdrive_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" DEFAULT_PREFERENCE = "-2" LICENSE = "MIT" -DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext" +DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" diff --git a/openembedded/packages/xserver/xserver-xorg_6.8.99.10.bb b/openembedded/packages/xserver/xserver-xorg_6.8.99.10.bb index c5b05cd2f..37546fe1e 100644 --- a/openembedded/packages/xserver/xserver-xorg_6.8.99.10.bb +++ b/openembedded/packages/xserver/xserver-xorg_6.8.99.10.bb @@ -4,7 +4,7 @@ PROVIDES = "virtual/xserver" LICENSE = "Xorg" PR = "r2" -DEPENDS = "fontconfig freetype libxi xmu flex-native zlib" +DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib" SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_10 \ file://imake-staging.patch;patch=1 \ diff --git a/openembedded/packages/xserver/xserver-xorg_6.8.99.11.bb b/openembedded/packages/xserver/xserver-xorg_6.8.99.11.bb index 2a0519fd7..e60f62ef5 100644 --- a/openembedded/packages/xserver/xserver-xorg_6.8.99.11.bb +++ b/openembedded/packages/xserver/xserver-xorg_6.8.99.11.bb @@ -4,7 +4,7 @@ PROVIDES = "virtual/xserver" LICENSE = "Xorg" PR = "r0" -DEPENDS = "fontconfig freetype libxi xmu flex-native zlib" +DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib" SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_11 \ file://imake-staging.patch;patch=1 \ diff --git a/openembedded/packages/xserver/xserver-xorg_cvs.bb b/openembedded/packages/xserver/xserver-xorg_cvs.bb index 9c64fb837..e410581e1 100644 --- a/openembedded/packages/xserver/xserver-xorg_cvs.bb +++ b/openembedded/packages/xserver/xserver-xorg_cvs.bb @@ -5,7 +5,7 @@ PROVIDES = "virtual/xserver" PR = "r3" PV = "6.8.1+cvs${SRCDATE}" -DEPENDS = "fontconfig freetype libxi xmu flex-2.5.4-native" +DEPENDS = "fontconfig freetype libxi libxmu flex-2.5.4-native" SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver \ file://imake-staging.patch;patch=1 \ diff --git a/openembedded/packages/xtscal/xtscal_0.6.3.bb b/openembedded/packages/xtscal/xtscal_0.6.3.bb index a2a770f4f..70666f1fb 100644 --- a/openembedded/packages/xtscal/xtscal_0.6.3.bb +++ b/openembedded/packages/xtscal/xtscal_0.6.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Touchscreen calibration utility" MAINTAINER = "Phil Blundell " SECTION = "x11/base" -DEPENDS = "x11 libxft libxrandr xcalibrate" +DEPENDS = "libx11 libxft libxrandr xcalibrate" PR = "r1" diff --git a/openembedded/packages/xtst/xtst_cvs.bb b/openembedded/packages/xtst/xtst_cvs.bb deleted file mode 100644 index 1662d3983..000000000 --- a/openembedded/packages/xtst/xtst_cvs.bb +++ /dev/null @@ -1,16 +0,0 @@ -LICENSE = "GPL" -PV = "0.0+cvs${SRCDATE}" -SECTION = "x11/libs" -PRIORITY = "optional" -DEPENDS = "x11 recordext xext" -DESCRIPTION = "X Test Extension: client side library" -PR = "r3" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xtst" -S = "${WORKDIR}/Xtst" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/openembedded/site/arm-linux b/openembedded/site/arm-linux index e3e996872..dbed723cc 100644 --- a/openembedded/site/arm-linux +++ b/openembedded/site/arm-linux @@ -362,3 +362,7 @@ with_broken_putenv=${with_broken_putenv=no} # xffm jm_cv_func_working_readdir=yes + +# dpkg +dpkg_cv_va_copy=${ac_cv_va_copy=no} +dpkg_cv___va_copy=${ac_cv___va_copy=yes} -- cgit v1.2.3