[oe-commits] org.oe.dev merge of '29817a260e6a9fe06810b70340557576d2be9f57'

[xora commit]

merge of '29817a260e6a9fe06810b70340557576d2be9f57'
     and '7a8c7842dfe3f66d78bbcc7b5db97559d02147cd'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: cf5abc7766faffd221ece62edef44865e099d55f
ViewMTN: http://monotone.openembedded.org/revision/info/cf5abc7766faffd221ece62edef44865e099d55f
Files:
1
packages/libtorrent
packages/libtorrent/files
packages/libtorrent/files/autoconf-cross-fix.patch
packages/libtorrent/libtorrent_0.12.0.bb
packages/libtorrent/rtorrent_0.8.0.bb
packages/xserver-common/files/ti-osk.patch
packages/xserver-common/xserver-common_1.18.bb
Diffs:

#
# mt diff -r29817a260e6a9fe06810b70340557576d2be9f57 -rcf5abc7766faffd221ece62edef44865e099d55f
#
# 
# 
# add_dir "packages/libtorrent"
# 
# add_dir "packages/libtorrent/files"
# 
# add_file "packages/libtorrent/files/autoconf-cross-fix.patch"
#  content [71474d3433b952bb7d62cc2dc6be8d62b670d507]
# 
# add_file "packages/libtorrent/libtorrent_0.12.0.bb"
#  content [77ab2a4c1eefc4d9e9ceecf5597a817bb8aecef4]
# 
# add_file "packages/libtorrent/rtorrent_0.8.0.bb"
#  content [d7406dc7196fbb5fd457e04f94352d5daf090ea8]
# 
============================================================
--- packages/libtorrent/files/autoconf-cross-fix.patch	71474d3433b952bb7d62cc2dc6be8d62b670d507
+++ packages/libtorrent/files/autoconf-cross-fix.patch	71474d3433b952bb7d62cc2dc6be8d62b670d507
@@ -0,0 +1,14 @@
+Index: rtorrent-0.8.0/scripts/common.m4
+===================================================================
+--- rtorrent-0.8.0.orig/scripts/common.m4	2008-01-13 15:02:03.000000000 +0000
++++ rtorrent-0.8.0/scripts/common.m4	2008-02-04 13:12:01.000000000 +0000
+@@ -192,6 +192,9 @@
+       AC_DEFINE(USE_EXECINFO, 1, Use execinfo.h)
+     ], [
+       AC_MSG_RESULT(no)
++    ], [
++      AC_MSG_RESULT(yes)
++      AC_DEFINE(USE_EXECINFO, 1, Use execinfo.h)
+   ])
+ ])
+ 
============================================================
--- packages/libtorrent/libtorrent_0.12.0.bb	77ab2a4c1eefc4d9e9ceecf5597a817bb8aecef4
+++ packages/libtorrent/libtorrent_0.12.0.bb	77ab2a4c1eefc4d9e9ceecf5597a817bb8aecef4
@@ -0,0 +1,16 @@
+DESCRIPTION = "library implementing the bittorrent protocol"
+HOMEPAGE = "http://libtorrent.rakshasa.no"
+SECTION = "libs/network"
+LICENSE = "GPL"
+DEPENDS = "libsigc++-2.0 openssl"
+
+SRC_URI = "http://libtorrent.rakshasa.no/downloads/libtorrent-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-aligned"
+
+do_stage() {
+	autotools_stage_all
+}
+
============================================================
--- packages/libtorrent/rtorrent_0.8.0.bb	d7406dc7196fbb5fd457e04f94352d5daf090ea8
+++ packages/libtorrent/rtorrent_0.8.0.bb	d7406dc7196fbb5fd457e04f94352d5daf090ea8
@@ -0,0 +1,11 @@
+DESCRIPTION = "Console bittorrent client using libtorrent"
+HOMEPAGE = "http://libtorrent.rakshasa.no"
+SECTION = "libs/network"
+LICENSE = "GPL"
+DEPENDS = "libtorrent curl ncurses gnutls libgpg-error"
+
+SRC_URI = "http://libtorrent.rakshasa.no/downloads/rtorrent-${PV}.tar.gz \
+           file://autoconf-cross-fix.patch;patch=1"
+
+inherit autotools
+


#
# mt diff -r7a8c7842dfe3f66d78bbcc7b5db97559d02147cd -rcf5abc7766faffd221ece62edef44865e099d55f
#
# 
# 
# add_file "packages/xserver-common/files/ti-osk.patch"
#  content [df20cd58aa35b3bd5976b322aab2eaf895cc8a1a]
# 
# patch "packages/xserver-common/xserver-common_1.18.bb"
#  from [3409a8ba366a252767d2dd923e81b9c7ea5c824d]
#    to [e69696d1e49e2098413cfc6501b2281a99662042]
# 
============================================================
--- packages/xserver-common/files/ti-osk.patch	df20cd58aa35b3bd5976b322aab2eaf895cc8a1a
+++ packages/xserver-common/files/ti-osk.patch	df20cd58aa35b3bd5976b322aab2eaf895cc8a1a
@@ -0,0 +1,12 @@
+diff -Naur xserver-common-1.18-orig/X11/Xserver xserver-common-1.18/X11/Xserver
+--- xserver-common-1.18-orig/X11/Xserver	2007-08-24 06:15:25.000000000 -0500
++++ xserver-common-1.18/X11/Xserver	2008-01-12 19:59:59.000000000 -0600
+@@ -76,6 +76,8 @@
+ 		ARGS="$ARGS -dpi 100 -rgba rgb" ;;
+ 	"Generic OMAP1510/1610/1710")
+ 		ARGS="$ARGS -dpi 220 -mouse /dev/input/event0" ;;
++	"TI-OSK")
++		ARGS="$ARGS -dpi 100 -mouse tslib" ;;
+ 	"Cellon C8000 Board")
+ 		ARGS="$ARGS -dpi 100 -screen 240x320,10,1" ;;
+ 	"HTC Universal")
============================================================
--- packages/xserver-common/xserver-common_1.18.bb	3409a8ba366a252767d2dd923e81b9c7ea5c824d
+++ packages/xserver-common/xserver-common_1.18.bb	e69696d1e49e2098413cfc6501b2281a99662042
@@ -9,7 +9,7 @@ inherit gpe
 # we are using a gpe-style Makefile
 inherit gpe
 
-SRC_URI_append = " file://unbreak-simpad.patch;patch=1 file://setDPI.sh "
+SRC_URI_append = " file://ti-osk.patch;patch=1 file://unbreak-simpad.patch;patch=1 file://setDPI.sh "
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"