From c00cd09f520da9d74176f4b9ab1b21db5e9067e1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 22 Dec 2006 09:16:57 +0000 Subject: start removing task-bootstrap* as stated in removal.txt --- packages/obsolete/tasks/.mtn2git_empty | 0 .../obsolete/tasks/task-bootstrap-unionroot.bb | 34 ++++++++++++++++++++++ packages/obsolete/tasks/task-bootstrap.bb | 27 +++++++++++++++++ packages/obsolete/tasks/task-bootstrap.inc | 9 ++++++ packages/tasks/task-bootstrap-unionroot.bb | 34 ---------------------- packages/tasks/task-bootstrap.bb | 27 ----------------- packages/tasks/task-bootstrap.inc | 9 ------ removal.txt | 1 + 8 files changed, 71 insertions(+), 70 deletions(-) create mode 100644 packages/obsolete/tasks/.mtn2git_empty create mode 100644 packages/obsolete/tasks/task-bootstrap-unionroot.bb create mode 100644 packages/obsolete/tasks/task-bootstrap.bb create mode 100644 packages/obsolete/tasks/task-bootstrap.inc delete mode 100644 packages/tasks/task-bootstrap-unionroot.bb delete mode 100644 packages/tasks/task-bootstrap.bb delete mode 100644 packages/tasks/task-bootstrap.inc diff --git a/packages/obsolete/tasks/.mtn2git_empty b/packages/obsolete/tasks/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obsolete/tasks/task-bootstrap-unionroot.bb b/packages/obsolete/tasks/task-bootstrap-unionroot.bb new file mode 100644 index 0000000000..e737e31608 --- /dev/null +++ b/packages/obsolete/tasks/task-bootstrap-unionroot.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Core packages required for a basic installation with unionroot" +PROVIDES = "task-bootstrap" +RPROVIDES = "task-bootstrap" +PR = "r2" +DEFAULT_PREFERENCE = "-1" + +# The BOOTSTRAP_EXTRA_ variables are often manipulated by the +# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly. +PACKAGE_ARCH = "${MACHINE_ARCH}" + +ALLOW_EMPTY = "1" +PACKAGES = "${PN}" + +MODUTILS ?= "24 26" + +require task-bootstrap.inc + +HOTPLUG ?= "linux-hotplug" + +RDEPENDS = 'base-files base-passwd busybox \ + initscripts \ + netbase sysvinit sysvinit-pidof tinylogin \ + modutils-initscripts \ + ${HOTPLUG} \ + ${BOOTSTRAP_EXTRA_RDEPENDS} \ + ${@bootstrap_modutils_rdepends(d)} \ + unionfs-modules \ + unionfs-utils \ + unionroot \ + unionroot-utils' + +RRECOMMENDS = 'dropbear portmap \ + ${BOOTSTRAP_EXTRA_RRECOMMENDS}' +LICENSE = "MIT" diff --git a/packages/obsolete/tasks/task-bootstrap.bb b/packages/obsolete/tasks/task-bootstrap.bb new file mode 100644 index 0000000000..d84f331102 --- /dev/null +++ b/packages/obsolete/tasks/task-bootstrap.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Core packages required for a basic installation" +PR = "r25" + +# The BOOTSTRAP_EXTRA_ variables are often manipulated by the +# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly. +PACKAGE_ARCH = "${MACHINE_ARCH}" + +ALLOW_EMPTY = "1" +PACKAGES = "${PN}" + +MODUTILS ?= "24 26" + +require task-bootstrap.inc + +HOTPLUG ?= "linux-hotplug" + +RDEPENDS = 'base-files base-passwd busybox \ + initscripts \ + netbase sysvinit sysvinit-pidof tinylogin \ + modutils-initscripts fuser setserial\ + ${HOTPLUG} \ + ${BOOTSTRAP_EXTRA_RDEPENDS} \ + ${@bootstrap_modutils_rdepends(d)}' + +RRECOMMENDS = 'dropbear portmap \ + ${BOOTSTRAP_EXTRA_RRECOMMENDS}' +LICENSE = "MIT" diff --git a/packages/obsolete/tasks/task-bootstrap.inc b/packages/obsolete/tasks/task-bootstrap.inc new file mode 100644 index 0000000000..073da7055f --- /dev/null +++ b/packages/obsolete/tasks/task-bootstrap.inc @@ -0,0 +1,9 @@ +def bootstrap_modutils_rdepends(d): + import bb + m = bb.data.getVar('MODUTILS', d, 1) + r = [] + if '24' in m: + r.append('modutils-depmod') + if '26' in m: + r.append('module-init-tools-depmod') + return ' '.join(r) diff --git a/packages/tasks/task-bootstrap-unionroot.bb b/packages/tasks/task-bootstrap-unionroot.bb deleted file mode 100644 index e737e31608..0000000000 --- a/packages/tasks/task-bootstrap-unionroot.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "Core packages required for a basic installation with unionroot" -PROVIDES = "task-bootstrap" -RPROVIDES = "task-bootstrap" -PR = "r2" -DEFAULT_PREFERENCE = "-1" - -# The BOOTSTRAP_EXTRA_ variables are often manipulated by the -# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly. -PACKAGE_ARCH = "${MACHINE_ARCH}" - -ALLOW_EMPTY = "1" -PACKAGES = "${PN}" - -MODUTILS ?= "24 26" - -require task-bootstrap.inc - -HOTPLUG ?= "linux-hotplug" - -RDEPENDS = 'base-files base-passwd busybox \ - initscripts \ - netbase sysvinit sysvinit-pidof tinylogin \ - modutils-initscripts \ - ${HOTPLUG} \ - ${BOOTSTRAP_EXTRA_RDEPENDS} \ - ${@bootstrap_modutils_rdepends(d)} \ - unionfs-modules \ - unionfs-utils \ - unionroot \ - unionroot-utils' - -RRECOMMENDS = 'dropbear portmap \ - ${BOOTSTRAP_EXTRA_RRECOMMENDS}' -LICENSE = "MIT" diff --git a/packages/tasks/task-bootstrap.bb b/packages/tasks/task-bootstrap.bb deleted file mode 100644 index d84f331102..0000000000 --- a/packages/tasks/task-bootstrap.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "Core packages required for a basic installation" -PR = "r25" - -# The BOOTSTRAP_EXTRA_ variables are often manipulated by the -# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly. -PACKAGE_ARCH = "${MACHINE_ARCH}" - -ALLOW_EMPTY = "1" -PACKAGES = "${PN}" - -MODUTILS ?= "24 26" - -require task-bootstrap.inc - -HOTPLUG ?= "linux-hotplug" - -RDEPENDS = 'base-files base-passwd busybox \ - initscripts \ - netbase sysvinit sysvinit-pidof tinylogin \ - modutils-initscripts fuser setserial\ - ${HOTPLUG} \ - ${BOOTSTRAP_EXTRA_RDEPENDS} \ - ${@bootstrap_modutils_rdepends(d)}' - -RRECOMMENDS = 'dropbear portmap \ - ${BOOTSTRAP_EXTRA_RRECOMMENDS}' -LICENSE = "MIT" diff --git a/packages/tasks/task-bootstrap.inc b/packages/tasks/task-bootstrap.inc deleted file mode 100644 index 073da7055f..0000000000 --- a/packages/tasks/task-bootstrap.inc +++ /dev/null @@ -1,9 +0,0 @@ -def bootstrap_modutils_rdepends(d): - import bb - m = bb.data.getVar('MODUTILS', d, 1) - r = [] - if '24' in m: - r.append('modutils-depmod') - if '26' in m: - r.append('module-init-tools-depmod') - return ' '.join(r) diff --git a/removal.txt b/removal.txt index 7c09fded9f..70dc59278b 100644 --- a/removal.txt +++ b/removal.txt @@ -24,6 +24,7 @@ Removal Date: 2006-12-22 Maintainer: None Reason: Obsoleted by task-base Proposed by: Koen Kooi +Note: Moved to packages/obsolete/tasks on 2006-12-22 Package Name: gst* 0.8.x Removal Date: 2006-12-29 -- cgit v1.2.3 From c0c21a6d23cf70c053dbf39f85402e2d4ba21677 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 22 Dec 2006 09:26:00 +0000 Subject: local.conf.sample: update it a bit --- conf/local.conf.sample | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 52bd88a4e9..df00fbae37 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -55,8 +55,9 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # TMPDIR = /usr/local/projects/oetmp # Uncomment this to specify a machine to build for. See the conf directory -# for machines currently known to OpenEmbedded. -# MACHINE = "collie" +# for machines currently known to OpenEmbedded. This will automatically take care +# of TARGET_ARCH +# MACHINE = "c7x0" # Use this to specify the target architecture. Note that this is only # needed when building for a machine not known to OpenEmbedded. Better use @@ -66,25 +67,26 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # Use this to specify the target operating system. The default is "linux", # for a normal linux system with glibc. Set this to "linux-uclibc" if you want # to build a uclibc based system. +# Normally the DISTRO of your choosing will take care of this # TARGET_OS = "linux" # TARGET_OS = "linux-uclibc" # Uncomment this to select a distribution policy. See the conf directory # for distributions currently known to OpenEmbedded. -# Although they no longer contain version number in the (file-)name -# familiar-unstable and openzaurus-unstable are so called "versioned" -# distros, i.e. they explicitely select specific versions of various -# packages. +# Although it no longer contain version number in the (file-)name +# openzaurus-unstable is a so called "versioned" distro, i.e. they +# explicitely select specific versions of various packages. # Stay away from unversioned distros unless you really know what you are doing # DISTRO = "generic" -# So far, angstrom.conf and familiar.conf set ENABLE_BINARY_LOCALE_GENERATION +# So far, angstrom.conf sets ENABLE_BINARY_LOCALE_GENERATION # to generate binary locale packages at build time using qemu-native and # thereby guarantee i18n support on all devices. If your build breaks on # qemu-native consider disabling ENABLE_BINARY_LOCALE_GENERATION (note that # this breaks i18n on devices with less than 128MB RAM) or installing # a working third-party qemu (e.g. provided by your distribution) and -# adding qemu-native to ASSUME_PROVIDED +# adding qemu-native to ASSUME_PROVIDED. Caveat emptor, since third-party +# qemus lack patches needed to work with various OE targets. # ENABLE_BINARY_LOCALE_GENERATION = "0" # ASSUME_PROVIDED += "qemu-native" @@ -108,7 +110,8 @@ IMAGE_FSTYPES = "jffs2 tar" # BBDEBUG = "yes" # Uncomment these two if you want BitBake to build images useful for debugging. -# Note that INHIBIT_PACKAGE_STRIP needs a package format to be defined +# Note that INHIBIT_PACKAGE_STRIP needs a package format to be defined. +# Also note that OE now produces -dbg packages which contain debugging symbols. # DEBUG_BUILD = "1" # INHIBIT_PACKAGE_STRIP = "1" -- cgit v1.2.3 From f0ac326b0c83fad9315d406e12b5f2e992674913 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 22 Dec 2006 09:36:31 +0000 Subject: h3900: 2.6 port reached usable state (suspend/resume, buttons, TS, SD/MMC), switch to it. --- conf/machine/h3900.conf | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index f00dc9eb96..323aa8f061 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -1,37 +1,34 @@ #@TYPE: Machine -#@NAME: Compaq iPAQ 39xx -#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx - -KERNEL ?= "kernel24" -#KERNEL ?= "kernel26" - -INHERIT += "linux-kernel-base" - -OVERRIDES =. "${KERNEL}:" +#@NAME: HP iPAQ h39xx +#@DESCRIPTION: Machine configuration for the HP iPAQ h39xx +# +# Hardware-based properties +# TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa" -PREFERRED_PROVIDER_virtual/kernel_kernel26 = "linux-handhelds-2.6" -EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p" -ROOT_FLASH_SIZE = "32" +require conf/machine/include/tune-xscale.conf -BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools" +ROOT_FLASH_SIZE = "32" +VOLATILE_STORAGE_SIZE = "64" +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen" -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 +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" +PCMCIA_MANAGER = "pcmciautils" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" -SERIAL_CONSOLE = "115200 tts/0 vt100" +# +# Modules autoload and other boot properties +# +module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_g_ether = "g_ether" -USE_DEVFS_kernel24 = "1" +SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" - -GUI_MACHINE_CLASS = "smallscreen" - -# not using tune-xscale so as to retain backwards compatibility -require conf/machine/include/tune-xscale.conf +require conf/machine/include/LAB-settings.conf -- cgit v1.2.3 From e595893a7970568aef11e39c75fd029038ec54e1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 22 Dec 2006 17:21:53 +0000 Subject: task-pivotboot: drop it as part of task-booststrap removal --- packages/tasks/task-pivotboot.bb | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 packages/tasks/task-pivotboot.bb diff --git a/packages/tasks/task-pivotboot.bb b/packages/tasks/task-pivotboot.bb deleted file mode 100644 index 14397e288c..0000000000 --- a/packages/tasks/task-pivotboot.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Basic packages required for a pivot root image" -PR = "r0" - -# The PIVOTBOOT_EXTRA_ variables are often manipulated by the -# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly. -PACKAGE_ARCH = "${MACHINE_ARCH}" - -ALLOW_EMPTY = "1" -PACKAGES = "${PN}" - -MODUTILS ?= "24 26" - -require task-bootstrap.inc - -HOTPLUG ?= "linux-hotplug" -PIVOTBOOT_EXTRA_RDEPENDS ?= "" -PIVOTBOOT_EXTRA_RRECOMMENDS ?= "" - -RDEPENDS = 'base-files base-passwd busybox \ - netbase modutils-initscripts \ - ${HOTPLUG} \ - ${PIVOTBOOT_EXTRA_RDEPENDS} \ - ${@bootstrap_modutils_rdepends(d)}' - -RRECOMMENDS = '${PIVOTBOOT_EXTRA_RRECOMMENDS}' -LICENSE = "MIT" -- cgit v1.2.3 From c2bed2d98af8b6cc5646caeba26fa18cc0b786c1 Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Fri, 22 Dec 2006 17:44:11 +0000 Subject: mkfontscale-native X11R7.0-1.0.1: add freetype-native to DEPENDS --- packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 98b49f99ac..051a9e5f63 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 = "libx11-native libfontenc-native" +DEPENDS = "libx11-native libfontenc-native freetype-native" SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/mkfontscale-${PV}.tar.bz2" -- cgit v1.2.3 From faed65e886e0aa0309ad13f4b03a962ba8171914 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 22 Dec 2006 17:57:52 +0000 Subject: angstrom: add provider for powerpc stuff --- conf/distro/angstrom-2007.1.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index eff7a14e42..0c8e2ad518 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.3" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "25" +DISTRO_REVISION = "26" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -141,6 +141,7 @@ PREFERRED_PROVIDER_libxss = "libxss" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc-linux-libc-for-gcc = "glibc-intermediate" #shouldn't that be uclibc-initial???? PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" -- cgit v1.2.3 From 29da43a0c0d5e5fbf2170eb7ec1d84f026afc67b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 22 Dec 2006 18:03:07 +0000 Subject: angstrom: really add powerpc providers --- conf/distro/angstrom-2007.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 0c8e2ad518..a0eda7dd11 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -141,7 +141,7 @@ PREFERRED_PROVIDER_libxss = "libxss" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/powerpc-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate" #shouldn't that be uclibc-initial???? PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" -- cgit v1.2.3 From 7c872b1394a47c8049e241e20e41c93911192be6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 22 Dec 2006 19:05:23 +0000 Subject: gnet cvs: stage all --- packages/gnet/gnet_cvs.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/gnet/gnet_cvs.bb b/packages/gnet/gnet_cvs.bb index 28b9f1e2e3..42a216f1db 100644 --- a/packages/gnet/gnet_cvs.bb +++ b/packages/gnet/gnet_cvs.bb @@ -12,3 +12,7 @@ S = "${WORKDIR}/gnet" EXTRA_OECONF = "--disable-pthreads" inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 7849cfd166f605c0abd1175d3a5f9f488485c941 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 22 Dec 2006 19:19:32 +0000 Subject: hiker: initial version of Access' hiker application framework --- packages/alp/.mtn2git_empty | 0 packages/alp/hiker_0.9.bb | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 packages/alp/.mtn2git_empty create mode 100644 packages/alp/hiker_0.9.bb diff --git a/packages/alp/.mtn2git_empty b/packages/alp/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/alp/hiker_0.9.bb b/packages/alp/hiker_0.9.bb new file mode 100644 index 0000000000..17e34efceb --- /dev/null +++ b/packages/alp/hiker_0.9.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Hiker Application Framework™" +LICENSE = "MPL" + +DEPENDS = "gtk+ sqlite3 gnet dbus-glib" + +SRC_URI = "http://www.access-company.com/downloads/${P}.tar.gz" + +inherit autotools pkgconfig lib_package + +export CFLAGS += "-DALP_BUILD=ALP_BUILD_DEBUG" +export CXXFLAGS += "-DALP_BUILD=ALP_BUILD_DEBUG" + +do_configure_prepend() { + sed -i s:unittest::g utils/Makefile.am +} + +PACKAGES =+ "libhiker libsqlfs" +FILES_libhiker += "${libdir}/libhiker*.so.*" +FILES_libsqlfs += "${libdir}/libsql*.so.*" + +do_stage() { + autotools_stage_all +} + -- cgit v1.2.3 From 0edaea31b34ca0bedca5a2ecff0ead510644ffe1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 23 Dec 2006 09:32:53 +0000 Subject: cairo: update to 1.3.10 From the release notes: This is the fifth development snapshot in the 1.3 series. It comes 9 days after the 1.3.8 snapshot, and still well within our goal of having a new snapshot every week, (though don't expect one next week---we'll all be too stuffed with sugar plums). Speaking of sugar plums, there's a sweet treat waiting in this cairo snapshot---greatly improved performance for stroking rectilinear shapes, like the ever common rectangle: image-rgb box-outline-stroke-100 0.18 -> 0.01: 25.58x speedup In past releases of cairo, some people had noticed that using cairo_stroke to draw rectilinear shapes could be awfully slow. Many people had worked around this by using cairo_fill with a more complex path and gotten a 5-15x performance benefit from that. If you're one of those people, please rip that workaround out, as now the more natural use of cairo_stroke should be 1.2-2x faster than the unnatural use of cairo_fill. And if you hadn't ever implemented that workaround, then you just might get to see your stroked rectangles now get drawn 5-25x faster. --- packages/cairo/cairo.inc | 15 +++++++++++++++ packages/cairo/cairo_1.3.10.bb | 7 +++++++ packages/cairo/cairo_1.3.8.bb | 20 -------------------- 3 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 packages/cairo/cairo.inc create mode 100644 packages/cairo/cairo_1.3.10.bb delete mode 100644 packages/cairo/cairo_1.3.8.bb diff --git a/packages/cairo/cairo.inc b/packages/cairo/cairo.inc new file mode 100644 index 0000000000..e405257dfb --- /dev/null +++ b/packages/cairo/cairo.inc @@ -0,0 +1,15 @@ +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender" +DESCRIPTION = "Cairo graphics library" +LICENSE = "MPL LGPL" + +#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points +require cairo-fpu.inc +EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)}" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/cairo/cairo_1.3.10.bb b/packages/cairo/cairo_1.3.10.bb new file mode 100644 index 0000000000..883884d15f --- /dev/null +++ b/packages/cairo/cairo_1.3.10.bb @@ -0,0 +1,7 @@ +#This is a development snapshot, so lets hint OE to use the releases +DEFAULT_PREFERENCE = "-1" + +require cairo.inc + +SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz" + diff --git a/packages/cairo/cairo_1.3.8.bb b/packages/cairo/cairo_1.3.8.bb deleted file mode 100644 index d9454fadcd..0000000000 --- a/packages/cairo/cairo_1.3.8.bb +++ /dev/null @@ -1,20 +0,0 @@ -#This is a development snapshot, so lets hint OE to use the releases -DEFAULT_PREFERENCE = "-1" - -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender" -DESCRIPTION = "Cairo graphics library" -LICENSE = "MPL LGPL" - -SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz" - -#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points -require cairo-fpu.inc -EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)}" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} -- cgit v1.2.3 From c1c765057029fea10a58a4eeb4faf56bfb6f46cd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 23 Dec 2006 09:33:12 +0000 Subject: angstrom: prefer cairo 1.3.10 --- conf/distro/angstrom-2007.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index a0eda7dd11..59ef9d3f4e 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -92,7 +92,7 @@ PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_freetype = "2.2.1" #fix screen corruption issues -PREFERRED_VERSION_cairo = "1.3.8" +PREFERRED_VERSION_cairo = "1.3.10" #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" -- cgit v1.2.3 From 7da039dea82104f22defaa39375fee6e645a378d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 23 Dec 2006 12:02:51 +0000 Subject: sapwood engine: add svn version --- packages/sapwood/.mtn2git_empty | 0 packages/sapwood/sapwood/.mtn2git_empty | 0 packages/sapwood/sapwood/sockets.patch | 113 ++++++++++++++++++++++++++++++++ packages/sapwood/sapwood_svn.bb | 24 +++++++ 4 files changed, 137 insertions(+) create mode 100644 packages/sapwood/.mtn2git_empty create mode 100644 packages/sapwood/sapwood/.mtn2git_empty create mode 100644 packages/sapwood/sapwood/sockets.patch create mode 100644 packages/sapwood/sapwood_svn.bb diff --git a/packages/sapwood/.mtn2git_empty b/packages/sapwood/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sapwood/sapwood/.mtn2git_empty b/packages/sapwood/sapwood/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sapwood/sapwood/sockets.patch b/packages/sapwood/sapwood/sockets.patch new file mode 100644 index 0000000000..1568206e2a --- /dev/null +++ b/packages/sapwood/sapwood/sockets.patch @@ -0,0 +1,113 @@ +--- configure.in.old 2005-06-10 17:04:52.000000000 +0200 ++++ configure.in 2005-06-10 17:20:47.000000000 +0200 +@@ -13,61 +13,61 @@ + AC_PROG_MAKE_SET + + dnl abstract sockets namespace checks, from dbus +-AC_ARG_ENABLE(abstract-sockets, +- [AC_HELP_STRING([--enable-abstract-sockets], +- [use abstract socket namespace (linux only)])], +- [enable_abstract_sockets=$enableval], +- [enable_abstract_sockets=auto]) +- +-AC_MSG_CHECKING(abstract socket namespace) +-AC_RUN_IFELSE([AC_LANG_PROGRAM( +-[[ ++#AC_ARG_ENABLE(abstract-sockets, ++# [AC_HELP_STRING([--enable-abstract-sockets], ++# [use abstract socket namespace (linux only)])], ++# [enable_abstract_sockets=$enableval], ++# [enable_abstract_sockets=no]) ++# ++#AC_MSG_CHECKING(abstract socket namespace) ++#AC_RUN_IFELSE([AC_LANG_PROGRAM( ++#[[ + #include + #include + #include + #include + #include + #include +-]], +-[[ +- int listen_fd; +- struct sockaddr_un addr; +- +- listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); +- +- if (listen_fd < 0) +- { +- fprintf (stderr, "socket() failed: %s\n", strerror (errno)); +- exit (1); +- } +- +- memset (&addr, '\0', sizeof (addr)); +- addr.sun_family = AF_UNIX; +- strcpy (addr.sun_path, "X/tmp/sapwood-fake-socket-path-used-in-configure-test"); +- addr.sun_path[0] = '\0'; /* this is what makes it abstract */ +- +- if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) +- { +- fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", +- strerror (errno)); +- exit (1); +- } +- else +- exit (0); +-]])], +- [have_abstract_sockets=yes], +- [have_abstract_sockets=no]) +-AC_MSG_RESULT($have_abstract_sockets) +- +-if test x$enable_abstract_sockets = xyes; then +- if test x$have_abstract_sockets = xno; then +- AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.]) +- fi +-fi +- +-if test x$enable_abstract_sockets = xno; then +- have_abstract_sockets=no +-fi ++#]], ++#[[ ++# int listen_fd; ++# struct sockaddr_un addr; ++# ++# listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); ++ ++# if (listen_fd < 0) ++# { ++# fprintf (stderr, "socket() failed: %s\n", strerror (errno)); ++# exit (1); ++# } ++# ++# memset (&addr, '\0', sizeof (addr)); ++# addr.sun_family = AF_UNIX; ++# strcpy (addr.sun_path, "X/tmp/sapwood-fake-socket-path-used-in-configure-test"); ++# addr.sun_path[0] = '\0'; /* this is what makes it abstract */ ++# ++# if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) ++# { ++# fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", ++# strerror (errno)); ++# exit (1); ++# } ++# else ++# exit (0); ++#]])], ++# [have_abstract_sockets=no], ++# [have_abstract_sockets=no]) ++#AC_MSG_RESULT($have_abstract_sockets) ++ ++#if test x$enable_abstract_sockets = xyes; then ++# if test x$have_abstract_sockets = xno; then ++# AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.]) ++# fi ++#fi ++ ++#if test x$enable_abstract_sockets = xno; then ++have_abstract_sockets=no ++#fi + + if test x$have_abstract_sockets = xyes; then + AC_DEFINE(HAVE_ABSTRACT_SOCKETS,1,[Have abstract socket namespace]) diff --git a/packages/sapwood/sapwood_svn.bb b/packages/sapwood/sapwood_svn.bb new file mode 100644 index 0000000000..11a26319de --- /dev/null +++ b/packages/sapwood/sapwood_svn.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "GTK theme engine Sapwood" +LICENSE = "LGPL" + +DEPENDS = "gtk+" + +PV = "2.43+svn${SRCDATE}" + +SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/trunk/;module=sapwood;proto=https \ + file://sockets.patch;patch=1 \ + " + +S = "${WORKDIR}/${PN}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-abstract-sockets=no" + +do_install_append () { + install -d ${D}${sysconfdir}/osso-af-init + install -m755 ${S}/debian/sapwood-server.sh ${D}${sysconfdir}/osso-af-init/sapwood-server.sh +} + +FILES_${PN} += "${libdir}/gtk-2.0/2.10.0/engines/" + -- cgit v1.2.3 From 3d6662c0866f0ea95ea9bc45f3871817c50414c9 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sat, 23 Dec 2006 14:21:44 +0000 Subject: Added bitbake recipe for libzvbi 0.2.24. --- packages/libzvbi/libzvbi_0.2.24.bb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 packages/libzvbi/libzvbi_0.2.24.bb diff --git a/packages/libzvbi/libzvbi_0.2.24.bb b/packages/libzvbi/libzvbi_0.2.24.bb new file mode 100644 index 0000000000..c14376387b --- /dev/null +++ b/packages/libzvbi/libzvbi_0.2.24.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "The Zapping VBI library, in short ZVBI, provides functions to \ +capture and decode VBI data. It is written in plain ANSI C with few dependencies \ +on other tools and libraries." +HOMEPAGE = "http://zapping.sourceforge.net/ZVBI/index.html" +LICENSE = "GPL" +SECTION = "libs/multimedia" +DEPENDS = "libpng" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/zapping/zvbi-${PV}.tar.bz2" +S = "${WORKDIR}/zvbi-${PV}" + +EXTRA_OECONF = "--without-x" + +inherit autotools + +do_stage() { + autotools_stage_all +} + + -- cgit v1.2.3 From e301e52dc20f0d10d4e9503f65ce101c0244a04a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 23 Dec 2006 21:11:09 +0000 Subject: familiar[-unstable].conf: "clean" up the situation by issuing a message --- conf/distro/familiar-unstable.conf | 89 +------------------------------------- conf/distro/familiar.conf | 1 + conf/distro/include/familiar.inc | 20 --------- 3 files changed, 2 insertions(+), 108 deletions(-) create mode 100644 conf/distro/familiar.conf delete mode 100644 conf/distro/include/familiar.inc diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index 8041ca8fb6..2b0c745bde 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -1,88 +1 @@ -DISTRO = "familiar" -DISTRO_NAME = "Familiar Linux" -DISTRO_VERSION = "unstable-${DATE}" - -require conf/distro/include/familiar.inc - -DISTRO_TYPE = "debug" -#DISTRO_TYPE = "release" -#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!! - -FEED_URIS += " \ - base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ - ${MACHINE}##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/machine/${MACHINE} \ - updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates \ - locale-en##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/en \ - locale-fr##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/fr \ - locale-de##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/de" - -#SRCDATE = 20050331 -#SRCDATE = "now" - -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_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" - -PREFERRED_VERSION_hostap-modules ?= "0.3.9" - -#2.4 machines prefer 0.13e ones -PREFERRED_VERSION_orinoco-modules ?= "0.13e" - -#but 0.13e doesn't build against 2.6 -PREFERRED_VERSION_orinoco-modules_h2200 ?= "0.15" -PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15" - -# The CSL compiler is unusable because -# 1) certain programs stop to compile -# 2) more programs segfault -PREFERRED_VERSION_gcc ?= "3.4.4" -PREFERRED_VERSION_gcc-cross ?= "3.4.4" -PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" - -# -# PIN the familiar build to a version -# -PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" -PREFERRED_VERSION_binutils ?= "2.15.94.0.1" - - -# -# Base -# -PREFERRED_PROVIDER_hostap-conf = "hostap-conf" -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -require conf/distro/include/sane-srcdates.inc -PREFERRED_VERSION_busybox ?= "1.00" - -# -# GlibC -# -PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" - -# -# Opie -# - -OPIE_VERSION = "1.2.2" -QTE_VERSION = "2.3.10" -PALMTOP_USE_MULTITHREADED_QT = "yes" -require conf/distro/include/preferred-opie-versions.inc - -# -# GPE -# - -PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" -PREFERRED_PROVIDER_dbus-glib = "dbus-glib" -require conf/distro/include/preferred-gpe-versions-2.8.inc - -# -# E -# -require conf/distro/include/preferred-e-versions.inc - +WARNING:="${@bb.fatal('\n*\n*\n* Sorry, the Familiar Linux support in OpenEmbedded is not up-to-date. \n If you want to produce Familiar Linux compatible packages,\n please use the Familiar Linux fork of OpenEmbedded.\n Otherwise, using a DISTRO like \"angstrom-2007.1\" or \"generic\"\n probably works well enough with your MACHINE configuration.\n*\n*\n')}" diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf new file mode 100644 index 0000000000..2b0c745bde --- /dev/null +++ b/conf/distro/familiar.conf @@ -0,0 +1 @@ +WARNING:="${@bb.fatal('\n*\n*\n* Sorry, the Familiar Linux support in OpenEmbedded is not up-to-date. \n If you want to produce Familiar Linux compatible packages,\n please use the Familiar Linux fork of OpenEmbedded.\n Otherwise, using a DISTRO like \"angstrom-2007.1\" or \"generic\"\n probably works well enough with your MACHINE configuration.\n*\n*\n')}" diff --git a/conf/distro/include/familiar.inc b/conf/distro/include/familiar.inc deleted file mode 100644 index ea360f5dc5..0000000000 --- a/conf/distro/include/familiar.inc +++ /dev/null @@ -1,20 +0,0 @@ -#@TYPE: Distribution -#@NAME: Familiar Linux -#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org) - -MAINTAINER ?= "Familiar Developers " - -INHERIT += "package_ipk debian multimachine" -TARGET_OS = "linux" - -BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version" -IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" - -ENABLE_BINARY_LOCALE_GENERATION ?= "1" -PARALLEL_INSTALL_MODULES = "1" -UDEV_DEVFS_RULES = "1" - -DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" - -# We want images supporting the following features (for task-base) -DISTRO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" -- cgit v1.2.3