opie-freetype: catch up with upstream changes

BKrev: 41f8ef40INYbY1zDvAMVw7xPsN3Bow

diff --git a/packages/opie-freetype/opie-freetype_1.1.8.bb b/packages/opie-freetype/opie-freetype_1.1.8.bb
index e69de29..9716201 100644 (file)
--- a/packages/opie-freetype/opie-freetype_1.1.8.bb
+++ b/packages/opie-freetype/opie-freetype_1.1.8.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Freetype fontfactory plugin"
+SECTION = "opie/fontfactories"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "freetype"
+APPNAME = "freetypefactory"
+PR = "r1"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/freetype"
+S = "${WORKDIR}/freetype"
+
+inherit opie
+
+EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=${STAGING_INCDIR}/freetype2"

diff --git a/packages/opie-freetype/opie-freetype_cvs.bb b/packages/opie-freetype/opie-freetype_cvs.bb
index 951964e..e4b8452 100644 (file)
--- a/packages/opie-freetype/opie-freetype_cvs.bb
+++ b/packages/opie-freetype/opie-freetype_cvs.bb
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 DEPENDS = "freetype"
 PV = "1.1.8+cvs-${CVSDATE}"
 APPNAME = "freetypefactory"
+PR = "r1"
 
-SRC_URI = "${HANDHELDS_CVS};module=opie/freetype \
-          file://modern-freetype-includes.patch;patch=1"
+SRC_URI = "${HANDHELDS_CVS};module=opie/freetype"
 S = "${WORKDIR}/freetype"
 
 inherit opie

diff --git a/packages/prism3-support/prism3-support_0.1.bb b/packages/prism3-support/prism3-support_0.1.bb
index dface76..492a908 100644 (file)
--- a/packages/prism3-support/prism3-support_0.1.bb
+++ b/packages/prism3-support/prism3-support_0.1.bb
@@ -15,7 +15,7 @@ do_install() {
 # Add more known manfids, if necessary          
                                                        
 if [ `cardctl info|grep "d601,0010\|d601,0101"` ]; then
-  $IWPRIV "$IFACE" reset 1                             
+  iwpriv "$IFACE" reset 1                             
   hostap_fw_load "$IFACE"  
 fi