diff options
23 files changed, 172 insertions, 34 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 15fff1d896..c3c91e2dbf 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1,3 +1,7 @@ +[http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip] +md5=30e2fe5edd143f347e03a8baf5d60f8a +sha256=5071431068c58c1f56dcc8fff37f8a213351f3b45c012d3adb640ec9418053ad + [http://www.directfb.org/downloads/Extras/++DFB-0.9.25.tar.gz] md5=c6a2705f6210d8ede50a947b375f1c0b sha256=b3dbf01563dd60d63cff543ea8cd0c885381e78ecbbab8ff176e46df3f198a88 @@ -5350,6 +5354,10 @@ sha256=6f40962eb8d76e0e9d76ec9f461d62c6af8561028d194358aed001827cc418fc md5=f100632e67f94ef4fffa4da32d25427a sha256=748359a51e008c179dc5dd5e2974f4b1279c78e09a2613a73d15cd22cb55e8d8 +[http://www.burghardt.pl/files/esekeyd-1.2.4.tar.gz] +md5=5eb8d1b02cdd99d0681e946768e529db +sha256=7267db1685b04e766b782e4c5aab9729bf3f23b86d568a3a513c77eb91aaed03 + [http://enlightenment.freedesktop.org/files/esmart-0.9.0.007.tar.gz] md5=a65b4a08818ac9ef9de3dd9d4f20f148 sha256=5df5b02c568f5e4b744252fbd62f5fae71bf0eddecc423d2b396a0ffbfe94465 @@ -6950,10 +6958,6 @@ sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5 md5=5dfac5da961ecd5f227c3175859a486d sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165 -[ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2] -md5=5dfac5da961ecd5f227c3175859a486d -sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165 - [ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2] md5=cc3c5565fdb9ab87a05ddb106ba0bd1f sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de @@ -20382,6 +20386,10 @@ sha256=1774de918b156c360843c1b68690f5f57532ee48ff079d4d05c51dace8d523ed md5=797ea136fe43e4286c9362ee4516674e sha256=1774de918b156c360843c1b68690f5f57532ee48ff079d4d05c51dace8d523ed +[http://trac.luon.net/data/ruby-dbus/releases/ruby-dbus-0.2.1.tar.gz] +md5=1f6398d8bbafa272c0b43878fec43276 +sha256=cfcadc4ae860f2de3d6aa1a1230a410b1dedf783148a27a20205bb3b54e3c3ac + [http://rxtx.qbang.org/pub/rxtx/rxtx-2.1-7r2.zip] md5=9290b4832d46199f8d798a531209640b sha256=31db3852a86105766758975519b27d262407c96cacad4f34ad0de5aae26addd9 diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index fc341f3726..bb9b75bece 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -19,6 +19,7 @@ SRCREV_pn-assassin ?= "268" SRCREV_pn-assassin-thumbnail ?= "4690" SRCREV_pn-bfin-uclibc ?= "1857" SRCREV_pn-bootchart-lite ?= "4" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" SRCREV_pn-clutter-box2d ?= "3197" SRCREV_pn-clutter-cairo ?= "3210" SRCREV_pn-clutter-gst ?= "3188" @@ -98,6 +99,7 @@ SRCREV_pn-libowl ?= "277" SRCREV_pn-librfid ?= "2094" SRCREV_pn-libw100 ?= "47" SRCREV_pn-libowl ?= "277" +SRCREV_pn-libxcalibrate ?= "209d83af61ed38a002c8096377deac292b3e396c" SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf index 3fdfeae292..6fe6a830e6 100644 --- a/conf/machine/geodegx.conf +++ b/conf/machine/geodegx.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "i486" -require conf/machine/include/tune-x86.inc +require conf/machine/include/tune-geodegx.inc PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx" BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" diff --git a/conf/machine/geodelx.conf b/conf/machine/geodelx.conf index 37ea17e734..de4d9ca16e 100644 --- a/conf/machine/geodelx.conf +++ b/conf/machine/geodelx.conf @@ -1,6 +1,6 @@ TARGET_ARCH = "i486" -require conf/machine/include/tune-x86.inc +require conf/machine/include/tune-geodelx.inc PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" diff --git a/conf/machine/include/tune-geodegx.inc b/conf/machine/include/tune-geodegx.inc new file mode 100644 index 0000000000..cae285a91c --- /dev/null +++ b/conf/machine/include/tune-geodegx.inc @@ -0,0 +1,6 @@ +TARGET_CC_ARCH = "-march=geode" +BASE_PACKAGE_ARCH = "geode" +PACKAGE_EXTRA_ARCHS += "x86 i386 geode" + +FEED_ARCH = "geode" + diff --git a/conf/machine/include/tune-geodelx.inc b/conf/machine/include/tune-geodelx.inc index 4e146f4c04..63e6678947 100644 --- a/conf/machine/include/tune-geodelx.inc +++ b/conf/machine/include/tune-geodelx.inc @@ -1,9 +1,9 @@ # Geode CPU has it's own target in GCC 4.3 # in older versions k6-2 is closest # -TARGET_CC_ARCH = "-march=k6-2" +TARGET_CC_ARCH = "-march=geode" BASE_PACKAGE_ARCH = "geode" -PACKAGE_EXTRA_ARCHS += "x86 i386 i486 geode" +PACKAGE_EXTRA_ARCHS += "x86 i386 geode" FEED_ARCH = "geode" diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf index ad1138f422..c25121659c 100644 --- a/conf/machine/qemux86.conf +++ b/conf/machine/qemux86.conf @@ -2,11 +2,8 @@ #@NAME: qemu x86 Emulator setup #@DESCRIPTION: Machine configuration for running an x86 system under qemu emulation -TARGET_ARCH = "i586" -TARGET_CC_ARCH = "-march=i586" -PACKAGE_EXTRA_ARCHS = "x86" - require conf/machine/include/qemu.inc +require conf/machine/i686-generic.conf MACHINE_FEATURES += "x86" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-uvesafb v86d" diff --git a/recipes/alsa/alsa-state.bb b/recipes/alsa/alsa-state.bb index 09cf22b3c8..9bb22e2aa7 100644 --- a/recipes/alsa/alsa-state.bb +++ b/recipes/alsa/alsa-state.bb @@ -7,7 +7,7 @@ DESCRIPTION = "Alsa Scenario Files" LICENSE = "MIT" PV = "0.2.0" -PR = "r7" +PR = "r8" SRC_URI = "\ file://asound.conf \ @@ -22,7 +22,7 @@ SRC_URI_append_a780 = "file://gsmhandset.state \ inherit update-rc.d INITSCRIPT_NAME = "alsa-state" -INITSCRIPT_PARAMS = "start 39 S ." +INITSCRIPT_PARAMS = "start 39 S . stop 31 0 6 ." do_install() { install -d ${D}${sysconfdir}/init.d diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc index eb094470c4..b7a1223cc9 100644 --- a/recipes/e2fsprogs/e2fsprogs.inc +++ b/recipes/e2fsprogs/e2fsprogs.inc @@ -9,6 +9,9 @@ S = "${WORKDIR}/e2fsprogs-${PV}" inherit autotools -EXTRA_OECONF = "--enable-dynamic-e2fsck --disable-nls --sbindir=${base_sbindir}" +#if uclibc ntpl is merged into trunk we can enable tls for armv4 again +EXTRA_OECONF = "${@['','--disable-tls'][bb.data.getVar('ARM_ABI', d, 1) == 'oabi' and \ + bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 ]} \ + --enable-dynamic-e2fsck --disable-nls --sbindir=${base_sbindir}" PARALLEL_MAKE = "" diff --git a/recipes/esekeyd/esekeyd_1.2.4.bb b/recipes/esekeyd/esekeyd_1.2.4.bb new file mode 100644 index 0000000000..5a9deb6c55 --- /dev/null +++ b/recipes/esekeyd/esekeyd_1.2.4.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "ESE Key Daemon" +LICENSE = "GPL" +SECTION = "base" +HOMEPAGE = "http://www.burghardt.pl" + +SRC_URI = "http://www.burghardt.pl/files/esekeyd-${PV}.tar.gz" + +inherit autotools + diff --git a/recipes/ffmpeg/ffmpeg-0.5/armv4.patch b/recipes/ffmpeg/ffmpeg-0.5/armv4.patch new file mode 100644 index 0000000000..53016b938d --- /dev/null +++ b/recipes/ffmpeg/ffmpeg-0.5/armv4.patch @@ -0,0 +1,16 @@ +Index: ffmpeg-0.5/libavcodec/arm/dsputil_arm_s.S +=================================================================== +--- ffmpeg-0.5.orig/libavcodec/arm/dsputil_arm_s.S 2009-04-01 23:20:21.590344985 +0200 ++++ ffmpeg-0.5/libavcodec/arm/dsputil_arm_s.S 2009-04-01 23:21:29.952427128 +0200 +@@ -722,5 +722,11 @@ + bne 1b + + pop {r4-r10} ++#if defined(__ARM_ARCH_2__) || defined(__ARM_ARCH_3__) \ ++ || defined(__ARM_ARCH_3M__) || defined(__ARM_ARCH_4__) ++ mov pc, lr ++#else + bx lr ++#endif + .endfunc ++ diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb index 698f45c83b..54db0042e3 100644 --- a/recipes/ffmpeg/ffmpeg_0.5.bb +++ b/recipes/ffmpeg/ffmpeg_0.5.bb @@ -8,7 +8,9 @@ PR = "r1" DEFAULT_PREFERENCE = "1" SRCREV_libswscale = "b2e1c8222eeef74b0ca8053b400957dd69e18e4d" -SRC_URI = "http://ffmpeg.org/releases/ffmpeg-${PV}.tar.bz2" +SRC_URI = "http://ffmpeg.org/releases/ffmpeg-${PV}.tar.bz2 \ + file://armv4.patch;patch=1 \ + " #S = "${WORKDIR}/git" B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" diff --git a/recipes/gnome/gnome-keyring_2.24.1.bb b/recipes/gnome/gnome-keyring_2.24.1.bb index 105ee16d11..9d2b5234a5 100644 --- a/recipes/gnome/gnome-keyring_2.24.1.bb +++ b/recipes/gnome/gnome-keyring_2.24.1.bb @@ -3,7 +3,9 @@ SECTION = "x11/gnome" inherit autotools gnome pkgconfig -DEPENDS = "gtk+ libtasn1 libgcrypt" +PR = "r1" + +DEPENDS = "gtk+ libtasn1 libgcrypt gconf" EXTRA_OECONF = "--disable-gtk-doc" diff --git a/recipes/mozilla/firefox-l10n-pt-br_3.0.4.bb b/recipes/mozilla/firefox-l10n-pt-br_3.0.4.bb new file mode 100644 index 0000000000..a79c96dc00 --- /dev/null +++ b/recipes/mozilla/firefox-l10n-pt-br_3.0.4.bb @@ -0,0 +1,6 @@ +# Copyright (C) 2009, O.S. Systems Software Ltda. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require firefox-l10n.inc + +PR = "${INC_PR}.1" diff --git a/recipes/mozilla/firefox-l10n.inc b/recipes/mozilla/firefox-l10n.inc new file mode 100644 index 0000000000..31555e3d0d --- /dev/null +++ b/recipes/mozilla/firefox-l10n.inc @@ -0,0 +1,46 @@ +# Copyright (C) 2009, O.S. Systems Software Ltda. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +def get_language_name(package): + lang = package.replace('firefox-l10n-', '') + + if lang.find('-'): + lang = lang.split('-') + lang[1] = lang[1].upper() + lang = '-'.join(lang) + + return lang + +DEPENDS = "unzip-native" +RDEPENDS = "firefox" +LANGUAGE = "${@get_language_name('${PN}')}" + +SRC_URI = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/linux-i686/xpi/${LANGUAGE}.xpi" +S = "${WORKDIR}" + +do_configure() { + unzip -o -q -d ${LANGUAGE} ${LANGUAGE}.xpi +} + +INC_PR = "r1" + +do_install() { + cd ${S}/${LANGUAGE} + + # Get extension UUID + EXTENSION=`cat install.rdf | sed --posix '/em:id=/!d;s/[ ]*em:id="//;s/".*//'` + + mkdir -p ${D}/usr/lib/firefox-${PV}/extensions/${EXTENSION}/chrome + mkdir -p ${D}/usr/lib/firefox-${PV}/extensions/${EXTENSION}/uninstall + install -m 644 chrome/*.jar ${D}/usr/lib/firefox-${PV}/extensions/${EXTENSION}/chrome + install -m 644 install.rdf ${D}/usr/lib/firefox-${PV}/extensions/${EXTENSION} + install -m 644 chrome.manifest ${D}/usr/lib/firefox-${PV}/extensions/${EXTENSION} + + cat install.rdf \ + | sed --posix '/<em:locale>/!d' \ + | sed --posix "s/.*/register global locale ${LANGUAGE}/" \ + > ${D}/usr/lib/firefox-${PV}/extensions/${EXTENSION}/uninstall/Uninstall +} + +FILES_${PN} += "/usr/lib/firefox-${PV}" +PACKAGE_ARCH = "all" diff --git a/recipes/mozilla/firefox.inc b/recipes/mozilla/firefox.inc index c00dfd4ef4..1be9c4da8f 100644 --- a/recipes/mozilla/firefox.inc +++ b/recipes/mozilla/firefox.inc @@ -37,6 +37,17 @@ do_install() { install -m 0644 ${WORKDIR}/mozilla-${PN}.desktop ${D}${datadir}/applications/ install -m 0644 ${WORKDIR}/mozilla-${PN}.png ${D}${datadir}/pixmaps/ rm -f ${D}${libdir}/${PN}-*/TestGtkEmbed + rm -f ${D}${libdir}/${PN}-*/defaults/pref/firefox-l10n.js + + # use locale settings + grep -Rl intl.locale.matchOS ${D}${libdir}/${PN}-*/ \ + | grep '.js$' \ + | xargs -n 1 sed -i 's/\(pref("intl.locale.matchOS",\s*\)false)/\1true)/g' + + # disable application updating + grep -Rl app.update.enabled ${D}${libdir}/${PN}-*/ \ + | grep '.js$' \ + | xargs -n 1 sed -i 's/\(pref("app.update.enabled",\s*\)true)/\1false)/g' } pkg_postinst_${PN}() { diff --git a/recipes/openssl/openssl-native_0.9.7g.bb b/recipes/openssl/openssl-native_0.9.7g.bb index 14f6d92f09..dfe3ab5eae 100644 --- a/recipes/openssl/openssl-native_0.9.7g.bb +++ b/recipes/openssl/openssl-native_0.9.7g.bb @@ -8,8 +8,6 @@ SRC_URI += "file://debian.patch;patch=1 \ file://armeb.patch;patch=1;pnum=0 \ file://gnueabi-arm.patch;patch=1" -FILESPATH = "${@base_set_filespath( ['${FILE_DIRNAME}/openssl-${PV}', '${FILE_DIRNAME}/openssl', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - do_install() { : } diff --git a/recipes/openssl/openssl-native_0.9.7m.bb b/recipes/openssl/openssl-native_0.9.7m.bb index b00dc5e73b..445b6e9161 100644 --- a/recipes/openssl/openssl-native_0.9.7m.bb +++ b/recipes/openssl/openssl-native_0.9.7m.bb @@ -12,8 +12,6 @@ SRC_URI += "file://debian.patch;patch=1 \ file://armeb.patch;patch=1;pnum=0 \ file://gnueabi-arm.patch;patch=1" -FILESPATH = "${@base_set_filespath( ['${FILE_DIRNAME}/openssl-${PV}', '${FILE_DIRNAME}/openssl', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - do_install() { : } diff --git a/recipes/openssl/openssl-native_0.9.8g.bb b/recipes/openssl/openssl-native_0.9.8g.bb index 4975cf5b1d..27f0169cf9 100644 --- a/recipes/openssl/openssl-native_0.9.8g.bb +++ b/recipes/openssl/openssl-native_0.9.8g.bb @@ -14,8 +14,6 @@ SRC_URI += "file://debian.patch;patch=1 \ PARALLEL_MAKE = "" -FILESPATH = "${@base_set_filespath( ['${FILE_DIRNAME}/openssl-${PV}', '${FILE_DIRNAME}/openssl', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - do_install() { : } diff --git a/recipes/openssl/openssl-native_0.9.8j.bb b/recipes/openssl/openssl-native_0.9.8j.bb index 2a69855eb6..ffbd5ea8a9 100644 --- a/recipes/openssl/openssl-native_0.9.8j.bb +++ b/recipes/openssl/openssl-native_0.9.8j.bb @@ -14,8 +14,6 @@ SRC_URI += "file://configure-targets.patch;patch=1 \ PARALLEL_MAKE = "" -FILESPATH = "${@base_set_filespath( ['${FILE_DIRNAME}/openssl-${PV}', '${FILE_DIRNAME}/openssl', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - do_install() { : } diff --git a/recipes/ruby/ruby-dbus_0.2.1.bb b/recipes/ruby/ruby-dbus_0.2.1.bb new file mode 100644 index 0000000000..40627d347b --- /dev/null +++ b/recipes/ruby/ruby-dbus_0.2.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "${PN} bindings" +SECTION = "devel/ruby" +LICENSE = "LGPL" +RDEPENDS = "dbus ruby" + +SRC_URI = "http://trac.luon.net/data/${PN}/releases/${PN}-0.2.1.tar.gz" + +RUBY_DIR = "/usr/lib/ruby/1.8" + +S = "${WORKDIR}/${PN}-${PV}" + +FILES_${PN} += "${RUBY_DIR}" + +do_install() { + install -d ${D}${RUBY_DIR} + cp -r lib/* ${D}${RUBY_DIR} +} + diff --git a/recipes/sg3-utils/files/Makefile.patch b/recipes/sg3-utils/files/Makefile-r1.patch index cc5babfa26..d43b51d63c 100644 --- a/recipes/sg3-utils/files/Makefile.patch +++ b/recipes/sg3-utils/files/Makefile-r1.patch @@ -1,8 +1,8 @@ Index: sg3-utils-1.24/Makefile =================================================================== ---- sg3-utils-1.24.orig/Makefile 2009-01-27 16:29:26.000000000 -0800 -+++ sg3-utils-1.24/Makefile 2009-01-27 22:31:04.000000000 -0800 -@@ -1,6 +1,6 @@ +--- sg3-utils-1.24.orig/Makefile 2007-05-07 11:59:19.000000000 -0700 ++++ sg3-utils-1.24/Makefile 2009-02-02 16:37:35.000000000 -0800 +@@ -1,13 +1,15 @@ SHELL = /bin/sh -PREFIX=/usr/local @@ -10,15 +10,32 @@ Index: sg3-utils-1.24/Makefile LIBDIR=$(DESTDIR)/$(PREFIX)/lib INSTDIR=$(DESTDIR)/$(PREFIX)/bin MANDIR=$(DESTDIR)/$(PREFIX)/share/man -@@ -8,6 +8,8 @@ + INCLUDEDIR=$(DESTDIR)/$(PREFIX)/include - CC = gcc - LD = gcc -+LIBTOOL = libtool +-CC = gcc +-LD = gcc ++CC ?= gcc ++LD = ${CC} ++LIBTOOL ?= libtool +LT_EXTRA = --tag=CC EXECS = sg_dd sgp_dd sgm_dd sg_read sg_map sg_scan sg_rbuf \ sginfo sg_readcap sg_turs sg_inq sg_test_rwbuf \ +@@ -37,12 +39,12 @@ + S_CFLAGS = $(OS_FLAGS) $(LARGE_FILE_FLAGS) + + # CFLAGS = -O2 -Wall -W +-CFLAGS = -g -O2 -Wall -W ++CFLAGS ?= -g -O2 -Wall -W + # CFLAGS = -g -O2 -Wall -W -pedantic -std=c99 + + CFLAGS_PTHREADS = -D_REENTRANT + +-LDFLAGS = ++LDFLAGS ?= + # LDFLAGS = -v -lm + + LIB_VINFO = 1:0:0 @@ -64,164 +66,164 @@ $(CC) $(INCLUDES) $(CFLAGS) $(S_CFLAGS) -c -o $@ $< diff --git a/recipes/sg3-utils/sg3-utils_1.24.bb b/recipes/sg3-utils/sg3-utils_1.24.bb index 135ba0f817..4a2c378676 100644 --- a/recipes/sg3-utils/sg3-utils_1.24.bb +++ b/recipes/sg3-utils/sg3-utils_1.24.bb @@ -3,11 +3,14 @@ AUTHOR = "Eric Schwartz (Skif) <emschwar@debian.org>" HOMEPAGE = "http://packages.qa.debian.org/s/sg3-utils.html" SECTION = "console/admin" LICENSE = "GPLv2" -PR = "r0" +AUTHOR = "Eric Schwartz (Skif) <emschwar@debian.org>" +PR = "r1" SRC_URI = "${DEBIAN_MIRROR}/main/s/sg3-utils/sg3-utils_${PV}.orig.tar.gz \ - file://Makefile.patch;patch=1" + file://Makefile-r1.patch;patch=1" S = "${WORKDIR}/sg3-utils-${PV}" inherit autotools + +EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"' |