summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/fontconfig/fontconfig_2.4.1.bb57
-rw-r--r--packages/libpcap/libpcap-0.9.5/shared.patch2
-rw-r--r--packages/libpcap/libpcap_0.9.5.bb1
-rw-r--r--packages/maemo-mapper/maemo-mapper-nohildon_svn.bb14
-rw-r--r--packages/tslib/tslib/smdk2440/.mtn2git_empty0
-rw-r--r--packages/tslib/tslib/smdk2440/tslib.sh13
6 files changed, 83 insertions, 4 deletions
diff --git a/packages/fontconfig/fontconfig_2.4.1.bb b/packages/fontconfig/fontconfig_2.4.1.bb
new file mode 100644
index 0000000000..2590fed88e
--- /dev/null
+++ b/packages/fontconfig/fontconfig_2.4.1.bb
@@ -0,0 +1,57 @@
+SECTION = "libs"
+LICENSE = "BSD"
+DESCRIPTION = "A library for configuring and customizing font access."
+DEPENDS = "expat freetype freetype-native zlib"
+
+SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz"
+
+PR = "r0"
+
+PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
+FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
+FILES_fontconfig-utils = "${bindir}/*"
+
+# Work around past breakage in debian.bbclass
+RPROVIDES_fontconfig-utils = "libfontconfig-utils"
+RREPLACES_fontconfig-utils = "libfontconfig-utils"
+RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
+DEBIAN_NOAUTONAME_fontconfig-utils = "1"
+
+S = "${WORKDIR}/fontconfig-${PV}"
+
+inherit autotools pkgconfig
+
+export HASDOCBOOK="no"
+
+EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH}"
+EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
+
+# The tarball has some of the patched files as read only, which
+# patch doesn't like at all
+
+fontconfig_do_unpack() {
+ chmod -R u+rw ${S}
+}
+
+python do_unpack () {
+ bb.build.exec_func('base_do_unpack', d)
+ bb.build.exec_func('fontconfig_do_unpack', d)
+}
+
+do_stage () {
+ oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/fontconfig
+ for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
+}
+
+do_configure_append () {
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
+}
+
+do_install () {
+ autotools_do_install
+}
+
diff --git a/packages/libpcap/libpcap-0.9.5/shared.patch b/packages/libpcap/libpcap-0.9.5/shared.patch
index cc66a5e5ef..d8118cf142 100644
--- a/packages/libpcap/libpcap-0.9.5/shared.patch
+++ b/packages/libpcap/libpcap-0.9.5/shared.patch
@@ -11,7 +11,7 @@
+# some defines for shared library compilation - FIXME, if not matching
+MAJ=0.9
-+MIN=3
++MIN=5
+VERSION=$(MAJ).$(MIN)
+LIBNAME=pcap
+LIBRARY=lib$(LIBNAME).a
diff --git a/packages/libpcap/libpcap_0.9.5.bb b/packages/libpcap/libpcap_0.9.5.bb
index 09002d92b8..5d66687482 100644
--- a/packages/libpcap/libpcap_0.9.5.bb
+++ b/packages/libpcap/libpcap_0.9.5.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Network Packet Capture Library"
HOMEPAGE = "http://www.tcpdump.org/"
LICENSE = "BSD"
SECTION = "libs/network"
+PR = "r1"
SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz \
file://shared.patch;patch=1"
diff --git a/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb b/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb
index 988cde8f37..b06df25359 100644
--- a/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb
+++ b/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb
@@ -1,14 +1,22 @@
DESCRIPTION = "GPS navigation/map display software"
LICENSE = "GPL"
DEPENDS = "sqlite3 gtk+ gnome-vfs-dbus dbus bluez-libs"
+RDEPENDS = "bluez-utils"
PV = "1.2.4+svn${SRCDATE}"
+PR = "r1"
-#only works with SRCDATE_maemo-mapper-nohildon = "20061114"
+# Only works with SRCDATE_maemo-mapper-nohildon = "20061114"
SRC_URI = "svn://garage.maemo.org/svn/maemo-mapper;proto=https;module=trunk \
- http://home.tal.org/%7Emilang/n770/maemo-mapper-desktop-20061114-001.patch;patch=1;pnum=0"
+ http://home.tal.org/%7Emilang/n770/maemo-mapper-desktop-20061114-001.patch;patch=1;pnum=0 \
+ file://fix_segfault.patch;patch=1"
S = "${WORKDIR}/trunk"
inherit autotools pkgconfig
-#FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pixmaps ${datadir}/applications"
+do_install_append () {
+ install -d ${D}${datadir}/applications/
+ mv ${D}/maemo-mapper.desktop ${D}${datadir}/applications/
+}
+
+#FILES_${PN} += "${datadir}/icons"
diff --git a/packages/tslib/tslib/smdk2440/.mtn2git_empty b/packages/tslib/tslib/smdk2440/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib/smdk2440/.mtn2git_empty
diff --git a/packages/tslib/tslib/smdk2440/tslib.sh b/packages/tslib/tslib/smdk2440/tslib.sh
new file mode 100644
index 0000000000..0ff219b31f
--- /dev/null
+++ b/packages/tslib/tslib/smdk2440/tslib.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
+case `uname -r` in
+2.4*)
+ TSLIB_TSDEVICE=/dev/ts
+ TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
+ ;;
+esac
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE