diff options
| author | Kristoffer Ericson <kristoffer_e1@hotmail.com> | 2006-07-31 15:36:05 +0000 |
|---|---|---|
| committer | Kristoffer Ericson <kristoffer_e1@hotmail.com> | 2006-07-31 15:36:05 +0000 |
| commit | cc67256da139ba348bfc5e98138da3d7e84c7f48 (patch) | |
| tree | a88692987440c7a78c27dfc5ff1aa3cf01223da1 | |
| parent | 5e5b590002af02b51b7e39ddb3a18357ce1954c6 (diff) | |
| parent | 09436056f94e7103d436177bdaea7c3bd9493913 (diff) | |
merge of 158d7fcc3d3ef86d360c775f912e5e314992018d
and bbd3a2811e13a3b99224c1a846af2a244d292c41
433 files changed, 2009 insertions, 650 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 49d6260090..85756edacd 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -398,8 +398,15 @@ def oe_unpack_file(file, data, url = None): destdir = "." bb.mkdirhier("%s/%s" % (os.getcwd(), destdir)) cmd = 'cp %s %s/%s/' % (file, os.getcwd(), destdir) + if not cmd: return True + + dest = os.path.join(os.getcwd(), os.path.basename(file)) + if os.path.exists(dest): + if os.path.samefile(file, dest): + return True + cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', data, 1), cmd) bb.note("Unpacking %s to %s/" % (file, os.getcwd())) ret = os.system(cmd) diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 629d0e82b0..395f124572 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -1,24 +1,21 @@ # # BB Class inspired by ebuild.sh # -# As I will be copying code from from ebuild.sh this is -# Copyright Gentoo Foundation 1999-2006 -# GPLv2 -# # This class will test files after installation for certain # security issues and other kind of issues. # # Checks we do: # -Check the ownership and permissions # -Check the RUNTIME path for the $TMPDIR +# -Check if .la files wrongly point to workdir +# -Check if .pc files wrongly point to workdir +# -Check if packages contains .dbg or .so files where they should be in -dev or -dbg # -# Checks that are planned: -# -Check installed and stages .la files # # We need to have the scanelf utility as soon as -# possible. +# possible and this is contained within the pax-utils-native # # We play a special package function @@ -26,7 +23,40 @@ inherit package PACKAGE_DEPENDS += "pax-utils-native" PACKAGEFUNCS += " do_package_qa " +def package_qa_check_rpath(path): + pass + +def package_qa_check_devdbg(path, name): + pass + +def package_qa_check_perm(path): + pass + +def package_qa_check_staged(path): + pass + + +# The PACKAGE FUNC to scan each package python do_package_qa () { + bb.note("DO PACKAGE QA") + workdir = bb.data.getVar('WORKDIR', d, True) + packages = bb.data.getVar('PACKAGES',d, True) + + # no packages should be scanned + if not packages: + return + + for package in packages.split(): + bb.note("Package: %s" % package) + path = "%s/install/%s" % (workdir, package) + package_qa_check_rpath(path) + package_qa_check_devdbg(path,package) + package_qa_check_perm(path) } +# The Staging Func, to check all staging +addtask qa_staging after do_populate_staging before do_build +python do_qa_staging() { + bb.note("Staged!") +} diff --git a/classes/package.bbclass b/classes/package.bbclass index eb3a0349cb..2791e4bcfa 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -177,10 +177,12 @@ runstrip() { ro=1 chmod +w "$1" } - '${OBJCOPY}' --only-keep-debug "$1" "$1.dbg" + mkdir $(dirname "$1")/.debug + debugfile="$(dirname "$1")/.debug/$(basename "$1")" + '${OBJCOPY}' --only-keep-debug "$1" "$debugfile" '${STRIP}' "$1" st=$? - '${OBJCOPY}' --add-gnu-debuglink="$1.dbg" "$1" + '${OBJCOPY}' --add-gnu-debuglink="$debugfile" "$1" test -n "$ro" && chmod -w "$1" if test $st -ne 0 then @@ -723,7 +725,7 @@ python package_do_split_locales() { bb.data.setVar('RDEPENDS_%s' % mainpkg, ' '.join(rdep), d) } -PACKAGEFUNCS = "do_install package_do_split_locales \ +PACKAGEFUNCS ?= " do_install package_do_split_locales \ populate_packages package_do_shlibs \ package_do_pkgconfig read_shlibdeps" python package_do_package () { diff --git a/conf/bitbake.conf b/conf/bitbake.conf index d446d40b8f..f12cca15f0 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -51,7 +51,7 @@ HOST_CC_ARCH = "${TARGET_CC_ARCH}" TARGET_ARCH = "INVALID" TARGET_OS = "INVALID" TARGET_VENDOR = "${BUILD_VENDOR}" -TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" +TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}" TARGET_PREFIX = "${TARGET_SYS}-" TARGET_CC_ARCH = "" @@ -118,8 +118,8 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \ /lib/*.a /lib/*.o ${datadir}/aclocal" FILES_${PN}-locale = "${datadir}/locale" -FILES_${PN}-dbg = "${bindir}/*.dbg ${sbindir}/*.dbg ${libexecdir}/*.dbg ${libdir}/lib*.so.*.dbg \ - /bin/*.dbg /sbin/*.dbg /lib/*.so*.dbg ${libdir}/${PN}/*.dbg" +FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ + /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug" # File manifest diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index fbb2814453..a387a102bb 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -22,7 +22,7 @@ FEED_URIS += " \ perl##${ANGSTROM_URI}/unstable/feed/perl \ python##${ANGSTROM_URI}/unstable/feed/python \ debug##${ANGSTROM_URI}/unstable/feed/debug \ - ${MACHINE}##${ANGSTROM_URI}/usntable/feed/machine/${MACHINE}" + ${MACHINE}##${ANGSTROM_URI}/unstable/feed/machine/${MACHINE}" # base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \ # ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" @@ -74,7 +74,7 @@ PREFERRED_PROVIDER_virtual/db-native ?= "db-native" PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive # Others: -PREFERRED_PROVIDER_x11 ?= "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" PREFERRED_PROVIDER_gconf ?= gconf-dbus PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus PREFERRED_PROVIDER_tslib ?= tslib @@ -107,7 +107,7 @@ PREFERRED_VERSION_busybox = "1.2.0" PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" -PREFERRED_VERSION_dbus ?= "0.61" +PREFERRED_VERSION_dbus ?= "0.62" PREFERRED_VERSION_gstreamer ?= "0.10.6" PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index 14372b5b9e..e8eef43b70 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -10,6 +10,8 @@ CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ http://www.oesources.org/source/current/" + +require conf/distro/include/sane-srcdates.inc require conf/distro/include/openzaurus.inc DISTRO_TYPE = "debug" @@ -50,8 +52,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_VERSION_binutils-cross = "2.16" -PREFERRED_VERSION_binutils = "2.16" +PREFERRED_VERSION_binutils-cross = "2.15.94.0.1" +PREFERRED_VERSION_binutils = "2.15.94.0.1" # # Opie diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 89c0d031ee..005a70e664 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -4,5 +4,6 @@ include conf/machine/include/zaurus-clamshell.conf include conf/machine/include/zaurus-clamshell-2.6.conf +IPKG_EXTRA_ARCHS += "armv4 armv4t iwmmxt" ROOT_FLASH_SIZE = "58" diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 1611ed431a..65cce6ce81 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -1,10 +1,12 @@ #@TYPE: Machine -#@NAME: Compaq iPAQ 39xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx -#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices +#@NAME: Compaq iPAQ 39xx +#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx KERNEL ?= "kernel24" #KERNEL ?= "kernel26" +INHERIT += "linux_modules" + OVERRIDES =. "${KERNEL}:" TARGET_ARCH = "arm" @@ -17,11 +19,10 @@ EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p" ROOT_FLASH_SIZE = "32" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules" BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools" -H3900_MODULES_kernel24 = "g_ether pxa2xx_udc h3900_asic h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mmc_asic3 mtdchar h5400-audio h3900-uda1380" -H3900_MODULES_kernel26 = " h3900_lcd h5400_lcd asic2_adcts g_ether apm h5400_battery h3900_battery pcmcia-core" +H3900_MODULES_kernel24 = "g_ether pxa2xx_udc h3900_asic nmc_asic3 mtdchar h3900-uda1380" +H3900_MODULES_kernel26 = " h3900_lcd asic2_adcts g_ether apm h3900_battery pcmcia-core" # pxa2xx_udc is built in to the kernel SERIAL_CONSOLE = "115200 tts/0 vt100" diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf index 758793f7a7..32e9304cdb 100644 --- a/conf/machine/h5xxx.conf +++ b/conf/machine/h5xxx.conf @@ -7,6 +7,8 @@ KERNEL ?= "kernel24" OVERRIDES =. "${KERNEL}:" +INHERIT += "linux_modules" + TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" PREFERRED_PROVIDER_xserver = "xserver-kdrive" @@ -32,4 +34,4 @@ USE_VT = "0" GUI_MACHINE_CLASS = "smallscreen" -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf index da6c28c6e2..f85c2a1221 100644 --- a/conf/machine/include/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.conf @@ -12,9 +12,12 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" # add a summary to the jffs2 file to make it mount a lot faster -#EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img \ -# -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.img \ -# --eraseblock=0x4000" +EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \ + --eraseblock=0x4000 -l -p" +IMAGE_CMD_jffs2 += "; cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ + ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.img" + GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_INSTALL += "gaim sylpheed" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 359f8296d8..f509cd0a5d 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices TARGET_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa hx4700" +IPKG_EXTRA_ARCHS = "armv4 armv4t iwmmxt armv5te ipaqpxa hx4700" #use this for a hx47xx ipaq PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index e4c108c071..fb8b521a3c 100755 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf @@ -12,7 +12,8 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" #don't try to access tty1 USE_VT = "0" - +#use the epson xserver +XSERVER = "xserver-kdrive-epson" #ship in rootfs: NBP_MODULES = " apm \ @@ -21,7 +22,7 @@ NBP_MODULES = " apm \ BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${NBP_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" -GPE_EXTRA_INSTALL += "gpe-mini-browser tinymail" +GPE_EXTRA_INSTALL += "gpe-mini-browser" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttySA0 vt100" @@ -34,6 +35,7 @@ udevdir = "/dev" GUI_MACHINE_CLASS = "bigscreen" - +#The initrd needs /initrd present to be able to do pivot_root +ROOTFS_POSTPROCESS_COMMAND += " mkdir -p ${IMAGE_ROOTFS}/initrd; " include conf/machine/include/tune-xscale.conf diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index f78dd7a3b9..3d80a41486 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -5,6 +5,8 @@ include conf/machine/include/zaurus-clamshell.conf include conf/machine/include/zaurus-clamshell-2.6.conf +IPKG_EXTRA_ARCHS += "armv4 armv4t iwmmxt" + PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" PIVOTBOOT_EXTRA_RRECOMMENDS += "" diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index b604da188a..83382f57a0 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -21,7 +21,7 @@ RDEPENDS_${PN} = "${PN}-conf" ###################################################################################### -PR = "r44" +PR = "r45" ###################################################################################### diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index 9a0b139bfb..7457f66822 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -77,7 +77,7 @@ check_target() { if test "$real_fs_found" != 1 -a "$image_found" != 1 then - die "Nothing to do!" + mdie "No direct-install or loop-images found. Nothing to do!" fi } diff --git a/packages/altboot/files/poodle/altboot-2.6.cfg b/packages/altboot/files/poodle/altboot-2.6.cfg index f55e77b8f0..d976ee3a20 100644 --- a/packages/altboot/files/poodle/altboot-2.6.cfg +++ b/packages/altboot/files/poodle/altboot-2.6.cfg @@ -10,7 +10,7 @@ TIMEOUT="4" REAL_INIT="/sbin/init.sysvinit" SH_SHELL="/bin/sh" -ENABLE_SOUND="no" +ENABLE_SOUND="yes" IMAGE_PATH="boot-images" IMAGE_TYPE="ext2" @@ -20,7 +20,7 @@ ENABLE_IMAGECONF="yes" SD_DEVICE="/dev/mmcblk0p1" SD_KERNEL_MODULE="" -USB_HOST_AVAILABLE="yes" +USB_HOST_AVAILABLE="no" USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" USB_STORAGE_PARTITION="/dev/sda1" USB_STORAGE_WAIT="4" diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb index b2b5565eb6..88ace3c1ba 100644 --- a/packages/angstrom/angstrom-bootstrap-image.bb +++ b/packages/angstrom/angstrom-bootstrap-image.bb @@ -1,7 +1,7 @@ #Angstrom bootstrap image LICENSE = MIT MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" -PR = "r0" +PR = "r2" DEPENDS = "task-angstrom" RDEPENDS = "angstrom-base-depends" diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb index e6dc88dffb..4eea0ab1bb 100644 --- a/packages/angstrom/angstrom-gpe-image.bb +++ b/packages/angstrom/angstrom-gpe-image.bb @@ -1,12 +1,13 @@ #Angstrom GPE image LICENSE = MIT MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" -PR = "r1" +PR = "r3" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_tslib ?= "tslib" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" ANGSTROM_EXTRA_INSTALL ?= "" XSERVER ?= "xserver-kdrive-fbdev" @@ -18,7 +19,7 @@ RDEPENDS = "\ ${XSERVER} \ angstrom-base-depends \ angstrom-x11-base-depends \ - angsgrom-gpe-task-base \ + angstrom-gpe-task-base \ angstrom-gpe-task-settings \ angstrom-gpe-task-pim \ ${ANGSTROM_EXTRA_INSTALL}" @@ -26,6 +27,7 @@ RDEPENDS = "\ export IPKG_INSTALL = "${RDEPENDS}" -#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' inherit image_ipk diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index d050add3a5..0058623f9c 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -1,18 +1,23 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r4" +PR = "r12" ALLOW_EMPTY = "1" +PACKAGE_ARCH = "${MACHINE_ARCH}" + BOOTMODULES_RRECOMMENDS ?= "" +DEBUG_APPS ?= "" +DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace gdb",d)}' + PACKAGES = "\ angstrom-base-depends \ angstrom-base-wifi \ angstrom-x11-base-depends \ - angsgrom-gpe-task-base \ + angstrom-gpe-task-base \ angstrom-gpe-task-settings \ angstrom-gpe-task-pim \ angstrom-gpe-task-apps \ - angstgrom-gpe-task-games \ + angstrom-gpe-task-games \ angstrom-task-office \ angstrom-task-printing \ angstrom-task-sectest" @@ -22,15 +27,26 @@ RDEPENDS_angstrom-base-depends = "\ base-passwd tinylogin \ busybox \ udev \ - update-modules module-init-tools \ + update-modules module-init-tools modutils-initscripts \ sysvinit initscripts sysvinit-pidof \ netbase dropbear \ angstrom-version \ - ipkg \ - " + ipkg ipkg-collateral \ + wireless-tools \ + tslib-tests tslib-calibrate \ + ${DEBUG_APPS} \ +" + +RDEPENDS_angstrom-base-depends_append_ipaq-pxa270 = " tiinit acx-firmware " + RRECOMMENDS_angstrom-base-depends = "\ ${BOOTMODULES_RRECOMMENDS} \ + kernel-module-evdev \ + kernel-module-uinput \ + kernel-module-g-ether \ + kernel-module-hostap-cs \ + kernel-module-af-packet \ " RDEPENDS_angstrom-base-wifi = "\ @@ -44,8 +60,11 @@ RDEPENDS_angstrom-base-wifi = "\ " RDEPENDS_angstrom-x11-base-depends := "\ - libx11 \ - virtual/xserver" + virtual/libx11 \ + virtual/xserver \ + ttf-dejavu-sans \ + ttf-dejavu-sans-mono \ + " RDEPENDS_angstrom-gpe-task-base := "\ matchbox \ @@ -56,7 +75,6 @@ RDEPENDS_angstrom-gpe-task-base := "\ xhost \ xrdb \ gpe-soundserver \ - ttf-dejavu \ gpe-dm \ gpe-login \ gpe-session-scripts \ diff --git a/packages/busybox/slingbox-1.1.3/defconfig b/packages/busybox/slingbox-1.1.3/defconfig index c297988ea5..f1fe0d6d2d 100644 --- a/packages/busybox/slingbox-1.1.3/defconfig +++ b/packages/busybox/slingbox-1.1.3/defconfig @@ -352,9 +352,9 @@ CONFIG_FEATURE_GREP_FGREP_ALIAS=y # CONFIG_FEATURE_FBSET_READMODE is not set # CONFIG_FDFLUSH is not set # CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set +CONFIG_FDISK=y FDISK_SUPPORT_LARGE_DISKS=y -# CONFIG_FEATURE_FDISK_WRITABLE is not set +CONFIG_FEATURE_FDISK_WRITABLE=y # CONFIG_FEATURE_AIX_LABEL is not set # CONFIG_FEATURE_SGI_LABEL is not set # CONFIG_FEATURE_SUN_LABEL is not set diff --git a/packages/busybox/slingbox_1.1.3.bb b/packages/busybox/slingbox_1.1.3.bb index 5fc31dec41..8cd85ce540 100644 --- a/packages/busybox/slingbox_1.1.3.bb +++ b/packages/busybox/slingbox_1.1.3.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r1" +PR = "r2" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://defconfig \ @@ -40,6 +40,8 @@ do_configure () { do_compile () { unset CFLAGS base_do_compile + # Just in case fdisk is compiled in, do not overwrite the Linksys one + sed -i -e '/fdisk/d' ${S}/busybox.links } do_install () { diff --git a/packages/bzflag/bzflag_1.10.6.20040515.bb b/packages/bzflag/bzflag_1.10.6.20040515.bb index a3a24fae31..62d5394171 100644 --- a/packages/bzflag/bzflag_1.10.6.20040515.bb +++ b/packages/bzflag/bzflag_1.10.6.20040515.bb @@ -1,4 +1,4 @@ -DEPENDS = "adns ncurses virtual/x11" +DEPENDS = "adns ncurses virtual/libx11" SECTION = "x11/games" LICENSE = "LGPL" SRC_URI = "${SOURCEFORGE_MIRROR}/bzflag/bzflag-${PV}.tar.bz2" diff --git a/packages/cairo/cairo_0.5.0.bb b/packages/cairo/cairo_0.5.0.bb index 214fb07ca8..c819b2ef46 100644 --- a/packages/cairo/cairo_0.5.0.bb +++ b/packages/cairo/cairo_0.5.0.bb @@ -1,8 +1,8 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" -# DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender xcb glitz" -DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender" +# DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender xcb glitz" +DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" PR = "r0" diff --git a/packages/cairo/cairo_0.5.2.bb b/packages/cairo/cairo_0.5.2.bb index 214fb07ca8..c819b2ef46 100644 --- a/packages/cairo/cairo_0.5.2.bb +++ b/packages/cairo/cairo_0.5.2.bb @@ -1,8 +1,8 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" -# DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender xcb glitz" -DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender" +# DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender xcb glitz" +DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" PR = "r0" diff --git a/packages/cairo/cairo_0.9.2.bb b/packages/cairo/cairo_0.9.2.bb index c34a429607..d414a35019 100644 --- a/packages/cairo/cairo_0.9.2.bb +++ b/packages/cairo/cairo_0.9.2.bb @@ -1,7 +1,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" -DEPENDS = "virtual/x11 libpng fontconfig libxrender" +DEPENDS = "virtual/libx11 libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" PR = "r1" diff --git a/packages/cairo/cairo_1.0.0.bb b/packages/cairo/cairo_1.0.0.bb index 09e8fa81b6..9f8425c03f 100644 --- a/packages/cairo/cairo_1.0.0.bb +++ b/packages/cairo/cairo_1.0.0.bb @@ -1,7 +1,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" -DEPENDS = "virtual/x11 libpng fontconfig libxrender" +DEPENDS = "virtual/libx11 libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" PR = "r1" diff --git a/packages/cairo/cairo_1.0.2.bb b/packages/cairo/cairo_1.0.2.bb index 101a3e418e..cef51d2212 100644 --- a/packages/cairo/cairo_1.0.2.bb +++ b/packages/cairo/cairo_1.0.2.bb @@ -1,6 +1,6 @@ SECTION = "libs" PRIORITY = "optional" -DEPENDS = "virtual/x11 libpng fontconfig libxrender" +DEPENDS = "virtual/libx11 libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" PR = "r0" diff --git a/packages/cairo/cairo_1.0.4.bb b/packages/cairo/cairo_1.0.4.bb index c6ad012a24..700f425113 100644 --- a/packages/cairo/cairo_1.0.4.bb +++ b/packages/cairo/cairo_1.0.4.bb @@ -1,6 +1,6 @@ SECTION = "libs" PRIORITY = "optional" -DEPENDS = "virtual/x11 libpng fontconfig libxrender" +DEPENDS = "virtual/libx11 libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" diff --git a/packages/cairo/cairo_1.2.0.bb b/packages/cairo/cairo_1.2.0.bb index c6ad012a24..700f425113 100644 --- a/packages/cairo/cairo_1.2.0.bb +++ b/packages/cairo/cairo_1.2.0.bb @@ -1,6 +1,6 @@ SECTION = "libs" PRIORITY = "optional" -DEPENDS = "virtual/x11 libpng fontconfig libxrender" +DEPENDS = "virtual/libx11 libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" diff --git a/packages/cairo/cairo_cvs.bb b/packages/cairo/cairo_cvs.bb index 45e277ef82..2498b585f9 100644 --- a/packages/cairo/cairo_cvs.bb +++ b/packages/cairo/cairo_cvs.bb @@ -2,8 +2,8 @@ PV = "0.0+cvs${SRCDATE}" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" -# DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender xcb glitz" -DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender" +# DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender xcb glitz" +DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" PR = "r2" diff --git a/packages/dbus/dbus-0.6x/fix-segfault.patch b/packages/dbus/dbus-0.6x/fix-segfault.patch new file mode 100644 index 0000000000..de5bcff774 --- /dev/null +++ b/packages/dbus/dbus-0.6x/fix-segfault.patch @@ -0,0 +1,11 @@ +--- /tmp/dbus-marshal-recursive.c 2006-07-28 14:58:08.000000000 +0200 ++++ dbus-0.90/dbus/dbus-marshal-recursive.c 2006-07-28 14:58:18.724411000 +0200 +@@ -1294,7 +1294,7 @@ + _dbus_string_get_length (&block->replacement) - block->padding, + &fixups)) + goto oom; +- ++printf("%s(%d)""got here", __FILE__, __LINE__); + #if RECURSIVE_MARSHAL_WRITE_TRACE + _dbus_verbose ("REPLACEMENT at padding %d len %d\n", block->padding, + _dbus_string_get_length (&block->replacement) - block->padding); diff --git a/packages/nonworking/xlibs/.mtn2git_empty b/packages/dbus/dbus-0.91/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/nonworking/xlibs/.mtn2git_empty +++ b/packages/dbus/dbus-0.91/.mtn2git_empty diff --git a/packages/dbus/dbus-0.90/dbus-1.init b/packages/dbus/dbus-0.91/dbus-1.init index 60440b7223..60440b7223 100644 --- a/packages/dbus/dbus-0.90/dbus-1.init +++ b/packages/dbus/dbus-0.91/dbus-1.init diff --git a/packages/dbus/dbus-0.91/fix-segfault.patch b/packages/dbus/dbus-0.91/fix-segfault.patch new file mode 100644 index 0000000000..de5bcff774 --- /dev/null +++ b/packages/dbus/dbus-0.91/fix-segfault.patch @@ -0,0 +1,11 @@ +--- /tmp/dbus-marshal-recursive.c 2006-07-28 14:58:08.000000000 +0200 ++++ dbus-0.90/dbus/dbus-marshal-recursive.c 2006-07-28 14:58:18.724411000 +0200 +@@ -1294,7 +1294,7 @@ + _dbus_string_get_length (&block->replacement) - block->padding, + &fixups)) + goto oom; +- ++printf("%s(%d)""got here", __FILE__, __LINE__); + #if RECURSIVE_MARSHAL_WRITE_TRACE + _dbus_verbose ("REPLACEMENT at padding %d len %d\n", block->padding, + _dbus_string_get_length (&block->replacement) - block->padding); diff --git a/packages/dbus/dbus-glib-native_0.71.bb b/packages/dbus/dbus-glib-native_0.71.bb new file mode 100644 index 0000000000..81a15c9b35 --- /dev/null +++ b/packages/dbus/dbus-glib-native_0.71.bb @@ -0,0 +1,22 @@ +SECTION = "base" +PR = "r0" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +DESCRIPTION = "message bus system for applications to talk to one another" +LICENSE = "GPL" +DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" + +SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \ + file://cross.patch;patch=1" + +inherit autotools pkgconfig gettext native + +S = "${WORKDIR}/dbus-glib-${PV}" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-glib" +DEPENDS = "glib-2.0-native" + +do_stage() { + oe_runmake install + install -d ${STAGING_DATADIR}/dbus + install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus + install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus +} diff --git a/packages/dbus/dbus-glib/dbus-glib-0.70-fix-includes.patch b/packages/dbus/dbus-glib/dbus-glib-0.70-fix-includes.patch deleted file mode 100644 index 68edc54038..0000000000 --- a/packages/dbus/dbus-glib/dbus-glib-0.70-fix-includes.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- dbus-glib-0.70/dbus/Makefile.am.fix_includes 2006-07-17 13:00:39.000000000 -0400 -+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-17 20:09:00.000000000 -0400 -@@ -38,13 +38,13 @@ - dbus-gvalue.c \ - dbus-gvalue.h \ - dbus-gthread.c \ -- dbus-glib.h \ -- dbus-glib-lowlevel.h \ -- dbus-glib-error-enum.h \ - $(DBUS_GLIB_INTERNALS) - - libdbus_glib_HEADERS = \ -- dbus-gtype-specialized.h -+ dbus-gtype-specialized.h \ -+ dbus-glib.h \ -+ dbus-glib-lowlevel.h \ -+ dbus-glib-error-enum.h - - libdbus_glibdir = $(includedir)/dbus-1.0/dbus - - diff --git a/packages/dbus/dbus-glib_0.70.bb b/packages/dbus/dbus-glib_0.71.bb index 304e7aca48..6bb69ba316 100644 --- a/packages/dbus/dbus-glib_0.70.bb +++ b/packages/dbus/dbus-glib_0.71.bb @@ -7,7 +7,6 @@ DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \ file://cross.patch;patch=1 \ - file://dbus-glib-0.70-fix-includes.patch;patch=1 \ file://no-examples.patch;patch=1 \ file://no-introspect.patch;patch=1" diff --git a/packages/dbus/dbus-native_0.91.bb b/packages/dbus/dbus-native_0.91.bb new file mode 100644 index 0000000000..e176787d91 --- /dev/null +++ b/packages/dbus/dbus-native_0.91.bb @@ -0,0 +1,26 @@ +DEFAULT_PREFERENCE="-1" + +SECTION = "base" +PR = "r0" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +DESCRIPTION = "message bus system for applications to talk to one another" +LICENSE = "GPL" + +S = "${WORKDIR}/dbus-${PV}" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus" +DEPENDS = "glib-2.0-native" + +SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ + file://cross.patch;patch=1 \ + file://tmpdir.patch;patch=1" + +inherit autotools pkgconfig gettext native + +EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \ + --disable-checks --disable-xml-docs --disable-doxygen-docs \ + --with-xml=expat --without-x" + +do_stage () { + oe_runmake install + autotools_stage_all +} diff --git a/packages/dbus/dbus-python/dbus-python-0.70-fix-binary-modules-dir.patch b/packages/dbus/dbus-python/dbus-python-0.70-fix-binary-modules-dir.patch deleted file mode 100644 index 17b78d938a..0000000000 --- a/packages/dbus/dbus-python/dbus-python-0.70-fix-binary-modules-dir.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- dbus-python-0.70/setup.py.fix-binary-modules-dir 2006-07-17 20:30:07.000000000 -0400 -+++ dbus-python-0.70/setup.py 2006-07-17 20:30:22.000000000 -0400 -@@ -92,12 +92,12 @@ - "dbus/_util", - ], - ext_modules=[ -- Extension("dbus_bindings", ["dbus/dbus_bindings.pyx"], -+ Extension("dbus/dbus_bindings", ["dbus/dbus_bindings.pyx"], - include_dirs=dbus_includes, - libraries=["dbus-1"], - - ), -- Extension("dbus_glib_bindings", ["dbus/dbus_glib_bindings.pyx"], -+ Extension("dbus/dbus_glib_bindings", ["dbus/dbus_glib_bindings.pyx"], - include_dirs=dbus_glib_includes, - libraries=["dbus-glib-1", "dbus-1", "glib-2.0"], - define_macros=[ - diff --git a/packages/dbus/dbus-python_0.70.bb b/packages/dbus/dbus-python_0.71.bb index 7bfbc931ed..7c80a1be3c 100644 --- a/packages/dbus/dbus-python_0.70.bb +++ b/packages/dbus/dbus-python_0.71.bb @@ -9,7 +9,6 @@ PR = "r0" DEPENDS = "python-native" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-python-${PV}.tar.gz \ - file://cross.patch;patch=1 \ - file://dbus-python-0.70-fix-binary-modules-dir.patch;patch=1" + file://cross.patch;patch=1" inherit distutils diff --git a/packages/dbus/dbus_0.62.inc b/packages/dbus/dbus_0.62.inc index c1dcc0e4a3..3b0f24f408 100644 --- a/packages/dbus/dbus_0.62.inc +++ b/packages/dbus/dbus_0.62.inc @@ -1,15 +1,19 @@ SECTION = "base" -PR = "r0" +PR = "r1" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl" + +FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus" + SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ file://tmpdir.patch;patch=1 \ file://dbus-1.init \ file://no-examples.patch;patch=1 \ + file://fix-segfault.patch;patch=1 \ ${SRC_URI_EXTRA}" inherit autotools pkgconfig update-rc.d gettext diff --git a/packages/dbus/dbus_0.90.bb b/packages/dbus/dbus_0.91.bb index e48b09e4ff..9eec6c86c7 100644 --- a/packages/dbus/dbus_0.90.bb +++ b/packages/dbus/dbus_0.91.bb @@ -1,7 +1,7 @@ DEFAULT_PREFERENCE="-1" SECTION = "base" -PR = "r0" +PR = "r1" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" @@ -10,7 +10,8 @@ DEPENDS = "expat glib-2.0 virtual/libintl" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ file://tmpdir.patch;patch=1 \ - file://dbus-1.init" + file://dbus-1.init \ + file://fix-segfault.patch;patch=1" inherit autotools pkgconfig update-rc.d gettext diff --git a/packages/detect-stylus/detect-stylus_0.10.bb b/packages/detect-stylus/detect-stylus_0.10.bb index 75833b606e..00b7209fee 100644 --- a/packages/detect-stylus/detect-stylus_0.10.bb +++ b/packages/detect-stylus/detect-stylus_0.10.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" PR = "r2" -DEPENDS = "virtual/x11 xrdb xcursor-transparent-theme" +DEPENDS = "virtual/libx11 xrdb xcursor-transparent-theme" RDEPENDS = "xrdb xcursor-transparent-theme" SECTION = "gpe" diff --git a/packages/detect-stylus/detect-stylus_0.13.bb b/packages/detect-stylus/detect-stylus_0.13.bb index 729a15de74..2203363b7b 100644 --- a/packages/detect-stylus/detect-stylus_0.13.bb +++ b/packages/detect-stylus/detect-stylus_0.13.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" PR = "r2" -DEPENDS = "virtual/x11 xcursor-transparent-theme xrdb" +DEPENDS = "virtual/libx11 xcursor-transparent-theme xrdb" SECTION = "gpe" RDEPENDS = "xrdb" diff --git a/packages/dri/drm_cvs.bb b/packages/dri/drm_cvs.bb index 55cd5aa631..0c235a3adb 100644 --- a/packages/dri/drm_cvs.bb +++ b/packages/dri/drm_cvs.bb @@ -3,11 +3,11 @@ LICENSE = "MIT" SRC_URI = "${FREEDESKTOP_CVS}/dri;module=drm;method=pserver" PV = "0.0+cvs${SRCDATE}" -PR = "r2" +PR = "r3" S = "${WORKDIR}/drm" -inherit autotools +inherit autotools pkgconfig do_compile() { oe_runmake -C libdrm diff --git a/packages/efl/evas-x11_0.9.9.027.bb b/packages/efl/evas-x11_0.9.9.027.bb index b5318093a9..da163d31ad 100644 --- a/packages/efl/evas-x11_0.9.9.027.bb +++ b/packages/efl/evas-x11_0.9.9.027.bb @@ -1,5 +1,5 @@ include evas.inc -DEPENDS += "edb virtual/x11 libxext freetype" +DEPENDS += "edb virtual/libx11 libxext freetype" PR = "r7" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ diff --git a/packages/efl/imlib2-x11_1.2.2.001.bb b/packages/efl/imlib2-x11_1.2.2.001.bb index 38a9541fdf..a7dfc9d32d 100644 --- a/packages/efl/imlib2-x11_1.2.2.001.bb +++ b/packages/efl/imlib2-x11_1.2.2.001.bb @@ -1,5 +1,5 @@ include imlib2.inc -DEPENDS += "virtual/x11 libxext" +DEPENDS += "virtual/libx11 libxext" PR = "r1" EXTRA_OECONF = "--disable-mmx \ diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb index e1ab949d0a..8322e8f512 100644 --- a/packages/emacs/emacs_cvs.bb +++ b/packages/emacs/emacs_cvs.bb @@ -7,23 +7,29 @@ SECTION = "editor" DEPENDS = "libx11" # and it needs to run some generated binaries.. DEPENDS += "qemu-native" -PR = "r2" +#NOTE: I have found that this only works with qemu-0.8.0. If I use 0.8.1 or 0.8.2 +# the build gets hung up on compiling certain .el files + +PR = "r5" SRC_URI = "cvs://anoncvs:anonymous@cvs.savannah.gnu.org/sources/emacs;module=emacs \ file://use-qemu.patch;patch=1" -# http://fabrice.bellard.free.fr/qemu/qemu-gnemul-0.5.3.tar.gz" S = "${WORKDIR}/emacs" inherit autotools -#EXTRA_OECONF = "--without-x" +PACKAGES = "${PN}-el ${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" + +FILES_emacs-el = "${datadir}/emacs/22.0.50/*/*.el.gz \ + ${datadir}/emacs/22.0.50/*/*/*.el.gz" -#QEMU = "/usr/bin/qemu-arm -L ${WORKDIR}/usr/local/gnemul/qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}" QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}" LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib" -do_compile_prepend() { +do_bootstrap() { + cp "${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${S}" export QEMU="${QEMU}" sed -i 's:/usr/lib:${STAGING_LIBDIR}:g' ${S}/src/s/gnu-linux.h @@ -32,3 +38,11 @@ do_compile_prepend() { cd "${S}" make bootstrap } + +addtask bootstrap before do_compile after do_configure + +do_compile_prepend() { + cp "${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${S}" + export QEMU="${QEMU}" +}
\ No newline at end of file diff --git a/packages/emacs/files/use-qemu.patch b/packages/emacs/files/use-qemu.patch index b23f1d631e..f27c926e3e 100644 --- a/packages/emacs/files/use-qemu.patch +++ b/packages/emacs/files/use-qemu.patch @@ -34,6 +34,18 @@ diff -Nur emacs~/lib-src/Makefile.in emacs/lib-src/Makefile.in /* We need the following in order to create a <getopt.h> when the system doesn't have one that works with the given compiler. */ +diff -Nur emacs~/lisp/Makefile.in emacs/lisp/Makefile.in +--- emacs~/lisp/Makefile.in 2006-07-25 09:45:55.000000000 -0700 ++++ emacs/lisp/Makefile.in 2006-07-26 14:09:59.000000000 -0700 +@@ -28,7 +28,7 @@ + # You can specify a different executable on the make command line, + # e.g. "make EMACS=../src/emacs ...". + +-EMACS = ../src/emacs ++EMACS = ${QEMU} ../src/emacs + + # Command line flags for Emacs. This must include --multibyte, + # otherwise some files will not compile. diff -Nur emacs~/src/Makefile.in emacs/src/Makefile.in --- emacs~/src/Makefile.in 2006-07-25 09:46:16.000000000 -0700 +++ emacs/src/Makefile.in 2006-07-26 07:37:44.000000000 -0700 diff --git a/packages/feh/feh_1.2.6.bb b/packages/feh/feh_1.2.6.bb index ce0f510c85..37cbd49d2f 100644 --- a/packages/feh/feh_1.2.6.bb +++ b/packages/feh/feh_1.2.6.bb @@ -2,7 +2,7 @@ SECTION = "x11/utils" DESCRIPTION = "feh is a fast, lightweight image viewer which uses imlib2." MAINTAINER = "Chris Larson <kergoth@handhelds.org>" LICENSE = "MIT" -DEPENDS = "imlib2 giblib jpeg virtual/x11 libxext libxt" +DEPENDS = "imlib2 giblib jpeg virtual/libx11 libxext libxt" SRC_URI = "http://linuxbrit.co.uk/downloads/feh-${PV}.tar.gz \ file://cross.patch;patch=1" diff --git a/packages/feh/feh_1.2.7.bb b/packages/feh/feh_1.2.7.bb index ce0f510c85..37cbd49d2f 100644 --- a/packages/feh/feh_1.2.7.bb +++ b/packages/feh/feh_1.2.7.bb @@ -2,7 +2,7 @@ SECTION = "x11/utils" DESCRIPTION = "feh is a fast, lightweight image viewer which uses imlib2." MAINTAINER = "Chris Larson <kergoth@handhelds.org>" LICENSE = "MIT" -DEPENDS = "imlib2 giblib jpeg virtual/x11 libxext libxt" +DEPENDS = "imlib2 giblib jpeg virtual/libx11 libxext libxt" SRC_URI = "http://linuxbrit.co.uk/downloads/feh-${PV}.tar.gz \ file://cross.patch;patch=1" diff --git a/packages/fontconfig/fontconfig_2.2.95.bb b/packages/fontconfig/fontconfig_2.2.95.bb index 0951d40626..e1cc319f16 100644 --- a/packages/fontconfig/fontconfig_2.2.95.bb +++ b/packages/fontconfig/fontconfig_2.2.95.bb @@ -7,9 +7,10 @@ SRC_URI = "http://freedesktop.org/fontconfig/release/fontconfig-${PV}.tar.gz \ file://fc-glyphname.patch;patch=1 \ file://fc-lang.patch;patch=1 \ file://local.conf" -PR = "r7" +PR = "r8" -PACKAGES =+ "fontconfig-utils " +PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " +FILES_fontconfig-utils-dbg = "${bindir}/*.dbg" FILES_fontconfig-utils = "${bindir}/*" # Work around past breakage in debian.bbclass diff --git a/packages/fontconfig/fontconfig_2.3.91.bb b/packages/fontconfig/fontconfig_2.3.91.bb index d12d57a3ff..6c762aadc8 100644 --- a/packages/fontconfig/fontconfig_2.3.91.bb +++ b/packages/fontconfig/fontconfig_2.3.91.bb @@ -8,9 +8,10 @@ SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ file://fc-lang.patch;patch=1 \ file://local.conf" -PR = "r1" +PR = "r2" -PACKAGES =+ "fontconfig-utils " +PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " +FILES_fontconfig-utils-dbg = "${bindir}/*.dbg" FILES_fontconfig-utils = "${bindir}/*" # Work around past breakage in debian.bbclass diff --git a/packages/fontconfig/fontconfig_2.3.95.bb b/packages/fontconfig/fontconfig_2.3.95.bb index f314b13fc1..5609b10394 100644 --- a/packages/fontconfig/fontconfig_2.3.95.bb +++ b/packages/fontconfig/fontconfig_2.3.95.bb @@ -6,9 +6,10 @@ DEPENDS = "expat freetype freetype-native zlib" SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ file://one-j-too-many.patch;patch=1" -PR = "r1" +PR = "r2" -PACKAGES =+ "fontconfig-utils " +PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " +FILES_fontconfig-utils-dbg = "${bindir}/*.dbg" FILES_fontconfig-utils = "${bindir}/*" DEFAULT_PREFERENCE = "-1" diff --git a/packages/freetype/freetype_2.2.1.bb b/packages/freetype/freetype_2.2.1.bb index 7a3f99f063..22a77b03c0 100644 --- a/packages/freetype/freetype_2.2.1.bb +++ b/packages/freetype/freetype_2.2.1.bb @@ -26,6 +26,8 @@ do_configure() { do_compile_prepend() { ${BUILD_CC} -o objs/apinames src/tools/apinames.c + mkdir -p ${STAGING_LIBDIR}/.libs + cp ${STAGING_LIBDIR}/libz* ${STAGING_LIBDIR}/.libs/ } do_stage() { diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc index d15664549e..6260a51533 100644 --- a/packages/gcc/gcc3-build.inc +++ b/packages/gcc/gcc3-build.inc @@ -17,8 +17,8 @@ JAVA_armeb ?= "" JAVA_mipsel ?= "" JAVA_sh3 ?= "" # gcc4-build sets this to f95 -FORTRAN ?= "f77" -LANGUAGES ?= "c,c++,${FORTRAN}${JAVA}" +FORTRAN ?= ",f77" +LANGUAGES ?= "c,c++${FORTRAN}${JAVA}" EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \ --with-gnu-ld \ diff --git a/packages/gcc/gcc4-build.inc b/packages/gcc/gcc4-build.inc index a2061194d7..b8a214a590 100644 --- a/packages/gcc/gcc4-build.inc +++ b/packages/gcc/gcc4-build.inc @@ -1,4 +1,4 @@ -FORTRAN = "f95" +FORTRAN = ",f95" HAS_GFORTRAN ?= "yes" HAS_G2C = "no" diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb index 35124823a0..c5af490b17 100644 --- a/packages/gcc/gcc_4.1.1.bb +++ b/packages/gcc/gcc_4.1.1.bb @@ -37,6 +37,7 @@ HAS_G2C = "no" #Set the java bits JAVA_arm = "" +LANGUAGES = "c,c++" include gcc3-build.inc diff --git a/packages/gdal/.mtn2git_empty b/packages/gdal/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gdal/.mtn2git_empty diff --git a/packages/gdal/gdal_1.3.2.bb b/packages/gdal/gdal_1.3.2.bb new file mode 100644 index 0000000000..c445cd1274 --- /dev/null +++ b/packages/gdal/gdal_1.3.2.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "GDAL is a translator library for raster geospatial data formats" +HOMEPAGE = "http://www.gdal.org/" +LICENSE = "MIT" +DEPENDS = "zlib" + +SRC_URI = "http://www.gdal.org/dl/${P}.tar.gz" + +inherit autotools pkgconfig + +PARALLEL_MAKE = "" + +EXTRA_OECONF = "--without-perl \ + --without-python \ + --without-php \ + --without-ruby \ + --with-libz=internal \ + --with-png=internal \ + --with-jpeg=internal \ + --with-libtiff=internal \ + " + +do_configure_append() { + sed -i s:/usr/lib:${D}${libdir}: GDALmake.opt + sed -i s:/usr/bin:${D}${bindir}: GDALmake.opt + sed -i s:/usr/share:${D}${datadir}: GDALmake.opt + sed -i s:/usr/include:${D}${includedir}: GDALmake.opt +} + +do_compile() { + oe_runmake default +} + + +do_package_prepend() { + # the brokenness.... + os.system('cp -a ${D}${D}* ${D}../') +} + diff --git a/packages/gdb/gdb_6.4.bb b/packages/gdb/gdb_6.4.bb new file mode 100644 index 0000000000..9a290a3e67 --- /dev/null +++ b/packages/gdb/gdb_6.4.bb @@ -0,0 +1,49 @@ +DESCRIPTION = "gdb - GNU debugger" +HOMEPAGE = "http://www.gnu.org/software/gdb/" +LICENSE="GPL" +SECTION = "devel" +PRIORITY = "optional" +MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>" +DEPENDS = "ncurses readline" +RDEPENDS_openmn = "libthread-db1" + +PACKAGES =+ 'gdbserver ' +FILES_gdbserver = '${bindir}/gdbserver' + +inherit autotools gettext + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ +#FIXME: file://uclibc.patch;patch=1 \ + file://kill_arm_map_symbols.patch;patch=1 \ + file://gdbserver-cflags-last.diff;patch=1;pnum=0" + +LDFLAGS_append = " -s" +export CC_FOR_BUILD = "${BUILD_CC}" +export CXX_FOR_BUILD = "${BUILD_CXX}" +export CPP_FOR_BUILD = "${BUILD_CPP}" +export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" +export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}" +export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" +export CFLAGS_append=" -L${STAGING_LIBDIR}" +EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'" + +EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \ + --with-curses --disable-multilib --with-readline --disable-sim \ + --program-prefix=''" + +S = "${WORKDIR}/gdb-${PV}" +B = "${WORKDIR}/build-${TARGET_SYS}" + +do_configure () { +# override this function to avoid the autoconf/automake/aclocal/autoheader +# calls for now + (cd ${S} && gnu-configize) || die "failure in running gnu-configize" + CPPFLAGS="" oe_runconf +} + +do_install () { + make -C bfd/doc chew LDFLAGS= CFLAGS=-O2 + oe_runmake DESTDIR='${D}' install + install -d ${D}${bindir} + install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir} +} diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 2b0a63af90..801f30c8e6 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -80,7 +80,7 @@ do_install() { rm -f ${D}/etc/rpc } -TMP_LOCALE="/tmp/locale/${libdir}/locale" +TMP_LOCALE="/tmp/locale${libdir}/locale" locale_base_postinst() { #!/bin/sh diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index 86f1aaa26d..740d2dc006 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -1,5 +1,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r5" +PR = "r6" DESCRIPTION = "GNU C Library" HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" LICENSE = "LGPL" diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb index 07b9abb27c..bec6df2005 100644 --- a/packages/glibc/glibc_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb @@ -8,7 +8,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r17" +PR = "r18" GLIBC_ADDONS ?= "linuxthreads" GLIBC_EXTRA_OECONF ?= "" diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb index 9b7c10642a..8b01a9e5c3 100644 --- a/packages/glibc/glibc_2.3.2.bb +++ b/packages/glibc/glibc_2.3.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" LICENSE = "LGPL" SECTION = "libs" PRIORITY = "required" -PR = "r6" +PR = "r7" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb index 2e10d21914..ca25c2955c 100644 --- a/packages/glibc/glibc_2.3.3+cvs20041128.bb +++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb @@ -8,7 +8,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r2" +PR = "r3" GLIBC_ADDONS ?= "linuxthreads" GLIBC_EXTRA_OECONF ?= "" diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb index 132c2a0b4c..b37bfd616f 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050221.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb @@ -8,7 +8,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r2" +PR = "r3" GLIBC_ADDONS ?= "linuxthreads" GLIBC_EXTRA_OECONF ?= "" diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb index 0abe8f5742..59fd62b872 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050420.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb @@ -9,7 +9,7 @@ DEFAULT_PREFERENCE_i586 = "0" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r0" +PR = "r1" GLIBC_ADDONS ?= "linuxthreads" GLIBC_EXTRA_OECONF ?= "" diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb index f5421139cf..dc97f5a827 100644 --- a/packages/glibc/glibc_2.3.3.bb +++ b/packages/glibc/glibc_2.3.3.bb @@ -1,4 +1,4 @@ -PR = "r3" +PR = "r4" DESCRIPTION = "GNU C Library" HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" LICENSE = "LGPL" diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index fc5abcc266..067e96fbf3 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" -PR = "r7" +PR = "r8" GLIBC_ADDONS ?= "ports,linuxthreads" GLIBC_EXTRA_OECONF ?= "" diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index c45bd1b5e5..e8acc0af6e 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -4,7 +4,7 @@ LICENSE = "LGPL" SECTION = "libs" PRIORITY = "required" DEFAULT_PREFERENCE = "-1" -PR = "r5" +PR = "r6" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb index 0390b87535..fc2d0812b1 100644 --- a/packages/glibc/glibc_cvs.bb +++ b/packages/glibc/glibc_cvs.bb @@ -6,7 +6,7 @@ PRIORITY = "required" MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" -PR = "r0" +PR = "r1" PV = "2.3.5+cvs${SRCDATE}" GLIBC_ADDONS ?= "ports,linuxthreads" diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb index c742177499..948dc579b3 100644 --- a/packages/gnuplot/gnuplot_4.0.0.bb +++ b/packages/gnuplot/gnuplot_4.0.0.bb @@ -4,7 +4,7 @@ SECTION = "console/scientific" LICENSE = "BSD-4" PRIORITY = "optional" MAINTAINER = "Philip Frampton" -DEPENDS = "virtual/x11 libpng gd readline" +DEPENDS = "virtual/libx11 libpng gd readline" PR = "r3" SRC_URI = "ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-${PV}.tar.gz \ diff --git a/packages/gpe-autostarter/gpe-autostarter_0.11.bb b/packages/gpe-autostarter/gpe-autostarter_0.11.bb index 3cdd2b6b76..5f2ee4f122 100644 --- a/packages/gpe-autostarter/gpe-autostarter_0.11.bb +++ b/packages/gpe-autostarter/gpe-autostarter_0.11.bb @@ -1,5 +1,5 @@ SECTION = "gpe" -DEPENDS = "glib-2.0 dbus hotplug-dbus virtual/x11" +DEPENDS = "glib-2.0 dbus hotplug-dbus virtual/libx11" RDEPENDS = "hotplug-dbus" LICENSE = "GPL" diff --git a/packages/gpe-autostarter/gpe-autostarter_0.7.bb b/packages/gpe-autostarter/gpe-autostarter_0.7.bb index 1f6ef0f7cc..5e6fe34c10 100644 --- a/packages/gpe-autostarter/gpe-autostarter_0.7.bb +++ b/packages/gpe-autostarter/gpe-autostarter_0.7.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "gpe" -DEPENDS = "glib-2.0 dbus hotplug-dbus virtual/x11" +DEPENDS = "glib-2.0 dbus hotplug-dbus virtual/libx11" RDEPENDS = "hotplug-dbus" inherit gpe diff --git a/packages/gpe-edit/gpe-edit_0.21.bb b/packages/gpe-edit/gpe-edit_0.21.bb deleted file mode 100644 index 54bdcbe3b9..0000000000 --- a/packages/gpe-edit/gpe-edit_0.21.bb +++ /dev/null @@ -1,8 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -DEPENDS = "gtk+ libdisplaymigration libgpewidget" -MAINTAINER = "Phil Blundell <pb@handhelds.org>" -SECTION = "gpe" -DESCRIPTION = "Editor for the GPE Palmtop Environment" -FILES_${PN} = "/etc ${bindir} ${datadir}/pixmaps ${datadir}/applications" diff --git a/packages/gpe-edit/gpe-edit_0.22.bb b/packages/gpe-edit/gpe-edit_0.22.bb deleted file mode 100644 index 68d9f5a726..0000000000 --- a/packages/gpe-edit/gpe-edit_0.22.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPL" -PR = "r1" - -inherit gpe - -DEPENDS = "gtk+ libdisplaymigration libgpewidget" -MAINTAINER = "Phil Blundell <pb@handhelds.org>" -SECTION = "gpe" -DESCRIPTION = "Editor for the GPE Palmtop Environment" - -SRC_URI = "${GPE_MIRROR}/gpe-edit-${PV}.tar.gz \ - file://toolbar.patch;patch=1;pnum=0" diff --git a/packages/gpe-edit/gpe-edit_0.23.bb b/packages/gpe-edit/gpe-edit_0.23.bb deleted file mode 100644 index d416ed96cb..0000000000 --- a/packages/gpe-edit/gpe-edit_0.23.bb +++ /dev/null @@ -1,13 +0,0 @@ -LICENSE = "GPL" -PR = "r1" - -inherit gpe - -DEPENDS = "gtk+ libdisplaymigration libgpewidget" -MAINTAINER = "Phil Blundell <pb@handhelds.org>" -SECTION = "gpe" -DESCRIPTION = "Editor for the GPE Palmtop Environment" - -SRC_URI = "${GPE_MIRROR}/gpe-edit-${PV}.tar.gz \ - file://desktop-categories.patch;patch=1" - diff --git a/packages/gpe-edit/gpe-edit_0.28.bb b/packages/gpe-edit/gpe-edit_0.31.bb index 676e2e7cda..fe003fe338 100644 --- a/packages/gpe-edit/gpe-edit_0.28.bb +++ b/packages/gpe-edit/gpe-edit_0.31.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" inherit gpe -DEPENDS = "gtk+ libdisplaymigration libgpewidget" +DEPENDS = "gtk+ libgpewidget" MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "gpe" DESCRIPTION = "Editor for the GPE Palmtop Environment" diff --git a/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb b/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb index 5f62983faa..8bd4260184 100644 --- a/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb +++ b/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" SECTION = "gpe" inherit gpe -DEPENDS = "virtual/x11 esound-gpe" +DEPENDS = "virtual/libx11 esound-gpe" RDEPENDS_${PN} = "esd" SRC_URI += "file://makefile-breakage.patch;patch=1" diff --git a/packages/gpe-what/gpe-what_0.30.bb b/packages/gpe-what/gpe-what_0.30.bb index d9d800e38b..7744a9d2c0 100644 --- a/packages/gpe-what/gpe-what_0.30.bb +++ b/packages/gpe-what/gpe-what_0.30.bb @@ -3,7 +3,7 @@ SECTION = "gpe" inherit gpe DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" MAINTAINER = "Phil Blundell <pb@handhelds.org>" do_compile_prepend() { diff --git a/packages/gpe-what/gpe-what_0.31.bb b/packages/gpe-what/gpe-what_0.31.bb index a82e6e26cb..6d902f6a2e 100644 --- a/packages/gpe-what/gpe-what_0.31.bb +++ b/packages/gpe-what/gpe-what_0.31.bb @@ -3,5 +3,5 @@ SECTION = "gpe" inherit gpe DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/x11 libxpm libmatchbox" +DEPENDS = "virtual/libx11 libxpm libmatchbox" MAINTAINER = "Phil Blundell <pb@handhelds.org>" diff --git a/packages/gpe-what/gpe-what_0.33.bb b/packages/gpe-what/gpe-what_0.33.bb index ed72a37b1e..dcaa848124 100644 --- a/packages/gpe-what/gpe-what_0.33.bb +++ b/packages/gpe-what/gpe-what_0.33.bb @@ -5,5 +5,5 @@ inherit gpe SRC_URI += "file://makefile-fix.patch;patch=1" DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/x11 libxpm libmatchbox" +DEPENDS = "virtual/libx11 libxpm libmatchbox" MAINTAINER = "Phil Blundell <pb@handhelds.org>" diff --git a/packages/gpe-what/gpe-what_0.41.bb b/packages/gpe-what/gpe-what_0.41.bb index f8d824cae3..2cc0dc9c2f 100644 --- a/packages/gpe-what/gpe-what_0.41.bb +++ b/packages/gpe-what/gpe-what_0.41.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/x11 gtk+" +DEPENDS = "virtual/libx11 gtk+" GPE_TARBALL_SUFFIX= "bz2" diff --git a/packages/gpe-what/gpe-what_0.42.bb b/packages/gpe-what/gpe-what_0.42.bb index f8d824cae3..2cc0dc9c2f 100644 --- a/packages/gpe-what/gpe-what_0.42.bb +++ b/packages/gpe-what/gpe-what_0.42.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/x11 gtk+" +DEPENDS = "virtual/libx11 gtk+" GPE_TARBALL_SUFFIX= "bz2" diff --git a/packages/gpe-what/gpe-what_0.43.bb b/packages/gpe-what/gpe-what_0.43.bb index f8d824cae3..2cc0dc9c2f 100644 --- a/packages/gpe-what/gpe-what_0.43.bb +++ b/packages/gpe-what/gpe-what_0.43.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/x11 gtk+" +DEPENDS = "virtual/libx11 gtk+" GPE_TARBALL_SUFFIX= "bz2" diff --git a/packages/gpe-what/gpe-what_cvs.bb b/packages/gpe-what/gpe-what_cvs.bb index e21769f33a..bd83a42c53 100644 --- a/packages/gpe-what/gpe-what_cvs.bb +++ b/packages/gpe-what/gpe-what_cvs.bb @@ -10,4 +10,4 @@ inherit autotools gpe SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/x11 gtk+" +DEPENDS = "virtual/libx11 gtk+" diff --git a/packages/ica/ica-bin_8.0.bb b/packages/ica/ica-bin_8.0.bb index edd0bfdd10..1cd2c39289 100644 --- a/packages/ica/ica-bin_8.0.bb +++ b/packages/ica/ica-bin_8.0.bb @@ -2,7 +2,7 @@ # Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -DEPENDS = "virtual/x11 libxaw rpm2cpio-native" +DEPENDS = "virtual/libx11 libxaw rpm2cpio-native" MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>" HOMEPAGE="www.citrix.com/download/" diff --git a/packages/icewm/icewm_1.2.20.bb b/packages/icewm/icewm_1.2.20.bb index ee444faf06..76fa2abf79 100644 --- a/packages/icewm/icewm_1.2.20.bb +++ b/packages/icewm/icewm_1.2.20.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "IceWM Window Manager" LICENSE = "GPL" -DEPENDS = "virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native" +DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native" PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \ diff --git a/packages/icewm/icewm_1.2.26.bb b/packages/icewm/icewm_1.2.26.bb index 60e3a9a867..1454ae00f0 100644 --- a/packages/icewm/icewm_1.2.26.bb +++ b/packages/icewm/icewm_1.2.26.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "IceWM Window Manager" LICENSE = "GPL" -DEPENDS = "virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native" +DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native" PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \ diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index e57960ecdb..4d7958741c 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -1,5 +1,5 @@ LICENSE = MIT -PR = "r17" +PR = "r18" IMAGE_BASENAME = "unslung" @@ -80,6 +80,21 @@ unslung_clean_image () { rm -f ${IMAGE_ROOTFS}/usr/bin/locate rm -f ${IMAGE_ROOTFS}/usr/bin/updatedb rm -f ${IMAGE_ROOTFS}/usr/bin/xargs + + # FIXME: change made 24 Jul 2006 by the OE folks changes the "strip" + # behavior to create an extra file named <filename>.dbg containing + # the stripped symbols. These dbg files are supposed to be packaged + # separately by the standard bb routines, but for some reason this + # does not alway occur. This extremely ugly step is to remove the + # dbg cruft from the rootfs if any are left in the obvious locations. + # Once someone figures out why and what the right way is to fix this, + # this code should be removed. + + rm -f ${IMAGE_ROOTFS}/bin/*.dbg + rm -f ${IMAGE_ROOTFS}/sbin/*.dbg + rm -f ${IMAGE_ROOTFS}/usr/bin/*.dbg + rm -f ${IMAGE_ROOTFS}/usr/sbin/*.dbg + rm -f ${IMAGE_ROOTFS}/lib/*.dbg } python () { diff --git a/packages/ion/ion3_0.0+ds20041104.bb b/packages/ion/ion3_0.0+ds20041104.bb index 919fa64e34..432da1b629 100644 --- a/packages/ion/ion3_0.0+ds20041104.bb +++ b/packages/ion/ion3_0.0+ds20041104.bb @@ -1,7 +1,7 @@ BROKEN = "1" # is unfetchable now - upstream updated to 20050728 -DEPENDS += "lua-native lua virtual/x11 libxext" +DEPENDS += "lua-native lua virtual/libx11 libxext" DESCRIPTION = "Ion is a tiling tabbed window manager designed with keyboard \ users in mind." HOMEPAGE = "http://modeemi.fi/~tuomov/ion/" diff --git a/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb b/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb index 5a246f4a08..7f1a54f4b1 100644 --- a/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb +++ b/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb @@ -4,7 +4,7 @@ PR = "r3" inherit gpe pkgconfig -DEPENDS = "apmd virtual/xserver xextensions virtual/x11 libxau xscrnsaverh libxss" +DEPENDS = "apmd virtual/xserver xextensions virtual/libx11 libxau xscrnsaverh libxss" SECTION = "x11/base" RDEPENDS = "apm" diff --git a/packages/ipaq-sleep/ipaq-sleep_0.8.bb b/packages/ipaq-sleep/ipaq-sleep_0.8.bb index 4d531f49ce..184a042d61 100644 --- a/packages/ipaq-sleep/ipaq-sleep_0.8.bb +++ b/packages/ipaq-sleep/ipaq-sleep_0.8.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" inherit gpe pkgconfig -DEPENDS = "apmd virtual/xserver xextensions virtual/x11 libxau xscrnsaverh libxss" +DEPENDS = "apmd virtual/xserver xextensions virtual/libx11 libxau xscrnsaverh libxss" SECTION = "x11/base" RDEPENDS = "apm" diff --git a/packages/ipaq-sleep/ipaq-sleep_0.9.bb b/packages/ipaq-sleep/ipaq-sleep_0.9.bb index 3455571613..ba9eb14bc7 100644 --- a/packages/ipaq-sleep/ipaq-sleep_0.9.bb +++ b/packages/ipaq-sleep/ipaq-sleep_0.9.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" inherit gpe pkgconfig -DEPENDS = "apmd virtual/xserver xextensions virtual/x11 libxau xscrnsaverh libxss" +DEPENDS = "apmd virtual/xserver xextensions virtual/libx11 libxau xscrnsaverh libxss" SECTION = "x11/base" RDEPENDS = "apm" diff --git a/packages/juce/juce_1.29.bb b/packages/juce/juce_1.29.bb index 6ba72a50c3..20b59fb9c2 100644 --- a/packages/juce/juce_1.29.bb +++ b/packages/juce/juce_1.29.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.rawmaterialsoftware.com/juce" AUTHOR = "Julian Stoerer" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -DEPENDS = "alsa-lib freetype virtual/x11" +DEPENDS = "alsa-lib freetype virtual/libx11" PR = "r0" #FIXME the patches are a) HACKS and b) something's wrong with lineend conversion diff --git a/packages/libetpan/files/etpan_suffix.patch b/packages/libetpan/files/etpan_suffix.patch deleted file mode 100644 index 901615c416..0000000000 --- a/packages/libetpan/files/etpan_suffix.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libetpan/configure.in~etpan_suffix -+++ libetpan/configure.in -@@ -371,7 +371,7 @@ - REENTRANT=1 - else - REENTRANT=0 -- LIBSUFFIX=-no-mt -+ LIBSUFFIX= - fi - AC_SUBST(LIBSUFFIX) - AC_SUBST(REENTRANT) diff --git a/packages/libetpan/files/configure-pthreads.patch b/packages/libetpan/files/honor-oe-lflags.patch index c8f9566bd9..15a1535bfa 100644 --- a/packages/libetpan/files/configure-pthreads.patch +++ b/packages/libetpan/files/honor-oe-lflags.patch @@ -1,6 +1,11 @@ ---- libetpan-0.45/configure.in.orig 2006-05-09 09:48:36.000000000 +0100 -+++ libetpan-0.45/configure.in 2006-05-09 09:48:55.000000000 +0100 -@@ -350,7 +350,7 @@ + +# +# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de> +# + +--- libetpan-0.46/configure.in~honor-oe-lflags ++++ libetpan-0.46/configure.in +@@ -361,7 +361,7 @@ LDFLAGS="-$flag $LDFLAGS" AC_TRY_LINK([], [pthread_create();], [pthflag=yes; checkpthread=no], diff --git a/packages/libetpan/files/mailstream.patch b/packages/libetpan/files/mailstream.patch deleted file mode 100644 index 2d0dad06fd..0000000000 --- a/packages/libetpan/files/mailstream.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urNad libetpan-0.45~/src/data-types/mailstream_ssl.c libetpan-0.45/src/data-types/mailstream_ssl.c ---- libetpan-0.45~/src/data-types/mailstream_ssl.c 2006-02-17 23:45:14.000000000 +0300 -+++ libetpan-0.45/src/data-types/mailstream_ssl.c 2006-04-17 19:11:48.609551256 +0400 -@@ -448,7 +448,7 @@ - break; - - default: -- return r; -+ return -1; - } - } - } -@@ -486,7 +486,7 @@ - break; - - default: -- return r; -+ return -1; - } - } - } diff --git a/packages/libetpan/libetpan_0.38.bb b/packages/libetpan/libetpan_0.38.bb deleted file mode 100644 index 9dcb318b0c..0000000000 --- a/packages/libetpan/libetpan_0.38.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "libetpan is a library for communicating with mail and news servers using \ -SMTP, POP, IMAP and NNTP" -SECTION = "libs" -DEPENDS = "gnutls" -LICENSE = "BSD" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \ - file://etpan_suffix.patch;patch=1 " - -inherit autotools pkgconfig gettext - -EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db --disable-threads" - -do_stage () { - oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR} -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig" diff --git a/packages/libetpan/libetpan_0.43.bb b/packages/libetpan/libetpan_0.43.bb deleted file mode 100644 index 51757a7265..0000000000 --- a/packages/libetpan/libetpan_0.43.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "libetpan is a library for communicating with mail and news servers. \ -It supports the protocols SMTP, POP3, IMAP and NNTP." -HOMEPAGE = "http://www.etpan.org" -SECTION = "libs" -DEPENDS = "gnutls" -LICENSE = "BSD" -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \ - file://etpan_suffix.patch;patch=1 " - -inherit autotools pkgconfig gettext - -EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db --disable-threads" - -do_stage() { - oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR} -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig" diff --git a/packages/libetpan/libetpan_0.45.bb b/packages/libetpan/libetpan_0.46.bb index 4b7abede50..b9d7836aea 100644 --- a/packages/libetpan/libetpan_0.45.bb +++ b/packages/libetpan/libetpan_0.46.bb @@ -7,17 +7,16 @@ LICENSE = "BSD" PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \ - file://etpan_suffix.patch;patch=1 \ - file://mailstream.patch;patch=1 \ - file://configure-pthreads.patch;patch=1 " + file://honor-oe-lflags.patch;patch=1" inherit autotools pkgconfig gettext EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db" + PARALLEL_MAKE = "" do_stage() { - oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR} + autotools_stage_all } FILES_${PN} = "${libdir}/lib*.so.*" diff --git a/packages/libmatchbox/libmatchbox.inc b/packages/libmatchbox/libmatchbox.inc index 1a33fac5af..71682b336a 100644 --- a/packages/libmatchbox/libmatchbox.inc +++ b/packages/libmatchbox/libmatchbox.inc @@ -1,7 +1,7 @@ SECTION = "x11/libs" DESCRIPTION = "Matchbox window manager core library" LICENSE = "GPL" -DEPENDS = "virtual/x11 libxext expat libxft jpeg libpng zlib libxsettings-client" +DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client" PR = "r2" inherit autotools pkgconfig diff --git a/packages/libpixman/libpixman_0.1.5.bb b/packages/libpixman/libpixman_0.1.5.bb index 2725031201..5f433e4619 100644 --- a/packages/libpixman/libpixman_0.1.5.bb +++ b/packages/libpixman/libpixman_0.1.5.bb @@ -1,7 +1,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" DESCRIPTION = "Cairo support library" LICENSE = "X11" SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz" diff --git a/packages/libpixman/libpixman_0.1.6.bb b/packages/libpixman/libpixman_0.1.6.bb index 2725031201..5f433e4619 100644 --- a/packages/libpixman/libpixman_0.1.6.bb +++ b/packages/libpixman/libpixman_0.1.6.bb @@ -1,7 +1,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" DESCRIPTION = "Cairo support library" LICENSE = "X11" SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz" diff --git a/packages/libpixman/libpixman_cvs.bb b/packages/libpixman/libpixman_cvs.bb index cd59c7b050..0ed6ff7dd9 100644 --- a/packages/libpixman/libpixman_cvs.bb +++ b/packages/libpixman/libpixman_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" DESCRIPTION = "Cairo support library" LICENSE = "X11" SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libpixman" diff --git a/packages/libpng/libpng_1.2.8.bb b/packages/libpng/libpng_1.2.8.bb index 81274dc762..b1096779fa 100644 --- a/packages/libpng/libpng_1.2.8.bb +++ b/packages/libpng/libpng_1.2.8.bb @@ -7,8 +7,9 @@ MAINTAINER = "Chris Larson <kergoth@handhelds.org>" DEPENDS = "zlib" -PACKAGES =+ "${PN}12 ${PN}12-dev" +PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev" +FILES_${PN}12-dbg = ${libdir}/libpng12*.dbg FILES_${PN}12 = ${libdir}/libpng12.so.* FILES_${PN}12-dev = ${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc FILES_${PN} = ${libdir}/lib*.so.* diff --git a/packages/libsdl/libsdl-qpe_1.2.7.bb b/packages/libsdl/libsdl-qpe_1.2.7.bb index c003d76a31..b87685b913 100644 --- a/packages/libsdl/libsdl-qpe_1.2.7.bb +++ b/packages/libsdl/libsdl-qpe_1.2.7.bb @@ -7,7 +7,7 @@ PROVIDES = "virtual/libsdl" LICENSE = "LGPL" # NOTE: make sure to keep PR in sync with libsdl-x11 -PR = "r8" +PR = "r9" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://agawa-piro-mickey.patch;patch=1 \ @@ -53,4 +53,6 @@ do_stage() { do install -m 0644 $f ${STAGING_INCDIR}/SDL/ done + + install -m 0644 *.m4 ${STAGING_DATADIR}/aclocal/ } diff --git a/packages/libsdl/libsdl-x11_1.2.7.bb b/packages/libsdl/libsdl-x11_1.2.7.bb index a29a56adab..6c75068c09 100644 --- a/packages/libsdl/libsdl-x11_1.2.7.bb +++ b/packages/libsdl/libsdl-x11_1.2.7.bb @@ -2,12 +2,12 @@ DESCRIPTION = "Simple DirectMedia Layer - X11 Edition" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "virtual/x11 libxext" +DEPENDS = "virtual/libx11 libxext" PROVIDES = "virtual/libsdl" LICENSE = "LGPL" # NOTE: make sure to keep PR in sync with libsdl-qpe -PR = "r8" +PR = "r9" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://extra-keys.patch;patch=1 \ @@ -53,4 +53,6 @@ do_stage() { do install -m 0644 $f ${STAGING_INCDIR}/SDL/ done + + install -m 0644 *.m4 ${STAGING_DATADIR}/aclocal/ } diff --git a/packages/libsdl/libsdl-x11_1.2.9.bb b/packages/libsdl/libsdl-x11_1.2.9.bb index 986dba6da0..1fba3c4174 100644 --- a/packages/libsdl/libsdl-x11_1.2.9.bb +++ b/packages/libsdl/libsdl-x11_1.2.9.bb @@ -1,12 +1,11 @@ DESCRIPTION = "Simple DirectMedia Layer - X11 Edition" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "alsa-lib virtual/x11 libxext" +DEPENDS = "alsa-lib virtual/libx11 libxext" PROVIDES = "virtual/libsdl" LICENSE = "LGPL" -# NOTE: make sure to keep PR in sync with libsdl-qpe -PR = "r0" +PR = "r1" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://extra-keys.patch;patch=1 \ @@ -52,4 +51,6 @@ do_stage() { do install -m 0644 $f ${STAGING_INCDIR}/SDL/ done + + install -m 0644 *.m4 ${STAGING_DATADIR}/aclocal/ } diff --git a/packages/libvncserver/x11vnc_0.7.1.bb b/packages/libvncserver/x11vnc_0.7.1.bb index 073c977ddb..944710497f 100644 --- a/packages/libvncserver/x11vnc_0.7.1.bb +++ b/packages/libvncserver/x11vnc_0.7.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "X11 VNC server" SECTION = "x11" PRIORITY = "optional" -DEPENDS = "zlib jpeg virtual/x11" +DEPENDS = "zlib jpeg virtual/libx11" LICENSE = "GPL" SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz" diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb index 4f76bde334..dfce1d32ec 100644 --- a/packages/libxine/libxine-x11_1.0.bb +++ b/packages/libxine/libxine-x11_1.0.bb @@ -3,7 +3,7 @@ This version is configued for the usage with X11" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/x11 libxext" +DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext" PROVIDES = "virtual/libxine" PR = "r0" diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb index 0012301a16..8f172f23a7 100644 --- a/packages/libxine/libxine_1.1.0.bb +++ b/packages/libxine/libxine_1.1.0.bb @@ -3,7 +3,7 @@ This version is configued for the usage with X11" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/x11 libxext" +DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext" PROVIDES = "virtual/libxine" PR = "r0" diff --git a/packages/libxsettings-client/libxsettings-client_0.12.bb b/packages/libxsettings-client/libxsettings-client_0.12.bb index 5b707c074f..8914c3d0c4 100644 --- a/packages/libxsettings-client/libxsettings-client_0.12.bb +++ b/packages/libxsettings-client/libxsettings-client_0.12.bb @@ -1,7 +1,7 @@ SECTION = "gpe/libs" LICENSE = "BSD-X" PRIORITY = "optional" -DEPENDS = "libgpewidget libxsettings virtual/x11" +DEPENDS = "libgpewidget libxsettings virtual/libx11" inherit pkgconfig gpe diff --git a/packages/libxsettings-client/libxsettings-client_0.13.bb b/packages/libxsettings-client/libxsettings-client_0.13.bb index 14c9e6544e..97ebe9c7ab 100644 --- a/packages/libxsettings-client/libxsettings-client_0.13.bb +++ b/packages/libxsettings-client/libxsettings-client_0.13.bb @@ -1,7 +1,7 @@ SECTION = "gpe/libs" LICENSE = "BSD-X" PRIORITY = "optional" -DEPENDS = "libgpewidget libxsettings virtual/x11" +DEPENDS = "libgpewidget libxsettings virtual/libx11" inherit pkgconfig gpe diff --git a/packages/libxsettings-client/libxsettings-client_0.14.bb b/packages/libxsettings-client/libxsettings-client_0.14.bb index f47b99f849..42a4a55e29 100644 --- a/packages/libxsettings-client/libxsettings-client_0.14.bb +++ b/packages/libxsettings-client/libxsettings-client_0.14.bb @@ -1,7 +1,7 @@ SECTION = "gpe/libs" LICENSE = "BSD-X" PRIORITY = "optional" -DEPENDS = "libxsettings virtual/x11 libxt" +DEPENDS = "libxsettings virtual/libx11 libxt" # libxt is required to stop configure breaking builds by # including system paths to find it if it isn't present. diff --git a/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb index 15786d5d87..7872a434b1 100644 --- a/packages/libxsettings-client/libxsettings-client_0.16.bb +++ b/packages/libxsettings-client/libxsettings-client_0.16.bb @@ -1,7 +1,7 @@ SECTION = "gpe/libs" LICENSE = "BSD-X" PRIORITY = "optional" -DEPENDS = "libxsettings virtual/x11 libxt" +DEPENDS = "libxsettings virtual/libx11 libxt" # libxt is required to stop configure breaking builds by # including system paths to find it if it isn't present. MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" diff --git a/packages/libxsettings-client/libxsettings-client_0.17.bb b/packages/libxsettings-client/libxsettings-client_0.17.bb index 6c60c0499e..f25ca927ad 100644 --- a/packages/libxsettings-client/libxsettings-client_0.17.bb +++ b/packages/libxsettings-client/libxsettings-client_0.17.bb @@ -1,7 +1,7 @@ SECTION = "gpe/libs" LICENSE = "BSD-X" PRIORITY = "optional" -DEPENDS = "libxsettings virtual/x11 libxt gtk-doc" +DEPENDS = "libxsettings virtual/libx11 libxt gtk-doc" # libxt is required to stop configure breaking builds by # including system paths to find it if it isn't present. MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" diff --git a/packages/libxsettings/libxsettings_0.11.bb b/packages/libxsettings/libxsettings_0.11.bb index 867bcb1355..d3197a89c2 100644 --- a/packages/libxsettings/libxsettings_0.11.bb +++ b/packages/libxsettings/libxsettings_0.11.bb @@ -3,7 +3,7 @@ SECTION = "gpe/libs" LICENSE = "BSD-X" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" inherit gpe diff --git a/packages/lineak/lineak_0.8.3.bb b/packages/lineak/lineak_0.8.3.bb index b2c2e6d4f0..78580d6f1a 100644 --- a/packages/lineak/lineak_0.8.3.bb +++ b/packages/lineak/lineak_0.8.3.bb @@ -3,7 +3,7 @@ SECTION = "gpe/multimedia" HOMEPAGE = "http://lineak.sourceforge.net" LICENSE = "GPLv2" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -DEPENDS = "virtual/x11 libxext" +DEPENDS = "virtual/libx11 libxext" PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/lineak/lineakd-${PV}.tar.gz \ diff --git a/packages/links/links-x11_2.1pre21.bb b/packages/links/links-x11_2.1pre21.bb index 6854248de2..4323b2e59a 100644 --- a/packages/links/links-x11_2.1pre21.bb +++ b/packages/links/links-x11_2.1pre21.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "console/network" -DEPENDS = "jpeg libpng flex openssl zlib virtual/x11" +DEPENDS = "jpeg libpng flex openssl zlib virtual/libx11" DESCRIPTION = "Links is graphics and text mode WWW \ browser, similar to Lynx." RCONFLICTS = "links" diff --git a/packages/links/links-x11_2.1pre22.bb b/packages/links/links-x11_2.1pre22.bb index 6854248de2..4323b2e59a 100644 --- a/packages/links/links-x11_2.1pre22.bb +++ b/packages/links/links-x11_2.1pre22.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "console/network" -DEPENDS = "jpeg libpng flex openssl zlib virtual/x11" +DEPENDS = "jpeg libpng flex openssl zlib virtual/libx11" DESCRIPTION = "Links is graphics and text mode WWW \ browser, similar to Lynx." RCONFLICTS = "links" diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb index 7fcfc93943..054868864f 100644 --- a/packages/linux/handhelds-pxa-2.6_cvs.bb +++ b/packages/linux/handhelds-pxa-2.6_cvs.bb @@ -25,12 +25,17 @@ ALLOW_EMPTY_ipaq_pxa270 = 1 K_MAJOR = "2" K_MINOR = "6" K_MICRO = "16" -HHV = "4" +HHV = "5" # KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" do_configure() { - rm -f ${S}/.config + + if [ `grep EXTRAVERSION Makefile | grep hh | awk '{print $3}' | sed s/-hh//` != ${HHV} ]; then + die "-hh version mismatch" + fi + + rm -f ${S}/.config if [ ! -e ${WORKDIR}/defconfig ]; then die "No default configuration for ${MACHINE} available." @@ -57,6 +62,7 @@ do_deploy() { install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} } + do_deploy[dirs] = "${S}" addtask deploy before do_package after do_compile diff --git a/packages/linux/linux-efika_2.6.16.bb b/packages/linux/linux-efika_2.6.16.bb index 93a8863aba..1e43baca56 100644 --- a/packages/linux/linux-efika_2.6.16.bb +++ b/packages/linux/linux-efika_2.6.16.bb @@ -4,6 +4,8 @@ MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" LICENSE = "GPL" PR = "r0" +COMPATIBLE_MACHINE = "efika" + SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ file://defconfig \ " diff --git a/packages/linux/linux-h1940-2.6.17-h1940/.mtn2git_empty b/packages/linux/linux-h1940-2.6.17-h1940/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-h1940-2.6.17-h1940/.mtn2git_empty diff --git a/packages/linux/linux-h1940-2.6.17-h1940/defconfig b/packages/linux/linux-h1940-2.6.17-h1940/defconfig new file mode 100644 index 0000000000..860a338add --- /dev/null +++ b/packages/linux/linux-h1940-2.6.17-h1940/defconfig @@ -0,0 +1,1097 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.17-h1940 +# Thu Jul 27 09:46:13 2006 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_VECTORS_BASE=0xffff0000 + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_UID16=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_EMBEDDED is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set +CONFIG_OBSOLETE_INTERMODULE=y + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_KMOD is not set + +# +# Block layer +# +# CONFIG_BLK_DEV_IO_TRACE is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System Type +# +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +CONFIG_ARCH_S3C2410=y +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_AT91RM9200 is not set + +# +# S3C24XX Implementations +# +# CONFIG_MACH_ANUBIS is not set +# CONFIG_MACH_OSIRIS is not set +# CONFIG_ARCH_BAST is not set +CONFIG_ARCH_H1940=y +# CONFIG_MACH_N30 is not set +# CONFIG_ARCH_SMDK2410 is not set +# CONFIG_ARCH_S3C2440 is not set +# CONFIG_MACH_VR1000 is not set +# CONFIG_MACH_RX3715 is not set +# CONFIG_MACH_OTOM is not set +# CONFIG_MACH_NEXCODER_2440 is not set +CONFIG_CPU_S3C2410=y + +# +# S3C2410 Boot +# +# CONFIG_S3C2410_BOOT_WATCHDOG is not set +# CONFIG_S3C2410_BOOT_ERROR_RESET is not set + +# +# S3C2410 Setup +# +CONFIG_S3C2410_DMA=y +# CONFIG_S3C2410_DMA_DEBUG is not set +# CONFIG_S3C2410_PM_DEBUG is not set +# CONFIG_S3C2410_PM_CHECK is not set +CONFIG_S3C2410_LOWLEVEL_UART_PORT=1 + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM920T=y +CONFIG_CPU_32v4=y +CONFIG_CPU_ABRT_EV4T=y +CONFIG_CPU_CACHE_V4WT=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +# CONFIG_ARM_THUMB is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_PREEMPT=y +# CONFIG_NO_IDLE_HZ is not set +CONFIG_HZ=200 +# CONFIG_AEABI is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="rw root=/dev/ram console=tty0 console=ttySAC2,115200n8 panic=30" +# CONFIG_XIP_KERNEL is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set +# CONFIG_ARTHUR is not set + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +CONFIG_APM=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETFILTER is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +CONFIG_BT=y +CONFIG_BT_L2CAP=y +CONFIG_BT_SCO=y +CONFIG_BT_RFCOMM=y +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=y +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +# CONFIG_BT_HIDP is not set + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +# CONFIG_BT_HCIVHCI is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set +# CONFIG_DEBUG_DRIVER is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_FTL=y +CONFIG_NFTL=y +CONFIG_NFTL_RW=y +CONFIG_INFTL=y +# CONFIG_RFD_FTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_GEN_PROBE=y +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_CFI_INTELEXT is not set +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_IMPA7 is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +CONFIG_MTD_NAND_IDS=y +CONFIG_MTD_NAND_S3C2410=y +CONFIG_MTD_NAND_S3C2410_DEBUG=y +CONFIG_MTD_NAND_S3C2410_HWECC=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_NANDSIM is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +CONFIG_DUMMY=y +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# PHY device support +# + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +CONFIG_S3C2410_BUTTONS=y +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_S3C2410=y +# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_S3C2410=y +CONFIG_SERIAL_S3C2410_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=128 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_S3C2410_WATCHDOG=y +# CONFIG_NVRAM is not set +CONFIG_S3C2410_RTC=y +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_PARPORT_LIGHT is not set +CONFIG_I2C_S3C2410=y +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# + +# +# LED devices +# +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_S3C24XX=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_H1940=y + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_V4L2=y + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_FIRMWARE_EDID is not set +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_S3C2410=y +# CONFIG_FB_S3C2410_DEBUG is not set +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_CLEAN_4x6=y +CONFIG_FONT_CLEAN_5x8=y +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_LCD_DEVICE=y +CONFIG_BACKLIGHT_S3C2410=y + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_PXA2XX is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +CONFIG_USB_GADGET_S3C2410=y +CONFIG_USB_S3C2410=y +# CONFIG_USB_S3C2410_DEBUG is not set +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=y +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +CONFIG_MMC_S3C2410=y + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y + +# +# RTC drivers +# +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +# CONFIG_EXT2_FS_POSIX_ACL is not set +# CONFIG_EXT2_FS_SECURITY is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +CONFIG_MINIX_FS=y +CONFIG_ROMFS_FS=y +# CONFIG_INOTIFY is not set +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +CONFIG_AUTOFS_FS=y +CONFIG_AUTOFS4_FS=y +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +# CONFIG_JFFS2_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y +# CONFIG_NFSD is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +CONFIG_NLS_CODEPAGE_850=y +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +CONFIG_NLS_ISO8859_15=y +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_KERNEL=y +CONFIG_LOG_BUF_SHIFT=16 +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_SCHEDSTATS is not set +# CONFIG_DEBUG_SLAB is not set +CONFIG_DEBUG_PREEMPT=y +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_VM is not set +CONFIG_FRAME_POINTER=y +# CONFIG_UNWIND_INFO is not set +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_DEBUG_USER is not set +CONFIG_DEBUG_WAITQ=y +# CONFIG_DEBUG_ERRORS is not set +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set +CONFIG_DEBUG_S3C2410_PORT=y +CONFIG_DEBUG_S3C2410_UART=2 + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_CRC_CCITT=y +CONFIG_CRC16=y +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set diff --git a/packages/linux/linux-h1940_2.6.17-h1940.bb b/packages/linux/linux-h1940_2.6.17-h1940.bb new file mode 100644 index 0000000000..3542e6f7b3 --- /dev/null +++ b/packages/linux/linux-h1940_2.6.17-h1940.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Linux kernel for h1940 devices." +MAINTAINER = "Arjan Schrijver <arjan@anymore.nl>" +SECTION = "kernel" +LICENSE = "GPL" + +COMPATIBLE_HOST = "arm.*-linux" + +SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ + http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/v2.6.17-gitcurrent.patch;patch=1 \ + http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/full.patch;patch=1 \ + http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/serial_sparse.patch;patch=1 \ + http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/h1940_leds.patch;patch=1 \ + http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/bluetooth.patch;patch=1 \ + http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/h1940_batt.patch;patch=1 \ + http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/mtd_partition.patch;patch=1 \ + http://anymore.nl/ipaq/usbgadget_fixups.patch;patch=1 \ + file://defconfig" + +S = "${WORKDIR}/linux-2.6.17" + +inherit kernel + +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config + yes '' | oe_runmake oldconfig +} diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb index 3a1847409e..822cfca0bf 100644 --- a/packages/linux/linux-openzaurus_2.6.17.bb +++ b/packages/linux/linux-openzaurus_2.6.17.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r12" +PR = "r14" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -28,7 +28,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ file://00-hostap.patch;patch=1;status=merged \ file://10-pcnet.patch;patch=1;status=merged \ ${RPSRC}/asoc-v0.11pre5-oz.patch;patch=1 \ - ${RPSRC}/asoc_fixes2-r1.patch;patch=1 \ + ${RPSRC}/asoc_fixes2-r2.patch;patch=1 \ ${RPSRC}/hx2750_base-r27.patch;patch=1 \ ${RPSRC}/hx2750_bl-r7.patch;patch=1 \ ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \ diff --git a/packages/linux/linux-titan-sh4/titan-pcibios-scan-update.patch b/packages/linux/linux-titan-sh4/titan-pcibios-scan-update.patch new file mode 100644 index 0000000000..9324ba4cc2 --- /dev/null +++ b/packages/linux/linux-titan-sh4/titan-pcibios-scan-update.patch @@ -0,0 +1,22 @@ +--- linux-2.6.17/include/asm-sh/pci.h.orig 2006-07-27 10:17:30.000000000 +1000 ++++ linux-2.6.17/include/asm-sh/pci.h 2006-07-27 10:21:53.000000000 +1000 +@@ -143,6 +143,19 @@ + /* generic pci stuff */ + #include <asm-generic/pci.h> + ++#ifdef CONFIG_SH_TITAN ++/* ++ * With the updated BIOS the RTL8139D is function 1 while the ++ * mini-pci card is function 0 of the RTL8139D. This is a feature ++ * which enables more pci bus-master inputs than are available by ++ * using a bus-master sharing feature of the RTL8139D. Without this ++ * patch the RTL8139D isn't detected when no mini-pci card is ++ * inserted. ++ */ ++#undef pcibios_scan_all_fns ++#define pcibios_scan_all_fns(a, b) ((b)?0:1) ++#endif ++ + /* generic DMA-mapping stuff */ + #include <asm-generic/pci-dma-compat.h> + diff --git a/packages/linux/linux-titan-sh4_2.6.17.bb b/packages/linux/linux-titan-sh4_2.6.17.bb index c3bae053cb..17ea61baa4 100644 --- a/packages/linux/linux-titan-sh4_2.6.17.bb +++ b/packages/linux/linux-titan-sh4_2.6.17.bb @@ -2,11 +2,12 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for SH4 based TITAN router appliance" LICENSE = "GPL" MAINTAINER = "Jamie Lenehan <lenehan@twibble.org> -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - cvs://anonymous@linuxsh.cvs.sourceforge.net/cvsroot/linuxsh;module=linux;date=20060709 \ + cvs://anonymous@linuxsh.cvs.sourceforge.net/cvsroot/linuxsh;module=linux;date=20060726 \ file://titan-flash.patch;patch=1 \ + file://titan-pcibios-scan-update.patch;patch=1 \ file://titan-config" S = "${WORKDIR}/linux-${PV}" diff --git a/packages/linux/netbook-pro-kernel_2.6.17.bb b/packages/linux/netbook-pro-kernel_2.6.17.bb index 671f0fba4f..fe0edb6c18 100644 --- a/packages/linux/netbook-pro-kernel_2.6.17.bb +++ b/packages/linux/netbook-pro-kernel_2.6.17.bb @@ -2,12 +2,12 @@ DESCRIPTION = "Linux Kernel for Psion/Teklogix netbookpro compatible machines" SECTION = "kernel" MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" LICENSE = "GPL" -PR = "r0" +PR = "r1" COMPATIBLE_MACHINE = "netbook-pro" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ - http://linuxtogo.org/~koen/netbook-base-r2.patch;patch=1 \ + http://linuxtogo.org/~koen/netbook-base-r3.patch;patch=1 \ http://linuxtogo.org/~koen/netbook-pcon-r0.patch;patch=1 \ http://linuxtogo.org/~koen/netbook-pcon-i2c-r1.patch;patch=1 \ http://linuxtogo.org/~koen/defconfig \ diff --git a/packages/lirc/lirc_0.8.0.bb b/packages/lirc/lirc_0.8.0.bb index 43253937b2..5044c69c6e 100644 --- a/packages/lirc/lirc_0.8.0.bb +++ b/packages/lirc/lirc_0.8.0.bb @@ -9,7 +9,7 @@ PRIORITY = "optional" HOMEPAGE = "http://www.lirc.org" MAINTAINER = "Matthias Goebl <matthias.goebl@goebl.net>" LICENSE = "GPL" -DEPENDS = "virtual/kernel virtual/x11 libxau libsm libice" +DEPENDS = "virtual/kernel virtual/libx11 libxau libsm libice" DEPENDS_nslu2 = "virtual/kernel lirc-modules" RDEPENDS = "lirc-modules" RDEPENDS_lirc-x = "lirc" diff --git a/packages/maemo/osso-af-utils_0.4.bb b/packages/maemo/osso-af-utils_0.4.bb index 2ffa19b6bc..300e7804df 100644 --- a/packages/maemo/osso-af-utils_0.4.bb +++ b/packages/maemo/osso-af-utils_0.4.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" MAINTAINER = "Koen Kooi <koen@handhelds.org>" -DEPENDS = "virtual/x11 dbus libosso" +DEPENDS = "virtual/libx11 dbus libosso" SRC_URI = "http://stage.maemo.org:80/pool/maemo/ossw/source/o/osso-af-utils/osso-af-utils_${PV}-1.tar.gz" inherit autotools pkgconfig diff --git a/packages/maemo/xpext_1.0-5.bb b/packages/maemo/xpext_1.0-5.bb index b8ee5d9b98..d56581dcde 100644 --- a/packages/maemo/xpext_1.0-5.bb +++ b/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 = "virtual/x11 xextensions libxext" +DEPENDS = "virtual/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/packages/maemo/xsp_1.0.0-8.bb b/packages/maemo/xsp_1.0.0-8.bb index d797724f4c..7c54931b03 100644 --- a/packages/maemo/xsp_1.0.0-8.bb +++ b/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 = "virtual/x11 xextensions libxext xpext" +DEPENDS = "virtual/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/packages/matchbox-panel/matchbox-panel_0.8.1.bb b/packages/matchbox-panel/matchbox-panel_0.8.1.bb index 3f836a32bb..9475edd55e 100644 --- a/packages/matchbox-panel/matchbox-panel_0.8.1.bb +++ b/packages/matchbox-panel/matchbox-panel_0.8.1.bb @@ -2,7 +2,7 @@ SECTION = "x11/utils" PR = "r4" DESCRIPTION = "Matchbox panel" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxpm apmd startup-notification virtual/kernel" +DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel" SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \ file://automake-lossage.patch;patch=1 \ diff --git a/packages/matchbox-panel/matchbox-panel_0.8.3.bb b/packages/matchbox-panel/matchbox-panel_0.8.3.bb index dd991ddbaa..f6bc0166fc 100644 --- a/packages/matchbox-panel/matchbox-panel_0.8.3.bb +++ b/packages/matchbox-panel/matchbox-panel_0.8.3.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Matchbox Window Manager Panel" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxpm apmd startup-notification virtual/kernel" +DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel" SECTION = "x11/wm" PR = "r1" diff --git a/packages/matchbox-panel/matchbox-panel_0.8.bb b/packages/matchbox-panel/matchbox-panel_0.8.bb index 361a901597..a65c017f9e 100644 --- a/packages/matchbox-panel/matchbox-panel_0.8.bb +++ b/packages/matchbox-panel/matchbox-panel_0.8.bb @@ -1,7 +1,7 @@ SECTION = "x11/utils" DESCRIPTION = "Matchbox panel" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxpm" +DEPENDS = "libmatchbox virtual/libx11 libxext libxpm" RDEPENDS = "libmatchbox matchbox-common" SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/${PV}/matchbox-panel-${PV}.tar.bz2" diff --git a/packages/matchbox-panel/matchbox-panel_0.9.1.bb b/packages/matchbox-panel/matchbox-panel_0.9.1.bb index fa68298a37..3a10e1938d 100644 --- a/packages/matchbox-panel/matchbox-panel_0.9.1.bb +++ b/packages/matchbox-panel/matchbox-panel_0.9.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Matchbox Window Manager Panel" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxpm apmd startup-notification virtual/kernel" +DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel" SECTION = "x11/wm" PR = "r2" diff --git a/packages/matchbox-panel/matchbox-panel_0.9.bb b/packages/matchbox-panel/matchbox-panel_0.9.bb index 9b36f17692..4f0a8a6b00 100644 --- a/packages/matchbox-panel/matchbox-panel_0.9.bb +++ b/packages/matchbox-panel/matchbox-panel_0.9.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Matchbox Window Manager Panel" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxpm apmd startup-notification virtual/kernel" +DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel" SECTION = "x11/wm" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz" diff --git a/packages/matchbox-wm/matchbox-wm_0.8.3.bb b/packages/matchbox-wm/matchbox-wm_0.8.3.bb index af791cbe23..947f14e867 100644 --- a/packages/matchbox-wm/matchbox-wm_0.8.3.bb +++ b/packages/matchbox-wm/matchbox-wm_0.8.3.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \ diff --git a/packages/matchbox-wm/matchbox-wm_0.8.4.bb b/packages/matchbox-wm/matchbox-wm_0.8.4.bb index af791cbe23..947f14e867 100644 --- a/packages/matchbox-wm/matchbox-wm_0.8.4.bb +++ b/packages/matchbox-wm/matchbox-wm_0.8.4.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \ diff --git a/packages/matchbox-wm/matchbox-wm_0.9.2.bb b/packages/matchbox-wm/matchbox-wm_0.9.2.bb index 7f8b768106..304efc3c44 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.2.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.2.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PR = "r1" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.3.bb b/packages/matchbox-wm/matchbox-wm_0.9.3.bb index b858153b8f..3a46009a4c 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.3.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.3.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PR = "r2" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.4.bb b/packages/matchbox-wm/matchbox-wm_0.9.4.bb index 05f006c195..4fa9a6bd74 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.4.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.4.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/packages/matchbox-wm/matchbox-wm_0.9.5.bb index 06cd29eb6b..aad37abc3f 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.5.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.5.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PR="r0" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.bb b/packages/matchbox-wm/matchbox-wm_0.9.bb index ddc3dccd62..4a9fa639f2 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.gz" diff --git a/packages/matchbox-wm/matchbox-wm_1.0.bb b/packages/matchbox-wm/matchbox-wm_1.0.bb index 88c04d9473..00bea89603 100644 --- a/packages/matchbox-wm/matchbox-wm_1.0.bb +++ b/packages/matchbox-wm/matchbox-wm_1.0.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PR="r1" diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb index 5720c23392..95d24b5b95 100644 --- a/packages/matchbox-wm/matchbox-wm_svn.bb +++ b/packages/matchbox-wm/matchbox-wm_svn.bb @@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PV = "0.9.5+svn${SRCDATE}" PR = "r2" diff --git a/packages/mesa/mesa_6.4.1+cvs20060101.bb b/packages/mesa/mesa_6.4.1+cvs20060101.bb index b3fccad992..c39dc02d97 100644 --- a/packages/mesa/mesa_6.4.1+cvs20060101.bb +++ b/packages/mesa/mesa_6.4.1+cvs20060101.bb @@ -10,7 +10,7 @@ S = "${WORKDIR}/Mesa" LICENSE = "LGPL" RDEPENDS = "expat" -DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/x11 libxext libxxf86vm libxi libxmu libice" +DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 libxext libxxf86vm libxi libxmu libice" # gcc-3.4 blows up in gtktext with -frename-registers on arm-linux CXXFLAGS := "${@'${CXXFLAGS}'.replace('-frename-registers', '')}" diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb index 286abb4d79..0714e506b7 100644 --- a/packages/meta/meta-sdk.bb +++ b/packages/meta/meta-sdk.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta package for SDK including GPE and Opie" LICENSE = MIT DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" -PR = "r10" +PR = "r11" PACKAGES = "" diff --git a/packages/miniclipboard/miniclipboard_0.3.bb b/packages/miniclipboard/miniclipboard_0.3.bb index f0e5e46d6e..980f928ccd 100644 --- a/packages/miniclipboard/miniclipboard_0.3.bb +++ b/packages/miniclipboard/miniclipboard_0.3.bb @@ -2,7 +2,7 @@ SECTION = "x11/utils" inherit gpe LICENSE = "LGPL" DESCRIPTION = "Clipboard management application" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" RDEPENDS = "gdk-pixbuf-loader-xpm" MAINTAINER = "Phil Blundell <pb@handhelds.org>" PR = "r1" diff --git a/packages/minipredict/minipredict.bb b/packages/minipredict/minipredict.bb index df8cfe7781..e67bf0daff 100644 --- a/packages/minipredict/minipredict.bb +++ b/packages/minipredict/minipredict.bb @@ -1,7 +1,7 @@ inherit gpe pkgconfig DESCRIPTION = "Minipredict is a app that sits above the dock, e.g. mbdock, and suggests words for completion." -DEPENDS = "virtual/x11 libxext gtk+ libdictionary zlib" +DEPENDS = "virtual/libx11 libxext gtk+ libdictionary zlib" SECTION = "gpe" PRIORITY = "optional" diff --git a/packages/mrxvt/mrxvt_0.4.1.bb b/packages/mrxvt/mrxvt_0.4.1.bb index f4f34a672c..153d226f97 100644 --- a/packages/mrxvt/mrxvt_0.4.1.bb +++ b/packages/mrxvt/mrxvt_0.4.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://materm.sourceforge.net" AUTHOR = "Jimmy Zhou <jimmyzhou@users.sf.net>" LICENSE = "GPL" SECTION = "x11/apps" -DEPENDS = "virtual/x11 libxext libxpm jpeg libpng" +DEPENDS = "virtual/libx11 libxext libxpm jpeg libpng" PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/materm/mrxvt-${PV}.tar.gz \ diff --git a/packages/nonworking/xlibs/xext_6.4.3.bb b/packages/nonworking/xlibs/xext_6.4.3.bb deleted file mode 100644 index f8a17fe2db..0000000000 --- a/packages/nonworking/xlibs/xext_6.4.3.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "X Server Extension library" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "xproto x11 xextensions" - -SRC_URI = "${XLIBS_MIRROR}/libXext-${PV}.tar.bz2" -S = "${WORKDIR}/libXext-${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/packages/nonworking/xlibs/xmu_6.2.3.bb b/packages/nonworking/xlibs/xmu_6.2.3.bb deleted file mode 100644 index cad9bdc5d5..0000000000 --- a/packages/nonworking/xlibs/xmu_6.2.3.bb +++ /dev/null @@ -1,13 +0,0 @@ -SECTION = "libs" -PRIORITY = "optional" -MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "xt xext xaw" - -SRC_URI = "${XLIBS_MIRROR}/libXmu-${PV}.tar.bz2" -S = "${WORKDIR}/libXmu-${PV}" - -inherit autotools pkgconfig - -do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} -} diff --git a/packages/pango/pango_1.10.0.bb b/packages/pango/pango_1.10.0.bb index 4be6047ffa..27d57052f7 100644 --- a/packages/pango/pango_1.10.0.bb +++ b/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 virtual/x11 libxft libxt gtk-doc cairo" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/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/packages/pango/pango_1.10.2.bb b/packages/pango/pango_1.10.2.bb index 3006b41970..74730e18db 100644 --- a/packages/pango/pango_1.10.2.bb +++ b/packages/pango/pango_1.10.2.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 virtual/x11 libxft libxt gtk-doc cairo" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/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/packages/pango/pango_1.12.0.bb b/packages/pango/pango_1.12.0.bb index 8859f6b873..907d813d00 100644 --- a/packages/pango/pango_1.12.0.bb +++ b/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 virtual/x11 libxft libxt gtk-doc cairo" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/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/packages/pango/pango_1.13.2.bb b/packages/pango/pango_1.13.2.bb index dda2cf7d1c..fb2a6a7394 100644 --- a/packages/pango/pango_1.13.2.bb +++ b/packages/pango/pango_1.13.2.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 virtual/x11 libxft xt gtk-doc cairo" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft xt 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/packages/pango/pango_1.2.5.bb b/packages/pango/pango_1.2.5.bb index bf66887e9f..5a8e3da345 100644 --- a/packages/pango/pango_1.2.5.bb +++ b/packages/pango/pango_1.2.5.bb @@ -1,6 +1,6 @@ LICENSE = "LGPL" SECTION = "x11/libs" -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 libxft libxt" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt" 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/packages/pango/pango_1.4.0.bb b/packages/pango/pango_1.4.0.bb index 1e53f049d4..3f2f664d21 100644 --- a/packages/pango/pango_1.4.0.bb +++ b/packages/pango/pango_1.4.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 virtual/x11 libxft libxt" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt" 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/packages/pango/pango_1.4.1.bb b/packages/pango/pango_1.4.1.bb index 52007acf78..32edd7965c 100644 --- a/packages/pango/pango_1.4.1.bb +++ b/packages/pango/pango_1.4.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 virtual/x11 libxft libxt gtk-doc" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/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/packages/pango/pango_1.8.0.bb b/packages/pango/pango_1.8.0.bb index 55dac29f25..fe9752c8bd 100644 --- a/packages/pango/pango_1.8.0.bb +++ b/packages/pango/pango_1.8.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 virtual/x11 libxft libxt gtk-doc" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/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/packages/pango/pango_1.8.1.bb b/packages/pango/pango_1.8.1.bb index 55dac29f25..fe9752c8bd 100644 --- a/packages/pango/pango_1.8.1.bb +++ b/packages/pango/pango_1.8.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 virtual/x11 libxft libxt gtk-doc" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/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/packages/pango/pango_1.8.2.bb b/packages/pango/pango_1.8.2.bb index 7dad993d9c..923e17a029 100644 --- a/packages/pango/pango_1.8.2.bb +++ b/packages/pango/pango_1.8.2.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 virtual/x11 libxft libxt gtk-doc" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc" RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ diff --git a/packages/pango/pango_1.9.1.bb b/packages/pango/pango_1.9.1.bb index d110d0a76d..dad91c7101 100644 --- a/packages/pango/pango_1.9.1.bb +++ b/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 virtual/x11 libxft libxt gtk-doc" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc" RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ diff --git a/packages/pax-utils/pax-utils-native_0.1.9.bb b/packages/pax-utils/pax-utils-native_0.1.13.bb index d586dcb29e..d586dcb29e 100644 --- a/packages/pax-utils/pax-utils-native_0.1.9.bb +++ b/packages/pax-utils/pax-utils-native_0.1.13.bb diff --git a/packages/pax-utils/pax-utils_0.1.9.bb b/packages/pax-utils/pax-utils_0.1.13.bb index 3aa6b22ee8..0e514673b0 100644 --- a/packages/pax-utils/pax-utils_0.1.9.bb +++ b/packages/pax-utils/pax-utils_0.1.13.bb @@ -3,9 +3,11 @@ HOMEPAGE = "http://www.gentoo.org/proj/en/hardened/pax-utils.xml" LICENSE = "GPLv2" MAINTAINER = "freyther@handhelds.org" -SRC_URI = "${GENTOO_MIRROR}/pax-utils-${PV}.tar.bz2;md5sum=71e8d13d072efcbc4123960211a34d4f" +SRC_URI = "${GENTOO_MIRROR}/pax-utils-${PV}.tar.bz2;md5sum=5f09df47a16e83462384b44b75310539" S = "${WORKDIR}/pax-utils-${PV}" +CPPFLAGS += "-D_GNU_SOURCE " + do_compile() { oe_runmake } diff --git a/packages/proj4/.mtn2git_empty b/packages/proj4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/proj4/.mtn2git_empty diff --git a/packages/proj4/proj-4_4.9.bb b/packages/proj4/proj-4_4.9.bb new file mode 100644 index 0000000000..cb8dcc5eea --- /dev/null +++ b/packages/proj4/proj-4_4.9.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "PROJ.4 - Cartographic Projections Library" +HOMEPAGE = "http://www.remotesensing.org/proj/" +LICENSE = "MIT" + +inherit autotools pkgconfig + +SRC_URI = "ftp://ftp.remotesensing.org/proj/proj-4.${PV}.tar.gz" + +S = "${WORKDIR}/proj-4.${PV}" + +do_stage() { + autotools_stage_all +} + diff --git a/packages/qt/qt-x11-free_3.3.6.bb b/packages/qt/qt-x11-free_3.3.6.bb index 6509bac524..b246e9ebcf 100644 --- a/packages/qt/qt-x11-free_3.3.6.bb +++ b/packages/qt/qt-x11-free_3.3.6.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL QPL" HOMEPAGE = "http://www.trolltech.com" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -DEPENDS = "uicmoc3-native freetype virtual/x11 xft libxext libxrender libxrandr libxcursor mysql" +DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql" PROVIDES = "qt3x11" PR = "r0" diff --git a/packages/qt/qt4-x11-free_4.1.2.bb b/packages/qt/qt4-x11-free_4.1.2.bb index 128413d166..cd0f90becd 100644 --- a/packages/qt/qt4-x11-free_4.1.2.bb +++ b/packages/qt/qt4-x11-free_4.1.2.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -DEPENDS = "uicmoc4-native qmake2-native freetype jpeg virtual/x11 xft libxext libxrender libxrandr libxcursor" +DEPENDS = "uicmoc4-native qmake2-native freetype jpeg virtual/libx11 xft libxext libxrender libxrandr libxcursor" PROVIDES = "qt4x11" PR = "r1" diff --git a/packages/rdesktop/rdesktop_1.3.1.bb b/packages/rdesktop/rdesktop_1.3.1.bb index 7695b336d3..ed19483d6b 100644 --- a/packages/rdesktop/rdesktop_1.3.1.bb +++ b/packages/rdesktop/rdesktop_1.3.1.bb @@ -5,7 +5,7 @@ DESCRIPTION = "RDesktop is a X11 based RDP client" HOMEPAGE = "http://www.rdesktop.org/" LICENSE = "GPL" -DEPENDS = "virtual/x11 openssl" +DEPENDS = "virtual/libx11 openssl" RDEPENDS= "openssl" SECTION = "x11/network" diff --git a/packages/rdesktop/rdesktop_1.4.1.bb b/packages/rdesktop/rdesktop_1.4.1.bb index 5d0dff6627..315dd87ebe 100644 --- a/packages/rdesktop/rdesktop_1.4.1.bb +++ b/packages/rdesktop/rdesktop_1.4.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Rdesktop rdp client for X" -DEPENDS = "virtual/x11 openssl" +DEPENDS = "virtual/libx11 openssl" HOMEPAGE = "http://www.rdesktop.org" SECTION = "x11/network" MAINTAINER = "Adrian Davey <ade@beth2.org>" diff --git a/packages/rdesktop/rdesktop_cvs.bb b/packages/rdesktop/rdesktop_cvs.bb index 0568789afa..e111189e6f 100644 --- a/packages/rdesktop/rdesktop_cvs.bb +++ b/packages/rdesktop/rdesktop_cvs.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Rdesktop rdp client for X" -DEPENDS = "virtual/x11 openssl" +DEPENDS = "virtual/libx11 openssl" HOMEPAGE = "http://www.rdesktop.org" SECTION = "x11/network" MAINTAINER = "Adrian Davey <ade@beth2.org>" diff --git a/packages/rosetta/rosetta_cvs.bb b/packages/rosetta/rosetta_cvs.bb index 06f8d8c73c..726b68aa81 100644 --- a/packages/rosetta/rosetta_cvs.bb +++ b/packages/rosetta/rosetta_cvs.bb @@ -1,6 +1,6 @@ SECTION = "x11/utils" PV = "0.0+cvs${SRCDATE}" -DEPENDS = "gtk+ libgpewidget virtual/x11 libxrandr libxft libxtst libxext libxau \ +DEPENDS = "gtk+ libgpewidget virtual/libx11 libxrandr libxft libxtst libxext libxau \ virtual/libintl" DESCRIPTION = "Multistroke / full word handwriting recognition for X" LICENSE = "GPL" diff --git a/packages/rxvt-unicode/rxvt-unicode_4.8.bb b/packages/rxvt-unicode/rxvt-unicode_4.8.bb index 5ba2b23616..3b96243b77 100644 --- a/packages/rxvt-unicode/rxvt-unicode_4.8.bb +++ b/packages/rxvt-unicode/rxvt-unicode_4.8.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxt libxft" +DEPENDS = "virtual/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/packages/rxvt-unicode/rxvt-unicode_4.9.bb b/packages/rxvt-unicode/rxvt-unicode_4.9.bb index dd3cf46c2c..d7c5b4c705 100644 --- a/packages/rxvt-unicode/rxvt-unicode_4.9.bb +++ b/packages/rxvt-unicode/rxvt-unicode_4.9.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxt libxft" +DEPENDS = "virtual/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/packages/rxvt-unicode/rxvt-unicode_5.2.bb b/packages/rxvt-unicode/rxvt-unicode_5.2.bb index 001da697ad..966f006178 100644 --- a/packages/rxvt-unicode/rxvt-unicode_5.2.bb +++ b/packages/rxvt-unicode/rxvt-unicode_5.2.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxt libxft" +DEPENDS = "virtual/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/packages/rxvt-unicode/rxvt-unicode_5.3.bb b/packages/rxvt-unicode/rxvt-unicode_5.3.bb index 2825fb015f..b3f261818c 100644 --- a/packages/rxvt-unicode/rxvt-unicode_5.3.bb +++ b/packages/rxvt-unicode/rxvt-unicode_5.3.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxt libxft" +DEPENDS = "virtual/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/packages/rxvt-unicode/rxvt-unicode_5.4.bb b/packages/rxvt-unicode/rxvt-unicode_5.4.bb index 2825fb015f..b3f261818c 100644 --- a/packages/rxvt-unicode/rxvt-unicode_5.4.bb +++ b/packages/rxvt-unicode/rxvt-unicode_5.4.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxt libxft" +DEPENDS = "virtual/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/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/packages/rxvt-unicode/rxvt-unicode_5.6.bb index 296582ef73..f9ba2bedde 100644 --- a/packages/rxvt-unicode/rxvt-unicode_5.6.bb +++ b/packages/rxvt-unicode/rxvt-unicode_5.6.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxt libxft" +DEPENDS = "virtual/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/packages/rxvt-unicode/rxvt-unicode_7.7.bb b/packages/rxvt-unicode/rxvt-unicode_7.7.bb index e6c3c165a3..532fe2da63 100644 --- a/packages/rxvt-unicode/rxvt-unicode_7.7.bb +++ b/packages/rxvt-unicode/rxvt-unicode_7.7.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxt libxft libxpm" +DEPENDS = "virtual/libx11 libxt libxft libxpm" 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/packages/rxvt-unicode/rxvt-unicode_cvs.bb b/packages/rxvt-unicode/rxvt-unicode_cvs.bb index 73674bac92..fca5be9370 100644 --- a/packages/rxvt-unicode/rxvt-unicode_cvs.bb +++ b/packages/rxvt-unicode/rxvt-unicode_cvs.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxt libxft" +DEPENDS = "virtual/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/packages/rxvt/rxvt_2.7.9.bb b/packages/rxvt/rxvt_2.7.9.bb index 0093a218fd..5a66d04f9d 100644 --- a/packages/rxvt/rxvt_2.7.9.bb +++ b/packages/rxvt/rxvt_2.7.9.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Well known terminal emulator" SECTION = "x11/utils" PR = "r1" -DEPENDS = "virtual/x11 libxft" +DEPENDS = "virtual/libx11 libxft" LICENSE = "GPL" SRC_URI = "${HANDHELDS_CVS};module=apps/rxvt \ file://include.patch;patch=1" diff --git a/packages/startup-monitor/startup-monitor_0.18-2.bb b/packages/startup-monitor/startup-monitor_0.18-2.bb index b056ea9441..efb2b69ad7 100644 --- a/packages/startup-monitor/startup-monitor_0.18-2.bb +++ b/packages/startup-monitor/startup-monitor_0.18-2.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" -DEPENDS = "virtual/x11 startup-notification glib-2.0 libmatchbox" +DEPENDS = "virtual/libx11 startup-notification glib-2.0 libmatchbox" inherit gpe pkgconfig diff --git a/packages/startup-notification/startup-notification_0.5.bb b/packages/startup-notification/startup-notification_0.5.bb index d04c6da160..e53ac16fa2 100644 --- a/packages/startup-notification/startup-notification_0.5.bb +++ b/packages/startup-notification/startup-notification_0.5.bb @@ -3,7 +3,7 @@ LICENSE = "LGPL" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" inherit autotools pkgconfig diff --git a/packages/startup-notification/startup-notification_0.8.bb b/packages/startup-notification/startup-notification_0.8.bb index d847de20d0..0cf4f089cc 100644 --- a/packages/startup-notification/startup-notification_0.8.bb +++ b/packages/startup-notification/startup-notification_0.8.bb @@ -3,7 +3,7 @@ LICENSE = "LGPL" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" inherit autotools pkgconfig diff --git a/packages/tasks/task-qpe.bb b/packages/tasks/task-qpe.bb index 50f42d84fa..d6a73739f5 100644 --- a/packages/tasks/task-qpe.bb +++ b/packages/tasks/task-qpe.bb @@ -3,7 +3,7 @@ SECTION = "opie/base" ALLOW_EMPTY = 1 PACKAGE_ARCH = "all" LICENSE = "MIT" -PR = "r6" +PR = "r7" PACKAGES = "task-qpe-applets task-qpe-games task-qpe-inputmethods \ task-qpe-multimedia task-qpe-emulators task-qpe-applications \ @@ -106,7 +106,8 @@ RDEPENDS_task-qpe-games = "\ zrally \ zrev7 \ zsubhunt \ - ztappy" + ztappy \ + zudoku" RDEPENDS_task-qpe-inputmethods = "\ custominput \ diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index c39ffd59f8..7e1fae85e6 100644 --- a/packages/tasks/task-sdk.bb +++ b/packages/tasks/task-sdk.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SDK packages for Opie and GPE" -PR = "r2" +PR = "r3" LICENSE = MIT ALLOW_EMPTY = "1" @@ -35,16 +35,18 @@ RDEPENDS_task-sdk-base := "\ libetpan-dev \ libgcrypt-dev \ libglade-dev \ + libgnutls-dev \ libgpg-error-dev \ libidl-dev \ libiw-dev \ - libmimedir-dev \ + libmimedir-3.3-dev \ libpcap-dev \ libpixman-dev \ libpng-dev \ libschedule-dev \ libsm-dev \ libsoundgen-dev \ + libsoup-2.2-dev \ libsvg-dev \ libtododb-dev \ libts-dev \ @@ -106,7 +108,8 @@ RDEPENDS_task-sdk-gpe := "\ libgpepimc-dev \ libgpevtype-dev \ libgpelaunch-dev \ - libgpewidget-dev" + libgpewidget-dev \ + libhandoff-dev" RDEPENDS_task-sdk-opie := "\ libopiebluez2 \ diff --git a/packages/tcltk/tk_8.4.11.bb b/packages/tcltk/tk_8.4.11.bb index c8b3ac0d3a..69a3227437 100644 --- a/packages/tcltk/tk_8.4.11.bb +++ b/packages/tcltk/tk_8.4.11.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Tool Command Language ToolKit Extension" LICENSE = "tcl" SECTION = "devel/tcltk" HOMEPAGE = "http://tcl.sourceforge.net" -DEPENDS = "tcl virtual/x11 libxt" +DEPENDS = "tcl virtual/libx11 libxt" RDEPENDS = "tcl" PR = "r4" diff --git a/packages/tetex/tetex_3.0.bb b/packages/tetex/tetex_3.0.bb index ad0e0f23f2..838447fa57 100644 --- a/packages/tetex/tetex_3.0.bb +++ b/packages/tetex/tetex_3.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "teTeX is a complete (pdf)(La)TeX distribution for UNIX compatible HOMEPAGE = "http://www.tug.org/tetex" LICENSE = "GPL" SECTION = "console/utils" -DEPENDS = "tetex-native flex gd ncurses libpng t1lib virtual/x11 libxau libxext libxt zlib" +DEPENDS = "tetex-native flex gd ncurses libpng t1lib virtual/libx11 libxau libxext libxt zlib" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" PR = "r5" diff --git a/packages/uae/e-uae_0.8.27.bb b/packages/uae/e-uae_0.8.28.bb index 454136cc05..cb59f88957 100644 --- a/packages/uae/e-uae_0.8.27.bb +++ b/packages/uae/e-uae_0.8.28.bb @@ -1,13 +1,12 @@ DESCRIPTION = "Amiga Emulator based on SDL" SECTION = "base" PRIORITY = "optional" -DEPENDS = "libsdl-qpe" +DEPENDS = "virtual/libsdl zlib" LICENSE = "GPL" -PR = "r1" +PR = "r0" -SRC_URI = "http://rcdrummond.net/uae/old/e-uae-${PV}/e-uae-${PV}.tar.bz2 \ +SRC_URI = "http://rcdrummond.net/uae/e-uae-${PV}/e-uae-${PV}.tar.bz2 \ file://configure.patch;patch=1" -# file://m4.patch;patch=1" inherit autotools @@ -24,13 +23,3 @@ PARALLEL_MAKE = "" do_configure_prepend () { touch NEWS AUTHORS ChangeLog } - -do_install_append() { -# Packages NEVER, ever, ever, ever touch home directories directly. -# ever. -# Either update a global config in /etc, install it into /etc/skel/ for -# new users homedirs, rely on the user installing it to put it in place, -# or dont install it at all. --CL -# install -d ${D}/home/root -# install ${FILESDIR}/uaerc ${D}/home/root/.uaerc -} diff --git a/packages/uim/uim_1.1.0.bb b/packages/uim/uim_1.1.0.bb index 59cba88047..2b6fb5c089 100644 --- a/packages/uim/uim_1.1.0.bb +++ b/packages/uim/uim_1.1.0.bb @@ -1,5 +1,5 @@ require uim.inc -DEPENDS = "gtk+ uim-native anthy fontconfig virtual/x11 libxft xt glib-2.0 ncurses" +DEPENDS = "gtk+ uim-native anthy fontconfig virtual/libx11 libxft xt glib-2.0 ncurses" SRC_URI += "file://uim-module-manager.patch;patch=1" diff --git a/packages/v4l2apps/v4l2apps_20020317.bb b/packages/v4l2apps/v4l2apps_20020317.bb index 0206863f93..9915cd63a0 100644 --- a/packages/v4l2apps/v4l2apps_20020317.bb +++ b/packages/v4l2apps/v4l2apps_20020317.bb @@ -1,7 +1,7 @@ SECTION = "console/utils" DESCRIPTION = "Video4linux Two sample applications" LICENSE = "PD" -DEPENDS = "libxaw virtual/x11 libxt" +DEPENDS = "libxaw virtual/libx11 libxt" SRC_URI = "http://www.thedirks.org/pub/v4l2/apps/apps${PV}.tgz" S = "${WORKDIR}" diff --git a/packages/vnc/tightvnc_1.3dev7.bb b/packages/vnc/tightvnc_1.3dev7.bb index a79f100230..c5fe202c64 100644 --- a/packages/vnc/tightvnc_1.3dev7.bb +++ b/packages/vnc/tightvnc_1.3dev7.bb @@ -1,6 +1,6 @@ DESCRIPTION = "A Unix VNC client" HOMEPAGE = "http://www.tightvnc.com/" -DEPENDS = "virtual/x11 zlib libxmu libxaw" +DEPENDS = "virtual/libx11 zlib libxmu libxaw" LICENSE = "GPL" MAINTAINER = "Graeme Gregory <dp@xora.org.uk>" diff --git a/packages/xawtv/xawtv_3.93.bb b/packages/xawtv/xawtv_3.93.bb index 18ff27b428..068fc094b1 100644 --- a/packages/xawtv/xawtv_3.93.bb +++ b/packages/xawtv/xawtv_3.93.bb @@ -4,7 +4,7 @@ DESCRIPTION = "XawTV is a simple Xaw-based TV program which uses the bttw \ driver or video4linux. It also contains various command-line utilities for \ grabbing images and AVI movies, tuning in TV stations, etc." MAINTAINER = "Chris Larson <kergoth@handhelds.org>" -DEPENDS = "libxaw libxmu libxt libxpm libxext virtual/x11 ncurses libxft fs jpeg" +DEPENDS = "libxaw libxmu libxt libxpm libxext virtual/libx11 ncurses libxft fs jpeg" SRC_URI = "http://dl.bytesex.org/releases/xawtv/xawtv-${PV}.tar.gz \ file://make.patch;patch=1" diff --git a/packages/xcalibrate/xcalibrate_20060312.bb b/packages/xcalibrate/xcalibrate_20060312.bb index 7239275f21..1de87c04eb 100644 --- a/packages/xcalibrate/xcalibrate_20060312.bb +++ b/packages/xcalibrate/xcalibrate_20060312.bb @@ -3,7 +3,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" LICENSE = "BSD-X" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "virtual/x11 xcalibrateext libxext" +DEPENDS = "virtual/libx11 xcalibrateext libxext" DESCRIPTION = "XCalibrate client-side library" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \ diff --git a/packages/xcalibrate/xcalibrate_cvs.bb b/packages/xcalibrate/xcalibrate_cvs.bb index 98c493f3ca..a5b435795a 100644 --- a/packages/xcalibrate/xcalibrate_cvs.bb +++ b/packages/xcalibrate/xcalibrate_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "BSD-X" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "virtual/x11 xcalibrateext libxext" +DEPENDS = "virtual/libx11 xcalibrateext libxext" DESCRIPTION = "XCalibrate client-side library" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \ diff --git a/packages/xcompmgr/xcompmgr_cvs.bb b/packages/xcompmgr/xcompmgr_cvs.bb index ba2550261d..3979e430c0 100644 --- a/packages/xcompmgr/xcompmgr_cvs.bb +++ b/packages/xcompmgr/xcompmgr_cvs.bb @@ -3,7 +3,7 @@ LICENSE = "BSD-X" SECTION = "x11" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "virtual/x11 libxdamage libxcomposite libxrender" +DEPENDS = "virtual/libx11 libxdamage libxcomposite libxrender" DESCRIPTION = "X Compositing Manager" SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xcompmgr" diff --git a/packages/xdemineur/xdemineur_2.1.1.bb b/packages/xdemineur/xdemineur_2.1.1.bb index ffd6b3a918..8c1e8ae206 100644 --- a/packages/xdemineur/xdemineur_2.1.1.bb +++ b/packages/xdemineur/xdemineur_2.1.1.bb @@ -1,7 +1,7 @@ inherit gpe LICENSE = "BSD-X" -DEPENDS = "virtual/x11 libxpm" +DEPENDS = "virtual/libx11 libxpm" SECTION = "gpe" DESCRIPTION = "Mine-sweeper game for GPE." PRIORITY = "optional" diff --git a/packages/xfcalendar/xfcalendar.inc b/packages/xfcalendar/xfcalendar.inc index 8a1a5b7e20..987d8b4d67 100644 --- a/packages/xfcalendar/xfcalendar.inc +++ b/packages/xfcalendar/xfcalendar.inc @@ -4,5 +4,5 @@ DESCRIPTION="XFCE Calendar" SECTION = "x11" -DEPENDS = "virtual/x11 libxfcegui4 libxfce4mcs" +DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs" inherit xfce diff --git a/packages/xfcalendar/xfcalendar_4.2.0.bb b/packages/xfcalendar/xfcalendar_4.2.0.bb index 8a1a5b7e20..987d8b4d67 100644 --- a/packages/xfcalendar/xfcalendar_4.2.0.bb +++ b/packages/xfcalendar/xfcalendar_4.2.0.bb @@ -4,5 +4,5 @@ DESCRIPTION="XFCE Calendar" SECTION = "x11" -DEPENDS = "virtual/x11 libxfcegui4 libxfce4mcs" +DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs" inherit xfce diff --git a/packages/xfce-utils/xfce-utils.inc b/packages/xfce-utils/xfce-utils.inc index a4b3958493..3de7625940 100644 --- a/packages/xfce-utils/xfce-utils.inc +++ b/packages/xfce-utils/xfce-utils.inc @@ -3,7 +3,7 @@ # Released under the MIT license (see packages/COPYING) DESCRIPTION="XFCE4 Utilities" -DEPENDS = "virtual/x11 libxfcegui4 xfce-mcs-manager" +DEPENDS = "virtual/libx11 libxfcegui4 xfce-mcs-manager" inherit xfce FILES_${PN} += " /usr/share/xfce4/AUTHORS \ diff --git a/packages/xfce4-panel/xfce4-panel.inc b/packages/xfce4-panel/xfce4-panel.inc index 573e2bdaa3..e43807540e 100644 --- a/packages/xfce4-panel/xfce4-panel.inc +++ b/packages/xfce4-panel/xfce4-panel.inc @@ -4,7 +4,7 @@ DESCRIPTION = "XFCE4 Panel" SECTION = "x11" -DEPENDS = "startup-notification virtual/x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" +DEPENDS = "startup-notification virtual/libx11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" inherit pkgconfig xfce diff --git a/packages/xfdesktop/xfdesktop.inc b/packages/xfdesktop/xfdesktop.inc index 1b22894fed..380832d7c3 100644 --- a/packages/xfdesktop/xfdesktop.inc +++ b/packages/xfdesktop/xfdesktop.inc @@ -4,7 +4,7 @@ DESCRIPTION="xfce4 Desktop Background Manager" SECTION = "x11/base" -DEPENDS = "virtual/x11 libxfcegui4 libxfce4mcs libxml2" +DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2" inherit xfce PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins" diff --git a/packages/xfdesktop/xfdesktop_4.2.0.bb b/packages/xfdesktop/xfdesktop_4.2.0.bb index 4c56b459a3..7a90487cc8 100644 --- a/packages/xfdesktop/xfdesktop_4.2.0.bb +++ b/packages/xfdesktop/xfdesktop_4.2.0.bb @@ -4,7 +4,7 @@ DESCRIPTION="xfce4 Desktop Background Manager" SECTION = "x11/base" -DEPENDS = "virtual/x11 libxfcegui4 libxfce4mcs libxml2" +DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2" inherit xfce PACKAGES += "xfdesktop-backdrops" diff --git a/packages/xfwm4/xfwm4.inc b/packages/xfwm4/xfwm4.inc index 5af8a5f18b..1b137c4261 100644 --- a/packages/xfwm4/xfwm4.inc +++ b/packages/xfwm4/xfwm4.inc @@ -8,7 +8,7 @@ inherit xfce FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*" -DEPENDS = "startup-notification virtual/x11 xpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager" +DEPENDS = "startup-notification virtual/libx11 xpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager" EXTRA_OECONF += " --enable-startup-notification" diff --git a/packages/xfwm4/xfwm4_4.2.0.bb b/packages/xfwm4/xfwm4_4.2.0.bb index f23227ae60..e6fbd22b59 100644 --- a/packages/xfwm4/xfwm4_4.2.0.bb +++ b/packages/xfwm4/xfwm4_4.2.0.bb @@ -9,7 +9,7 @@ inherit xfce FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*" -DEPENDS = "startup-notification virtual/x11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager" +DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager" EXTRA_OECONF += " --enable-startup-notification" diff --git a/packages/xmonobut/xmonobut_0.4.1.bb b/packages/xmonobut/xmonobut_0.4.1.bb index 6f3bf8888a..813a390c7c 100644 --- a/packages/xmonobut/xmonobut_0.4.1.bb +++ b/packages/xmonobut/xmonobut_0.4.1.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" PR = "r1" DESCRIPTION = "utility to allow middle and right clicking with a stylus" SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxext libxpm libmatchbox" +DEPENDS = "virtual/libx11 libxext libxpm libmatchbox" SRC_URI = "http://www.handhelds.org/~philippe/sources/xmonobut-${PV}.tar.gz \ file://xmonobut.desktop" inherit autotools diff --git a/packages/xmonobut/xmonobut_0.4.bb b/packages/xmonobut/xmonobut_0.4.bb index fb377cb179..97ebcbd84c 100644 --- a/packages/xmonobut/xmonobut_0.4.bb +++ b/packages/xmonobut/xmonobut_0.4.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" PR = "r1" DESCRIPTION = "utility to allow middle and right clicking with a stylus" SECTION = "x11/utils" -DEPENDS = "virtual/x11 libxext libxpm" +DEPENDS = "virtual/libx11 libxext libxpm" SRC_URI = "http://www.handhelds.org/~mallum/downloadables/xmonobut/xmonobut-${PV}.tar.gz \ file://xmonobut.desktop" inherit autotools diff --git a/packages/xorg-app/appres_X11R7.0-1.0.0.bb b/packages/xorg-app/appres_X11R7.0-1.0.0.bb index cb0d42a2a6..0e58c4e833 100644 --- a/packages/xorg-app/appres_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/appres_X11R7.0-1.0.0.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc DESCRIPTION = "The appres program prints the resources seen by an application." -DEPENDS += " virtual/x11 libxt" +DEPENDS += " virtual/libx11 libxt" diff --git a/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb b/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb index e25b3ba16a..95ef0cc62c 100644 --- a/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxscrnsaver libxt libxaw libxt" +DEPENDS += " virtual/libx11 libxscrnsaver libxt libxaw libxt" diff --git a/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb b/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb index 3d953e8a19..2c723fc720 100644 --- a/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb @@ -2,4 +2,4 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxmu xbitmaps libxt" +DEPENDS += " virtual/libx11 libxmu xbitmaps libxt" diff --git a/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb b/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb index 3e5736e063..a38e28f0b0 100644 --- a/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxmu xbitmaps libxt" +DEPENDS += " virtual/libx11 libxmu xbitmaps libxt" diff --git a/packages/xorg-app/editres_X11R7.0-1.0.1.bb b/packages/xorg-app/editres_X11R7.0-1.0.1.bb index 908dc878cb..8007aca6b7 100644 --- a/packages/xorg-app/editres_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/editres_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxt libxmu libxaw" +DEPENDS += " virtual/libx11 libxt libxmu libxaw" diff --git a/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb b/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb index b274cd549f..5cdde24099 100644 --- a/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libfs" +DEPENDS += " virtual/libx11 libfs" diff --git a/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb b/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb index b274cd549f..5cdde24099 100644 --- a/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libfs" +DEPENDS += " virtual/libx11 libfs" diff --git a/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb b/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb index b274cd549f..5cdde24099 100644 --- a/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libfs" +DEPENDS += " virtual/libx11 libfs" diff --git a/packages/xorg-app/ico_X11R7.0-1.0.1.bb b/packages/xorg-app/ico_X11R7.0-1.0.1.bb index 827257910a..558ed4643b 100644 --- a/packages/xorg-app/ico_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/ico_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" diff --git a/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb index f18de41289..a96ac9d325 100644 --- a/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb @@ -3,4 +3,4 @@ include xorg-app-common.inc DESCRIPTION = "Applications that would like to take advantage of the Low Bandwidth \ extension to X (LBX) must make their connections to an lbxproxy." -DEPENDS += " xtrans libxext liblbxutil virtual/x11 libice xproxymngproto bigreqsproto zlib" +DEPENDS += " xtrans libxext liblbxutil virtual/libx11 libice xproxymngproto bigreqsproto zlib" diff --git a/packages/xorg-app/listres_X11R7.0-1.0.1.bb b/packages/xorg-app/listres_X11R7.0-1.0.1.bb index aff984e46b..9a36345429 100644 --- a/packages/xorg-app/listres_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/listres_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxaw virtual/x11 libxt libxmu" +DEPENDS += " libxaw virtual/libx11 libxt libxmu" diff --git a/packages/xorg-app/luit_X11R7.0-1.0.1.bb b/packages/xorg-app/luit_X11R7.0-1.0.1.bb index c83cd38c5d..e4d89bfe77 100644 --- a/packages/xorg-app/luit_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/luit_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " zlib zlib virtual/x11 libfontenc" +DEPENDS += " zlib zlib virtual/libx11 libfontenc" diff --git a/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb b/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb index 144e600beb..8b33179a51 100644 --- a/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxfont libfs libfontenc" +DEPENDS += " virtual/libx11 libxfont libfs libfontenc" diff --git a/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb index 29e304922d..98b49f99ac 100644 --- a/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb @@ -3,7 +3,7 @@ SECTION = "x11/apps" LICENSE = "MIT-X" S="${WORKDIR}/mkfontscale-${PV}" -DEPENDS = "virtual/x11-native libfontenc-native" +DEPENDS = "libx11-native libfontenc-native" SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/mkfontscale-${PV}.tar.bz2" diff --git a/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb index dc2b681490..ac452f9edc 100644 --- a/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " zlib libfontenc freetype virtual/x11" +DEPENDS += " zlib libfontenc freetype virtual/libx11" diff --git a/packages/xorg-app/oclock_X11R7.0-1.0.1.bb b/packages/xorg-app/oclock_X11R7.0-1.0.1.bb index 4c564a3643..d995da2a40 100644 --- a/packages/xorg-app/oclock_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/oclock_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxmu libxext libxt" +DEPENDS += " virtual/libx11 libxmu libxext libxt" diff --git a/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb b/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb index 7272764f52..5d23a1afe7 100644 --- a/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libice libxt virtual/x11 xproxymngproto" +DEPENDS += " libice libxt virtual/libx11 xproxymngproto" diff --git a/packages/xorg-app/rgb_X11R7.0-1.0.0.bb b/packages/xorg-app/rgb_X11R7.0-1.0.0.bb index 0895ec79c8..f9d4b86f9f 100644 --- a/packages/xorg-app/rgb_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/rgb_X11R7.0-1.0.0.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxt" +DEPENDS += " virtual/libx11 libxt" diff --git a/packages/xorg-app/rstart_X11R7.0-1.0.1.bb b/packages/xorg-app/rstart_X11R7.0-1.0.1.bb index 827257910a..558ed4643b 100644 --- a/packages/xorg-app/rstart_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/rstart_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" diff --git a/packages/xorg-app/rstart_X11R7.1-1.0.2.bb b/packages/xorg-app/rstart_X11R7.1-1.0.2.bb index 827257910a..558ed4643b 100644 --- a/packages/xorg-app/rstart_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/rstart_X11R7.1-1.0.2.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" diff --git a/packages/xorg-app/scripts_X11R7.0-1.0.1.bb b/packages/xorg-app/scripts_X11R7.0-1.0.1.bb index e1f332e8c1..3c5bf5f926 100644 --- a/packages/xorg-app/scripts_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/scripts_X11R7.0-1.0.1.bb @@ -2,6 +2,6 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" diff --git a/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb b/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb index 827257910a..558ed4643b 100644 --- a/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" diff --git a/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb b/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb index 29ed7358d5..f03ed310dd 100644 --- a/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxkbfile virtual/x11" +DEPENDS += " libxkbfile virtual/libx11" diff --git a/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb b/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb index 29ed7358d5..f03ed310dd 100644 --- a/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxkbfile virtual/x11" +DEPENDS += " libxkbfile virtual/libx11" diff --git a/packages/xorg-app/twm_X11R7.0-1.0.1.bb b/packages/xorg-app/twm_X11R7.0-1.0.1.bb index c975c2c42d..f5fa5fb952 100644 --- a/packages/xorg-app/twm_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/twm_X11R7.0-1.0.1.bb @@ -2,7 +2,7 @@ include xorg-app-common.inc DESCRIPTION = "tiny window manager" -DEPENDS += " virtual/x11 libxext libxt libxmu" +DEPENDS += " virtual/libx11 libxext libxt libxmu" ALTERNATIVE_PATH = "${bindir}/twm" ALTERNATIVE_NAME = "x-window-manager" diff --git a/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb b/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb index 8e07c499b9..3e6143ab01 100644 --- a/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxmu" +DEPENDS += " virtual/libx11 libxmu" diff --git a/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb b/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb index 4b4f4fe068..bcaa28942c 100644 --- a/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb +++ b/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb @@ -2,4 +2,4 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxmu libxrender libxft libxext" +DEPENDS += " virtual/libx11 libxmu libxrender libxft libxext" diff --git a/packages/xorg-app/xauth_X11R7.0-1.0.1.bb b/packages/xorg-app/xauth_X11R7.0-1.0.1.bb index d9e62caa1f..64a9284f01 100644 --- a/packages/xorg-app/xauth_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xauth_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxau libxext libxmu" +DEPENDS += " virtual/libx11 libxau libxext libxmu" diff --git a/packages/xorg-app/xauth_cvs.bb b/packages/xorg-app/xauth_cvs.bb index c1489e10a9..a944d1d51d 100644 --- a/packages/xorg-app/xauth_cvs.bb +++ b/packages/xorg-app/xauth_cvs.bb @@ -1,6 +1,6 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" -DEPENDS = "virtual/x11 libxau libxmu libxext" +DEPENDS = "virtual/libx11 libxau libxmu libxext" DESCRIPTION = "X authority file utility" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" diff --git a/packages/xorg-app/xclock_X11R7.0-1.0.1.bb b/packages/xorg-app/xclock_X11R7.0-1.0.1.bb index e8ee6e20a4..c3ecef6037 100644 --- a/packages/xorg-app/xclock_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xclock_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxaw libxrender libxft libxkbfile libxt" +DEPENDS += " virtual/libx11 libxaw libxrender libxft libxkbfile libxt" diff --git a/packages/xorg-app/xclock_X11R7.1-1.0.2.bb b/packages/xorg-app/xclock_X11R7.1-1.0.2.bb index e8ee6e20a4..c3ecef6037 100644 --- a/packages/xorg-app/xclock_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xclock_X11R7.1-1.0.2.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxaw libxrender libxft libxkbfile libxt" +DEPENDS += " virtual/libx11 libxaw libxrender libxft libxkbfile libxt" diff --git a/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb b/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb index 827257910a..558ed4643b 100644 --- a/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" diff --git a/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb b/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb index f75a98b9d3..4f77cad470 100644 --- a/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxcursor libpng" +DEPENDS += " virtual/libx11 libxcursor libpng" diff --git a/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb b/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb index f75a98b9d3..4f77cad470 100644 --- a/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb +++ b/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxcursor libpng" +DEPENDS += " virtual/libx11 libxcursor libpng" diff --git a/packages/xorg-app/xdm_X11R7.0-1.0.1.bb b/packages/xorg-app/xdm_X11R7.0-1.0.1.bb index e99c1aa768..8d424ad08a 100644 --- a/packages/xorg-app/xdm_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xdm_X11R7.0-1.0.1.bb @@ -2,7 +2,7 @@ include xorg-app-common.inc DESCRIPTION = "X display manager" -DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/x11 libxext libxdmcp libxt" +DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt" EXTRA_OECONF += " --with-random-device=/dev/urandom" diff --git a/packages/xorg-app/xdm_X11R7.1-1.0.4.bb b/packages/xorg-app/xdm_X11R7.1-1.0.4.bb index 438af7fbf6..2d78de5f08 100644 --- a/packages/xorg-app/xdm_X11R7.1-1.0.4.bb +++ b/packages/xorg-app/xdm_X11R7.1-1.0.4.bb @@ -2,6 +2,6 @@ include xorg-app-common.inc DESCRIPTION = "X display manager" -DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/x11 libxext libxdmcp libxt" +DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt" EXTRA_OECONF += " --with-random-device=/dev/urandom" diff --git a/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb index c577aeb38a..c152ca7884 100644 --- a/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb @@ -3,7 +3,7 @@ include xorg-app-common.inc DESCRIPTION = "X display information utility" LICENSE = "MIT" -DEPENDS += " libxtst libxext virtual/x11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp" +DEPENDS += " libxtst libxext virtual/libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp" SRC_URI += "file://disable-xkb.patch;patch=1" diff --git a/packages/xorg-app/xdpyinfo_cvs.bb b/packages/xorg-app/xdpyinfo_cvs.bb index 06d548c9ba..df31ba68d5 100644 --- a/packages/xorg-app/xdpyinfo_cvs.bb +++ b/packages/xorg-app/xdpyinfo_cvs.bb @@ -1,6 +1,6 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" -DEPENDS = "virtual/x11 libxext libxtst" +DEPENDS = "virtual/libx11 libxext libxtst" DESCRIPTION = "X display information utility" MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "x11/base" diff --git a/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb b/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb index 9ab9e1a0e7..a07f6e2f2e 100644 --- a/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 glproto mesa" +DEPENDS += " virtual/libx11 glproto mesa" diff --git a/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb b/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb index 9ab9e1a0e7..a07f6e2f2e 100644 --- a/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb +++ b/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 glproto mesa" +DEPENDS += " virtual/libx11 glproto mesa" diff --git a/packages/xorg-app/xev_X11R7.0-1.0.1.bb b/packages/xorg-app/xev_X11R7.0-1.0.1.bb index 61b8ca4284..a300e62b1a 100644 --- a/packages/xorg-app/xev_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xev_X11R7.0-1.0.1.bb @@ -4,5 +4,5 @@ DESCRIPTION = "X Event Viewer" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" LICENSE = "MIT" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" diff --git a/packages/xorg-app/xev_cvs.bb b/packages/xorg-app/xev_cvs.bb index e1f9a33a67..8acf2261cb 100644 --- a/packages/xorg-app/xev_cvs.bb +++ b/packages/xorg-app/xev_cvs.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://freedesktop.org/wiki/Software_2fxapps" LICENSE = "MIT" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" SECTION = "x11/base" -DEPENDS = "virtual/x11 libxau" +DEPENDS = "virtual/libx11 libxau" PR = "r1" SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xev \ diff --git a/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb b/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb index 6d2c81ffd6..e568238673 100644 --- a/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb @@ -2,4 +2,4 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxau libxt libxext libxmu" +DEPENDS += " virtual/libx11 libxau libxt libxext libxmu" diff --git a/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb b/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb index 4dfb42d0b3..3d1abfda69 100644 --- a/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxxf86dga libxt libxaw libxmu" +DEPENDS += " virtual/libx11 libxxf86dga libxt libxaw libxmu" diff --git a/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb index 41fe411756..6e2c3eb9ca 100644 --- a/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libice libxt xproxymngproto" +DEPENDS += " virtual/libx11 libice libxt xproxymngproto" diff --git a/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb index b274cd549f..5cdde24099 100644 --- a/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libfs" +DEPENDS += " virtual/libx11 libfs" diff --git a/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb b/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb index 258c980548..3673395ba4 100644 --- a/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libice xproxymngproto" +DEPENDS += " virtual/libx11 libice xproxymngproto" diff --git a/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb b/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb index 8f3678475a..45331d67ee 100644 --- a/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxxf86vm" +DEPENDS += " virtual/libx11 libxxf86vm" diff --git a/packages/xorg-app/xhost_20040413.bb b/packages/xorg-app/xhost_20040413.bb index 1bc64ecf77..ed240dbba1 100644 --- a/packages/xorg-app/xhost_20040413.bb +++ b/packages/xorg-app/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 = "virtual/x11 libxext libxmu" +DEPENDS = "virtual/libx11 libxext libxmu" DESCRIPTION = "server access control program for X" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" diff --git a/packages/xorg-app/xhost_X11R7.0-1.0.0.bb b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb index ff7cacd178..370cdbbf54 100644 --- a/packages/xorg-app/xhost_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb @@ -4,5 +4,5 @@ DESCRIPTION = "Server access control program for X" MAINTAINER = "Rene Wagner <rw@handhelds.org>" LICENSE = "MIT" -DEPENDS += " virtual/x11 libxmu libxau" +DEPENDS += " virtual/libx11 libxmu libxau" diff --git a/packages/xorg-app/xhost_X11R7.1-1.0.1.bb b/packages/xorg-app/xhost_X11R7.1-1.0.1.bb index ff7cacd178..370cdbbf54 100644 --- a/packages/xorg-app/xhost_X11R7.1-1.0.1.bb +++ b/packages/xorg-app/xhost_X11R7.1-1.0.1.bb @@ -4,5 +4,5 @@ DESCRIPTION = "Server access control program for X" MAINTAINER = "Rene Wagner <rw@handhelds.org>" LICENSE = "MIT" -DEPENDS += " virtual/x11 libxmu libxau" +DEPENDS += " virtual/libx11 libxmu libxau" diff --git a/packages/xorg-app/xinit_X11R7.0-1.0.1.bb b/packages/xorg-app/xinit_X11R7.0-1.0.1.bb index e1f332e8c1..3c5bf5f926 100644 --- a/packages/xorg-app/xinit_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xinit_X11R7.0-1.0.1.bb @@ -2,6 +2,6 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" diff --git a/packages/xorg-app/xinit_X11R7.1-1.0.2.bb b/packages/xorg-app/xinit_X11R7.1-1.0.2.bb index 59f7755640..df579023fb 100644 --- a/packages/xorg-app/xinit_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xinit_X11R7.1-1.0.2.bb @@ -2,6 +2,6 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" FILES_${PN} += " /usr/lib/X11/xinit" diff --git a/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb index aa6b46e13c..f1f76411bc 100644 --- a/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard." -DEPENDS += " virtual/x11 libxkbfile" +DEPENDS += " virtual/libx11 libxkbfile" diff --git a/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb b/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb index aa6b46e13c..f1f76411bc 100644 --- a/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard." -DEPENDS += " virtual/x11 libxkbfile" +DEPENDS += " virtual/libx11 libxkbfile" diff --git a/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb index 29ed7358d5..f03ed310dd 100644 --- a/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxkbfile virtual/x11" +DEPENDS += " libxkbfile virtual/libx11" diff --git a/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb b/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb index 29ed7358d5..f03ed310dd 100644 --- a/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxkbfile virtual/x11" +DEPENDS += " libxkbfile virtual/libx11" diff --git a/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb index 29ed7358d5..f03ed310dd 100644 --- a/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxkbfile virtual/x11" +DEPENDS += " libxkbfile virtual/libx11" diff --git a/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb index 512ff6c6de..ef238cf69f 100644 --- a/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxaw libxkbfile virtual/x11" +DEPENDS += " libxaw libxkbfile virtual/libx11" diff --git a/packages/xorg-app/xkill_X11R7.0-1.0.1.bb b/packages/xorg-app/xkill_X11R7.0-1.0.1.bb index 8e07c499b9..3e6143ab01 100644 --- a/packages/xorg-app/xkill_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xkill_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxmu" +DEPENDS += " virtual/libx11 libxmu" diff --git a/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb index 8e07c499b9..3e6143ab01 100644 --- a/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxmu" +DEPENDS += " virtual/libx11 libxmu" diff --git a/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb index 8e07c499b9..3e6143ab01 100644 --- a/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxmu" +DEPENDS += " virtual/libx11 libxmu" diff --git a/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb index 827257910a..558ed4643b 100644 --- a/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" diff --git a/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb index e0149a478f..3b04dfe71d 100644 --- a/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb @@ -4,5 +4,5 @@ DESCRIPTION = "Utility for modifying keymaps and pointer button mappings in X" MAINTAINER = "Rene Wagner <rw@handhelds.org>" LICENSE = "MIT" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" diff --git a/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb b/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb index 40e27576a6..f99627cf8f 100644 --- a/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb +++ b/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb @@ -4,5 +4,5 @@ DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" MAINTAINER = "Rene Wagner <rw@handhelds.org>" LICENSE = "MIT" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" diff --git a/packages/xorg-app/xmodmap_cvs.bb b/packages/xorg-app/xmodmap_cvs.bb index c1fb2425d1..7f45b28a89 100644 --- a/packages/xorg-app/xmodmap_cvs.bb +++ b/packages/xorg-app/xmodmap_cvs.bb @@ -5,7 +5,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" PR = "r1" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \ file://autofoo.patch;patch=1" diff --git a/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb b/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb index 609c5643bf..c62dffdc84 100644 --- a/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxprintapputil libxaw libxprintutil libxt libxp" +DEPENDS += " virtual/libx11 libxprintapputil libxaw libxprintutil libxt libxp" diff --git a/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb b/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb index f1c547af4e..695554764b 100644 --- a/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxp libxprintutil virtual/x11" +DEPENDS += " libxp libxprintutil virtual/libx11" diff --git a/packages/xorg-app/xpr_X11R7.0-1.0.1.bb b/packages/xorg-app/xpr_X11R7.0-1.0.1.bb index 7bba2c74df..642a459965 100644 --- a/packages/xorg-app/xpr_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xpr_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxmu virtual/x11" +DEPENDS += " libxmu virtual/libx11" diff --git a/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb b/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb index cccb035df6..d820b6924f 100644 --- a/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxp virtual/x11" +DEPENDS += " libxp virtual/libx11" diff --git a/packages/xorg-app/xprop_X11R7.0-1.0.1.bb b/packages/xorg-app/xprop_X11R7.0-1.0.1.bb index 7bba2c74df..642a459965 100644 --- a/packages/xorg-app/xprop_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xprop_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxmu virtual/x11" +DEPENDS += " libxmu virtual/libx11" diff --git a/packages/xorg-app/xprop_cvs.bb b/packages/xorg-app/xprop_cvs.bb index 93ddb2dbf6..1079d6a591 100644 --- a/packages/xorg-app/xprop_cvs.bb +++ b/packages/xorg-app/xprop_cvs.bb @@ -1,6 +1,6 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" -DEPENDS = "virtual/x11 libxmu libxext" +DEPENDS = "virtual/libx11 libxmu libxext" DESCRIPTION = "property displayer for X" MAINTER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" diff --git a/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb b/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb index b03804bcb6..93d96293c3 100644 --- a/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb @@ -3,5 +3,5 @@ include xorg-app-common.inc DESCRIPTION = "X Resize and Rotate extension command." LICENSE= "BSD-X" -DEPENDS += " libxrandr libxrender virtual/x11" +DEPENDS += " libxrandr libxrender virtual/libx11" diff --git a/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb b/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb index b03804bcb6..93d96293c3 100644 --- a/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb @@ -3,5 +3,5 @@ include xorg-app-common.inc DESCRIPTION = "X Resize and Rotate extension command." LICENSE= "BSD-X" -DEPENDS += " libxrandr libxrender virtual/x11" +DEPENDS += " libxrandr libxrender virtual/libx11" diff --git a/packages/xorg-app/xrandr_cvs.bb b/packages/xorg-app/xrandr_cvs.bb index f45e04115b..30a31e1569 100644 --- a/packages/xorg-app/xrandr_cvs.bb +++ b/packages/xorg-app/xrandr_cvs.bb @@ -1,6 +1,6 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" -DEPENDS = "libxrandr virtual/x11 libxext" +DEPENDS = "libxrandr virtual/libx11 libxext" DESCRIPTION = "X Resize and Rotate extension command." SECTION = "x11/base" diff --git a/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb index 7d8538be29..a0ea3b223f 100644 --- a/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb @@ -4,5 +4,5 @@ DESCRIPTION = "X server resource database utility" MAINTAINER = "Rene Wagner <rw@handhelds.org>" LICENSE = "xrdb" -DEPENDS += " libxmu virtual/x11 libxext" +DEPENDS += " libxmu virtual/libx11 libxext" diff --git a/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb b/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb index 9533003b8f..0b53593c9f 100644 --- a/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb @@ -4,4 +4,4 @@ DESCRIPTION = "X server resource database utility" MAINTAINER = "Rene Wagner <rw@handhelds.org>" LICENSE = "xrdb" -DEPENDS += " libxmu virtual/x11 libxext" +DEPENDS += " libxmu virtual/libx11 libxext" diff --git a/packages/xorg-app/xrdb_cvs.bb b/packages/xorg-app/xrdb_cvs.bb index 191eb9897f..51a3fcd08a 100644 --- a/packages/xorg-app/xrdb_cvs.bb +++ b/packages/xorg-app/xrdb_cvs.bb @@ -1,5 +1,5 @@ PV = "0.0+cvs${SRCDATE}" -DEPENDS = "virtual/x11 libxmu libxext" +DEPENDS = "virtual/libx11 libxmu libxext" DESCRIPTION = "X server resource database utility" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" diff --git a/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb b/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb index 827257910a..558ed4643b 100644 --- a/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" diff --git a/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb b/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb index 827257910a..558ed4643b 100644 --- a/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" diff --git a/packages/xorg-app/xrx_X11R7.0-1.0.1.bb b/packages/xorg-app/xrx_X11R7.0-1.0.1.bb index 831e7de68f..7782b3c4b1 100644 --- a/packages/xorg-app/xrx_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xrx_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxaw virtual/x11 libxt libxext xtrans xproxymngproto libxau" +DEPENDS += " libxaw virtual/libx11 libxt libxext xtrans xproxymngproto libxau" diff --git a/packages/xorg-app/xset_20040817.bb b/packages/xorg-app/xset_20040817.bb index ca41d2373d..90247fdb26 100644 --- a/packages/xorg-app/xset_20040817.bb +++ b/packages/xorg-app/xset_20040817.bb @@ -5,7 +5,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" PV = "0.0+cvs${FIXEDSRCDATE}" PR = "r1" -DEPENDS = "virtual/x11 libxext xextensions libxmu" +DEPENDS = "virtual/libx11 libxext xextensions libxmu" CFLAGS += "-D_GNU_SOURCE" diff --git a/packages/xorg-app/xset_X11R7.0-1.0.1.bb b/packages/xorg-app/xset_X11R7.0-1.0.1.bb index ca689e55f7..f737bcbd9a 100644 --- a/packages/xorg-app/xset_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xset_X11R7.0-1.0.1.bb @@ -4,7 +4,7 @@ DESCRIPTION = "user preference utility for X" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" LICENSE = "MIT" -DEPENDS += " libxmu libxext virtual/x11 libxxf86misc libxfontcache libxp" +DEPENDS += " libxmu libxext virtual/libx11 libxxf86misc libxfontcache libxp" SRC_URI += "file://disable-xkb.patch;patch=1" diff --git a/packages/xorg-app/xset_X11R7.1-1.0.2.bb b/packages/xorg-app/xset_X11R7.1-1.0.2.bb index ca689e55f7..f737bcbd9a 100644 --- a/packages/xorg-app/xset_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xset_X11R7.1-1.0.2.bb @@ -4,7 +4,7 @@ DESCRIPTION = "user preference utility for X" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" LICENSE = "MIT" -DEPENDS += " libxmu libxext virtual/x11 libxxf86misc libxfontcache libxp" +DEPENDS += " libxmu libxext virtual/libx11 libxxf86misc libxfontcache libxp" SRC_URI += "file://disable-xkb.patch;patch=1" diff --git a/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb b/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb index 6bd79a0eb8..de6b894fac 100644 --- a/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxi virtual/x11" +DEPENDS += " libxi virtual/libx11" diff --git a/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb b/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb index 6bd79a0eb8..de6b894fac 100644 --- a/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb +++ b/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxi virtual/x11" +DEPENDS += " libxi virtual/libx11" diff --git a/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb b/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb index 99061f45c4..4f2db234b2 100644 --- a/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxmu virtual/x11 xbitmaps" +DEPENDS += " libxmu virtual/libx11 xbitmaps" diff --git a/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb b/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb index 7bba2c74df..642a459965 100644 --- a/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxmu virtual/x11" +DEPENDS += " libxmu virtual/libx11" diff --git a/packages/xorg-app/xterm_207.bb b/packages/xorg-app/xterm_207.bb index aa34d9b106..5fc59a1c37 100644 --- a/packages/xorg-app/xterm_207.bb +++ b/packages/xorg-app/xterm_207.bb @@ -3,9 +3,9 @@ SECTION = "x11/apps" #MAINTAINER = "" LICENSE = "MIT-X" -DEPENDS = "xproto virtual/x11 xextproto xext xau xpm ncurses" +DEPENDS = "xproto virtual/libx11 xextproto xext xau xpm ncurses" -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/extras/${PN}-${PV}.tar.gz" +SRC_URI = "${XORG_MIRROR}/development/X11R7.0-RC4/extras/${PN}-${PV}.tar.gz" inherit autotools pkgconfig diff --git a/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb b/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb index fb3dca78a1..114b732ff7 100644 --- a/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxtrap" +DEPENDS += " virtual/libx11 libxtrap" diff --git a/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb b/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb index fb3dca78a1..114b732ff7 100644 --- a/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxtrap" +DEPENDS += " virtual/libx11 libxtrap" diff --git a/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb index 4fdaf2427e..eb59db6922 100644 --- a/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxv virtual/x11" +DEPENDS += " libxv virtual/libx11" diff --git a/packages/xorg-app/xwd_X11R7.0-1.0.1.bb b/packages/xorg-app/xwd_X11R7.0-1.0.1.bb index 7bba2c74df..642a459965 100644 --- a/packages/xorg-app/xwd_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xwd_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxmu virtual/x11" +DEPENDS += " libxmu virtual/libx11" diff --git a/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb index a871a5c6e5..55f97cb8cb 100644 --- a/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxmu libxext virtual/x11" +DEPENDS += " libxmu libxext virtual/libx11" diff --git a/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb b/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb index a871a5c6e5..55f97cb8cb 100644 --- a/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " libxmu libxext virtual/x11" +DEPENDS += " libxmu libxext virtual/libx11" diff --git a/packages/xorg-app/xwud_X11R7.0-1.0.1.bb b/packages/xorg-app/xwud_X11R7.0-1.0.1.bb index 827257910a..558ed4643b 100644 --- a/packages/xorg-app/xwud_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/xwud_X11R7.0-1.0.1.bb @@ -2,5 +2,5 @@ include xorg-app-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" diff --git a/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb b/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb index 6ec014854c..d76388cfe4 100644 --- a/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb +++ b/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb @@ -2,5 +2,5 @@ include xorg-driver-video.inc DESCRIPTION = "I810 for X11" -DEPENDS += " virtual/x11 libxvmc drm xf86driproto" +DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb b/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb index 6ec014854c..d76388cfe4 100644 --- a/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb +++ b/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb @@ -2,5 +2,5 @@ include xorg-driver-video.inc DESCRIPTION = "I810 for X11" -DEPENDS += " virtual/x11 libxvmc drm xf86driproto" +DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" diff --git a/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb b/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb index 02db64181a..1a061d9bf5 100644 --- a/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb +++ b/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb @@ -2,6 +2,6 @@ include xorg-font-common.inc DESCRIPTION = "X font aliases." -DEPENDS = "xserver-xorg font-util" +DEPENDS = "virtual/xserver font-util" RDEPENDS = "encodings font-util" diff --git a/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb index 4ae26c4a14..f5acc7a670 100644 --- a/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxext xextproto applewmproto" +DEPENDS += " virtual/libx11 libxext xextproto applewmproto" XORG_PN = "libAppleWM" diff --git a/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb b/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb index 8e14c07680..d26cad95b1 100644 --- a/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb @@ -2,4 +2,4 @@ include xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxext xextproto dmxproto" +DEPENDS += " virtual/libx11 libxext xextproto dmxproto" diff --git a/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb b/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb index 8e14c07680..d26cad95b1 100644 --- a/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb @@ -2,4 +2,4 @@ include xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxext xextproto dmxproto" +DEPENDS += " virtual/libx11 libxext xextproto dmxproto" diff --git a/packages/xorg-lib/libice_6.3.3.bb b/packages/xorg-lib/libice_6.3.3.bb index c5403f625f..e771161e59 100644 --- a/packages/xorg-lib/libice_6.3.3.bb +++ b/packages/xorg-lib/libice_6.3.3.bb @@ -2,7 +2,7 @@ SECTION = "libs" LICENSE= "MIT" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" PROVIDES = "ice" DESCRIPTION = "X11 ICE library" PR = "r1" diff --git a/packages/xorg-lib/libice_cvs.bb b/packages/xorg-lib/libice_cvs.bb index 598791cc40..1756a235d7 100644 --- a/packages/xorg-lib/libice_cvs.bb +++ b/packages/xorg-lib/libice_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "MIT" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" PROVIDES = "ice" DESCRIPTION = "X11 ICE library" PR = "r1" diff --git a/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb b/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb index 3d17aa561b..99be60d038 100644 --- a/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11" +DEPENDS += " virtual/libx11" XORG_PN = "liboldX" diff --git a/packages/xorg-lib/libsm_6.0.3.bb b/packages/xorg-lib/libsm_6.0.3.bb index 51dbe93251..cd374649bb 100644 --- a/packages/xorg-lib/libsm_6.0.3.bb +++ b/packages/xorg-lib/libsm_6.0.3.bb @@ -2,7 +2,7 @@ SECTION = "libs" LICENSE = "MIT-X" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "virtual/x11 libice" +DEPENDS = "virtual/libx11 libice" DESCRIPTION = "Session management library" PR = "r1" diff --git a/packages/xorg-lib/libsm_cvs.bb b/packages/xorg-lib/libsm_cvs.bb index ce43901aad..45d6bfa236 100644 --- a/packages/xorg-lib/libsm_cvs.bb +++ b/packages/xorg-lib/libsm_cvs.bb @@ -2,7 +2,7 @@ PV = "6.0.3+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "virtual/x11 libice" +DEPENDS = "virtual/libx11 libice" DESCRIPTION = "Session management library" PR = "r1" diff --git a/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb index 27cf01a31c..da595182f4 100644 --- a/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxext xextproto windowswmproto" +DEPENDS += " virtual/libx11 libxext xextproto windowswmproto" XORG_PN = "libWindowsWM" diff --git a/packages/xorg-lib/libx11_6.2.1.bb b/packages/xorg-lib/libx11_6.2.1.bb index 54e79bf727..ce57c42f7f 100644 --- a/packages/xorg-lib/libx11_6.2.1.bb +++ b/packages/xorg-lib/libx11_6.2.1.bb @@ -3,7 +3,8 @@ LICENSE = "XFree86" PRIORITY = "optional" MAINTAINER = "Greg Gilbert <greg@treke.net>" DEPENDS = "xproto xextensions libxau xtrans libxdmcp" -PROVIDES = "virtual/x11" +PROVIDES = "virtual/libx11" +RPROVIDES = "virtual/libx11" DESCRIPTION = "Base X libs." FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" diff --git a/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb index e738d48e73..784f1c65b6 100644 --- a/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb @@ -4,7 +4,8 @@ DESCRIPTION = "Base X libs." DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto" -PROVIDES = "virtual/x11" +PROVIDES = "virtual/libx11" +RPROVIDES = "virtual/libx11" XORG_PN = "libX11" diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb index e738d48e73..784f1c65b6 100644 --- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb @@ -4,7 +4,8 @@ DESCRIPTION = "Base X libs." DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto" -PROVIDES = "virtual/x11" +PROVIDES = "virtual/libx11" +RPROVIDES = "virtual/libx11" XORG_PN = "libX11" diff --git a/packages/xorg-lib/libx11_cvs.bb b/packages/xorg-lib/libx11_cvs.bb index b37d0e13e7..aaa052eba3 100644 --- a/packages/xorg-lib/libx11_cvs.bb +++ b/packages/xorg-lib/libx11_cvs.bb @@ -5,7 +5,8 @@ SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Greg Gilbert <greg@treke.net>" DEPENDS = "xproto xextensions libxau xtrans libxdmcp" -PROVIDES = "virtual/x11" +PROVIDES = "virtual/libx11" +RPROVIDES = "virtual/libx11" DESCRIPTION = "Base X libs." FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" diff --git a/packages/xorg-lib/libx11_git.bb b/packages/xorg-lib/libx11_git.bb index 347d4c1386..3f7fd5853e 100644 --- a/packages/xorg-lib/libx11_git.bb +++ b/packages/xorg-lib/libx11_git.bb @@ -6,7 +6,8 @@ PRIORITY = "optional" LICENSE = "XFree86" DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" -PROVIDES = "virtual/x11" +PROVIDES = "virtual/libx11" +RPROVIDES = "virtual/libx11" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" diff --git a/packages/xorg-lib/libxaw_7.0.2.bb b/packages/xorg-lib/libxaw_7.0.2.bb index 883886efb2..04f2855101 100644 --- a/packages/xorg-lib/libxaw_7.0.2.bb +++ b/packages/xorg-lib/libxaw_7.0.2.bb @@ -2,7 +2,7 @@ SECTION = "x11/libs" LICENSE = "MIT" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "xproto virtual/x11 libxt libxmu libxpm" +DEPENDS = "xproto virtual/libx11 libxt libxmu libxpm" PROVIDES = "xaw" DESCRIPTION = "X Athena Widgets library" diff --git a/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb index a558b889ae..dcb73a19ea 100644 --- a/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc DESCRIPTION = "Xaw is the X Athena Widget Set." -DEPENDS += " xproto virtual/x11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" +DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" PROVIDES = "xaw" XORG_PN = "libXaw" diff --git a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb index a558b889ae..dcb73a19ea 100644 --- a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc DESCRIPTION = "Xaw is the X Athena Widget Set." -DEPENDS += " xproto virtual/x11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" +DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" PROVIDES = "xaw" XORG_PN = "libXaw" diff --git a/packages/xorg-lib/libxaw_cvs.bb b/packages/xorg-lib/libxaw_cvs.bb index da21df75c3..2c696ceba2 100644 --- a/packages/xorg-lib/libxaw_cvs.bb +++ b/packages/xorg-lib/libxaw_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "xproto virtual/x11 libxt libxmu libxpm" +DEPENDS = "xproto virtual/libx11 libxt libxmu libxpm" PROVIDES = "xaw" DESCRIPTION = "X Athena Widgets library" diff --git a/packages/xorg-lib/libxcomposite_1.0.1.bb b/packages/xorg-lib/libxcomposite_1.0.1.bb index 987a7043b5..a60f8d5179 100644 --- a/packages/xorg-lib/libxcomposite_1.0.1.bb +++ b/packages/xorg-lib/libxcomposite_1.0.1.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE= "BSD-X" -DEPENDS = "virtual/x11 compositeext xextensions libxfixes" +DEPENDS = "virtual/libx11 compositeext xextensions libxfixes" PROVIDES = "xcomposite" DESCRIPTION = "X Composite extension library." PR = "r1" diff --git a/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb b/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb index ee5b2f7358..a9ee4190c2 100644 --- a/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb +++ b/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Composite extension library." LICENSE= "BSD-X" -DEPENDS += " compositeproto virtual/x11 libxfixes" +DEPENDS += " compositeproto virtual/libx11 libxfixes" PROVIDES = "xcomposite" XORG_PN = "libXcomposite" diff --git a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb index ee5b2f7358..a9ee4190c2 100644 --- a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb +++ b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Composite extension library." LICENSE= "BSD-X" -DEPENDS += " compositeproto virtual/x11 libxfixes" +DEPENDS += " compositeproto virtual/libx11 libxfixes" PROVIDES = "xcomposite" XORG_PN = "libXcomposite" diff --git a/packages/xorg-lib/libxcomposite_cvs.bb b/packages/xorg-lib/libxcomposite_cvs.bb index 922488593a..fd31b5dbff 100644 --- a/packages/xorg-lib/libxcomposite_cvs.bb +++ b/packages/xorg-lib/libxcomposite_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" -DEPENDS = "virtual/x11 compositeext xextensions libxfixes" +DEPENDS = "virtual/libx11 compositeext xextensions libxfixes" PROVIDES = "xcomposite" DESCRIPTION = "X Composite extension library." diff --git a/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb b/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb index 25f1c15d78..65f8432a21 100644 --- a/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb +++ b/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Cursor library" LICENSE= "BSD-X" -DEPENDS += " libxrender libxfixes virtual/x11 fixesproto" +DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto" XORG_PN = "libXcursor" diff --git a/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb b/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb index 25f1c15d78..65f8432a21 100644 --- a/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb +++ b/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Cursor library" LICENSE= "BSD-X" -DEPENDS += " libxrender libxfixes virtual/x11 fixesproto" +DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto" XORG_PN = "libXcursor" diff --git a/packages/xorg-lib/libxdamage_1.0.1.bb b/packages/xorg-lib/libxdamage_1.0.1.bb index c2e9ab0ae0..a132b751c0 100644 --- a/packages/xorg-lib/libxdamage_1.0.1.bb +++ b/packages/xorg-lib/libxdamage_1.0.1.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE= "BSD-X" -DEPENDS = "virtual/x11 damageext libxfixes xproto" +DEPENDS = "virtual/libx11 damageext libxfixes xproto" PROVIDES = "xdamage" DESCRIPTION = "X Damage extension library." PR = "r1" diff --git a/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb b/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb index 258ec25203..a6105f07a6 100644 --- a/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb +++ b/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Damage extension library." LICENSE= "BSD-X" -DEPENDS += " virtual/x11 damageproto libxfixes fixesproto xextproto" +DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto" PROVIDES = "xdamage" XORG_PN = "libXdamage" diff --git a/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb b/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb index 258ec25203..a6105f07a6 100644 --- a/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb +++ b/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Damage extension library." LICENSE= "BSD-X" -DEPENDS += " virtual/x11 damageproto libxfixes fixesproto xextproto" +DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto" PROVIDES = "xdamage" XORG_PN = "libXdamage" diff --git a/packages/xorg-lib/libxdamage_cvs.bb b/packages/xorg-lib/libxdamage_cvs.bb index 41f7846888..a613d0e673 100644 --- a/packages/xorg-lib/libxdamage_cvs.bb +++ b/packages/xorg-lib/libxdamage_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" -DEPENDS = "virtual/x11 damageext libxfixes xproto" +DEPENDS = "virtual/libx11 damageext libxfixes xproto" PROVIDES = "xdamage" DESCRIPTION = "X Damage extension library." diff --git a/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb index 1697278938..36af0189df 100644 --- a/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " xproto virtual/x11 xextproto libxext evieext" +DEPENDS += " xproto virtual/libx11 xextproto libxext evieext" XORG_PN = "libXevie" diff --git a/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb index 1697278938..36af0189df 100644 --- a/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " xproto virtual/x11 xextproto libxext evieext" +DEPENDS += " xproto virtual/libx11 xextproto libxext evieext" XORG_PN = "libXevie" diff --git a/packages/xorg-lib/libxext-native_cvs.bb b/packages/xorg-lib/libxext-native_cvs.bb index 27f7c1c96e..bdf33d354d 100644 --- a/packages/xorg-lib/libxext-native_cvs.bb +++ b/packages/xorg-lib/libxext-native_cvs.bb @@ -2,5 +2,5 @@ SECTION = "unknown" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext" include libxext_${PV}.bb inherit native -DEPENDS = "virtual/x11-native xextensions-native" +DEPENDS = "virtual/libx11-native xextensions-native" PROVIDES = "" diff --git a/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb index d16fc00f5b..1a794e161d 100644 --- a/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Server Extension library" PRIORITY = "optional" -DEPENDS += " xproto virtual/x11 xextproto libxau" +DEPENDS += " xproto virtual/libx11 xextproto libxau" PROVIDES = "xext" XORG_PN = "libXext" diff --git a/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb index d16fc00f5b..1a794e161d 100644 --- a/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Server Extension library" PRIORITY = "optional" -DEPENDS += " xproto virtual/x11 xextproto libxau" +DEPENDS += " xproto virtual/libx11 xextproto libxau" PROVIDES = "xext" XORG_PN = "libXext" diff --git a/packages/xorg-lib/libxext_cvs.bb b/packages/xorg-lib/libxext_cvs.bb index 3193857eb8..101c240c5e 100644 --- a/packages/xorg-lib/libxext_cvs.bb +++ b/packages/xorg-lib/libxext_cvs.bb @@ -4,7 +4,7 @@ LICENSE= "MIT" DESCRIPTION = "X Server Extension library" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "xproto virtual/x11 xextensions" +DEPENDS = "xproto virtual/libx11 xextensions" PROVIDES = "xext" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext" diff --git a/packages/xorg-lib/libxfixes_2.0.1.bb b/packages/xorg-lib/libxfixes_2.0.1.bb index 2c86445d74..ceebdfaa11 100644 --- a/packages/xorg-lib/libxfixes_2.0.1.bb +++ b/packages/xorg-lib/libxfixes_2.0.1.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE= "BSD-X" -DEPENDS = "virtual/x11 fixesext" +DEPENDS = "virtual/libx11 fixesext" DESCRIPTION = "X Fixes extension library." PR = "r1" diff --git a/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb b/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb index f39b08b3ae..594675b115 100644 --- a/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb +++ b/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Fixes extension library." LICENSE= "BSD-X" -DEPENDS += " virtual/x11 xproto fixesproto xextproto" +DEPENDS += " virtual/libx11 xproto fixesproto xextproto" XORG_PN = "libXfixes" diff --git a/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb b/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb index f39b08b3ae..594675b115 100644 --- a/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb +++ b/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Fixes extension library." LICENSE= "BSD-X" -DEPENDS += " virtual/x11 xproto fixesproto xextproto" +DEPENDS += " virtual/libx11 xproto fixesproto xextproto" XORG_PN = "libXfixes" diff --git a/packages/xorg-lib/libxfixes_cvs.bb b/packages/xorg-lib/libxfixes_cvs.bb index 50d01a1f21..92bad48eeb 100644 --- a/packages/xorg-lib/libxfixes_cvs.bb +++ b/packages/xorg-lib/libxfixes_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" -DEPENDS = "virtual/x11 fixesext" +DEPENDS = "virtual/libx11 fixesext" DESCRIPTION = "X Fixes extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfixes" diff --git a/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb index b4cf34f438..498bdac0ac 100644 --- a/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxext xextproto fontcacheproto" +DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto" XORG_PN = "libXfontcache" diff --git a/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb index b4cf34f438..498bdac0ac 100644 --- a/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxext xextproto fontcacheproto" +DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto" XORG_PN = "libXfontcache" diff --git a/packages/xorg-lib/libxft_2.1.6.bb b/packages/xorg-lib/libxft_2.1.6.bb index 03abf5a6ab..a793925596 100644 --- a/packages/xorg-lib/libxft_2.1.6.bb +++ b/packages/xorg-lib/libxft_2.1.6.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE = "MIT-X" -DEPENDS = "virtual/x11 xproto libxrender freetype fontconfig" +DEPENDS = "virtual/libx11 xproto libxrender freetype fontconfig" DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." PROVIDES = "xft" PR = "r1" diff --git a/packages/xorg-lib/libxft_cvs.bb b/packages/xorg-lib/libxft_cvs.bb index e1cc3ceb7b..38ba5a6d5c 100644 --- a/packages/xorg-lib/libxft_cvs.bb +++ b/packages/xorg-lib/libxft_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "x11/libs" -DEPENDS = "virtual/x11 xproto libxrender freetype fontconfig" +DEPENDS = "virtual/libx11 xproto libxrender freetype fontconfig" DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." PROVIDES = "xft" diff --git a/packages/xorg-lib/libxi_6.0.1.bb b/packages/xorg-lib/libxi_6.0.1.bb index 8900afdc6f..b9958ea6ac 100644 --- a/packages/xorg-lib/libxi_6.0.1.bb +++ b/packages/xorg-lib/libxi_6.0.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "X Input Extension library" LICENSE = "MIT-X" SECTION = "x11/libs" -DEPENDS = "xproto virtual/x11 xextensions" +DEPENDS = "xproto virtual/libx11 xextensions" PR = "r1" SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \ diff --git a/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb index 8ba01c923b..b8bdbe970e 100644 --- a/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Input extension library." -DEPENDS += " xproto virtual/x11 xextproto libxext inputproto" +DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto" XORG_PN = "libXi" diff --git a/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb index 8ba01c923b..b8bdbe970e 100644 --- a/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Input extension library." -DEPENDS += " xproto virtual/x11 xextproto libxext inputproto" +DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto" XORG_PN = "libXi" diff --git a/packages/xorg-lib/libxi_cvs.bb b/packages/xorg-lib/libxi_cvs.bb index 191e90a2ec..f37c78e819 100644 --- a/packages/xorg-lib/libxi_cvs.bb +++ b/packages/xorg-lib/libxi_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "x11/libs" -DEPENDS = "xproto virtual/x11 xextensions" +DEPENDS = "xproto virtual/libx11 xextensions" DESCRIPTION = "X Input extension library." PR = "r1" diff --git a/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb b/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb index d2d4e31027..eb4a6d54cf 100644 --- a/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb +++ b/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "panoramixext xproto virtual/x11 libxext" +DEPENDS = "panoramixext xproto virtual/libx11 libxext" PROVIDES = "xinerama" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama;date=20050505" diff --git a/packages/xorg-lib/libxinerama_1.0.2.bb b/packages/xorg-lib/libxinerama_1.0.2.bb index 4036f17fd8..429c2fc4d0 100644 --- a/packages/xorg-lib/libxinerama_1.0.2.bb +++ b/packages/xorg-lib/libxinerama_1.0.2.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Xinerama library" SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "panoramixext xproto virtual/x11 libxext" +DEPENDS = "panoramixext xproto virtual/libx11 libxext" PROVIDES = "xinerama" PR = "r1" diff --git a/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb index 4904bfd840..3a11ea9854 100644 --- a/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "Xinerama library" PRIORITY = "optional" -DEPENDS += " virtual/x11 libxext xextproto xineramaproto" +DEPENDS += " virtual/libx11 libxext xextproto xineramaproto" PROVIDES = "xinerama" XORG_PN = "libXinerama" diff --git a/packages/xorg-lib/libxinerama_cvs.bb b/packages/xorg-lib/libxinerama_cvs.bb index 10604909f6..5138367bbf 100644 --- a/packages/xorg-lib/libxinerama_cvs.bb +++ b/packages/xorg-lib/libxinerama_cvs.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Xinerama library" LICENSE = "MIT" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "panoramixext xproto virtual/x11 libxext" +DEPENDS = "panoramixext xproto virtual/libx11 libxext" PROVIDES = "xinerama" PV = "0.0+cvs${SRCDATE}" diff --git a/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb index eb73c0f4c4..c02dca34b7 100644 --- a/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb @@ -4,5 +4,5 @@ DESCRIPTION = "X11 keyboard library" LICENSE= "GPL" PRIORITY = "optional" -DEPENDS += " virtual/x11 kbproto" +DEPENDS += " virtual/libx11 kbproto" diff --git a/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb b/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb index eb73c0f4c4..c02dca34b7 100644 --- a/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb +++ b/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb @@ -4,5 +4,5 @@ DESCRIPTION = "X11 keyboard library" LICENSE= "GPL" PRIORITY = "optional" -DEPENDS += " virtual/x11 kbproto" +DEPENDS += " virtual/libx11 kbproto" diff --git a/packages/xorg-lib/libxkbfile_cvs.bb b/packages/xorg-lib/libxkbfile_cvs.bb index de63e64057..336caf139a 100644 --- a/packages/xorg-lib/libxkbfile_cvs.bb +++ b/packages/xorg-lib/libxkbfile_cvs.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" PV = "0.0+cvs${SRCDATE}" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "virtual/x11" +DEPENDS = "virtual/libx11" DESCRIPTION = "X11 keyboard library" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xkbfile" diff --git a/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb index af76b740a3..1d841e4913 100644 --- a/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb @@ -4,5 +4,5 @@ DESCRIPTION = "X11 lbxkbui library" LICENSE= "GPL" PRIORITY = "optional" -DEPENDS += " virtual/x11 libxt libxkbfile" +DEPENDS += " virtual/libx11 libxt libxkbfile" PROVIDES = "xkbui" diff --git a/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb index af76b740a3..1d841e4913 100644 --- a/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb @@ -4,5 +4,5 @@ DESCRIPTION = "X11 lbxkbui library" LICENSE= "GPL" PRIORITY = "optional" -DEPENDS += " virtual/x11 libxt libxkbfile" +DEPENDS += " virtual/libx11 libxt libxkbfile" PROVIDES = "xkbui" diff --git a/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb index 7f3d946dff..3b82bb0218 100644 --- a/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Window System miscellaneous utility library" PRIORITY = "optional" -DEPENDS += " libxt libxext xextproto virtual/x11" +DEPENDS += " libxt libxext xextproto virtual/libx11" PROVIDES = "xmu" XORG_PN = "libXmu" diff --git a/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb index 7f3d946dff..3b82bb0218 100644 --- a/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Window System miscellaneous utility library" PRIORITY = "optional" -DEPENDS += " libxt libxext xextproto virtual/x11" +DEPENDS += " libxt libxext xextproto virtual/libx11" PROVIDES = "xmu" XORG_PN = "libXmu" diff --git a/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb index 5565f35010..fc01924819 100644 --- a/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc DESCRIPTION = "X print extension library." -DEPENDS += " virtual/x11 libxext xextproto libxau printproto" +DEPENDS += " virtual/libx11 libxext xextproto libxau printproto" XORG_PN = "libXp" diff --git a/packages/xorg-lib/libxp_cvs.bb b/packages/xorg-lib/libxp_cvs.bb index 0d31fd6bca..e434e089cf 100644 --- a/packages/xorg-lib/libxp_cvs.bb +++ b/packages/xorg-lib/libxp_cvs.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" PV = "0.0+cvs${SRCDATE}" SECTION = "libs" -DEPENDS = "virtual/x11 libxext" +DEPENDS = "virtual/libx11 libxext" DESCRIPTION = "X print extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xp" diff --git a/packages/xorg-lib/libxpm_3.5.1.bb b/packages/xorg-lib/libxpm_3.5.1.bb index 69a2d5953a..8447cd3630 100644 --- a/packages/xorg-lib/libxpm_3.5.1.bb +++ b/packages/xorg-lib/libxpm_3.5.1.bb @@ -2,7 +2,7 @@ SECTION = "x11/libs" LICENSE = "X-BSD" PRIORITY = "optional" MAINTAINER = "Greg Gilbert <greg@treke.net>" -DEPENDS = "xproto virtual/x11" +DEPENDS = "xproto virtual/libx11" PROVIDES = "xpm" DESCRIPTION = "X Pixmap library." PR = "r1" diff --git a/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb b/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb index b99596f5f1..263a24db1f 100644 --- a/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb +++ b/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb @@ -4,7 +4,7 @@ DESCRIPTION = "X Pixmap library." PRIORITY = "optional" LICENSE = "X-BSD" -DEPENDS += " xproto virtual/x11 libxt libxext xextproto" +DEPENDS += " xproto virtual/libx11 libxt libxext xextproto" XORG_PN = "libXpm" diff --git a/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb b/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb index b99596f5f1..263a24db1f 100644 --- a/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb +++ b/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb @@ -4,7 +4,7 @@ DESCRIPTION = "X Pixmap library." PRIORITY = "optional" LICENSE = "X-BSD" -DEPENDS += " xproto virtual/x11 libxt libxext xextproto" +DEPENDS += " xproto virtual/libx11 libxt libxext xextproto" XORG_PN = "libXpm" diff --git a/packages/xorg-lib/libxpm_cvs.bb b/packages/xorg-lib/libxpm_cvs.bb index 3e625a1dd4..4d4d534e9a 100644 --- a/packages/xorg-lib/libxpm_cvs.bb +++ b/packages/xorg-lib/libxpm_cvs.bb @@ -3,7 +3,7 @@ LICENSE = "X-BSD" SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Greg Gilbert <greg@treke.net>" -DEPENDS = "xproto virtual/x11" +DEPENDS = "xproto virtual/libx11" PROVIDES = "xpm" DESCRIPTION = "X Pixmap library." PR = "r1" diff --git a/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb index a8fcd93f69..9431f9fbfa 100644 --- a/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxp libxprintutil printproto libxau" +DEPENDS += " virtual/libx11 libxp libxprintutil printproto libxau" XORG_PN = "libXprintAppUtil" diff --git a/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb index c0d1244a26..c03e569e4f 100644 --- a/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxp libxt printproto libxau" +DEPENDS += " virtual/libx11 libxp libxt printproto libxau" XORG_PN = "libXprintUtil" diff --git a/packages/xorg-lib/libxrandr_1.0.2.bb b/packages/xorg-lib/libxrandr_1.0.2.bb index ddb1f61556..d87471af05 100644 --- a/packages/xorg-lib/libxrandr_1.0.2.bb +++ b/packages/xorg-lib/libxrandr_1.0.2.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE = "BSD-X" -DEPENDS = "randrext virtual/x11 libxrender libxext" +DEPENDS = "randrext virtual/libx11 libxrender libxext" DESCRIPTION = "X Resize and Rotate extension library." PR = "r1" diff --git a/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb b/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb index 42062b5902..22ae2a5f6c 100644 --- a/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb +++ b/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Resize and Rotate extension library." LICENSE = "BSD-X" -DEPENDS += " virtual/x11 randrproto libxext xextproto libxrender renderproto" +DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto" XORG_PN = "libXrandr" diff --git a/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb b/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb index 42062b5902..22ae2a5f6c 100644 --- a/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb +++ b/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Resize and Rotate extension library." LICENSE = "BSD-X" -DEPENDS += " virtual/x11 randrproto libxext xextproto libxrender renderproto" +DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto" XORG_PN = "libXrandr" diff --git a/packages/xorg-lib/libxrandr_cvs.bb b/packages/xorg-lib/libxrandr_cvs.bb index 44b34f07d3..12f3b4ef38 100644 --- a/packages/xorg-lib/libxrandr_cvs.bb +++ b/packages/xorg-lib/libxrandr_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "BSD-X" SECTION = "x11/libs" -DEPENDS = "randrext virtual/x11 libxrender libxext" +DEPENDS = "randrext virtual/libx11 libxrender libxext" DESCRIPTION = "X Resize and Rotate extension library." PR = "r1" diff --git a/packages/xorg-lib/libxrender_0.8.4.bb b/packages/xorg-lib/libxrender_0.8.4.bb index 129cc58bbb..32e1962f26 100644 --- a/packages/xorg-lib/libxrender_0.8.4.bb +++ b/packages/xorg-lib/libxrender_0.8.4.bb @@ -1,5 +1,5 @@ SECTION = "libs" -DEPENDS = "renderext virtual/x11" +DEPENDS = "renderext virtual/libx11" DESCRIPTION = "X Render extension library." LICENSE = "BSD" PR = "r1" diff --git a/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb b/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb index 6f6fe2a7f9..865cf02d42 100644 --- a/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb +++ b/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Render extension library." LICENSE = "BSD-X" -DEPENDS += " virtual/x11 renderproto" +DEPENDS += " virtual/libx11 renderproto" XORG_PN = "libXrender" diff --git a/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb b/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb index 6f6fe2a7f9..865cf02d42 100644 --- a/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb +++ b/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Render extension library." LICENSE = "BSD-X" -DEPENDS += " virtual/x11 renderproto" +DEPENDS += " virtual/libx11 renderproto" XORG_PN = "libXrender" diff --git a/packages/xorg-lib/libxrender_cvs.bb b/packages/xorg-lib/libxrender_cvs.bb index 49a3f4204a..31a710643c 100644 --- a/packages/xorg-lib/libxrender_cvs.bb +++ b/packages/xorg-lib/libxrender_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" PR = "r1" SECTION = "libs" -DEPENDS = "renderext virtual/x11" +DEPENDS = "renderext virtual/libx11" DESCRIPTION = "X Render extension library." LICENSE = "BSD" diff --git a/packages/xorg-lib/libxres_1.0.1.bb b/packages/xorg-lib/libxres_1.0.1.bb index 752ef865fd..3f0d32bfe4 100644 --- a/packages/xorg-lib/libxres_1.0.1.bb +++ b/packages/xorg-lib/libxres_1.0.1.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" MAINTAINER = "Greg Gilbert <greg@treke.net>" -DEPENDS = "virtual/x11 xextensions libxext resourceext" +DEPENDS = "virtual/libx11 xextensions libxext resourceext" PROVIDES = "xres" DESCRIPTION = "X Resource usage library." LICENSE = "X-MIT" diff --git a/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb index ed49e72be6..98da017f09 100644 --- a/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Resource usage library." -DEPENDS += " virtual/x11 libxext xextproto resourceproto" +DEPENDS += " virtual/libx11 libxext xextproto resourceproto" XORG_PN = "libXres" diff --git a/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb index ed49e72be6..98da017f09 100644 --- a/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Resource usage library." -DEPENDS += " virtual/x11 libxext xextproto resourceproto" +DEPENDS += " virtual/libx11 libxext xextproto resourceproto" XORG_PN = "libXres" diff --git a/packages/xorg-lib/libxres_cvs.bb b/packages/xorg-lib/libxres_cvs.bb index 0c19870e16..a457d6c14f 100644 --- a/packages/xorg-lib/libxres_cvs.bb +++ b/packages/xorg-lib/libxres_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" SECTION = "x11/libs" MAINTAINER = "Greg Gilbert <greg@treke.net>" -DEPENDS = "virtual/x11 xextensions libxext resourceext" +DEPENDS = "virtual/libx11 xextensions libxext resourceext" PROVIDES = "xres" DESCRIPTION = "X Resource usage library." LICENSE = "X-MIT" diff --git a/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb index c41dbe5a12..d6b13a8c6c 100644 --- a/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X screen saver extension library." LICENSE = "GPL" -DEPENDS += " virtual/x11 libxext xextproto scrnsaverproto" +DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto" XORG_PN = "libXScrnSaver" diff --git a/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb index c41dbe5a12..d6b13a8c6c 100644 --- a/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb +++ b/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X screen saver extension library." LICENSE = "GPL" -DEPENDS += " virtual/x11 libxext xextproto scrnsaverproto" +DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto" XORG_PN = "libXScrnSaver" diff --git a/packages/xorg-lib/libxss_cvs.bb b/packages/xorg-lib/libxss_cvs.bb index 36d3d5956b..614133fce7 100644 --- a/packages/xorg-lib/libxss_cvs.bb +++ b/packages/xorg-lib/libxss_cvs.bb @@ -4,7 +4,7 @@ PV = "0.0+cvs${SRCDATE}" PR = "r2" SECTION = "libs" -DEPENDS = "virtual/x11 libxext" +DEPENDS = "virtual/libx11 libxext" DESCRIPTION = "X screen saver extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xss" diff --git a/packages/xorg-lib/libxt_0.1.5.bb b/packages/xorg-lib/libxt_0.1.5.bb index 4d8139b850..9c31075285 100644 --- a/packages/xorg-lib/libxt_0.1.5.bb +++ b/packages/xorg-lib/libxt_0.1.5.bb @@ -1,7 +1,7 @@ SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "virtual/x11 libsm" +DEPENDS = "virtual/libx11 libsm" PROVIDES = "xt" DESCRIPTION = "X Toolkit Intrinsics" LICENSE = "X-MIT" diff --git a/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb index 7c7054270a..33787e3482 100644 --- a/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Toolkit Intrinsics" PRIORITY = "optional" -DEPENDS += " libsm virtual/x11 xproto kbproto" +DEPENDS += " libsm virtual/libx11 xproto kbproto" PROVIDES = "xt" XORG_PN = "libXt" diff --git a/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb index 7c7054270a..33787e3482 100644 --- a/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Toolkit Intrinsics" PRIORITY = "optional" -DEPENDS += " libsm virtual/x11 xproto kbproto" +DEPENDS += " libsm virtual/libx11 xproto kbproto" PROVIDES = "xt" XORG_PN = "libXt" diff --git a/packages/xorg-lib/libxt_cvs.bb b/packages/xorg-lib/libxt_cvs.bb index 6f8a66d0bd..3fd2eabe67 100644 --- a/packages/xorg-lib/libxt_cvs.bb +++ b/packages/xorg-lib/libxt_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "virtual/x11 libsm" +DEPENDS = "virtual/libx11 libsm" PROVIDES = "xt" DESCRIPTION = "X Toolkit Intrinsics" LICENSE = "X-MIT" diff --git a/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb index 7f59ec2621..0c87974979 100644 --- a/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " virtual/x11 libxt trapproto libxext xextproto" +DEPENDS += " virtual/libx11 libxt trapproto libxext xextproto" XORG_PN = "libXTrap" diff --git a/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb index 01bcada964..9aeda79540 100644 --- a/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Test Extension: client side library" PRIORITY = "optional" -DEPENDS += " virtual/x11 libxext recordproto xextproto inputproto" +DEPENDS += " virtual/libx11 libxext recordproto xextproto inputproto" PROVIDES = "xtst" XORG_PN = "libXtst" diff --git a/packages/xorg-lib/libxtst_cvs.bb b/packages/xorg-lib/libxtst_cvs.bb index 875cd0914b..dc3e358d64 100644 --- a/packages/xorg-lib/libxtst_cvs.bb +++ b/packages/xorg-lib/libxtst_cvs.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" PV = "0.0+cvs${SRCDATE}" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "virtual/x11 recordext libxext" +DEPENDS = "virtual/libx11 recordext libxext" PROVIDES = "xtst" DESCRIPTION = "X Test Extension: client side library" PR = "r3" diff --git a/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb b/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb index e8f01379fd..93c41ce126 100644 --- a/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb +++ b/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "x11/libs" -DEPENDS = "virtual/x11 libxext" +DEPENDS = "virtual/libx11 libxext" DESCRIPTION = "X Video extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xv;date=20040918;method=pserver" diff --git a/packages/xorg-lib/libxv_2.2.2.bb b/packages/xorg-lib/libxv_2.2.2.bb index e88a35f1cd..d42302979e 100644 --- a/packages/xorg-lib/libxv_2.2.2.bb +++ b/packages/xorg-lib/libxv_2.2.2.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "x11/libs" -DEPENDS = "virtual/x11 libxext" +DEPENDS = "virtual/libx11 libxext" DESCRIPTION = "X Video extension library." SRC_URI = "${XLIBS_MIRROR}/libXv-${PV}.tar.bz2" diff --git a/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb index be3cacf4df..8680f050e3 100644 --- a/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb @@ -3,7 +3,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Video extension library." LICENSE = "GPL" -DEPENDS += " virtual/x11 libxext xextproto videoproto" +DEPENDS += " virtual/libx11 libxext xextproto videoproto" XORG_PN = "libXv" diff --git a/packages/xorg-lib/libxvmc_20040919.bb b/packages/xorg-lib/libxvmc_20040919.bb index 6fa8c8a272..f256211962 100644 --- a/packages/xorg-lib/libxvmc_20040919.bb +++ b/packages/xorg-lib/libxvmc_20040919.bb @@ -1,6 +1,6 @@ DESCRIPTION = "X Video Motion Compensation extension library." SECTION = "x11/libs" -DEPENDS = "virtual/x11 libxext libxv drm xserver-xorg" +DEPENDS = "virtual/libx11 libxext libxv drm xserver-xorg" PR = "r2" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \ diff --git a/packages/xorg-lib/libxvmc_20041025.bb b/packages/xorg-lib/libxvmc_20041025.bb index 55cbc58265..ff8dda58a6 100644 --- a/packages/xorg-lib/libxvmc_20041025.bb +++ b/packages/xorg-lib/libxvmc_20041025.bb @@ -1,6 +1,6 @@ DESCRIPTION = "X Video Motion Compensation extension library." SECTION = "x11/libs" -DEPENDS = "virtual/x11 libxext libxv drm xserver-xorg" +DEPENDS = "virtual/libx11 libxext libxv drm xserver-xorg" PR = "r2" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \ diff --git a/packages/xorg-lib/libxvmc_20050612.bb b/packages/xorg-lib/libxvmc_20050612.bb index d322ecfb33..d9be65baa0 100644 --- a/packages/xorg-lib/libxvmc_20050612.bb +++ b/packages/xorg-lib/libxvmc_20050612.bb @@ -1,6 +1,6 @@ DESCRIPTION = "X Video Motion Compensation extension library." SECTION = "x11/libs" -DEPENDS = "virtual/x11 libxext libxv drm xserver-xorg" +DEPENDS = "virtual/libx11 libxext libxv drm xserver-xorg" PR = "r0" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \ diff --git a/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb index aef95aaf60..42bb0062ab 100644 --- a/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Video Motion Compensation extension library." -DEPENDS += " virtual/x11 libxext libxv xextproto videoproto" +DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto" XORG_PN = "libXvMC" diff --git a/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb index aef95aaf60..42bb0062ab 100644 --- a/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc DESCRIPTION = "X Video Motion Compensation extension library." -DEPENDS += " virtual/x11 libxext libxv xextproto videoproto" +DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto" XORG_PN = "libXvMC" diff --git a/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb index 30e979cf7d..a5eca04252 100644 --- a/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc DESCRIPTION = "Xxf86dga extension library." -DEPENDS += " xproto virtual/x11 xextproto libxext xf86dgaproto" +DEPENDS += " xproto virtual/libx11 xextproto libxext xf86dgaproto" XORG_PN = "libXxf86dga" diff --git a/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb index 30e979cf7d..a5eca04252 100644 --- a/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc DESCRIPTION = "Xxf86dga extension library." -DEPENDS += " xproto virtual/x11 xextproto libxext xf86dgaproto" +DEPENDS += " xproto virtual/libx11 xextproto libxext xf86dgaproto" XORG_PN = "libXxf86dga" diff --git a/packages/xorg-lib/libxxf86dga_cvs.bb b/packages/xorg-lib/libxxf86dga_cvs.bb index cb91e2eb2d..d110e7e4c0 100644 --- a/packages/xorg-lib/libxxf86dga_cvs.bb +++ b/packages/xorg-lib/libxxf86dga_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "XFree86" SECTION = "x11/libs" -DEPENDS = "virtual/x11 libxext xxf86dgaext" +DEPENDS = "virtual/libx11 libxext xxf86dgaext" DESCRIPTION = "Xxf86dga extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86dga" diff --git a/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb index c6a95ddfd0..6c55f11a97 100644 --- a/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " xproto virtual/x11 xextproto libxext xf86miscproto" +DEPENDS += " xproto virtual/libx11 xextproto libxext xf86miscproto" PROVIDES = "xxf86misc" XORG_PN = "libXxf86misc" diff --git a/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb index c6a95ddfd0..6c55f11a97 100644 --- a/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc #DESCRIPTION = "" -DEPENDS += " xproto virtual/x11 xextproto libxext xf86miscproto" +DEPENDS += " xproto virtual/libx11 xextproto libxext xf86miscproto" PROVIDES = "xxf86misc" XORG_PN = "libXxf86misc" diff --git a/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb index c6b0ed5bfb..b9268ddaf9 100644 --- a/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc DESCRIPTION = "Xxf86vm extension library." -DEPENDS += " xproto virtual/x11 xextproto libxext xf86vidmodeproto" +DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto" XORG_PN = "libXxf86vm" diff --git a/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb index c6b0ed5bfb..b9268ddaf9 100644 --- a/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb @@ -2,7 +2,7 @@ include xorg-lib-common.inc DESCRIPTION = "Xxf86vm extension library." -DEPENDS += " xproto virtual/x11 xextproto libxext xf86vidmodeproto" +DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto" XORG_PN = "libXxf86vm" diff --git a/packages/xorg-lib/libxxf86vm_cvs.bb b/packages/xorg-lib/libxxf86vm_cvs.bb index a045adf458..5464c4330c 100644 --- a/packages/xorg-lib/libxxf86vm_cvs.bb +++ b/packages/xorg-lib/libxxf86vm_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" SECTION = "x11/libs" -DEPENDS = "virtual/x11 libxext xxf86vmext" +DEPENDS = "virtual/libx11 libxext xxf86vmext" DESCRIPTION = "Xxf86vm extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86vm" diff --git a/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb b/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb index 3683562543..b7e192dc76 100644 --- a/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb +++ b/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb @@ -1,5 +1,5 @@ LICENSE = "MIT" -DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau virtual/x11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" +DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau virtual/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/packages/xorg-xserver/xserver-kdrive_20050207.bb b/packages/xorg-xserver/xserver-kdrive_20050207.bb index 8cbde48ebd..c198a94de2 100644 --- a/packages/xorg-xserver/xserver-kdrive_20050207.bb +++ b/packages/xorg-xserver/xserver-kdrive_20050207.bb @@ -3,11 +3,11 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" DEFAULT_PREFERENCE = "1" LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau virtual/x11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" +DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" # Uncomment the following DEPENDS line and the commented line in SRC_URI # to make this snapshot build against X11R7.0 xlibs. -#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto" +#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" diff --git a/packages/xorg-xserver/xserver-kdrive_20050624.bb b/packages/xorg-xserver/xserver-kdrive_20050624.bb index fb6229e51f..f9ba323529 100644 --- a/packages/xorg-xserver/xserver-kdrive_20050624.bb +++ b/packages/xorg-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 libxdmcp xextensions xtrans libxau virtual/x11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" +DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau virtual/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/packages/xorg-xserver/xserver-kdrive_20060312.bb b/packages/xorg-xserver/xserver-kdrive_20060312.bb index 44a91ae1e9..594b6d74ec 100644 --- a/packages/xorg-xserver/xserver-kdrive_20060312.bb +++ b/packages/xorg-xserver/xserver-kdrive_20060312.bb @@ -3,7 +3,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" DEFAULT_PREFERENCE = "1" LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" 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/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index 2a572bea53..a7c92dcb83 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -1,5 +1,5 @@ LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" diff --git a/packages/xorg-xserver/xserver-kdrive_cvs.bb b/packages/xorg-xserver/xserver-kdrive_cvs.bb index c6d4a17e20..c2b25973fb 100644 --- a/packages/xorg-xserver/xserver-kdrive_cvs.bb +++ b/packages/xorg-xserver/xserver-kdrive_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" DEFAULT_PREFERENCE = "-2" LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" 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/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 71522c2909..e667e36f2c 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -2,7 +2,7 @@ PV = "0.0+git" DEFAULT_PREFERENCE = "-2" LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" diff --git a/packages/xscreensaver/xscreensaver_4.16.bb b/packages/xscreensaver/xscreensaver_4.16.bb index c26836893d..e007029b9b 100644 --- a/packages/xscreensaver/xscreensaver_4.16.bb +++ b/packages/xscreensaver/xscreensaver_4.16.bb @@ -16,7 +16,7 @@ HOMEPAGE="http://www.jwz.org/xscreensaver/" PR = "r1" SECTION="x11-misc" -DEPENDS = "intltool virtual/x11 gtk+ libxml2 libglade" +DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade" # xscreensaver-demo is a glade app LDFLAGS_append = " -Wl,--export-dynamic" diff --git a/packages/xscreensaver/xscreensaver_4.22.bb b/packages/xscreensaver/xscreensaver_4.22.bb index a7e457935c..d3b8e20022 100644 --- a/packages/xscreensaver/xscreensaver_4.22.bb +++ b/packages/xscreensaver/xscreensaver_4.22.bb @@ -13,7 +13,7 @@ HOMEPAGE="http://www.jwz.org/xscreensaver/" PR = "r0" SECTION="x11-misc" -DEPENDS = "intltool virtual/x11 gtk+ libxml2 libglade" +DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade" # xscreensaver-demo is a glade app LDFLAGS_append = " -Wl,--export-dynamic" diff --git a/packages/xstroke/xstroke_0.6.bb b/packages/xstroke/xstroke_0.6.bb index e33a4c8223..ca4afd2e6b 100644 --- a/packages/xstroke/xstroke_0.6.bb +++ b/packages/xstroke/xstroke_0.6.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" SECTION = "x11" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "virtual/x11 xft libxtst libxpm" +DEPENDS = "virtual/libx11 xft libxtst libxpm" PR = "r2" SRC_URI = "http://www.oesources.org/source/xstroke-0.6.tar.gz \ diff --git a/packages/xtscal/xtscal_0.4.bb b/packages/xtscal/xtscal_0.4.bb index d53aabe4bf..f2008506b5 100644 --- a/packages/xtscal/xtscal_0.4.bb +++ b/packages/xtscal/xtscal_0.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Touchscreen calibration utility" MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "x11/base" LICENSE = "GPL" -DEPENDS = "virtual/x11 libxft libxrandr" +DEPENDS = "virtual/libx11 libxft libxrandr" SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2" diff --git a/packages/xtscal/xtscal_0.5.1.bb b/packages/xtscal/xtscal_0.5.1.bb index 9642be132a..ff0346f9d9 100644 --- a/packages/xtscal/xtscal_0.5.1.bb +++ b/packages/xtscal/xtscal_0.5.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Touchscreen calibration utility" MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "x11/base" LICENSE = "GPL" -DEPENDS = "virtual/x11 libxft libxrandr xcalibrate" +DEPENDS = "virtual/libx11 libxft libxrandr xcalibrate" PR = "r1" diff --git a/packages/xtscal/xtscal_0.5.bb b/packages/xtscal/xtscal_0.5.bb index cec5782236..8f5a62c980 100644 --- a/packages/xtscal/xtscal_0.5.bb +++ b/packages/xtscal/xtscal_0.5.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Touchscreen calibration utility" MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "x11/base" LICENSE = "GPL" -DEPENDS = "virtual/x11 libxft libxrandr xcalibrate" +DEPENDS = "virtual/libx11 libxft libxrandr xcalibrate" SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2" diff --git a/packages/xtscal/xtscal_0.6.3.bb b/packages/xtscal/xtscal_0.6.3.bb index c8e7657ffb..682ed2258a 100644 --- a/packages/xtscal/xtscal_0.6.3.bb +++ b/packages/xtscal/xtscal_0.6.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Touchscreen calibration utility" MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "x11/base" -DEPENDS = "virtual/x11 libxft libxrandr xcalibrate" +DEPENDS = "virtual/libx11 libxft libxrandr xcalibrate" PR = "r1" diff --git a/packages/zudoku/.mtn2git_empty b/packages/zudoku/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/zudoku/.mtn2git_empty diff --git a/packages/zudoku/files/.mtn2git_empty b/packages/zudoku/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/zudoku/files/.mtn2git_empty diff --git a/packages/zudoku/files/zudoku.desktop b/packages/zudoku/files/zudoku.desktop new file mode 100644 index 0000000000..5b5f9f29f6 --- /dev/null +++ b/packages/zudoku/files/zudoku.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Exec=zudoku +Icon=zudoku +Comment= +Name=Zudoku diff --git a/packages/zudoku/files/zudoku.html b/packages/zudoku/files/zudoku.html new file mode 100644 index 0000000000..b5ceaac4ee --- /dev/null +++ b/packages/zudoku/files/zudoku.html @@ -0,0 +1,51 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> + <head> + <title>Fig Labs presents 'Zudoku'!</title> + </head> + <p> + <h1>Fig Labs presents 'Zudoku'!</h1> + <h2>About Zudoku</h2> + <p>Sudoku, sometimes written Su Doku, is a logic-based placement puzzle, also known as Number Place in the United States. The aim of the puzzle is to enter a numerical digit from 1 to 9 in each cell of a 9x9 grid, starting with various digits given in some cells (the "givens"). The grid is made up of 3x3 subgrids (called "regions"). Each row, column, and region must contain only one instance of each numeral. Completing the puzzle requires patience and logical ability. Although first published in 1979, Sudoku initially caught on in Japan in 1986 and attained international popularity in 2005. Fig Labs Zudoku is a free version of this popular puzzle for your computer.</p> + <h2>About Fig Labs</h2> + <p>The Fig Labs management team has over 35 years of portable computing experience; between us we've 'done time' at Psion, Symbian, Motorola, Gemplus and Intuwave, building systems software, applications and middleware. So we now feel that we are uniquely placed to tackle the big issue in constrained appliances - complexity - and subsequently make portable technology usable.</p> + <h2>Help</h2> + <p>You can use Fig Labs Zudoku to: + <ul> + <li>Generate an unlimited number of puzzles for you to play.</li> + <LI>Enter puzzles from newspapers or magazines so that you can play them on your computer.</LI> + <li>Create your own puzzles.</li> + <li>Help you with solving puzzles, or even solve an entire puzzle for you.</li> + <li>Print puzzles out to solve on paper.</li> + </ul> + </p> + <h3><b>Playing a puzzle</b></h3> + <p>When you first start Zudoku, it will generate a new 'medium' level puzzle for you. Thereafter, it will always start up from wherever you left it last time.</p> + <p>The bold digits are part of the puzzle, the "givens" - you can't change those unless you are designing the puzzle yourself. Digits you enter yourself are italic.</p> + <p>You can fill in the blank squares in two ways: + <ol><LI>Either: use the cursor keys to move round the grid and press 1-9 to fill in the current square.</LI> + <li>Or: click on a square and choose a digit from the pop-up list to fill it in.</li></ol></p> + <p>If you fill a square with a digit which breaks the rules of Sudoku, then that digit and those that it clashes with will be highlighted in red.</p> + <p>To delete a digit, just use the cursor keys to move to the square and press Spacebar, or click on it and select the blank entry from the pop-up list.</p> + <p>To help you solve more difficult puzzles, you can make 'pencil' marks on the board. Choose 'Make pencil marks' from the Game menu. After that, any moves you make will appear as small numbers in a gold colour. You can pencil in several numbers in as many squares as you like. To erase a pencil mark, enter the same number again. To erase all marks in a square, press Spacebar or choose the blank entry from the pop up menu.</p> + <p>If you want to start the current puzzle afresh, go to the Game menu and choose Start again.</p> + <p>If you want to print the puzzle out, choose Print from the File menu.</p> + <h3><b>Creating a new puzzle</b></h3> + <p>To start a new puzzle from scratch, go to the Game menu and choose New puzzle. While Zudoku is working, the grid will fill with question marks. When it is ready you will be presented with a brand new puzzle - probably one that has never been seen before!</p> + <p>When you start Zudoku, it is set to generate 'medium' level puzzles. To change the level of puzzle generated, go to the Game menu, choose New puzzle level, then pick a new level. If you set the level to Fiendish, sometimes Zudoku can only make a Difficult puzzle. If that happens, just generate again. If you choose 'Unlimited' Zudoku will try and make the hardest puzzle it can.</p> + <h3><b>Entering a printed puzzle</b></h3> + <p>If you have a printed puzzle, for example in a newspaper, magazine or book, you can enter that into Zudoku. You can then play it or solve it on your computer. To do this, just follow these steps:</p> + <p> + <ol><LI>Choose Design mode from the Game menu.</LI> + <li>Blank out the puzzle by choosing New blank puzzle from the Game menu.</li> + <li>Use the cursor keys or the pop-up list to enter digits into the puzzle to match the printed copy.</li> + <li>Choose Design mode again from the Game menu to leave Design mode. Zudoku now gives it a difficulty rating and you can start playing.</li></ol></p> + <h3><b>Creating your own puzzles</b></h3> + <p>Have a go at making your own puzzles - it's harder than it looks! Just go to Design mode as above, and place some digits.</p> + <p>If you try and put a digit in an invalid position while in Design mode, Zudoku won't let you do it. Try putting it somewhere else, or changing one of the other digits in the puzzle first.</p> + <p>Leave Design mode and see what Zudoku makes of your puzzle. It may tell you that there are Many solutions to the puzzle. In this case, you need to enter some more digits to make sure there is only a single solution. Sometimes Zudoku will think for a while and tell you there is no solution - you probably need to remove some digits to make your puzzle solvable.</p> + <h3><b>Helping you solve and design</b></h3> + <p>You can ask Zudoku to show you what numbers can possibly go in the empty squares. From the Game menu, choose Show possible moves. Zudoku will fill in small green digits to show the possibilities for each space. If there are 7 or more possible digits, Zudoku just puts an asterisk. If there are no possible digits, Zudoku puts a red exclamation mark.</p> + <p>If it all gets too much, or you are just interested to watch, you can ask Zudoku to solve the puzzle for you. Just choose Solve from the Game menu. You will see Zudoku rapidly filling in squares until the grid is full. Where a puzzle has more than one solution, it will simply display the first solution it comes across. If the puzzle is not solvable, Zudoku will try for a while before giving up and telling you.</p> + </body> +</html>
\ No newline at end of file diff --git a/packages/zudoku/zudoku_1.1.bb b/packages/zudoku/zudoku_1.1.bb new file mode 100644 index 0000000000..46c64ebb6e --- /dev/null +++ b/packages/zudoku/zudoku_1.1.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "A Sudoku Game for Opie" +HOMEPAGE = "http://figlabs.com" +AUTHOR = "FigLabs" +LICENSE = "GPL" +SECTION = "opie/games" +APPTYPE = "binary" +APPDESKTOP = "${WORKDIR}" + +SRC_URI = "http://www.vanille.de/mirror/zudoku-${PV}.tar.gz \ + file://zudoku.html \ + file://zudoku.desktop" + +inherit opie + +EXTRA_QMAKEVARS_POST += "TARGET=zudoku" + +do_install() { + install -d ${D}${palmtopdir}/help/en/html + install -m 0644 ${WORKDIR}/zudoku.html ${D}${palmtopdir}/help/en/html/ + install -d ${D}${palmtopdir}/pics/ + install -m 0644 zudoku64x64.png ${D}${palmtopdir}/pics/zudoku.png +} |