diff options
author | Michael Lauer <mickey@vanille-media.de> | 2007-07-30 11:15:39 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2007-07-30 11:15:39 +0000 |
commit | 929f61d2aef5cf85e6d88cdbcf542c838a03bf34 (patch) | |
tree | fa99fe12f0718313365a066d93df646ef6f5ef49 | |
parent | 22348937cf12a03afe2aaeaa0c297867bb40433b (diff) | |
parent | 10de3859729ec4a238d66340144a93005fcd0a61 (diff) |
merge of '4a597627acd6eec179bb1a03405d92cf8b871ac0'
and '6c89e16689bde0d5bff8b0e47eea04a458190a56'
72 files changed, 1184 insertions, 188 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index d0083bdc54..fec7622f18 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -825,8 +825,11 @@ def base_after_parse(d): if (old_arch == mach_arch): # Nothing to do return - if (bb.data.getVar('SRC_URI_OVERRIDES_PACKAGE_ARCH', d, 1) == '0'): + override = bb.data.getVar('SRC_URI_OVERRIDES_PACKAGE_ARCH', d, 1) + + if not override or override == '0': return + paths = [] for p in [ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ]: paths.append(bb.data.expand(os.path.join(p, mach_arch), d)) diff --git a/classes/image.bbclass b/classes/image.bbclass index 5f1dfa2dce..101b53307a 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -89,9 +89,9 @@ fakeroot do_rootfs () { for type in ${IMAGE_FSTYPES}; do if test -z "$FAKEROOTKEY"; then - fakeroot -i ${TMPDIR}/fakedb.image bbimage -t $type -e ${FILE} + fakeroot -i ${TMPDIR}/fakedb.image ${PYTHON} `which bbimage` -t $type -e ${FILE} else - bbimage -n "${IMAGE_NAME}" -t "$type" -e "${FILE}" + ${PYTHON} `which bbimage` -n "${IMAGE_NAME}" -t "$type" -e "${FILE}" fi cd ${DEPLOY_DIR_IMAGE}/ diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass index cd6e04731e..3256977517 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -24,7 +24,7 @@ def get_pkgconfig_mangle(d): do_install_append () { for pc in `find ${D} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do - sed -i ${@get_pkgconfig_mangle(d)} ${pc} + sed -i ${@get_pkgconfig_mangle(d)} -e 's:${D}::g' ${pc} done } @@ -32,6 +32,6 @@ do_stage_append () { for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do pcname=`basename $pc` install -d ${PKG_CONFIG_PATH} - cat $pc | sed ${@get_pkgconfig_mangle(d)} > ${PKG_CONFIG_PATH}/$pcname + cat $pc | sed ${@get_pkgconfig_mangle(d)} -e 's:${D}${libdir}\S*:${STAGING_LIBDIR}:g' -e 's:${D}${prefix}/include\S*:${STAGING_INCDIR}:g' > ${PKG_CONFIG_PATH}/$pcname done } diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index a0da0667dd..016b0d500b 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -111,6 +111,16 @@ python check_sanity_eventhandler() { from bb import note, error, data, __version__ from bb.event import getName + try: + from distutils.version import LooseVersion + except ImportError: + def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1 + + if (LooseVersion(bb.__version__) > LooseVersion("1.8.6")): + if getName(e) == "ConfigParsed": + check_sanity(e) + return NotHandled + if getName(e) == "BuildStarted": check_sanity(e) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 77d6c1ee83..e305dc3251 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -246,6 +246,7 @@ export RANLIB = "${HOST_PREFIX}ranlib" export STRIP = "${HOST_PREFIX}strip" export OBJCOPY = "${HOST_PREFIX}objcopy" export OBJDUMP = "${HOST_PREFIX}objdump" +PYTHON = "${@sys.executable}" export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}" @@ -462,6 +463,10 @@ IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" IMAGE_ROOTFS_SIZE_ext3 ?= "65536" IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536" +# Forcefully set CACHE now so future changes to things like +# MACHINE don't change the path to the cache +CACHE := "${CACHE}" + ################################################################## # Magic Cookie for SANITY CHECK ################################################################## diff --git a/conf/distro/include/preferred-opie-versions-1.2.3.inc b/conf/distro/include/preferred-opie-versions-1.2.3.inc index da946d4784..1f39916f4f 100644 --- a/conf/distro/include/preferred-opie-versions-1.2.3.inc +++ b/conf/distro/include/preferred-opie-versions-1.2.3.inc @@ -208,4 +208,4 @@ PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}" PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}" PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}" PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}" -PREFERRED_VERSION_konqueror-embedded = "20060404" +PREFERRED_VERSION_konqueror-embedded = "20070212" diff --git a/conf/machine/include/palm.conf b/conf/machine/include/palm.conf index 565f37b43f..821ebc4c03 100644 --- a/conf/machine/include/palm.conf +++ b/conf/machine/include/palm.conf @@ -41,7 +41,6 @@ module_autoload_pcmcia = "pcmcia" module_autoload_pcmcia_core = "pcmcia-core" module_autoload_pda_power = "pda_power" module_autoload_pxa2xx_core = "pxa2xx-core" -module_autoload_pxapwm_bl = "pxapwm_bl" module_autoload_snd = "snd" module_autoload_snd-ac97-codec = "snd-ac97-codec" module_autoload_snd-mixer-oss = "snd-mixer-oss" diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf index 7adb352ba4..3d1d90fbd8 100644 --- a/conf/machine/palmld.conf +++ b/conf/machine/palmld.conf @@ -24,7 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS += "\ kernel-module-pcmcia-core \ kernel-module-pda-power \ kernel-module-pxa2xx-core \ - kernel-module-pxapwm-bl \ kernel-module-snd-pxa2xx-ac97 \ kernel-module-snd-pxa2xx-pcm \ " diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf index 46e5fafdb5..4d1032dae8 100644 --- a/conf/machine/palmt650.conf +++ b/conf/machine/palmt650.conf @@ -10,8 +10,8 @@ SERIAL_CONSOLE = "115200 ttyS1" GUI_MACHINE_CLASS = "bigscreen" -MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \ - kernel-module-pxapwm-bl \ +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-snd-pxa2xx-ac97 \ + kernel-module-pxa27x-keyboard \ kernel-module-wm97xx-ts" module_autoload_g_ether = "g_ether" diff --git a/conf/machine/palmt680.conf b/conf/machine/palmt680.conf new file mode 100644 index 0000000000..b5e8aebb54 --- /dev/null +++ b/conf/machine/palmt680.conf @@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: Palm Treo 680 +#@DESCRIPTION: Machine configuration for the Palm TX + +require conf/machine/include/palm.conf + +ROOT_FLASH_SIZE = "100" + +SERIAL_CONSOLE = "115200 ttyS0" + +GUI_MACHINE_CLASS = "bigscreen" + +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \ + kernel-module-wm97xx-ts" diff --git a/conf/machine/palmtc.conf b/conf/machine/palmtc.conf index f4fcb405c5..b1139c21fa 100644 --- a/conf/machine/palmtc.conf +++ b/conf/machine/palmtc.conf @@ -12,5 +12,3 @@ SERIAL_CONSOLE = "115200 ttyS0" GUI_MACHINE_CLASS = "bigscreen" -MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxapwm-bl" - diff --git a/conf/machine/palmtt5.conf b/conf/machine/palmtt5.conf index aedaf4ba30..d2de3fa87b 100644 --- a/conf/machine/palmtt5.conf +++ b/conf/machine/palmtt5.conf @@ -11,6 +11,5 @@ SERIAL_CONSOLE = "115200 ttyS0" GUI_MACHINE_CLASS = "bigscreen" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \ - kernel-module-pxapwm-bl \ kernel-module-wm97xx-ts \ kernel-module-palmt5-battery" diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf index d9b934a306..9f1f079cdc 100644 --- a/conf/machine/palmtx.conf +++ b/conf/machine/palmtx.conf @@ -14,6 +14,5 @@ ROOT_FLASH_SIZE = "100" SERIAL_CONSOLE = "115200 ttyS0" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \ - kernel-module-pxapwm-bl \ kernel-module-wm97xx-ts \ kernel-module-palmtx-battery" diff --git a/packages/blassic/.mtn2git_empty b/packages/blassic/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/blassic/.mtn2git_empty diff --git a/packages/blassic/blassic_0.10.1.bb b/packages/blassic/blassic_0.10.1.bb new file mode 100644 index 0000000000..52b5ae4644 --- /dev/null +++ b/packages/blassic/blassic_0.10.1.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "classic basic interpreter" +LICENSE = "GPLv2" +DEPENDS = "ncurses" + +SRC_URI = "http://www.blassic.org/bin/blassic-${PV}.tgz" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-graphics=yes" + + diff --git a/packages/bluez/bluez-gnome_0.10.bb b/packages/bluez/bluez-gnome_0.10.bb new file mode 100644 index 0000000000..d50e8e5fde --- /dev/null +++ b/packages/bluez/bluez-gnome_0.10.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "BLuetooth configuration applet" +LICENSE = "GPL+LGPL" + +DEPENDS = "dbus-glib gconf libnotify gtk+" + +SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" + +inherit autotools pkgconfig gconf + +FILES_${PN} += "${datadir}/gconf" + diff --git a/packages/bluez/bluez-gnome_cvs.bb b/packages/bluez/bluez-gnome_cvs.bb index 65412663a0..ea5bbe6c2f 100644 --- a/packages/bluez/bluez-gnome_cvs.bb +++ b/packages/bluez/bluez-gnome_cvs.bb @@ -8,7 +8,7 @@ DEPENDS = "dbus-glib gconf libnotify gtk+" SRC_URI = "cvs://anonymous@cvs.bluez.org/cvsroot/bluez;module=gnome \ " -PV = "0.9+cvs${SRCDATE}" +PV = "0.10+cvs${SRCDATE}" S = "${WORKDIR}/gnome" inherit autotools pkgconfig gconf diff --git a/packages/bluez/bluez-gnome_git.bb b/packages/bluez/bluez-gnome_git.bb index ac772f8825..e16fee109d 100644 --- a/packages/bluez/bluez-gnome_git.bb +++ b/packages/bluez/bluez-gnome_git.bb @@ -1,12 +1,14 @@ DESCRIPTION = "BLuetooth configuration applet" LICENSE = "GPL+LGPL" +DEFAULT_PREFERENCE = "-2" + DEPENDS = "dbus-glib gconf libnotify gtk+" SRC_URI = "git://people.freedesktop.org/~hadess/bluez-gnome;protocol=git \ file://pkgconfig-add-gthread.patch;patch=1 " -PV = "0.9+git${SRCDATE}" +PV = "0.10+git${SRCDATE}" S = "${WORKDIR}/git" inherit autotools pkgconfig gconf diff --git a/packages/bluez/bluez-hcidump_1.38.bb b/packages/bluez/bluez-hcidump_1.38.bb new file mode 100644 index 0000000000..877c8db33c --- /dev/null +++ b/packages/bluez/bluez-hcidump_1.38.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool." +SECTION = "console" +PRIORITY = "optional" +DEPENDS = "bluez-libs" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz" +S = "${WORKDIR}/bluez-hcidump-${PV}" + +EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}" + +inherit autotools diff --git a/packages/bluez/bluez-libs_3.13.bb b/packages/bluez/bluez-libs_3.13.bb new file mode 100644 index 0000000000..6ddf62a4fb --- /dev/null +++ b/packages/bluez/bluez-libs_3.13.bb @@ -0,0 +1 @@ +require bluez-libs.inc diff --git a/packages/bluez/bluez-utils_3.13.bb b/packages/bluez/bluez-utils_3.13.bb new file mode 100644 index 0000000000..5ea1429641 --- /dev/null +++ b/packages/bluez/bluez-utils_3.13.bb @@ -0,0 +1,114 @@ +require bluez-utils.inc + +DEPENDS += "glib-2.0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://hcid.conf \ + " +PR = "r0" + +EXTRA_OECONF = " \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-alsa \ + --enable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + +# The config options are explained below: + +# --enable-obex enable OBEX support +# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1 +# --enable-cups install CUPS backend support +# --enable-bccmd install BCCMD interface utility +# --enable-avctrl install Audio/Video control utility +# --enable-hid2hci install HID mode switching utility +# --enable-dfutool install DFU firmware upgrade utility + +# --enable-glib For systems that use and install GLib anyway +# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server + +#Following services can be enabled so far: +# --enable-network +# --enable-serial +# --enable-input +# --enable-audio +# --enable-echo + +#There is no need to modify any init script. They will be started +#automatically or on demand. Only /etc/bluetooth/*.service files should +#be patched to change name or the autostart value. +# --enable-configfile +# --enable-initscripts + +#For even smaller -doc packages +# --disable-manpages +# --disable-pcmciarules + +#I haven't seen any embedded device with HID proxy support. So simply +#disable it: +# --disable-hid2hci + + +PACKAGES =+ "${PN}-compat ${PN}-alsa" + +CONFFILES_${PN} = " \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default/bluetooth \ + " + +CONFFILES_${PN}-compat = " \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +FILES_${PN} = " \ + ${base_sbindir}/hcid \ + ${libdir}/bluetooth \ + ${sysconfdir}/init.d/bluetooth \ + ${sysconfdir}/bluetooth/*.service \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default \ + ${sysconfdir}/dbus-1 \ + ${base_sbindir}/hciattach \ + " + +FILES_${PN}-dbg += " \ + ${libdir}/bluetooth/.debug \ + ${libdir}/cups/backend/.debug \ + ${libdir}/alsa-lib/.debug \ + " + +FILES_${PN}-compat = " \ + ${base_bindir}/sdptool \ + ${base_bindir}/dund \ + ${base_bindir}/rctest \ + ${base_bindir}/ciptool \ + ${base_bindir}/l2test \ + ${base_bindir}/rfcomm \ + ${base_bindir}/hcitool \ + ${base_bindir}/pand \ + ${base_bindir}/hidd \ + ${base_bindir}/l2ping \ + ${base_sbindir}/hciconfig \ + ${base_sbindir}/bccmd \ + ${base_sbindir}/hciemu \ + ${base_sbindir}/hid2hci \ + ${base_bindir}/passkey-agent \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*" + +FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" +RDEPENDS_bluez-cups-backend = "cups" + + diff --git a/packages/classpath/classpath-minimal-native_0.95.bb b/packages/classpath/classpath-minimal-native_0.95.bb new file mode 100644 index 0000000000..c7716ed639 --- /dev/null +++ b/packages/classpath/classpath-minimal-native_0.95.bb @@ -0,0 +1,8 @@ + +# classpath-minimal-native has no packages +# primary goal is to speed up building of java virtual machines + +inherit native + +require classpath-minimal.inc + diff --git a/packages/classpath/classpath-minimal.inc b/packages/classpath/classpath-minimal.inc new file mode 100644 index 0000000000..5a2587b56c --- /dev/null +++ b/packages/classpath/classpath-minimal.inc @@ -0,0 +1,39 @@ +DESCRIPTION = "GNU Classpath standard Java libraries" +HOMEPAGE = "http://www.gnu.org/software/classpath/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "Classpath" +PROVIDES = "classpath" +RPROVIDES = "classpath" + +S = "${WORKDIR}/classpath-${PV}" + +SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" + +DEPENDS = "ecj-native zip-native" + +inherit autotools + + +EXTRA_OECONF = "--with-glibj \ + --with-ecj=${STAGING_BINDIR_NATIVE}/ecj \ + --disable-alsa \ + --disable-gconf-peer \ + --disable-gtk-peer \ + --disable-plugin \ + --disable-dssi \ + --disable-examples \ + " +do_install() { + : +} + +do_stage() { + install -d ${STAGING_INCDIR}/classpath-minimal/ + install -m 0644 include/jni.h ${STAGING_INCDIR}/classpath-minimal/ + install -m 0644 include/jni_md.h ${STAGING_INCDIR}/classpath-minimal/ + install -d ${STAGING_LIBDIR}/java/classpath-minimal/ + install -m 0644 lib/glibj.zip ${STAGING_LIBDIR}/java/classpath-minimal/ +} + +PACKAGES = " " diff --git a/packages/classpath/classpath-minimal_0.95.bb b/packages/classpath/classpath-minimal_0.95.bb new file mode 100644 index 0000000000..e489a4efc9 --- /dev/null +++ b/packages/classpath/classpath-minimal_0.95.bb @@ -0,0 +1,5 @@ + +# classpath-minimal-native has no packages +# primary goal is to speed up building of java virtual machines + +require classpath-minimal.inc diff --git a/packages/glibc/glibc_2.6.bb b/packages/glibc/glibc_2.6.bb index d4803fa5cc..b3880df613 100644 --- a/packages/glibc/glibc_2.6.bb +++ b/packages/glibc/glibc_2.6.bb @@ -16,7 +16,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" GLIBC_ADDONS ?= "ports,nptl,libidn" -GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN" +GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN" # # For now, we will skip building of a gcc package if it is a uclibc one diff --git a/packages/gnome/gnome-desktop_2.18.3.bb b/packages/gnome/gnome-desktop_2.18.3.bb index 4d4b80efbc..02beafa044 100644 --- a/packages/gnome/gnome-desktop_2.18.3.bb +++ b/packages/gnome/gnome-desktop_2.18.3.bb @@ -4,7 +4,7 @@ PR = "r2" DESCRIPTION = "GNOME library for reading .desktop files" inherit gnome pkgconfig -DEPENDS = "gnome-common gnome-doc-utils libgnomeui" +DEPENDS = "gnome-common gnome-doc-utils gnome-vfs libgnomeui" SRC_URI += "file://scrollkeeper.patch;patch=1 \ file://no-desktop-docs.patch;patch=1;pnum=0" diff --git a/packages/gnome/gnome-keyring_0.6.0.bb b/packages/gnome/gnome-keyring_0.6.0.bb new file mode 100644 index 0000000000..dd6235263d --- /dev/null +++ b/packages/gnome/gnome-keyring_0.6.0.bb @@ -0,0 +1,13 @@ +LICENSE = "GPL" +SECTION = "x11/gnome" + +inherit gnome + +DEPENDS = "gtk+" + +EXTRA_OECONF = "--disable-gtk-doc" + + +do_stage() { + autotools_stage_all +} diff --git a/packages/gnome/gnome-menus_2.16.1.bb b/packages/gnome/gnome-menus_2.16.1.bb index 30e0abc14f..1307c026f2 100644 --- a/packages/gnome/gnome-menus_2.16.1.bb +++ b/packages/gnome/gnome-menus_2.16.1.bb @@ -1,6 +1,7 @@ DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+" LICENSE = "GPL" +PR = "r1" inherit gnome pkgconfig @@ -11,4 +12,6 @@ autotools_stage_all PACKAGES += "${PN}-python" FILES_${PN} += "${datadir}/desktop-directories/" FILES_${PN}-python = "${libdir}/python*" +FILES_${PN}-dbg += "${libdir}/python*/site-packages/*/.debug \ + ${libdir}/python*/site-packages/.debug" diff --git a/packages/gnome/gnome-panel_2.18.1.bb b/packages/gnome/gnome-panel_2.18.1.bb new file mode 100644 index 0000000000..349951143b --- /dev/null +++ b/packages/gnome/gnome-panel_2.18.1.bb @@ -0,0 +1,17 @@ +LICENSE = "GPL" +DEPENDS = "libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus" + +inherit gnome pkgconfig + + +do_configure_prepend() { + sed -i -e s:help:: ${S}/Makefile.am +} + + +PACKAGES =+ "libpanel-applet" +FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*" + +do_stage() { + autotools_stage_all +} diff --git a/packages/gnome/gnome-power-manager_2.18.3.bb b/packages/gnome/gnome-power-manager_2.18.3.bb new file mode 100644 index 0000000000..3963da3912 --- /dev/null +++ b/packages/gnome/gnome-power-manager_2.18.3.bb @@ -0,0 +1,29 @@ +LICENSE = "GPLv2" +DEPENDS = "libnotify libgnomeui gnome-panel gnome-doc-utils libwnck gtk+ gnome-keyring libglade hal dbus-glib " + +PR = "r1" + +inherit gnome + +EXTRA_OECONF = " --disable-scrollkeeper \ + --disable-keyring \ + " + +do_configure_append() { + rm config.log +} + +PACKAGES =+ "${PN}-applets" + +FILES_${PN}-applets = "${bindir}/*applet* \ + ${libdir}/bonobo/servers \ + ${datadir}/gnome-2.0/ui" + +FILES_${PN} += "${datadir}/icons \ + ${datadir}/dbus-1 \ + ${datadir}/gnome/autostart \ + " + +FILE_{PN}-doc += "${datadir}/omf \ + ${datadir}/gnome/help " + diff --git a/packages/gnome/gnome-vfs-2.18.1/.mtn2git_empty b/packages/gnome/gnome-vfs-2.18.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gnome/gnome-vfs-2.18.1/.mtn2git_empty diff --git a/packages/gnome/gnome-vfs-2.18.1/gconftool-lossage.patch b/packages/gnome/gnome-vfs-2.18.1/gconftool-lossage.patch new file mode 100644 index 0000000000..3dbc130ddc --- /dev/null +++ b/packages/gnome/gnome-vfs-2.18.1/gconftool-lossage.patch @@ -0,0 +1,11 @@ +--- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000 ++++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100 +@@ -154,7 +154,7 @@ + AC_PATH_PROG(GCONFTOOL, gconftool-2, no) + + if test x"$GCONFTOOL" = xno; then +- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) ++ AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf]) + fi + + AM_GCONF_SOURCE_2 diff --git a/packages/gnome/gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch b/packages/gnome/gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch new file mode 100644 index 0000000000..e25ecdd66f --- /dev/null +++ b/packages/gnome/gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch @@ -0,0 +1,51 @@ +removes kerberos completely to avoid conflicts with installed kerberos +--- configure.in.orig 2007-01-05 19:42:26.418541610 +0200 ++++ configure.in 2007-01-05 19:42:56.604261797 +0200 +@@ -436,47 +436,6 @@ + ]) + AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes) + AC_SUBST(CDDA_LIBS) +- +-dnl GSSAPI +-dnl Check for Kerberos installation +-have_gssapi=no +-AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin) +- +-if test "x$KRB5_CONFIG" != "xnone"; then +- GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`" +- GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`" +- +- saved_CPPFLAGS="$CPPFLAGS" +- saved_LIBS="$LIBS" +- LIBS="$LIBS $GSSAPI_LIBS" +- CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS" +- # MIT and Heimdal put gssapi.h in different places +- AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [ +- AC_CHECK_FUNCS(gss_init_sec_context, [ +- AC_MSG_NOTICE([GSSAPI authentication support enabled]) +- AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled]) +- AC_CHECK_HEADERS(gssapi/gssapi_generic.h) +- have_gssapi=yes +- +- # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE +- AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],, +- [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name, +- [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise]) +- ], [ +- #ifdef HAVE_GSSAPI_GSSAPI_H +- #include <gssapi/gssapi.h> +- #else +- #include <gssapi.h> +- #endif +- ]) +- ]) +- break +- ]) +- LIBS="$saved_LIBS" +- CPPFLAGS="$saved_CPPFLAGS" +-fi +-AC_SUBST(GSSAPI_LIBS) +-AC_SUBST(GSSAPI_CFLAGS) + + dnl ****************************** + dnl http-method (neon checks) diff --git a/packages/gnome/gnome-vfs_2.18.1.bb b/packages/gnome/gnome-vfs_2.18.1.bb new file mode 100644 index 0000000000..4ae7406a46 --- /dev/null +++ b/packages/gnome/gnome-vfs_2.18.1.bb @@ -0,0 +1,38 @@ +LICENSE = "GPL" +DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib" +RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info" + +PR = "r0" + +inherit gnome + +# This is to provide compatibility with the gnome-vfs DBus fork +PROVIDES = "gnome-vfs-plugin-dbus" +RREPLACES = "gnome-vfs-dbus" + +SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \ + file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0" + +EXTRA_OECONF = " \ + --disable-openssl \ + --enable-gnutls \ + --enable-avahi \ + --with-samba-includes=${STAGING_INCDIR} \ + " + +FILES_${PN} += " ${libdir}/vfs" +FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include" +FILES_${PN}-doc += " ${datadir}/gtk-doc" + +do_stage () { +autotools_stage_all +} + +PACKAGES_DYNAMIC = "gnome-vfs-plugin-*" + +python populate_packages_prepend () { + print bb.data.getVar('FILES_gnome-vfs', d, 1) + + plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d) + do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s') +} diff --git a/packages/gnome/libwnck_2.13.5.bb b/packages/gnome/libwnck_2.13.5.bb new file mode 100644 index 0000000000..1830a7540a --- /dev/null +++ b/packages/gnome/libwnck_2.13.5.bb @@ -0,0 +1,10 @@ +LICENSE = "LGPL" +DEPENDS = "gtk+" +DESCRIPTION = "Window navigation construction toolkit" +HOMEPAGE = "" + +inherit gnome + +do_stage() { + autotools_stage_all +} diff --git a/packages/gnuradio/gnuradio.inc b/packages/gnuradio/gnuradio.inc new file mode 100644 index 0000000000..4916411f0a --- /dev/null +++ b/packages/gnuradio/gnuradio.inc @@ -0,0 +1,61 @@ +DESCRIPTION = "GNU Radio" +SECTION = "apps" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = " guile-native fftwf python libusb virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native" + +RDEPENDS_${PN} = "python-core python-audio python-codecs python-lang python-textutils" +RDEPENDS_gnuradio-usrp = "python-core" + +inherit autotools pkgconfig + +CXXFLAGS_powerpc += "-lstdc++" + +export BUILD_SYS := "${BUILD_SYS}" +export HOST_SYS := "${HOST_SYS}" + +EXTRA_OECONF = " \ + --disable-gr-atsc \ + --enable-gr-video-sdl \ + --enable-gr-audio-alsa \ + --enable-gr-audio-jack \ + --enable-gr-audio-oss \ + --enable-mblock \ + " + +do_configure_append() { + find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g +} + +PACKAGES =+ "libpmt libpmt-qa \ + libmblock libmblock-qa \ + libgr-audio-alsa \ + libusrp libusrp-inband libusrp-inband-qa \ + libgromnithread \ + libgnuradio-core libgnuradio-core-qa \ + gnuradio-usrp-dbg gnuradio-usrp" + +FILES_libpmt = "${libdir}/libpmt.so" +FILES_libpmt-qa = "${libdir}/libpmt-qa.so" +FILES_libmblock = "${libdir}/libmblock.so" +FILES_libmblock-qa = "${libdir}/libmblock-qa.so" +FILES_libgr-audio-alsa = "${libdir}/libgr_audio_alsa.so" + +FILES_libusrp = "${libdir}/libusrp.so.*" +FILES_libusrp-inband = "${libdir}/libusrp_inband.so.*" +FILES_libusrp-inband-qa = "${libdir}/libusrp_inband-qa.so" +FILES_libgnuradio-core = "${libdir}/libgnuradio-core.so.*" +FILES_libgnuradio-core-qa = "${libdir}/libgnuradio-core-qa.so.*" +FILES_libgromnithread = "${libdir}/libgromnithread.so*" + +FILES_${PN} += "${libdir}/python*/site-packages/gnuradio/*" +FILES_${PN}-dbg += "${libdir}/python*/site-packages/gnuradio/.debug \ + ${libdir}/python*/site-packages/gnuradio/*/.debug \ + " + +FILES_gnuradio-usrp = "${libdir}/python*/site-packages/usrpm/* \ + ${datadir}/usrp" +FILES_gnuradio-usrp-dbg = "${libdir}/python*/site-packages/usrpm/.debug" + + + diff --git a/packages/gnuradio/gnuradio/.mtn2git_empty b/packages/gnuradio/gnuradio/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gnuradio/gnuradio/.mtn2git_empty diff --git a/packages/gnuradio/gnuradio/no-trellis-doc.patch b/packages/gnuradio/gnuradio/no-trellis-doc.patch new file mode 100644 index 0000000000..039aed9c8e --- /dev/null +++ b/packages/gnuradio/gnuradio/no-trellis-doc.patch @@ -0,0 +1,20 @@ +--- /tmp/Makefile.am 2007-07-27 13:44:31.000000000 +0200 ++++ trunk/gr-trellis/Makefile.am 2007-07-27 13:50:06.795215000 +0200 +@@ -21,5 +21,5 @@ + + include $(top_srcdir)/Makefile.common + +-SUBDIRS = src doc ++SUBDIRS = src + +--- /tmp/Makefile.am 2007-07-27 19:18:00.000000000 +0200 ++++ trunk/usrp/Makefile.am 2007-07-27 19:18:20.995215000 +0200 +@@ -20,7 +20,7 @@ + # + + EXTRA_DIST = usrp.pc.in usrp.iss.in usrp.inf +-SUBDIRS = host firmware fpga doc ++SUBDIRS = host firmware fpga + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = usrp.pc diff --git a/packages/gnuradio/gnuradio_3.0.4.bb b/packages/gnuradio/gnuradio_3.0.4.bb new file mode 100644 index 0000000000..30a6d0ab5e --- /dev/null +++ b/packages/gnuradio/gnuradio_3.0.4.bb @@ -0,0 +1,8 @@ +require gnuradio.inc + +PR = "r0" + +SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \ + file://no-trellis-doc.patch;patch=1 \ + " + diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb index f3d4873e5a..e40d151acb 100644 --- a/packages/gnuradio/gnuradio_svn.bb +++ b/packages/gnuradio/gnuradio_svn.bb @@ -1,24 +1,14 @@ -DESCRIPTION = "GNU Radio" -SECTION = "apps" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "fftwf python boost cppunit sdcc-native swig swig-native" -RDEPENDS = "libfftwf python swig" +require gnuradio.inc -PV = "0.0+svn${SRCDATE}" -PR = "r0" +DEFAULT_PREFERENCE = "-1" +PV = "3.0.4+svn${SRCDATE}" +PR = "r2" -SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http" - -inherit autotools pkgconfig +SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \ + file://no-trellis-doc.patch;patch=1 \ + " S="${WORKDIR}/trunk" -CXXFLAGS_powerpc += "-lstdc++" - -export BUILD_SYS := "${BUILD_SYS}" -export HOST_SYS := "${HOST_SYS}" - -EXTRA_OECONF = "--disable-gr-atsc --disable-gr-video-sdl" diff --git a/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch b/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch new file mode 100644 index 0000000000..d44c454ce3 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch @@ -0,0 +1,67 @@ +Index: gtk/gtkcombobox.c +=================================================================== +RCS file: /cvs/gnome/gtk+/gtk/gtkcombobox.c,v +retrieving revision 1.185 +diff -u -p -r1.185 gtkcombobox.c +--- gtk/gtkcombobox.c 12 Oct 2006 13:48:07 -0000 1.185 ++++ gtk/gtkcombobox.c 1 Nov 2006 19:01:09 -0000 +@@ -756,6 +756,25 @@ gtk_combo_box_class_init (GtkComboBoxCla + FALSE, + GTK_PARAM_READABLE)); + ++ /** ++ * GtkComboBox:arrow-size: ++ * ++ * Sets the minimum size of the arrow in the combo box. Note ++ * that the arrow size is coupled to the font size, so in case ++ * a larger font is used, the arrow will be larger than set ++ * by arrow size. ++ * ++ * Since: 2.12 ++ */ ++ gtk_widget_class_install_style_property (widget_class, ++ g_param_spec_int ("arrow-size", ++ P_("Arrow Size"), ++ P_("The minimum size of the arrow in the combo box"), ++ 0, ++ G_MAXINT, ++ 15, ++ GTK_PARAM_READABLE)); ++ + g_type_class_add_private (object_class, sizeof (GtkComboBoxPrivate)); + } + +@@ -1897,7 +1916,12 @@ gtk_combo_box_size_request (GtkWidget + { + gint width, height; + gint focus_width, focus_pad; ++ gint font_size; ++ gint arrow_size; + GtkRequisition bin_req; ++ PangoContext *context; ++ PangoFontMetrics *metrics; ++ PangoFontDescription *font_desc; + + GtkComboBox *combo_box = GTK_COMBO_BOX (widget); + +@@ -1910,7 +1934,20 @@ gtk_combo_box_size_request (GtkWidget + gtk_widget_style_get (GTK_WIDGET (widget), + "focus-line-width", &focus_width, + "focus-padding", &focus_pad, ++ "arrow-size", &arrow_size, + NULL); ++ ++ font_desc = GTK_BIN (widget)->child->style->font_desc; ++ context = gtk_widget_get_pango_context (widget); ++ metrics = pango_context_get_metrics (context, font_desc, ++ pango_context_get_language (context)); ++ font_size = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) + ++ pango_font_metrics_get_descent (metrics)); ++ pango_font_metrics_unref (metrics); ++ ++ arrow_size = MAX (arrow_size, font_size); ++ ++ gtk_widget_set_size_request (combo_box->priv->arrow, arrow_size, arrow_size); + + if (!combo_box->priv->tree_view) + { diff --git a/packages/gtk+/gtk+-2.10.14/range-no-redraw.patch b/packages/gtk+/gtk+-2.10.14/range-no-redraw.patch new file mode 100644 index 0000000000..e3603d7700 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/range-no-redraw.patch @@ -0,0 +1,41 @@ +Index: gtk/gtkrange.c +=================================================================== +--- gtk/gtkrange.c (revision 18523) ++++ gtk/gtkrange.c (working copy) +@@ -99,6 +99,8 @@ + + GtkSensitivityType lower_sensitivity; + GtkSensitivityType upper_sensitivity; ++ ++ guint motion_idle; + }; + + +@@ -1721,6 +1723,16 @@ + &handled); + } + ++static gboolean ++update_slider_position_idle (GtkRange *range) ++{ ++ update_slider_position (range, range->layout->mouse_x,range->layout->mouse_y); ++ ++ range->layout->motion_idle = 0; ++ ++ return FALSE; ++} ++ + static void + stop_scrolling (GtkRange *range) + { +@@ -1860,8 +1872,8 @@ + if (gtk_range_update_mouse_location (range)) + gtk_widget_queue_draw (widget); + +- if (range->layout->grab_location == MOUSE_SLIDER) +- update_slider_position (range, x, y); ++ if (range->layout->grab_location == MOUSE_SLIDER && !range->layout->motion_idle) ++ range->layout->motion_idle = g_idle_add ((GSourceFunc)update_slider_position_idle, range); + + /* We handled the event if the mouse was in the range_rect */ + return range->layout->mouse_location != MOUSE_OUTSIDE; diff --git a/packages/gtk+/gtk+-2.10.14/scrolled-placement.patch b/packages/gtk+/gtk+-2.10.14/scrolled-placement.patch new file mode 100644 index 0000000000..09ded531ea --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/scrolled-placement.patch @@ -0,0 +1,35 @@ +Index: gtk/gtkscrolledwindow.c +=================================================================== +--- gtk/gtkscrolledwindow.c (revision 18493) ++++ gtk/gtkscrolledwindow.c (working copy) +@@ -885,7 +885,7 @@ + if (GTK_IS_SCROLLED_WINDOW (widget)) + { + gtk_scrolled_window_update_real_placement (GTK_SCROLLED_WINDOW (widget)); +- gtk_widget_queue_draw (widget); ++ gtk_widget_queue_resize (widget); + } + else if (GTK_IS_CONTAINER (widget)) + gtk_container_forall (GTK_CONTAINER (widget), traverse_container, NULL); +Index: gdk/x11/gdksettings.c +=================================================================== +--- gdk/x11/gdksettings.c (revision 18493) ++++ gdk/x11/gdksettings.c (working copy) +@@ -65,7 +65,8 @@ + "Xft/RGBA\0" "gtk-xft-rgba\0" + "Xft/DPI\0" "gtk-xft-dpi\0" + "Net/FallbackIconTheme\0" "gtk-fallback-icon-theme\0" +- "Gtk/TouchscreenMode\0" "gtk-touchscreen-mode\0"; ++ "Gtk/TouchscreenMode\0" "gtk-touchscreen-mode\0" ++ "Gtk/ScrolledWindowPlacement\0" "gtk-scrolled-window-placement\0"; + + static const struct + { +@@ -107,5 +108,6 @@ + { 1197, 1206 }, + { 1219, 1227 }, + { 1239, 1261 }, +- { 1285, 1305 } ++ { 1285, 1305 }, ++ { 1326, 1354 } + }; diff --git a/packages/gtk+/gtk+-2.10.14/toggle-font.diff b/packages/gtk+/gtk+-2.10.14/toggle-font.diff new file mode 100644 index 0000000000..928da72430 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/toggle-font.diff @@ -0,0 +1,100 @@ +Index: gtk/gtkcellrenderertoggle.c +=================================================================== +--- gtk/gtkcellrenderertoggle.c (revision 18523) ++++ gtk/gtkcellrenderertoggle.c (working copy) +@@ -71,6 +71,8 @@ + PROP_INDICATOR_SIZE + }; + ++/* This is a hard-coded default which promptly gets overridden by a size ++ calculated from the font size. */ + #define TOGGLE_WIDTH 12 + + static guint toggle_cell_signals[LAST_SIGNAL] = { 0 }; +@@ -80,8 +82,9 @@ + typedef struct _GtkCellRendererTogglePrivate GtkCellRendererTogglePrivate; + struct _GtkCellRendererTogglePrivate + { +- gint indicator_size; +- ++ gint indicator_size; /* This is the real size */ ++ gint override_size; /* This is the size set from the indicator-size property */ ++ GtkWidget *cached_widget; + guint inconsistent : 1; + }; + +@@ -104,6 +107,7 @@ + GTK_CELL_RENDERER (celltoggle)->ypad = 2; + + priv->indicator_size = TOGGLE_WIDTH; ++ priv->override_size = 0; + priv->inconsistent = FALSE; + } + +@@ -210,7 +214,7 @@ + g_value_set_boolean (value, celltoggle->radio); + break; + case PROP_INDICATOR_SIZE: +- g_value_set_int (value, priv->indicator_size); ++ g_value_set_int (value, priv->override_size ? priv->override_size : priv->indicator_size); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); +@@ -245,7 +249,7 @@ + celltoggle->radio = g_value_get_boolean (value); + break; + case PROP_INDICATOR_SIZE: +- priv->indicator_size = g_value_get_int (value); ++ priv->override_size = g_value_get_int (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); +@@ -273,6 +277,27 @@ + } + + static void ++on_widget_style_set (GtkWidget *widget, GtkStyle *previous, gpointer user_data) ++{ ++ GtkCellRendererTogglePrivate *priv = user_data; ++ PangoContext *context; ++ PangoFontMetrics *metrics; ++ int height; ++ ++ context = gtk_widget_get_pango_context (widget); ++ metrics = pango_context_get_metrics (context, ++ widget->style->font_desc, ++ pango_context_get_language (context)); ++ ++ height = pango_font_metrics_get_ascent (metrics) + ++ pango_font_metrics_get_descent (metrics); ++ ++ pango_font_metrics_unref (metrics); ++ ++ priv->indicator_size = PANGO_PIXELS (height * 0.85); ++} ++ ++static void + gtk_cell_renderer_toggle_get_size (GtkCellRenderer *cell, + GtkWidget *widget, + GdkRectangle *cell_area, +@@ -287,6 +312,20 @@ + + priv = GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE (cell); + ++ if (priv->override_size) { ++ priv->indicator_size = priv->override_size; ++ } else if (priv->cached_widget != widget) { ++ if (priv->cached_widget) { ++ g_object_remove_weak_pointer (widget, &priv->cached_widget); ++ g_signal_handlers_disconnect_by_func (priv->cached_widget, on_widget_style_set, priv); ++ } ++ priv->cached_widget = widget; ++ g_object_add_weak_pointer (widget, &priv->cached_widget); ++ g_signal_connect (widget, "style-set", on_widget_style_set, priv); ++ ++ on_widget_style_set (widget, NULL, priv); ++ } ++ + calc_width = (gint) cell->xpad * 2 + priv->indicator_size; + calc_height = (gint) cell->ypad * 2 + priv->indicator_size; + diff --git a/packages/gtk+/gtk+_2.10.14.bb b/packages/gtk+/gtk+_2.10.14.bb index 4e85db45af..3aaa0d6bec 100644 --- a/packages/gtk+/gtk+_2.10.14.bb +++ b/packages/gtk+/gtk+_2.10.14.bb @@ -1,6 +1,6 @@ require gtk-2.10.inc -PR = "r0" +PR = "r1" # disable per default - untested and not all patches included. DEFAULT_PREFERENCE = "-1" @@ -22,7 +22,11 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ file://spinbutton.patch;patch=1 \ file://gtk+-handhelds.patch;patch=1 \ file://filesel-fix-segfault.patch;patch=1 \ - " + file://toggle-font.diff;patch=1;pnum=0 \ + file://combo-arrow-size.patch;patch=1;pnum=0 \ + file://range-no-redraw.patch;patch=1;pnum=0 \ + file://scrolled-placement.patch;patch=1;pnum=0 \ + " #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points require gtk-fpu.inc diff --git a/packages/guile/guile-native_1.8.2.bb b/packages/guile/guile-native_1.8.2.bb new file mode 100644 index 0000000000..99d77b0da0 --- /dev/null +++ b/packages/guile/guile-native_1.8.2.bb @@ -0,0 +1,133 @@ +SECTION = "unknown" +LICENSE = "GPL" +SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \ + " + +inherit autotools native + +S="${WORKDIR}/guile-${PV}" + +OE_LT_RPATH_ALLOW = "any" +LDFLAGS += " -L${STAGING_LIBDIR} " + +do_configure() { + # no autoreconf, thanks + oe_runconf +} + +LIBGUILE_HEADERS = "\ +__scm.h \ +alist.h \ +arbiters.h \ +async.h \ +backtrace.h \ +boolean.h \ +chars.h \ +continuations.h \ +debug-malloc.h \ +debug.h \ +deprecation.h \ +dynl.h \ +dynwind.h \ +environments.h \ +eq.h \ +error.h \ +eval.h \ +evalext.h \ +extensions.h \ +feature.h \ +filesys.h \ +fluids.h \ +fports.h \ +gc.h \ +gdb_interface.h \ +gdbint.h \ +goops.h \ +gsubr.h \ +guardians.h \ +hash.h \ +hashtab.h \ +hooks.h \ +init.h \ +ioext.h \ +iselect.h \ +keywords.h \ +lang.h \ +list.h \ +load.h \ +macros.h \ +mallocs.h \ +modules.h \ +net_db.h \ +numbers.h \ +objects.h \ +objprop.h \ +options.h \ +pairs.h \ +ports.h \ +posix.h \ +print.h \ +procprop.h \ +procs.h \ +properties.h \ +ramap.h \ +random.h \ +rdelim.h \ +read.h \ +regex-posix.h \ +root.h \ +rw.h \ +scmconfig.h \ +scmsigs.h \ +script.h \ +simpos.h \ +smob.h \ +snarf.h \ +socket.h \ +sort.h \ +srcprop.h \ +stackchk.h \ +stacks.h \ +stime.h \ +strings.h \ +strorder.h \ +strports.h \ +struct.h \ +symbols.h \ +tags.h \ +threads.h \ +throw.h \ +unif.h \ +validate.h \ +values.h \ +variable.h \ +vectors.h \ +version.h \ +vports.h \ +weaks.h \ +" + +do_stage() { + install -d ${STAGING_INCDIR}/libguile + for i in ${LIBGUILE_HEADERS}; do + install -m 0644 libguile/$i ${STAGING_INCDIR}/libguile/$i + done + + install -d ${STAGING_BINDIR_NATIVE} + install -m 0755 ${S}/libguile/.libs/guile ${STAGING_BINDIR_NATIVE}/ + + install -m 0644 libguile.h ${STAGING_INCDIR}/libguile.h + install -d ${STAGING_INCDIR}/guile + install -m 0644 libguile/gh.h ${STAGING_INCDIR}/guile/ + install -d ${STAGING_INCDIR}/guile/srfi + install -d ${STAGING_INCDIR}/guile-readline + install -m 0644 guile-readline/readline.h ${STAGING_INCDIR}/guile-readline/ + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 guile-config/guile.m4 ${STAGING_DATADIR}/aclocal + + install -d ${STAGING_DATADIR}/guile/1.8 + cp -pPr ${S}/ice-9 ${STAGING_DATADIR}/guile/1.8/ + + oe_libinstall -C guile-readline -so -a libguilereadline-v-17 ${STAGING_LIBDIR} + oe_libinstall -C libguile -so -a libguile ${STAGING_LIBDIR} +} diff --git a/packages/jack/jack_0.103.0.bb b/packages/jack/jack_0.103.0.bb index 9bb7c0f532..ccd6379447 100644 --- a/packages/jack/jack_0.103.0.bb +++ b/packages/jack/jack_0.103.0.bb @@ -18,7 +18,7 @@ EXTRA_OECONF = "--enable-timestamps --disable-capabilities --disable-oldtrans \ --disable-portaudio --disable-coreaudio --enable-oss --enable-alsa" EXTRA_OEMAKE = 'transform="s,^,,"' -LDFLAGS_append = " -L${STAGING_LIBDIR}" +LDFLAGS_append = " -ldl -L${STAGING_LIBDIR}" PACKAGES =+ "libjack jack-server jack-examples" diff --git a/packages/linux/linux-hackndev-2.6/palmld/defconfig b/packages/linux/linux-hackndev-2.6/palmld/defconfig index 8c654a6dcc..26d10ae1c8 100644 --- a/packages/linux/linux-hackndev-2.6/palmld/defconfig +++ b/packages/linux/linux-hackndev-2.6/palmld/defconfig @@ -920,8 +920,8 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=m CONFIG_LCD_CLASS_DEVICE=m -# CONFIG_BACKLIGHT_CORGI is not set -CONFIG_BACKLIGHT_PXAPWM=m +CONFIG_BACKLIGHT_CORGI=y +# CONFIG_BACKLIGHT_PXAPWM is not set CONFIG_FB=y CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set diff --git a/packages/linux/linux-hackndev-2.6/palmtc/defconfig b/packages/linux/linux-hackndev-2.6/palmtc/defconfig index 7c1030d9cd..fac96dfd88 100644 --- a/packages/linux/linux-hackndev-2.6/palmtc/defconfig +++ b/packages/linux/linux-hackndev-2.6/palmtc/defconfig @@ -846,8 +846,8 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m CONFIG_BACKLIGHT_DEVICE=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_DEVICE=y -# CONFIG_BACKLIGHT_CORGI is not set -CONFIG_BACKLIGHT_PXAPWM=m +CONFIG_BACKLIGHT_CORGI=y +# CONFIG_BACKLIGHT_PXAPWM is not set # # Sound diff --git a/packages/linux/linux-hackndev-2.6/palmtt3/defconfig b/packages/linux/linux-hackndev-2.6/palmtt3/defconfig index e10d5b792b..49b571a047 100644 --- a/packages/linux/linux-hackndev-2.6/palmtt3/defconfig +++ b/packages/linux/linux-hackndev-2.6/palmtt3/defconfig @@ -985,8 +985,8 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_DEVICE=y # CONFIG_LCD_CLASS_DEVICE is not set -# CONFIG_BACKLIGHT_CORGI is not set -CONFIG_BACKLIGHT_PXAPWM=y +CONFIG_BACKLIGHT_CORGI=y +# CONFIG_BACKLIGHT_PXAPWM is not set # # Sound diff --git a/packages/linux/linux-hackndev-2.6/palmtt5/defconfig b/packages/linux/linux-hackndev-2.6/palmtt5/defconfig index 5197fb8b8d..4e9db0a136 100644 --- a/packages/linux/linux-hackndev-2.6/palmtt5/defconfig +++ b/packages/linux/linux-hackndev-2.6/palmtt5/defconfig @@ -885,8 +885,8 @@ CONFIG_APM_POWER=m CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=m CONFIG_LCD_CLASS_DEVICE=m -# CONFIG_BACKLIGHT_CORGI is not set -CONFIG_BACKLIGHT_PXAPWM=m +CONFIG_BACKLIGHT_CORGI=y +# CONFIG_BACKLIGHT_PXAPWM is not set CONFIG_FB=y CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set diff --git a/packages/linux/linux-hackndev-2.6/palmtx/defconfig b/packages/linux/linux-hackndev-2.6/palmtx/defconfig index 68dcca286d..0411281aae 100644 --- a/packages/linux/linux-hackndev-2.6/palmtx/defconfig +++ b/packages/linux/linux-hackndev-2.6/palmtx/defconfig @@ -856,8 +856,8 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_DEVICE=y # CONFIG_LCD_CLASS_DEVICE is not set -# CONFIG_BACKLIGHT_CORGI is not set -CONFIG_BACKLIGHT_PXAPWM=y +CONFIG_BACKLIGHT_CORGI=y +# CONFIG_BACKLIGHT_PXAPWM is not set # # Sound diff --git a/packages/linux/linux-hackndev-2.6/palmz72/defconfig b/packages/linux/linux-hackndev-2.6/palmz72/defconfig index 4a77c775c7..f8490491c4 100644 --- a/packages/linux/linux-hackndev-2.6/palmz72/defconfig +++ b/packages/linux/linux-hackndev-2.6/palmz72/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hnd2 -# Sun Jul 1 04:44:00 2007 +# Mon Jul 23 21:44:35 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -182,7 +182,7 @@ CONFIG_ARCH_PXA=y # CONFIG_MACH_XSCALE_PALMTT5 is not set # CONFIG_MACH_XSCALE_PALMTX is not set CONFIG_MACH_PALMZ72=y -CONFIG_PALMZ72_PM=y +CONFIG_PALMZ72_PM=m CONFIG_PALMZ72_BATTERY=m # CONFIG_MACH_OMAP_PALMTC is not set # CONFIG_MACH_ZIRE31 is not set @@ -290,7 +290,7 @@ CONFIG_PM_LEGACY=y # CONFIG_PM_DEBUG is not set # CONFIG_DPM_DEBUG is not set # CONFIG_PM_SYSFS_DEPRECATED is not set -CONFIG_APM_EMULATION=y +CONFIG_APM_EMULATION=m # # Networking @@ -308,26 +308,27 @@ CONFIG_XFRM=y # CONFIG_XFRM_USER is not set # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set -# CONFIG_NET_KEY is not set +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE 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_NET_IPIP=m +CONFIG_NET_IPGRE=m # 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_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" @@ -374,14 +375,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set -CONFIG_IRDA=y +CONFIG_IRDA=m # # IrDA protocols # CONFIG_IRLAN=m CONFIG_IRNET=m -CONFIG_IRCOMM=y +CONFIG_IRCOMM=m # CONFIG_IRDA_ULTRA is not set # @@ -418,8 +419,8 @@ CONFIG_IRPORT_SIR=m # # FIR device drivers # -CONFIG_PXA_FICP=y -CONFIG_BT=y +CONFIG_PXA_FICP=m +CONFIG_BT=m CONFIG_BT_L2CAP=m CONFIG_BT_SCO=m CONFIG_BT_RFCOMM=m @@ -465,7 +466,77 @@ CONFIG_FW_LOADER=m # # Memory Technology Devices (MTD) # -# CONFIG_MTD is not set +CONFIG_MTD=m +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=m +# CONFIG_MTD_PARTITIONS is not set + +# +# User Modules And Translation Layers +# +# CONFIG_MTD_CHAR is not set +# CONFIG_MTD_BLKDEVS is not set +# CONFIG_MTD_BLOCK is not set +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE 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_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_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# 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 is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set # # Parallel port support @@ -533,7 +604,7 @@ CONFIG_NETDEVICES=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set +CONFIG_TUN=m # # PHY device support @@ -570,7 +641,7 @@ CONFIG_MII=y # Wan interfaces # # CONFIG_WAN is not set -CONFIG_PPP=y +CONFIG_PPP=m # CONFIG_PPP_MULTILINK is not set CONFIG_PPP_FILTER=y CONFIG_PPP_ASYNC=m @@ -580,11 +651,13 @@ CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m CONFIG_PPPOE=m # CONFIG_SLIP is not set -CONFIG_SLHC=y +CONFIG_SLHC=m CONFIG_SHAPER=m -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set +CONFIG_NETCONSOLE=m +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_RX is not set +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y # # ISDN subsystem @@ -602,7 +675,7 @@ CONFIG_INPUT=y # # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set -CONFIG_INPUT_TSDEV=y +CONFIG_INPUT_TSDEV=m CONFIG_INPUT_TSDEV_SCREEN_X=320 CONFIG_INPUT_TSDEV_SCREEN_Y=480 CONFIG_INPUT_EVDEV=y @@ -638,7 +711,7 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_TOUCHWIN is not set # CONFIG_TOUCHSCREEN_UCB1400 is not set # CONFIG_TOUCHSCREEN_PALMTC is not set -CONFIG_TOUCHSCREEN_WM97XX=y +CONFIG_TOUCHSCREEN_WM97XX=m # CONFIG_TOUCHSCREEN_WM9705 is not set CONFIG_TOUCHSCREEN_WM9712=y # CONFIG_TOUCHSCREEN_WM9713 is not set @@ -819,7 +892,7 @@ CONFIG_HWMON=y CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_PDA_POWER=y -CONFIG_APM_POWER=y +CONFIG_APM_POWER=m # CONFIG_BATTERY_DS2760 is not set # @@ -851,27 +924,26 @@ CONFIG_APM_POWER=y # CONFIG_SOC_T7L66XB is not set # CONFIG_SOC_TC6387XB is not set # CONFIG_SOC_TC6393XB is not set -# CONFIG_SOC_TSC2101 is not set # CONFIG_SOC_TSC2200 is not set # # LED devices # CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y +CONFIG_LEDS_CLASS=m # # LED drivers # -CONFIG_LEDS_PALMZ72=y +CONFIG_LEDS_PALMZ72=m # # LED Triggers # CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_TIMER=m # CONFIG_LEDS_TRIGGER_HWTIMER is not set -CONFIG_LEDS_TRIGGER_MMC_CARD=y +CONFIG_LEDS_TRIGGER_MMC_CARD=m # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set # CONFIG_LEDS_TRIGGER_SHARED is not set @@ -913,8 +985,8 @@ CONFIG_PXACI=m CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_LCD_CLASS_DEVICE is not set -# CONFIG_BACKLIGHT_CORGI is not set -CONFIG_BACKLIGHT_PXAPWM=y +CONFIG_BACKLIGHT_CORGI=y +# CONFIG_BACKLIGHT_PXAPWM is not set CONFIG_FB=y CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set @@ -968,19 +1040,21 @@ CONFIG_LOGO_LINUX_CLUT224=y # # Sound # -CONFIG_SOUND=y +CONFIG_SOUND=m # # Advanced Linux Sound Architecture # -CONFIG_SND=y -CONFIG_SND_TIMER=y -CONFIG_SND_PCM=y -# CONFIG_SND_SEQUENCER is not set +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_SEQUENCER=m +# CONFIG_SND_SEQ_DUMMY is not set CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_SEQUENCER_OSS is not set # CONFIG_SND_DYNAMIC_MINORS is not set CONFIG_SND_SUPPORT_OLD_API=y # CONFIG_SND_VERBOSE_PROCFS is not set @@ -991,8 +1065,9 @@ CONFIG_SND_DEBUG_DETECT=y # # Generic devices # -CONFIG_SND_AC97_CODEC=y +CONFIG_SND_AC97_CODEC=m # CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set # CONFIG_SND_MTPAV is not set # CONFIG_SND_SERIAL_U16550 is not set # CONFIG_SND_MPU401 is not set @@ -1000,9 +1075,9 @@ CONFIG_SND_AC97_CODEC=y # # ALSA ARM devices # -CONFIG_SND_PXA2xx_I2SOUND=y -CONFIG_SND_PXA2XX_PCM=y -CONFIG_SND_PXA2XX_AC97=y +CONFIG_SND_PXA2xx_I2SOUND=m +CONFIG_SND_PXA2XX_PCM=m +CONFIG_SND_PXA2XX_AC97=m # CONFIG_SND_RECON is not set # @@ -1014,7 +1089,7 @@ CONFIG_SND_PXA2XX_AC97=y # Open Sound System # # CONFIG_SOUND_PRIME is not set -CONFIG_AC97_BUS=y +CONFIG_AC97_BUS=m # # HID Devices @@ -1037,13 +1112,13 @@ CONFIG_USB_ARCH_HAS_OHCI=y # # USB Gadget Support # -CONFIG_USB_GADGET=y +CONFIG_USB_GADGET=m # 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_PXA27X=y -CONFIG_USB_PXA27X=y +CONFIG_USB_PXA27X=m # CONFIG_USB_PXA27X_DMA is not set # CONFIG_USB_GADGET_SX2 is not set # CONFIG_USB_GADGET_GOKU is not set @@ -1068,10 +1143,10 @@ CONFIG_USB_G_SERIAL=m # # MMC/SD Card support # -CONFIG_MMC=y +CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set -CONFIG_MMC_BLOCK=y -CONFIG_MMC_PXA=y +CONFIG_MMC_BLOCK=m +CONFIG_MMC_PXA=m # CONFIG_MMC_TMIO is not set # CONFIG_MMC_SAMCOP is not set @@ -1171,6 +1246,7 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set +# CONFIG_JFFS2_FS is not set # CONFIG_CRAMFS is not set CONFIG_SQUASHFS=y CONFIG_SQUASHFS_EMBEDDED=y @@ -1292,12 +1368,13 @@ CONFIG_FRAME_POINTER=y CONFIG_CRYPTO=y CONFIG_CRYPTO_ALGAPI=m CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_HASH=m CONFIG_CRYPTO_MANAGER=m -# CONFIG_CRYPTO_HMAC is not set +CONFIG_CRYPTO_HMAC=m # CONFIG_CRYPTO_XCBC is not set # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set -# CONFIG_CRYPTO_MD5 is not set +CONFIG_CRYPTO_MD5=m CONFIG_CRYPTO_SHA1=m # CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA512 is not set @@ -1308,7 +1385,7 @@ CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_PCBC=m # CONFIG_CRYPTO_LRW is not set -# CONFIG_CRYPTO_DES is not set +CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_FCRYPT is not set # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set @@ -1320,7 +1397,7 @@ CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_ARC4=m # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_ANUBIS is not set -# CONFIG_CRYPTO_DEFLATE is not set +CONFIG_CRYPTO_DEFLATE=m # CONFIG_CRYPTO_MICHAEL_MIC is not set # CONFIG_CRYPTO_CRC32C is not set # CONFIG_CRYPTO_CAMELLIA is not set diff --git a/packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb b/packages/linux/linux-handhelds-2.6_2.6.20-hh10.bb index 8e760267f4..8e760267f4 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.20-hh10.bb diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb index d7062ec675..4e008f5b6e 100644 --- a/packages/linux/linux-handhelds-2.6_cvs.bb +++ b/packages/linux/linux-handhelds-2.6_cvs.bb @@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1" K_MAJOR = "2" K_MINOR = "6" K_MICRO = "21" -HHV = "2" +HHV = "14" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ file://defconfig" diff --git a/packages/networkmanager/network-manager-applet_0.6.5.bb b/packages/networkmanager/network-manager-applet_0.6.5.bb new file mode 100644 index 0000000000..fae5507989 --- /dev/null +++ b/packages/networkmanager/network-manager-applet_0.6.5.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Frontend applet for NetworkManager" +LICENSE = "GPLv2" + +DEPENDS = "networkmanager dbus-glib libglade gconf gnome-keyring libnotify libgnomeui " + +inherit gnome + +S = "${WORKDIR}/nm-applet-${PV}" + +FILES_${PN} += "${datadir}/nm-applet/ \ + ${datadir}/icons \ + ${datadir}/gnome \ + " + diff --git a/packages/networkmanager/networkmanager.inc b/packages/networkmanager/networkmanager.inc new file mode 100644 index 0000000000..e11a52391d --- /dev/null +++ b/packages/networkmanager/networkmanager.inc @@ -0,0 +1,66 @@ +DESCRIPTION = "NetworkManager" +SECTION = "net/misc" +LICENSE = "GPL" +HOMEPAGE = "http://www.gnome.org" +PRIORITY = "optional" +DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools" +RDEPENDS = "wpa-supplicant iproute2 dhcdbd" + +PR = "r0" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \ + file://NetworkManager \ + file://99_networkmanager" + +S = "${WORKDIR}/NetworkManager-${PV}/" + + +EXTRA_OECONF = " \ + --with-gnome \ + --with-distro=debian \ + --without-gcrypt \ + --with-wpa_supplicant=/usr/sbin/wpa_supplicant \ + --with-dhcdbd=/sbin/dhcdbd \ + --with-ip=/sbin/ip" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + +do_install () { + oe_libinstall -C libnm-util libnm-util ${D}/usr/lib + oe_libinstall -C gnome/libnm_glib libnm_glib ${D}/usr/lib + + oe_runmake -C src DESTDIR="${D}" install + install -d ${D}/etc/default/volatiles + install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles + install -d ${D}/etc/init.d/ + install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d/ + install -d ${D}/${datadir}/ +} + +pkg_postinst_${PN} () { +if [ "x$D" != "x" ]; then + exit 1 +fi +/etc/init.d/populate-volatile.sh update +} + +PACKAGES =+ "libnmutil libnmglib" + +FILES_libnmutil += "${libdir}/libnm-util.so.*" +FILES_libnmglib += "${libdir}/libnm_glib.so.*" + +FILES_${PN} += "${datadir} \ + ${sbindir}/* \ + ${bindir}/* \ + ${sysconfdir} \ + ${libexecdir}" + +FILES_${PN}-dev += "${incdir} \ + ${libdir}/*.a \ + ${libdir}/*.la \ + ${libdir}/pkgconfig" + diff --git a/packages/networkmanager/networkmanager_0.6.5.bb b/packages/networkmanager/networkmanager_0.6.5.bb new file mode 100644 index 0000000000..e6d21de286 --- /dev/null +++ b/packages/networkmanager/networkmanager_0.6.5.bb @@ -0,0 +1,10 @@ +require networkmanager.inc + +PR = "r0" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \ + file://NetworkManager \ + file://99_networkmanager" + +S = "${WORKDIR}/NetworkManager-${PV}/" + diff --git a/packages/networkmanager/networkmanager_svn.bb b/packages/networkmanager/networkmanager_svn.bb index 604af0a729..d879381975 100644 --- a/packages/networkmanager/networkmanager_svn.bb +++ b/packages/networkmanager/networkmanager_svn.bb @@ -1,12 +1,6 @@ -DESCRIPTION = "NetworkManager" -SECTION = "net/misc" -LICENSE = "GPL" -HOMEPAGE = "http://www.gnome.org" -PRIORITY = "optional" -DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools" -RDEPENDS = "wpa-supplicant iproute2 dhcdbd" -PV = "0.6.5+svn${SRCDATE}" +require networkmanager.inc +PV = "0.6.5+svn${SRCDATE}" PR = "r0" SRC_URI="svn://svn.gnome.org/svn/NetworkManager/branches;module=NETWORKMANAGER_0_6_0_RELEASE;proto=http \ @@ -15,56 +9,6 @@ SRC_URI="svn://svn.gnome.org/svn/NetworkManager/branches;module=NETWORKMANAGER_0 DEFAULT_PREFERENCE = "-1" -EXTRA_OECONF = " \ - --with-gnome \ - --with-distro=debian \ - --without-gcrypt \ - --with-wpa_supplicant=/usr/sbin/wpa_supplicant \ - --with-dhcdbd=/sbin/dhcdbd \ - --with-ip=/sbin/ip" - S = "${WORKDIR}/NETWORKMANAGER_0_6_0_RELEASE" -inherit autotools pkgconfig - -do_staging () { - autotools_stage_includes - oe_libinstall -C libnm-util libnm-util ${STAGING_LIBDIR} - oe_libinstall gnome/libnm_glib libnm_glib ${STAGING_LIBDIR} -} - -do_install () { - oe_libinstall -C libnm-util libnm-util ${D}/usr/lib - oe_libinstall -C gnome/libnm_glib libnm_glib ${D}/usr/lib - - oe_runmake -C src DESTDIR="${D}" install - install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles - install -d ${D}/etc/init.d/ - install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d/ - install -d ${D}/${datadir}/ -} - -pkg_postinst_${PN} () { -if [ "x$D" != "x" ]; then - exit 1 -fi -/etc/init.d/populate-volatile.sh update -} - -PACKAGES =+ "libnmutil libnmglib" - -FILES_libnmutil += "${libdir}/libnm-util.so.*" -FILES_libnmglib += "${libdir}/libnm_glib.so.*" - -FILES_${PN} += "${datadir} \ - ${sbindir}/* \ - ${bindir}/* \ - ${sysconfdir} \ - ${libexecdir}" - -FILES_${PN}-dev += "${incdir} \ - ${libdir}/*.a \ - ${libdir}/*.la \ - ${libdir}/pkgconfig" diff --git a/packages/openmoko-apps/omext_0.2.bb b/packages/openmoko-apps/omext_0.2.bb new file mode 100644 index 0000000000..203b84e3df --- /dev/null +++ b/packages/openmoko-apps/omext_0.2.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Openmoko extensionhandler" +LICENSE = "GPLv2" + +DEPENDS = "dbus-glib" + +SRC_URI = "http://www.devzero.net/openmoko/dist/omext-${PV}.tar.gz" + +inherit autotools pkgconfig + +S = "{WORKDIR}/openmoko-extensionhandler" + + diff --git a/packages/opie-reader/files/opie-reader-unicode-copy.patch b/packages/opie-reader/files/opie-reader-unicode-copy.patch deleted file mode 100644 index d7d1ae24bd..0000000000 --- a/packages/opie-reader/files/opie-reader-unicode-copy.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- opie-reader/QTReaderApp.cpp.orig 2005-05-18 00:48:25.000000000 +0200 -+++ opie-reader/QTReaderApp.cpp 2006-04-08 15:55:43.000000000 +0200 -@@ -2558,7 +2558,7 @@ - reader->jumpto(m_savedpos); - while (reader->explocate() < endpos && (ch = reader->getch()) != UEOF) - { -- text += ch; -+ text += QChar(ch); - } - cb->setText(text); - reader->locate(currentpos); diff --git a/packages/opie-reader/opie-reader_1.2.3.bb b/packages/opie-reader/opie-reader_1.2.3.bb index e1ec40d831..43632416c5 100644 --- a/packages/opie-reader/opie-reader_1.2.3.bb +++ b/packages/opie-reader/opie-reader_1.2.3.bb @@ -1,9 +1,8 @@ require ${PN}.inc -PR = r1 +PR = r2 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-reader \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://opie-reader-unicode-copy.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-reader/opie-reader_cvs.bb b/packages/opie-reader/opie-reader_cvs.bb index 82b3547ae1..36c8c06157 100644 --- a/packages/opie-reader/opie-reader_cvs.bb +++ b/packages/opie-reader/opie-reader_cvs.bb @@ -1,10 +1,9 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = r1 +PR = r2 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \ ${HANDHELDS_CVS};module=opie/pics \ - ${HANDHELDS_CVS};module=opie/apps \ - file://opie-reader-unicode-copy.patch;patch=1" + ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-taskbar/opie-taskbar-images.inc b/packages/opie-taskbar/opie-taskbar-images.inc index 576220d2f0..769b5ff2c0 100644 --- a/packages/opie-taskbar/opie-taskbar-images.inc +++ b/packages/opie-taskbar/opie-taskbar-images.inc @@ -18,18 +18,20 @@ PIXMAP_SIZE_asus730 = "-480x640" PIXMAP_SIZE_htcuniversal= "-480x640" PIXMAP_SIZE_hx4700 = "-480x640" -PACKAGES = "${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320" +PACKAGES = "${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320" do_install() { install -d ${D}${palmtopdir}/pics/launcher - + + install -m 0644 ${FILESDIR}/firstuse-320x320.jpg ${D}${palmtopdir}/pics/launcher/firstuse-320x320.jpg + install -m 0644 ${FILESDIR}/opie-background-320x320.jpg ${D}${palmtopdir}/pics/launcher/opie-background-320x320.jpg install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-240x320.jpg install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-240x320.jpg # TODO: those should be correct images for the resolution: install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-320x240.jpg install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-320x240.jpg - for res in 480x640 640x480 800x600 ; do + for res in 480x640 640x480 800x600; do install -m 0644 ${WORKDIR}/pics/launcher/firstuse-${res}.jpg ${D}${palmtopdir}/pics/launcher/firstuse-${res}.jpg install -m 0644 ${WORKDIR}/pics/launcher/opie-background-${res}.jpg ${D}${palmtopdir}/pics/launcher/opie-background-${res}.jpg done @@ -39,7 +41,7 @@ do_install() { } python do_package_prepend () { - reslist = ['240x320','320x240', '480x640','640x480', '800x600','600x800'] + reslist = ['240x320','320x240', '320x320', '480x640','640x480', '800x600','600x800'] dir = bb.data.expand('${palmtopdir}/pics/launcher/', d) ft = bb.data.expand('${palmtopdir}/pics/*/*-%s.*', d) pn = bb.data.getVar('PN', d, 1) diff --git a/packages/opie-taskbar/opie-taskbar-images/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar-images/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar-images/.mtn2git_empty diff --git a/packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg b/packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg Binary files differnew file mode 100644 index 0000000000..67523f1291 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg diff --git a/packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg b/packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg Binary files differnew file mode 100644 index 0000000000..194816f1e1 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg diff --git a/packages/opie-taskbar/opie-taskbar-images_1.2.3.bb b/packages/opie-taskbar/opie-taskbar-images_1.2.3.bb new file mode 100644 index 0000000000..0c5b93780d --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar-images_1.2.3.bb @@ -0,0 +1,6 @@ +require ${PN}.inc +PR = "r1" + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-taskbar/opie-taskbar-images_cvs.bb b/packages/opie-taskbar/opie-taskbar-images_cvs.bb index 33588d9e12..ff7ea9e17b 100644 --- a/packages/opie-taskbar/opie-taskbar-images_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar-images_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r5" +PR = "r6" SRC_URI = "${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/synergy/synergy_1.3.1.bb b/packages/synergy/synergy_1.3.1.bb new file mode 100644 index 0000000000..3a1199b385 --- /dev/null +++ b/packages/synergy/synergy_1.3.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Synergy - control multiple computers with one keyboard and mouse" +HOMEPAGE = "http://synergy2.sourceforge.net/" +LICENSE = "GPLv2" +SECTION = "x11/utils" +# NOTE: This depends on full x11, not diet-x11 +DEPENDS = "libx11 libxtst" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/synergy2/synergy-${PV}.tar.gz" + +do_configure_prepend() { + grep -l -- -Werror "${S}/"* | xargs sed -i 's:-Werror::' +} + +inherit autotools diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index fb6bde07e8..a51ece76cf 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -3,7 +3,7 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r7" +PR = "r8" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/site/common b/site/common index f73a36abed..565b053623 100644 --- a/site/common +++ b/site/common @@ -1,2 +1,4 @@ # libelf mr_cv_target_elf=${mr_cv_target_elf=yes} + +ac_cv_file__dev_random=${ac_cv_file__dev_random=yes} |