[oe-commits] org.oe.dev merge of '01ae5b27f3e0a00ab17a31f68cf002afac6cb807'

[jeremy_laine commit]

merge of '01ae5b27f3e0a00ab17a31f68cf002afac6cb807'
     and '0e4a2bbb7147a46977d9c8085b4fd469d11ab2a2'

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: a03b869c626a99f8d8aa60e11dea1b8a0f04b5ed
ViewMTN: http://monotone.openembedded.org/revision/info/a03b869c626a99f8d8aa60e11dea1b8a0f04b5ed
Files:
1
packages/directfb/directfb_1.1.0.bb
packages/python/python-pysqlite2
packages/python/python-pysqlite2/fix-setup.patch
packages/python/python-pysqlite2_2.4.0.bb
Diffs:

#
# mt diff -r01ae5b27f3e0a00ab17a31f68cf002afac6cb807 -ra03b869c626a99f8d8aa60e11dea1b8a0f04b5ed
#
# 
# 
# patch "packages/directfb/directfb_1.1.0.bb"
#  from [1af7bf22ffbfcbc869a08e6664c2dde2ff16c7d2]
#    to [b13ed5a2cee07ae6410cd0eddde2ccbd14dd6b79]
# 
============================================================
--- packages/directfb/directfb_1.1.0.bb	1af7bf22ffbfcbc869a08e6664c2dde2ff16c7d2
+++ packages/directfb/directfb_1.1.0.bb	b13ed5a2cee07ae6410cd0eddde2ccbd14dd6b79
@@ -7,7 +7,7 @@ DEPENDS = "jpeg libpng freetype zlib tsl
 LICENSE = "LGPL"
 HOMEPAGE = "http://directfb.org"
 DEPENDS = "jpeg libpng freetype zlib tslib"
-PR = "r1"
+PR = "r2"
 RV = "1.1-0"
 
 SRC_URI = " \
@@ -37,6 +37,8 @@ do_stage() {
 
 do_stage() {
         autotools_stage_all
+        # fix breakage introduced with the fix-includes patch, it seems that directfb examples is the only app that looks in the wrong location :/
+        ln -sf ${STAGING_LIBDIR} ${STAGING_LIBDIR}/directfb
 }
 
 do_install() {


#
# mt diff -r0e4a2bbb7147a46977d9c8085b4fd469d11ab2a2 -ra03b869c626a99f8d8aa60e11dea1b8a0f04b5ed
#
# 
# 
# add_dir "packages/python/python-pysqlite2"
# 
# add_file "packages/python/python-pysqlite2/fix-setup.patch"
#  content [2dd57a23d7ac3ccea71558d925e5f243970e2449]
# 
# add_file "packages/python/python-pysqlite2_2.4.0.bb"
#  content [617a7751e48a571c7049118a1ddff35a47317af5]
# 
============================================================
--- packages/python/python-pysqlite2/fix-setup.patch	2dd57a23d7ac3ccea71558d925e5f243970e2449
+++ packages/python/python-pysqlite2/fix-setup.patch	2dd57a23d7ac3ccea71558d925e5f243970e2449
@@ -0,0 +1,9 @@
+diff -urN pysqlite-2.4.0.orig/setup.cfg pysqlite-2.4.0/setup.cfg
+--- pysqlite-2.4.0.orig/setup.cfg	2007-11-25 17:56:17.000000000 +0100
++++ pysqlite-2.4.0/setup.cfg	2007-12-07 09:59:36.000000000 +0100
+@@ -1,5 +1,3 @@
+ [build_ext]
+ define=
+-include_dirs=/usr/include
+-library_dirs=/usr/lib
+ libraries=sqlite3
============================================================
--- packages/python/python-pysqlite2_2.4.0.bb	617a7751e48a571c7049118a1ddff35a47317af5
+++ packages/python/python-pysqlite2_2.4.0.bb	617a7751e48a571c7049118a1ddff35a47317af5
@@ -0,0 +1,17 @@
+DESCRIPTION = "Python interface to SQLite 3"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "BSD"
+DEPENDS = "sqlite3"
+SRCNAME = "pysqlite"
+
+SRC_URI = "http://initd.org/pub/software/pysqlite/releases/2.4/${PV}/${SRCNAME}-${PV}.tar.gz \
+	   file://fix-setup.patch;patch=1"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+do_install_append() {
+    install -d ${D}${datadir}/doc/
+    mv ${D}${datadir}/pysqlite2-doc ${D}${datadir}/doc/${PN}
+}