summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/bluez/bluez-gnome_0.9.bb11
-rw-r--r--packages/bluez/bluez-hcidump_1.37.bb13
-rw-r--r--packages/bluez/bluez-libs_3.12.bb1
-rw-r--r--packages/bluez/bluez-utils_3.11.bb2
-rw-r--r--packages/bluez/bluez-utils_3.12.bb113
-rw-r--r--packages/gpsbabel/gpsbabel_1.2.5.bb6
-rw-r--r--packages/gpsbabel/gpsbabel_1.3.3.bb20
-rw-r--r--packages/gtk-webcore/midori_0.0.2.bb11
-rw-r--r--packages/gtk-webcore/osb-nrcore.inc9
-rw-r--r--packages/gtk-webcore/osb-nrcore_svn.bb2
-rw-r--r--packages/keymaps/files/jornada6xx/keymap-uk.map42
-rw-r--r--packages/libpcap/libpcap-0.9.6/shared.patch2
-rw-r--r--packages/libpcap/libpcap_0.9.6.bb4
-rw-r--r--packages/librsvg/librsvg_2.16.1.bb16
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.21.1.bb2
-rw-r--r--packages/sphyrna/sphyrna_svn.bb5
-rw-r--r--packages/sysvinit/sysvinit_2.86.bb3
17 files changed, 226 insertions, 36 deletions
diff --git a/packages/bluez/bluez-gnome_0.9.bb b/packages/bluez/bluez-gnome_0.9.bb
new file mode 100644
index 0000000000..d50e8e5fde
--- /dev/null
+++ b/packages/bluez/bluez-gnome_0.9.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "BLuetooth configuration applet"
+LICENSE = "GPL+LGPL"
+
+DEPENDS = "dbus-glib gconf libnotify gtk+"
+
+SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+inherit autotools pkgconfig gconf
+
+FILES_${PN} += "${datadir}/gconf"
+
diff --git a/packages/bluez/bluez-hcidump_1.37.bb b/packages/bluez/bluez-hcidump_1.37.bb
new file mode 100644
index 0000000000..877c8db33c
--- /dev/null
+++ b/packages/bluez/bluez-hcidump_1.37.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
+S = "${WORKDIR}/bluez-hcidump-${PV}"
+
+EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
+
+inherit autotools
diff --git a/packages/bluez/bluez-libs_3.12.bb b/packages/bluez/bluez-libs_3.12.bb
new file mode 100644
index 0000000000..6ddf62a4fb
--- /dev/null
+++ b/packages/bluez/bluez-libs_3.12.bb
@@ -0,0 +1 @@
+require bluez-libs.inc
diff --git a/packages/bluez/bluez-utils_3.11.bb b/packages/bluez/bluez-utils_3.11.bb
index 6ac6c8f977..2419f431f6 100644
--- a/packages/bluez/bluez-utils_3.11.bb
+++ b/packages/bluez/bluez-utils_3.11.bb
@@ -2,7 +2,7 @@ require bluez-utils.inc
DEPENDS += "glib-2.0"
-DEFAULT_PREFERENCE = "-1"
+#DEFAULT_PREFERENCE = "-1"
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
diff --git a/packages/bluez/bluez-utils_3.12.bb b/packages/bluez/bluez-utils_3.12.bb
new file mode 100644
index 0000000000..ae9774ec71
--- /dev/null
+++ b/packages/bluez/bluez-utils_3.12.bb
@@ -0,0 +1,113 @@
+require bluez-utils.inc
+
+DEPENDS += "glib-2.0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+ file://hcid.conf \
+ file://02dtl1_cs.sh \
+ "
+PR = "r0"
+
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --disable-hid2hci \
+ --disable-alsa \
+ --enable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+# The config options are explained below:
+
+# --enable-obex enable OBEX support
+# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1
+# --enable-cups install CUPS backend support
+# --enable-bccmd install BCCMD interface utility
+# --enable-avctrl install Audio/Video control utility
+# --enable-hid2hci install HID mode switching utility
+# --enable-dfutool install DFU firmware upgrade utility
+
+# --enable-glib For systems that use and install GLib anyway
+# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server
+
+#Following services can be enabled so far:
+# --enable-network
+# --enable-serial
+# --enable-input
+# --enable-audio
+# --enable-echo
+
+#There is no need to modify any init script. They will be started
+#automatically or on demand. Only /etc/bluetooth/*.service files should
+#be patched to change name or the autostart value.
+# --enable-configfile
+# --enable-initscripts
+
+#For even smaller -doc packages
+# --disable-manpages
+# --disable-pcmciarules
+
+#I haven't seen any embedded device with HID proxy support. So simply
+#disable it:
+# --disable-hid2hci
+
+
+PACKAGES =+ "${PN}-compat"
+
+CONFFILES_${PN} = " \
+ ${sysconfdir}/bluetooth/hcid.conf \
+ ${sysconfdir}/default/bluetooth \
+ "
+
+CONFFILES_${PN}-compat = " \
+ ${sysconfdir}/bluetooth/rfcomm.conf \
+ "
+
+FILES_${PN} = " \
+ ${base_sbindir}/hcid \
+ ${libdir}/bluetooth \
+ ${sysconfdir}/init.d/bluetooth \
+ ${sysconfdir}/bluetooth/*.service \
+ ${sysconfdir}/bluetooth/hcid.conf \
+ ${sysconfdir}/default \
+ ${sysconfdir}/dbus-1 \
+ ${base_sbindir}/hciattach \
+ "
+
+#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume
+FILES_${PN} += "${sysconfdir}/apm/"
+
+FILES_${PN}-dbg += " \
+ ${libdir}/bluetooth/.debug \
+ "
+
+FILES_${PN}-compat = " \
+ ${base_bindir}/sdptool \
+ ${base_bindir}/dund \
+ ${base_bindir}/rctest \
+ ${base_bindir}/ciptool \
+ ${base_bindir}/l2test \
+ ${base_bindir}/rfcomm \
+ ${base_bindir}/hcitool \
+ ${base_bindir}/pand \
+ ${base_bindir}/hidd \
+ ${base_bindir}/l2ping \
+ ${base_sbindir}/hciconfig \
+ ${base_sbindir}/bccmd \
+ ${base_sbindir}/hciemu \
+ ${base_bindir}/passkey-agent \
+ ${sysconfdir}/bluetooth/rfcomm.conf \
+ "
+
+FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
+RDEPENDS_bluez-cups-backend = "cups"
+
+
diff --git a/packages/gpsbabel/gpsbabel_1.2.5.bb b/packages/gpsbabel/gpsbabel_1.2.5.bb
index bd7e1246ca..987b000f10 100644
--- a/packages/gpsbabel/gpsbabel_1.2.5.bb
+++ b/packages/gpsbabel/gpsbabel_1.2.5.bb
@@ -1,15 +1,17 @@
SECTION = "console/utils"
DESCRIPTION = "GPS data converter"
-DEPENDS = "expat"
+DEPENDS = "expat libusb"
HOMEPAGE = "http://gpsbabel.sf.net"
LICENSE = "GPL"
+PR = "r1"
+
SRC_URI = "${SOURCEFORGE_MIRROR}/gpsbabel/gpsbabel-${PV}.tar.gz"
inherit autotools pkgconfig
do_compile () {
- oe_runmake EXTRA_CFLAGS="-I${STAGING_INCDIR} -L${STAGING_LIBDIR}" INHIBIT_USB=-DNO_USB LIBUSB=
+ oe_runmake EXTRA_CFLAGS="-I${STAGING_INCDIR} -L${STAGING_LIBDIR}"
}
do_install () {
diff --git a/packages/gpsbabel/gpsbabel_1.3.3.bb b/packages/gpsbabel/gpsbabel_1.3.3.bb
new file mode 100644
index 0000000000..f9a8d98d4e
--- /dev/null
+++ b/packages/gpsbabel/gpsbabel_1.3.3.bb
@@ -0,0 +1,20 @@
+SECTION = "console/utils"
+DESCRIPTION = "GPS data converter"
+DEPENDS = "expat libusb"
+HOMEPAGE = "http://gpsbabel.sf.net"
+LICENSE = "GPL"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gpsbabel/gpsbabel-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+do_compile () {
+ oe_runmake EXTRA_CFLAGS="-I${STAGING_INCDIR} -L${STAGING_LIBDIR}"
+}
+
+do_install () {
+ install -d ${D}${bindir}
+ install -m 0744 gpsbabel ${D}${bindir}
+}
diff --git a/packages/gtk-webcore/midori_0.0.2.bb b/packages/gtk-webcore/midori_0.0.2.bb
new file mode 100644
index 0000000000..7f5fb6cd74
--- /dev/null
+++ b/packages/gtk-webcore/midori_0.0.2.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "osb-jscore osb-nrcit osb-nrcore libsexy"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz"
+
+
+
diff --git a/packages/gtk-webcore/osb-nrcore.inc b/packages/gtk-webcore/osb-nrcore.inc
index 3b71c9685d..7cbf0ce890 100644
--- a/packages/gtk-webcore/osb-nrcore.inc
+++ b/packages/gtk-webcore/osb-nrcore.inc
@@ -18,6 +18,14 @@ do_configure () {
mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
}
+do_install_append() {
+ #backward compat for some apps
+ ln -sf ${datadir}/gtk-webcore-nrcore ${D}${datadir}/osb-nrcore
+}
+
+FILES_${PN} += "${datadir}/gtk-webcore-nrcore"
+
+
do_stage () {
oe_libinstall -so libnrcore ${STAGING_LIBDIR}
oe_libinstall -so -C kwiq libnrcore_kwiq_gtk ${STAGING_LIBDIR}
@@ -30,3 +38,4 @@ do_stage () {
done
}
+
diff --git a/packages/gtk-webcore/osb-nrcore_svn.bb b/packages/gtk-webcore/osb-nrcore_svn.bb
index a6a70059fa..b9af57ad52 100644
--- a/packages/gtk-webcore/osb-nrcore_svn.bb
+++ b/packages/gtk-webcore/osb-nrcore_svn.bb
@@ -3,7 +3,7 @@ require osb-nrcore.inc
DEFAULT_PREFERENCE = "-1"
PV = "0.5.2+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \
file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1 \
diff --git a/packages/keymaps/files/jornada6xx/keymap-uk.map b/packages/keymaps/files/jornada6xx/keymap-uk.map
index 4f511c8847..a7bb082464 100644
--- a/packages/keymaps/files/jornada6xx/keymap-uk.map
+++ b/packages/keymaps/files/jornada6xx/keymap-uk.map
@@ -26,14 +26,14 @@ keycode 7 = six asciicircum
alt keycode 7 = Meta_six
keycode 8 = seven ampersand braceleft
control keycode 8 = Control_underscore
- alt keycode 8 = KP_7
+ altgr keycode 8 = KP_7
keycode 9 = eight asterisk bracketleft
control keycode 9 = Delete
- alt keycode 9 = KP_8
+ altgr keycode 9 = KP_8
keycode 10 = nine parenleft bracketright
- alt keycode 10 = KP_9
+ altgr keycode 10 = KP_9
keycode 11 = zero parenright braceright
- alt keycode 11 = KP_Divide
+ altgr keycode 11 = KP_Divide
keycode 12 = minus underscore backslash
control keycode 11 = Control_underscore
shift control keycode 11 = Control_underscore
@@ -52,13 +52,13 @@ keycode 18 = e
keycode 19 = r
keycode 20 = t
keycode 21 = y
- alt keycode 21 = KP_4
+ altgr keycode 21 = KP_4
keycode 22 = u
- alt keycode 22 = KP_5
+ altgr keycode 22 = KP_5
keycode 23 = i
- alt keycode 23 = KP_6
+ altgr keycode 23 = KP_6
keycode 24 = o
- alt keycode 24 = KP_Multiply
+ altgr keycode 24 = KP_Multiply
keycode 25 = p
AltGr keycode 25 = braceleft
keycode 26 = backslash bar
@@ -73,13 +73,13 @@ keycode 32 = d
keycode 33 = f
keycode 34 = g
keycode 35 = h
- alt keycode 35 = KP_1
+ altgr keycode 35 = KP_1
keycode 36 = j
- alt keycode 36 = KP_2
+ altgr keycode 36 = KP_2
keycode 37 = k
- alt keycode 37 = KP_3
+ altgr keycode 37 = KP_3
keycode 38 = l
- alt keycode 38 = KP_Subtract
+ altgr keycode 38 = KP_Subtract
keycode 39 = semicolon colon bracketleft
alt keycode 39 = Meta_semicolon
keycode 40 = apostrophe quotedbl bracketright
@@ -98,14 +98,14 @@ keycode 46 = c
keycode 47 = v
keycode 48 = b
keycode 49 = n
- alt keycode 49 = KP_0
+ altgr keycode 49 = KP_0
keycode 50 = m
- alt keycode 50 = KP_Comma
+ altgr keycode 50 = KP_Comma
keycode 51 = comma less
- alt keycode 51 = KP_Period
+ altgr keycode 51 = KP_Period
keycode 52 = period greater
control keycode 52 = Compose
- alt keycode 52 = KP_Add
+ altgr keycode 52 = KP_Add
keycode 54 = Shift
keycode 56 = Alt
keycode 57 = space space
@@ -180,11 +180,11 @@ keycode 115 = slash question
alt keycode 115 = Meta_slash
keycode 123 = AltGr
keycode 219 = Insert
-string F1 = "\033[[A"
-string F2 = "\033[[B"
-string F3 = "\033[[C"
-string F4 = "\033[[D"
-string F5 = "\033[[E"
+string F1 = "\033[11~"
+string F2 = "\033[12~"
+string F3 = "\033[13~"
+string F4 = "\033[14~"
+string F5 = "\033[15~"
string F6 = "\033[17~"
string F7 = "\033[18~"
string F8 = "\033[19~"
diff --git a/packages/libpcap/libpcap-0.9.6/shared.patch b/packages/libpcap/libpcap-0.9.6/shared.patch
index d8118cf142..159389bb87 100644
--- a/packages/libpcap/libpcap-0.9.6/shared.patch
+++ b/packages/libpcap/libpcap-0.9.6/shared.patch
@@ -11,7 +11,7 @@
+# some defines for shared library compilation - FIXME, if not matching
+MAJ=0.9
-+MIN=5
++MIN=6
+VERSION=$(MAJ).$(MIN)
+LIBNAME=pcap
+LIBRARY=lib$(LIBNAME).a
diff --git a/packages/libpcap/libpcap_0.9.6.bb b/packages/libpcap/libpcap_0.9.6.bb
index d68cd31d52..9822f38ada 100644
--- a/packages/libpcap/libpcap_0.9.6.bb
+++ b/packages/libpcap/libpcap_0.9.6.bb
@@ -4,8 +4,10 @@ DESCRIPTION = "Network Packet Capture Library"
HOMEPAGE = "http://www.tcpdump.org/"
LICENSE = "BSD"
SECTION = "libs/network"
-PR = "r0"
+PR = "r1"
+
+# Don't forget to edit shared.patch to have the correct version number inside
SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz \
file://shared.patch;patch=1"
diff --git a/packages/librsvg/librsvg_2.16.1.bb b/packages/librsvg/librsvg_2.16.1.bb
index 49513128d7..273992de29 100644
--- a/packages/librsvg/librsvg_2.16.1.bb
+++ b/packages/librsvg/librsvg_2.16.1.bb
@@ -3,22 +3,26 @@ SECTION = "x11/utils"
DEPENDS = "gtk+ libcroco cairo libart-lgpl libxml2 popt"
LICENSE = "LGPL"
-EXTRA_OECONF = "--disable-mozilla-plugin"
+PR = "r1"
inherit autotools pkgconfig gnome
+EXTRA_OECONF = "--disable-mozilla-plugin"
+
+
PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
FILES_${PN} = "${libdir}/*.so.*"
FILES_rsvg = "${bindir}/rsvg \
${bindir}/rsvg-view \
${bindir}/rsvg-convert \
${datadir}/pixmaps/svg-viewer.svg"
-FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so.*"
+FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so"
FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.la \
- ${libdir}/gtk-2.0/*/*.la"
-FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug"
-
-EXTRA_OECONF = "--disable-mozilla-plugin"
+ ${libdir}/gtk-2.0/*/*.la \
+ ${libdir}/gtk-2.0/*/*/*.la \
+ "
+FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug \
+ ${libdir}/gtk-2.0/*/*/.debug"
do_stage() {
autotools_stage_all
diff --git a/packages/linux/ixp4xx-kernel_2.6.21.1.bb b/packages/linux/ixp4xx-kernel_2.6.21.1.bb
index c0cd8295e5..9fe53cad59 100644
--- a/packages/linux/ixp4xx-kernel_2.6.21.1.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.21.1.bb
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "861"
+IXP4XX_KERNEL_SVN_REV = "877"
#
# The directory containing the patches to be applied is
# specified below
diff --git a/packages/sphyrna/sphyrna_svn.bb b/packages/sphyrna/sphyrna_svn.bb
index 11809386f3..048d001905 100644
--- a/packages/sphyrna/sphyrna_svn.bb
+++ b/packages/sphyrna/sphyrna_svn.bb
@@ -11,7 +11,10 @@ S = "${WORKDIR}/${PN}"
inherit autotools
-PACKAGES = "sphyrna-console"
+PACKAGES = "sphyrna-console sphyrna-python"
FILES_sphyrna-console = "${bindir}/hhconsole"
+FILES_sphyrna-python = "${bindir}/decode.py ${libdir}/python2.4/site-packages/sphyrna/*"
+PACKAGE_ARCH_sphyrna-python = "all"
+RDEPENDS_sphyrna-python = "python-core python-re"
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index c8ce5ba191..7360a13104 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -51,7 +51,8 @@ EXTRA_OEMAKE += "'INSTALL=install' \
'usrbindir=${bindir}' \
'usrsbindir=${sbindir}' \
'includedir=${includedir}' \
- 'mandir=${mandir}'"
+ 'mandir=${mandir}' \
+ DISTRO=''"
do_install () {
oe_runmake 'ROOT=${D}' install
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 01:01:23 +0000