[oe-commits] org.oe.dev merge of 'd85165b6d72282ba94622c1c0d0c9c3e4a6be821'

[oe commit]

merge of 'd85165b6d72282ba94622c1c0d0c9c3e4a6be821'
     and 'e5325ab8e47ca7688fb1a8e72b249d38ff3a7b4c'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: df3f0f654af4ab20778a61e050187c6f94876b9d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=df3f0f654af4ab20778a61e050187c6f94876b9d
Files:
1
packages/proj4/proj-4_4.9.bb
packages/linux/linux-rp-2.6.20/defconfig-spitz
packages/linux/linux-rp-2.6.20/sharpsl-rc-r1.patch
Diffs:

#
# mt diff -rd85165b6d72282ba94622c1c0d0c9c3e4a6be821 -rdf3f0f654af4ab20778a61e050187c6f94876b9d
#
# 
# 
# patch "packages/proj4/proj-4_4.9.bb"
#  from [35b70b196c7ba5d7010365a703e2f9a9b7bc8543]
#    to [8fd0c92f1a2329d08b2c5a251cbd7d6270406e0d]
# 
============================================================
--- packages/proj4/proj-4_4.9.bb	35b70b196c7ba5d7010365a703e2f9a9b7bc8543
+++ packages/proj4/proj-4_4.9.bb	8fd0c92f1a2329d08b2c5a251cbd7d6270406e0d
@@ -1,13 +1,17 @@ LICENSE = "MIT"
 DESCRIPTION = "PROJ.4 - Cartographic Projections Library"
 HOMEPAGE = "http://www.remotesensing.org/proj/"
 LICENSE = "MIT"
 
+PR = "r1"
+
 inherit autotools pkgconfig
 
 SRC_URI = "ftp://ftp.remotesensing.org/proj/proj-4.${PV}.tar.gz"
 
 S = "${WORKDIR}/proj-4.${PV}"
 
+FILES_${PN} += "${datadir}/proj"
+
 do_stage() {
 	autotools_stage_all
 }


#
# mt diff -re5325ab8e47ca7688fb1a8e72b249d38ff3a7b4c -rdf3f0f654af4ab20778a61e050187c6f94876b9d
#
# 
# 
# patch "packages/linux/linux-rp-2.6.20/defconfig-spitz"
#  from [26634a14250dbbecb1fe7bc686ed78ef9258b7c3]
#    to [fcf9df062363a65137b484ed5c63b84befb552c5]
# 
# patch "packages/linux/linux-rp-2.6.20/sharpsl-rc-r1.patch"
#  from [83792e28a200bea10cc3a54d3957d2e6e3939cb0]
#    to [91d7f89ef3d420ced74c27bd90028782aa035bf2]
# 
============================================================
--- packages/linux/linux-rp-2.6.20/defconfig-spitz	26634a14250dbbecb1fe7bc686ed78ef9258b7c3
+++ packages/linux/linux-rp-2.6.20/defconfig-spitz	fcf9df062363a65137b484ed5c63b84befb552c5
@@ -431,7 +431,7 @@ CONFIG_BT_HCIUSB=m
 # Bluetooth device drivers
 #
 CONFIG_BT_HCIUSB=m
-# CONFIG_BT_HCIUSB_SCO is not set
+CONFIG_BT_HCIUSB_SCO=m
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
============================================================
--- packages/linux/linux-rp-2.6.20/sharpsl-rc-r1.patch	83792e28a200bea10cc3a54d3957d2e6e3939cb0
+++ packages/linux/linux-rp-2.6.20/sharpsl-rc-r1.patch	91d7f89ef3d420ced74c27bd90028782aa035bf2
@@ -298,7 +298,7 @@ Index: linux-2.6.20/drivers/input/keyboa
 +	pxa_gpio_mode(REMOTE_GPIO_INT | GPIO_IN);
 +	ret = request_irq(REMOTE_IRQ_INT,
 +					  sharpsl_rc_interrupt,
-+					  IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_SHARED,
++					  IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_SHARED,
 +					  "sharpsl_rc",
 +					  sharpsl_rc);
 +	if (ret < 0) {