diff options
| -rw-r--r-- | packages/gpsbabel/gpsbabel_1.2.5.bb | 6 | ||||
| -rw-r--r-- | packages/gpsbabel/gpsbabel_1.3.3.bb | 20 | ||||
| -rw-r--r-- | packages/gtk-webcore/midori_0.0.2.bb | 11 | ||||
| -rw-r--r-- | packages/libpcap/libpcap-0.9.6/shared.patch | 2 | ||||
| -rw-r--r-- | packages/libpcap/libpcap_0.9.6.bb | 4 | ||||
| -rw-r--r-- | packages/librsvg/librsvg_2.16.1.bb | 16 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.21.1.bb | 2 | ||||
| -rw-r--r-- | packages/sphyrna/sphyrna_svn.bb | 5 | ||||
| -rw-r--r-- | packages/sysvinit/sysvinit_2.86.bb | 3 |
9 files changed, 56 insertions, 13 deletions
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/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 |