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

9 files changed, 232 insertions, 6 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index b97dbabc7e..994389753e 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -8670,6 +8670,10 @@ sha256=d7676d7734d4821454a840a1ef05020c9c4f4797ab96ec54f2351e26d437c88c
 md5=6ff47bc8e66ba88f42932365a947f9f3
 sha256=f921da7c8beb396278591b5ca7159b432a38902f1f872c4ae2d40aeb38f9cf01
 
+[http://people.debian.org/~kov/gksu/gksu-2.0.2.tar.gz]
+md5=cacbcac3fc272dce01c6ea38354489e2
+sha256=a1de3dca039d88c195fcdc9516379439a1d699750417f1e655aa2101a955ee5a
+
 [ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz]
 md5=6fe30dad87c77b91b632def29dd69ef9
 sha256=6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f
@@ -14850,6 +14854,10 @@ sha256=b178c610fbbf2613ed1edeba2a11ed9c1ea042274465b2f3cd0a29cf1c7ebd9c
 md5=603739504648833779aa13b0327a1c3d
 sha256=54301052a327f2ff3f2d684c5b1d7920e8601e13f4f8d5f1d170e5a7c9585e85
 
+[http://people.debian.org/~kov/gksu/libgksu-2.0.12.tar.gz]
+md5=c7154c8806f791c10e7626ff123049d3
+sha256=22f9cfc3627dcb6774b9aff66c6ea6554f3b34b82bbfa2467b821e67874c3faf
+
 [ftp://ftp.gnome.org/pub/GNOME/sources/libglade/2.0/libglade-2.0.1.tar.bz2]
 md5=4d93f6b01510013ae429e91af432cfe2
 sha256=6386901d84cb41fb8a584f7aa1b54c984e0590f36f45ee016ef30aa45554194d
diff --git a/recipes/freesmartphone/fso-apm_git.bb b/recipes/freesmartphone/fso-apm_git.bb
index 18347978e5..20f832b4f4 100644
--- a/recipes/freesmartphone/fso-apm_git.bb
+++ b/recipes/freesmartphone/fso-apm_git.bb
@@ -5,7 +5,7 @@ SECTION = "console"
 LICENSE = "GPLv2"
 DEPENDS = "vala-native"
 PV = "2.0.0+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/tools/apm2"
@@ -13,3 +13,6 @@ S = "${WORKDIR}/git/tools/apm2"
 inherit autotools
 
 RCONFLICTS_${PN} = "apm"
+RPROVIDES_${PN} = "apm"
+RPROVIDES_${PN}-dev = ""
+RPROVIDES_${PN}-dbg = ""
diff --git a/recipes/gstreamer/gst-plugins-base_0.10.25.bb b/recipes/gstreamer/gst-plugins-base_0.10.25.bb
index 5862a65eb2..2b33c23c3a 100644
--- a/recipes/gstreamer/gst-plugins-base_0.10.25.bb
+++ b/recipes/gstreamer/gst-plugins-base_0.10.25.bb
@@ -1,6 +1,6 @@
 require gst-plugins.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 PROVIDES += "gst-plugins"
 
@@ -8,5 +8,5 @@ PROVIDES += "gst-plugins"
 # if alsa has been built and is present.  You will
 # not get an error if this is not present, just 
 # a missing alsa plugin
-DEPENDS += "pango libtheora alsa-lib libsm virtual/libx11 freetype gnome-vfs libxv"
+DEPENDS += "cdparanoia pango libtheora alsa-lib libsm virtual/libx11 freetype gnome-vfs libxv"
 
diff --git a/recipes/gstreamer/gst-plugins-good_0.10.15.bb b/recipes/gstreamer/gst-plugins-good_0.10.15.bb
index ae7566143e..57ff59ba99 100644
--- a/recipes/gstreamer/gst-plugins-good_0.10.15.bb
+++ b/recipes/gstreamer/gst-plugins-good_0.10.15.bb
@@ -1,13 +1,13 @@
 require gst-plugins.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI += "file://fix-unit-scale-asseration.patch;patch=1"
 
 OE_ALLOW_INSECURE_DOWNLOADS = "1"
 inherit gconf 
 
-DEPENDS += "flac gst-plugins-base openssl popt esound"
+DEPENDS += "libsoup-2.4 flac gst-plugins-base openssl popt esound"
 
 PACKAGES =+ "gst-plugin-gconfelements"
 FILES_gst-plugin-gconfelements += "${sysconfdir}/gconf"
diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig
index e5d033846e..f2ef01afad 100644
--- a/recipes/linux/linux-2.6.24/hipox/defconfig
+++ b/recipes/linux/linux-2.6.24/hipox/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.24.4
-# Tue Oct 20 14:36:38 2009
+# Fri Nov 27 16:35:59 2009
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -177,6 +177,8 @@ CONFIG_ARCH_HIPOX_PCI_CLKOUT_2=y
 CONFIG_ARCH_HIPOX_PCI_CLKOUT_3=y
 CONFIG_HIPOX_PCI_RESET=y
 CONFIG_HIPOX_PCI_RESET_GPIO=27
+CONFIG_HIPOX_OXE_INT2=y
+CONFIG_HIPOX_OXE_INT2_GPIO=34
 # CONFIG_HIPOX_SATA_POWER_1 is not set
 # CONFIG_HIPOX_SATA_POWER_2 is not set
 CONFIG_FORCE_MAX_ZONEORDER=10
diff --git a/recipes/linux/linux-2.6.24/hipox/hipox-OXE-INT2.patch b/recipes/linux/linux-2.6.24/hipox/hipox-OXE-INT2.patch
new file mode 100644
index 0000000000..372b139e5c
--- /dev/null
+++ b/recipes/linux/linux-2.6.24/hipox/hipox-OXE-INT2.patch
@@ -0,0 +1,188 @@
+diff -Nurd linux-2.6.24.orig//arch/arm/mach-hipox/Kconfig linux-2.6.24/arch/arm/mach-hipox/Kconfig
+--- linux-2.6.24.orig//arch/arm/mach-hipox/Kconfig	2009-11-30 17:07:36.000000000 +0100
++++ linux-2.6.24/arch/arm/mach-hipox/Kconfig	2009-11-30 17:08:12.000000000 +0100
+@@ -241,6 +241,20 @@
+ 		reset of the SoC has emerged from reset. This defines the GPIO
+ 		line which is connected to the PCI reset
+ 
++config HIPOX_OXE_INT2
++	bool "Signal power state to HIPOX board controller"
++	default y
++	help
++		Signal power state to HIPOX board controller using OXE_INT2 signal.
++
++config HIPOX_OXE_INT2_GPIO
++	int "GPIO line using as power state signal to HIPOX board controller"
++	depends on HIPOX_OXE_INT2
++	default 34
++	help
++		This defines the GPIO used to signal power state to
++		HIPOX board controller.
++
+ config HIPOX_SATA_POWER_1
+ 	bool "Allow control of SATA 1 disk power via GPIO"
+ 	default n
+diff -Nurd linux-2.6.24.orig//arch/arm/mach-hipox/hipox.c linux-2.6.24/arch/arm/mach-hipox/hipox.c
+--- linux-2.6.24.orig//arch/arm/mach-hipox/hipox.c	2009-11-30 17:07:36.000000000 +0100
++++ linux-2.6.24/arch/arm/mach-hipox/hipox.c	2009-11-30 17:10:12.000000000 +0100
+@@ -47,6 +47,30 @@
+ #include <asm/arch/leon-early-prog.h>
+ #endif // CONFIG_LEON_START_EARLY
+ 
++#ifdef CONFIG_HIPOX_OXE_INT2_GPIO
++#if (CONFIG_HIPOX_OXE_INT2_GPIO < 32)
++#define OXE_INT2_NUM               CONFIG_HIPOX_OXE_INT2_GPIO
++#define OXE_INT2_PRISEL_REG        SYS_CTRL_GPIO_PRIMSEL_CTRL_0
++#define OXE_INT2_SECSEL_REG        SYS_CTRL_GPIO_SECSEL_CTRL_0
++#define OXE_INT2_TERSEL_REG        SYS_CTRL_GPIO_TERTSEL_CTRL_0
++#define OXE_INT2_QUASEL_REG        SYS_CTRL_GPIO_PWMSEL_CTRL_0
++#define OXE_INT2_SET_OE_REG        GPIO_A_OUTPUT_ENABLE_SET
++#define OXE_INT2_OUTPUT_SET_REG    GPIO_A_OUTPUT_SET
++#define OXE_INT2_OUTPUT_CLR_REG    GPIO_A_OUTPUT_CLEAR
++#else
++#define OXE_INT2_NUM               ((CONFIG_HIPOX_OXE_INT2_GPIO) - 32)
++#define OXE_INT2_PRISEL_REG        SYS_CTRL_GPIO_PRIMSEL_CTRL_1
++#define OXE_INT2_SECSEL_REG        SYS_CTRL_GPIO_SECSEL_CTRL_1
++#define OXE_INT2_TERSEL_REG        SYS_CTRL_GPIO_TERTSEL_CTRL_1
++#define OXE_INT2_QUASEL_REG        SYS_CTRL_GPIO_PWMSEL_CTRL_1
++#define OXE_INT2_SET_OE_REG        GPIO_B_OUTPUT_ENABLE_SET
++#define OXE_INT2_OUTPUT_SET_REG    GPIO_B_OUTPUT_SET
++#define OXE_INT2_OUTPUT_CLR_REG    GPIO_B_OUTPUT_CLEAR
++#endif
++
++#define OXE_INT2_MASK (1UL << (OXE_INT2_NUM))
++#endif // CONFIG_HIPOX_OXE_INT2_GPIO
++
+ #ifdef CONFIG_HIPOX_PCI_RESET_GPIO
+ #if (CONFIG_HIPOX_PCI_RESET_GPIO < 32)
+ #define PCI_RESET_NUM               CONFIG_HIPOX_PCI_RESET_GPIO
+@@ -393,6 +417,22 @@
+     // Enable all DDR client interfaces
+     *(volatile u32*)DDR_BLKEN_REG |= (((1UL << DDR_BLKEN_CLIENTS_NUM_BITS) - 1) << DDR_BLKEN_CLIENTS_BIT);
+ 
++#ifdef CONFIG_HIPOX_OXE_INT2
++    printk("Enable OXE_INT2\n");
++
++    // Disable primary, secondary and teriary GPIO functions on OXE_INT2 line
++    writel(readl(OXE_INT2_PRISEL_REG) & ~OXE_INT2_MASK, OXE_INT2_PRISEL_REG);
++    writel(readl(OXE_INT2_SECSEL_REG) & ~OXE_INT2_MASK, OXE_INT2_SECSEL_REG);
++    writel(readl(OXE_INT2_TERSEL_REG) & ~OXE_INT2_MASK, OXE_INT2_TERSEL_REG);
++    writel(readl(OXE_INT2_QUASEL_REG) & ~OXE_INT2_MASK, OXE_INT2_QUASEL_REG);
++
++    // Enable GPIO output on OXE_INT2 line
++    writel(OXE_INT2_MASK, OXE_INT2_SET_OE_REG);
++
++    // Set OXE_INT2
++    writel(OXE_INT2_MASK, OXE_INT2_OUTPUT_SET_REG);
++#endif // CONFIG_HIPOX_OXE_INT2
++
+ #ifdef CONFIG_ARCH_HIPOX_UART1
+     // Block reset UART1
+     *(volatile u32*)SYS_CTRL_RSTEN_SET_CTRL = (1UL << SYS_CTRL_RSTEN_UART1_BIT);
+@@ -409,10 +449,10 @@
+     *(volatile u32*)SYS_CTRL_GPIO_TERTSEL_CTRL_1 |=  0x00000001;
+ 
+     // Setup GPIO line direction for UART1 SOUT
+-    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_SET   |= 0x80000000;
++    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_SET   = 0x80000000;
+ 
+     // Setup GPIO line direction for UART1 SIN
+-    *(volatile u32*)GPIO_B_OUTPUT_ENABLE_CLEAR |= 0x00000001;
++    *(volatile u32*)GPIO_B_OUTPUT_ENABLE_CLEAR = 0x00000001;
+ 
+ #ifdef CONFIG_ARCH_HIPOX_UART1_MODEM
+     // Route UART1 modem control lines onto external pins
+@@ -425,11 +465,11 @@
+     *(volatile u32*)SYS_CTRL_GPIO_TERTSEL_CTRL_1 |=  0x00000006;
+ 
+     // Setup GPIO line directions for UART1 modem control lines
+-    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_SET   |= 0x08000000;
+-    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_CLEAR |= 0x70000000;
++    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_SET   = 0x08000000;
++    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_CLEAR = 0x70000000;
+ 
+-    *(volatile u32*)GPIO_B_OUTPUT_ENABLE_SET   |= 0x00000004;
+-    *(volatile u32*)GPIO_B_OUTPUT_ENABLE_CLEAR |= 0x00000002;
++    *(volatile u32*)GPIO_B_OUTPUT_ENABLE_SET   = 0x00000004;
++    *(volatile u32*)GPIO_B_OUTPUT_ENABLE_CLEAR = 0x00000002;
+ #endif // CONFIG_ARCH_HIPOX_UART1_MODEM
+ 
+     // Give Linux a contiguous numbering scheme for available UARTs
+@@ -448,8 +488,8 @@
+     *(volatile u32*)SYS_CTRL_GPIO_TERTSEL_CTRL_0 |=  0x00500000;
+ 
+     // Setup GPIO line directions for UART2 SIN/SOUT
+-    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_SET   |= 0x00100000;
+-    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_CLEAR |= 0x00400000;
++    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_SET   = 0x00100000;
++    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_CLEAR = 0x00400000;
+ 
+ #ifdef CONFIG_ARCH_HIPOX_UART2_MODEM
+     // Route UART2 modem control lines onto external pins
+@@ -458,8 +498,8 @@
+     *(volatile u32*)SYS_CTRL_GPIO_TERTSEL_CTRL_0 |=  0x07800300;
+ 
+     // Setup GPIO line directions for UART2 modem control lines
+-    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_SET   |= 0x02000200;
+-    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_CLEAR |= 0x05800100;
++    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_SET   = 0x02000200;
++    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_CLEAR = 0x05800100;
+ #endif // CONFIG_ARCH_HIPOX_UART2_MODEM
+ 
+     // Give Linux a contiguous numbering scheme for available UARTs
+@@ -478,8 +518,8 @@
+     *(volatile u32*)SYS_CTRL_GPIO_TERTSEL_CTRL_0 |=  0x000000C0;
+ 
+     // Setup GPIO line directions for UART3 SIN/SOUT
+-    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_SET   |= 0x00000080;
+-    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_CLEAR |= 0x00000040;
++    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_SET   = 0x00000080;
++    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_CLEAR = 0x00000040;
+ 
+     // Enable UART3 interrupt
+     *(volatile u32*)SYS_CTRL_UART_CTRL |= (1UL << SYS_CTRL_UART3_IQ_EN);
+@@ -491,8 +531,8 @@
+     *(volatile u32*)SYS_CTRL_GPIO_TERTSEL_CTRL_0 |=  0x0000003f;
+ 
+     // Setup GPIO line directions for UART3 modem control lines
+-    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_SET   |= 0x00000030;
+-    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_CLEAR |= 0x0000000f;
++    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_SET   = 0x00000030;
++    *(volatile u32*)GPIO_A_OUTPUT_ENABLE_CLEAR = 0x0000000f;
+ #endif // CONFIG_ARCH_HIPOX_UART3_MODEM
+ 
+     // Give Linux a contiguous numbering scheme for available UARTs
+@@ -1032,9 +1072,33 @@
+ }
+ #endif // CONFIG_HIPOX_LED_TEST
+ 
++static void hipox_poweroff(void)
++{
++    printk("Power off OXE810.\n");
++#ifdef CONFIG_HIPOX_OXE_INT2
++    printk("Disable OXE_INT2.\n");
++
++    // Disable primary, secondary and teriary GPIO functions on OXE_INT2 line
++    writel(readl(OXE_INT2_PRISEL_REG) & ~OXE_INT2_MASK, OXE_INT2_PRISEL_REG);
++    writel(readl(OXE_INT2_SECSEL_REG) & ~OXE_INT2_MASK, OXE_INT2_SECSEL_REG);
++    writel(readl(OXE_INT2_TERSEL_REG) & ~OXE_INT2_MASK, OXE_INT2_TERSEL_REG);
++    writel(readl(OXE_INT2_QUASEL_REG) & ~OXE_INT2_MASK, OXE_INT2_QUASEL_REG);
++
++    // Enable GPIO output on OXE_INT2 line
++    writel(OXE_INT2_MASK, OXE_INT2_SET_OE_REG);
++
++    // Reset OXE_INT2
++    writel(OXE_INT2_MASK, OXE_INT2_OUTPUT_CLR_REG);
++#endif // CONFIG_HIPOX_OXE_INT2
++}
++
+ static void __init hipox_init_machine(void)
+ {
+ //printk("hipox_init_machine()\n");
++
++    /* Register machine_poweroff */
++    pm_power_off = hipox_poweroff;
++
+     /* Initialise the spinlock used to make GPIO register set access atomic */
+     spin_lock_init(&hipox_gpio_spinlock);
+ 
diff --git a/recipes/linux/linux_2.6.24.bb b/recipes/linux/linux_2.6.24.bb
index ac7def59d0..381713cd63 100644
--- a/recipes/linux/linux_2.6.24.bb
+++ b/recipes/linux/linux_2.6.24.bb
@@ -104,6 +104,7 @@ SRC_URI_append_hipox = " \
 	file://hipox-ubifs.patch;patch=1 \
 	file://hipox-kconfig.patch;patch=1 \
 	file://hipox-sata-module.patch;patch=1 \
+	file://hipox-OXE-INT2.patch;patch=1 \
 	"
 
 EXTRA_OEMAKE_smartq5 = " OBJCOPY=${OBJCOPY}"
diff --git a/recipes/sudo/gksu_2.0.2.bb b/recipes/sudo/gksu_2.0.2.bb
new file mode 100644
index 0000000000..3b13db869b
--- /dev/null
+++ b/recipes/sudo/gksu_2.0.2.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "GKSu is a library that provides a Gtk+ frontend to su and sudo."
+LICENSE = "GPLv2"
+DEPENDS = "gtk+ libgksu nautilus"
+
+SRC_URI = "http://people.debian.org/~kov/gksu/gksu-${PV}.tar.gz"
+
+inherit autotools
+
+PACKAGES =+ "${PN}-nautilus-extension"
+FILES_${PN}-nautilus-extension = "${libdir}/nautilus/extensions-2.0/*.so"
+
diff --git a/recipes/sudo/libgksu_2.0.12.bb b/recipes/sudo/libgksu_2.0.12.bb
new file mode 100644
index 0000000000..639a4b2107
--- /dev/null
+++ b/recipes/sudo/libgksu_2.0.12.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Gksu authorization library"
+LICENSE = "LGPLv2"
+
+DEPENDS = "gtk+ gconf startup-notification gnome-keyring libgtop"
+
+SRC_URI = "http://people.debian.org/~kov/gksu/libgksu-${PV}.tar.gz"
+
+inherit autotools lib_package
+
+FILES_${PN}-bin += "${datadir}/applications/gksu-properties.desktop \
+                      ${datadir}/pixmaps/gksu.png \
+"
+