Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

16 files changed, 147 insertions, 22 deletions

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"'