From 91b0eced09d6e24c472550a78940bdd11474885a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 19 May 2006 23:13:12 +0000 Subject: directfb: unbreak ++dfb, remove dfb++, unbreak directfb-examples, add patch to fix directfb's wrong pkgconfig spec file --- packages/directfb/++dfb_0.9.23.bb | 15 ++---------- packages/directfb/dfb++_0.9.23.bb | 30 ----------------------- packages/directfb/directfb-examples_0.9.23.bb | 1 + packages/directfb/directfb_0.9.25.1.bb | 6 ++--- packages/directfb/files/.mtn2git_empty | 0 packages/directfb/files/fix-pkgconfig-specs.patch | 13 ++++++++++ 6 files changed, 19 insertions(+), 46 deletions(-) delete mode 100644 packages/directfb/dfb++_0.9.23.bb create mode 100644 packages/directfb/files/.mtn2git_empty create mode 100644 packages/directfb/files/fix-pkgconfig-specs.patch diff --git a/packages/directfb/++dfb_0.9.23.bb b/packages/directfb/++dfb_0.9.23.bb index 4574b8eb4c..4c1f6bc482 100644 --- a/packages/directfb/++dfb_0.9.23.bb +++ b/packages/directfb/++dfb_0.9.23.bb @@ -1,30 +1,19 @@ DESCRIPTION = "A C++ Wrapper for the directfb framebuffer library." HOMEPAGE = "http://directfb.org" SECTION = "libs" -PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " DEPENDS = "directfb" LICENSE = "LGPL" -# needs a g++4 patch -BROKEN = "1" - SRC_URI = "http://www.directfb.org/downloads/Extras/++DFB-${PV}.tar.gz" S = "${WORKDIR}/++DFB-${PV}" inherit autotools pkgconfig do_stage() { - oe_runmake -C include 'libdir=/lib' 'includedir=/include/dfb++' \ - 'oldincludedir=/include' 'datadir=/share' \ - 'DESTDIR=${STAGING_LIBDIR}/..' \ - install-dfbppincludeHEADERS - oe_runmake -C dfb++ 'libdir=/lib' 'includedir=/include/dfb++' \ - 'oldincludedir=/include' 'datadir=/share' \ - 'DESTDIR=${STAGING_LIBDIR}/..' \ - install-libLTLIBRARIES + autotools_stage_all } - do_install() { oe_runmake 'DESTDIR=${D}' install } diff --git a/packages/directfb/dfb++_0.9.23.bb b/packages/directfb/dfb++_0.9.23.bb deleted file mode 100644 index 0e0772da94..0000000000 --- a/packages/directfb/dfb++_0.9.23.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "A C++ Wrapper for the directfb framebuffer library." -HOMEPAGE = "http://directfb.org" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "directfb" -LICENSE = "LGPL" - -# needs a g++4 patch -BROKEN = "1" - -SRC_URI = "http://www.directfb.org/downloads/Extras/DFB++-${PV}.tar.gz" -S = "${WORKDIR}/DFB++-${PV}" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake -C include 'libdir=/lib' 'includedir=/include/dfb++' \ - 'oldincludedir=/include' 'datadir=/share' \ - 'DESTDIR=${STAGING_LIBDIR}/..' \ - install-dfbppincludeHEADERS - oe_runmake -C dfb++ 'libdir=/lib' 'includedir=/include/dfb++' \ - 'oldincludedir=/include' 'datadir=/share' \ - 'DESTDIR=${STAGING_LIBDIR}/..' \ - install-libLTLIBRARIES -} - - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} diff --git a/packages/directfb/directfb-examples_0.9.23.bb b/packages/directfb/directfb-examples_0.9.23.bb index 423e888fd8..5357b55b6d 100644 --- a/packages/directfb/directfb-examples_0.9.23.bb +++ b/packages/directfb/directfb-examples_0.9.23.bb @@ -2,6 +2,7 @@ DESCRIPTION = "DirectFB examples" DEPENDS = "directfb" SECTION = "devel/examples" LICENSE = "GPL" +MAINTAINER = "Michael 'Mickey' Lauer Date: Sat, 20 May 2006 11:12:06 +0000 Subject: lcdproc: added bb file for 0.5.0 --- packages/lcdproc/lcdproc_0.5.0.bb | 65 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 packages/lcdproc/lcdproc_0.5.0.bb diff --git a/packages/lcdproc/lcdproc_0.5.0.bb b/packages/lcdproc/lcdproc_0.5.0.bb new file mode 100644 index 0000000000..4d933fc064 --- /dev/null +++ b/packages/lcdproc/lcdproc_0.5.0.bb @@ -0,0 +1,65 @@ +DESCRIPTION = "LCDproc is a client/Server suite to drive all kinds of LCD (-like) devices. The client \ +shipped with this package can be used to acquire various kinds of system stats." +HOMEPAGE = "http://lcdproc.org" +LICENSE = "GPL" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner " +SECTION = "utils" + +DEPENDS = "${@((bb.data.getVar('LCDPROC_DRIVERS',d) or 'all').find('curses') != -1) and 'ncurses' or ''}" +RRECOMMENDS_lcdproc = "lcdd" + +SRC_URI = "${SOURCEFORGE_MIRROR}/lcdproc/lcdproc-${PV}.tar.gz" + +inherit autotools update-rc.d + +PACKAGES =+ "lcdd" + +CONFFILES_lcdd = "${sysconfdir}/LCDd.conf" +CONFFILES_lcdproc = "${sysconfdir}/lcdproc.conf" + +FILES_lcdd = "${CONFFILES_lcdd} \ + ${sbindir}/LCDd \ + ${sysconfdir}/init.d/lcdd \ + ${libdir}/lcdproc/" +FILES_lcdproc = "${CONFFILES_lcdproc} \ + ${bindir}/lcdproc \ + ${sysconfdir}/init.d/lcdproc" + +INITSCRIPT_PACKAGES = "lcdd lcdproc" +INITSCRIPT_NAME_lcdd = "lcdd" +INITSCRIPT_NAME_lcdproc = "lcdproc" +INITSCRIPT_PARAMS_lcdd = "defaults 70 21" +INITSCRIPT_PARAMS_lcdproc = "defaults 71 20" + +EXTRA_OECONF = "${@'--enable-drivers=' + (bb.data.getVar('LCDPROC_DRIVERS',d) or 'all')}" + +do_install () { + # binaries + install -D -m 0755 server/LCDd ${D}${sbindir}/LCDd + install -D -m 0755 clients/lcdproc/lcdproc ${D}${bindir}/lcdproc + + # init scripts + install -d ${D}${sysconfdir}/init.d + # so far, not fixed :-( and now even uglier :-(( + cat scripts/init-LCDd.debian | sed -e s'/--oknodo//' -e 's/ -s -f / -s 1 -f 1 /' -e 's/force-reload/force-restart/' -e 's/sleep 1/sleep 4/' > ${D}${sysconfdir}/init.d/lcdd + chmod 0755 ${D}${sysconfdir}/init.d/lcdd + # prevent lcdproc from starting if no SCREENS are set. + # will be fixed in next upstream release + cat scripts/init-lcdproc.debian | sed -e 's/C X//' | sed -e 's/case/[ -n "$SCREENS" ] || exit 0\n\ncase/' | sed -e s'/--oknodo//' > ${D}${sysconfdir}/init.d/lcdproc + chmod 0755 ${D}${sysconfdir}/init.d/lcdproc + + # configuration files + install -D -m 0644 LCDd.conf ${D}${sysconfdir}/LCDd.conf + # don't start lcdproc by default + # will be fixed in next upstream release + cat scripts/lcdproc.conf | sed -e 's/C X//' > ${D}${sysconfdir}/lcdproc.conf + chmod 0644 ${D}${sysconfdir}/lcdproc.conf + + # driver library files + install -d ${D}${libdir}/lcdproc + for i in server/drivers/*.so; do + install -m 0644 $i ${D}${libdir}/lcdproc/ + done +} + -- cgit v1.2.3 From 3360528ed1615dff05dddca99d26fc67fa54e77b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sat, 20 May 2006 12:05:46 +0000 Subject: base.bbclass: add support for 'min/max' date for patches - SRC_URI = "file//something.patch;patch=1;mindate=20050312;maxdate=20060302 means that patch should be applied if SRCDATE > 20050312 and SRCDATE < 20060302 --- classes/base.bbclass | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/classes/base.bbclass b/classes/base.bbclass index 5f0e0d2fce..683b9e0d2a 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -475,6 +475,34 @@ python base_do_patch() { else: pname = os.path.basename(unpacked) + if "mindate" in parm: + mindate = parm["mindate"] + else: + mindate = 0 + + if "maxdate" in parm: + maxdate = parm["maxdate"] + else: + maxdate = bb.data.getVar('DATE', d, 1) + + pn = bb.data.getVar('PN', d, 1) + srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1) + + if not srcdate: + srcdate = bb.data.getVar('SRCDATE', d, 1) + + if srcdate == "now": + srcdate = bb.data.getVar('DATE', d, 1) + + if (maxdate < srcdate) or (mindate > srcdate): + if (maxdate < srcdate): + bb.note("Patch '%s' is outdated" % pname) + + if (mindate > srcdate): + bb.note("Patch '%s' is predated" % pname) + + continue + bb.note("Applying patch '%s'" % pname) bb.data.setVar("do_patchcmd", bb.data.getVar("PATCHCMD", d, 1) % (pnum, pname, unpacked), d) bb.data.setVarFlag("do_patchcmd", "func", 1, d) -- cgit v1.2.3