Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/16 17:38:14+00:00 nexus.co.uk!pb
update gpe-plucker to 0.2

2005/01/16 12:36:22-05:00 handhelds.org!kergoth
Add cvs build of genext2fs from http://sf.net/projects/genext2fs/.

2005/01/16 12:17:28-05:00 handhelds.org!kergoth
Add patch to xfont to build with automake 1.9.x.

2005/01/16 12:08:17-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded

2005/01/16 12:08:08-05:00 handhelds.org!kergoth
Add versions of the recent damageext and libxrandr patches that apply to the release, since the recent ChangeLog modifications made them fail to apply to those versions.

2005/01/16 17:55:30+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/16 16:53:02+00:00 nexus.co.uk!pb
break out some GPE customisations from Angelistic theme into global /etc/gtk-2.0/gtkrc

2005/01/16 17:52:53+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/16 11:54:05-05:00 handhelds.org!kergoth
Add ChangeLog entries to the libxrandr and damageext automake 1.9.x patches.

2005/01/16 17:52:43+01:00 uni-frankfurt.de!mickeyl
make gpsd-2.6 work, sanitize, and call older gpsd

2005/01/16 11:49:27-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded

2005/01/16 11:49:19-05:00 handhelds.org!kergoth
Apply patch to the damageext configure script to make it buildable with automake 1.9 and higher.

2005/01/16 17:35:42+01:00 uni-frankfurt.de!mickeyl
update pylinda to 0.4

BKrev: 41eaa6f79U-clYVe-ZNzRsRbjTNblw

diff --git a/packages/gpe-plucker/gpe-plucker-0.1/fix_makefiles.patch b/packages/damageext/damageext-1.0/autofoo.patch
similarity index 100%
rename from packages/gpe-plucker/gpe-plucker-0.1/fix_makefiles.patch
rename to packages/damageext/damageext-1.0/autofoo.patch

diff --git a/packages/damageext/damageext_1.0.bb b/packages/damageext/damageext_1.0.bb
index e69de29..61396e1 100644 (file)
--- a/packages/damageext/damageext_1.0.bb
+++ b/packages/damageext/damageext_1.0.bb
@@ -0,0 +1,18 @@
+SECTION = "libs"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xextensions fixesext"
+DESCRIPTION = "X Damage extension headers and specification"
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/damageext-${PV}.tar.bz2 \
+          file://autofoo.patch;patch=1"
+
+inherit autotools pkgconfig
+
+do_stage() {
+       oe_runmake install prefix=${STAGING_DIR} \
+              bindir=${STAGING_BINDIR} \
+              includedir=${STAGING_INCDIR} \
+              libdir=${STAGING_LIBDIR} \
+              datadir=${STAGING_DATADIR}
+}

diff --git a/packages/damageext/damageext_cvs.bb b/packages/damageext/damageext_cvs.bb
index e69de29..be03e12 100644 (file)
--- a/packages/damageext/damageext_cvs.bb
+++ b/packages/damageext/damageext_cvs.bb
@@ -0,0 +1,20 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xextensions fixesext"
+DESCRIPTION = "X Damage extension headers and specification"
+PR = "r1"
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=DamageExt \
+          file://autofoo.patch;patch=1"
+S = "${WORKDIR}/DamageExt"
+
+inherit autotools pkgconfig
+
+do_stage() {
+       oe_runmake install prefix=${STAGING_DIR} \
+              bindir=${STAGING_BINDIR} \
+              includedir=${STAGING_INCDIR} \
+              libdir=${STAGING_LIBDIR} \
+              datadir=${STAGING_DATADIR}
+}

diff --git a/packages/gpsd/gpsd-1.10-r0/gcc3.patch b/packages/damageext/files/autofoo.patch
similarity index 100%
rename from packages/gpsd/gpsd-1.10-r0/gcc3.patch
rename to packages/damageext/files/autofoo.patch

diff --git a/packages/gpsd/gpsd-1.10-r0/gcc34.patch b/packages/genext2fs/genext2fs-native_1.3+cvs.bb
similarity index 100%
rename from packages/gpsd/gpsd-1.10-r0/gcc34.patch
rename to packages/genext2fs/genext2fs-native_1.3+cvs.bb

diff --git a/packages/gpsd/gpsd-1.10-r0/gpsdc.patch b/packages/genext2fs/genext2fs.inc
similarity index 100%
rename from packages/gpsd/gpsd-1.10-r0/gpsdc.patch
rename to packages/genext2fs/genext2fs.inc

diff --git a/packages/gpsd/gpsd-1.10-r0/nmea-fix.patch b/packages/genext2fs/genext2fs_1.3+cvs.bb
similarity index 100%
rename from packages/gpsd/gpsd-1.10-r0/nmea-fix.patch
rename to packages/genext2fs/genext2fs_1.3+cvs.bb

diff --git a/packages/genext2fs/genext2fs_1.3.bb b/packages/genext2fs/genext2fs_1.3.bb
index e69de29..d32d17a 100644 (file)
--- a/packages/genext2fs/genext2fs_1.3.bb
+++ b/packages/genext2fs/genext2fs_1.3.bb
@@ -0,0 +1,15 @@
+include genext2fs.inc
+
+PR = "r3"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/g/genext2fs/genext2fs_${PV}.orig.tar.gz \
+          file://misc.patch;patch=1"
+S = "${WORKDIR}/genext2fs-${PV}.orig"
+
+do_compile () {
+       oe_runmake
+}      
+
+do_install () {
+       oe_runmake 'DESTDIR=${D}' install
+}

diff --git a/packages/gpsd/gpsd-2.4/2.6-kernel-headers.patch b/packages/gpe-plucker/gpe-plucker/fix_makefiles.patch
similarity index 100%
rename from packages/gpsd/gpsd-2.4/2.6-kernel-headers.patch
rename to packages/gpe-plucker/gpe-plucker/fix_makefiles.patch

diff --git a/packages/gpsd/gpsd-qpegps-0.9.2/gcc3.patch b/packages/gpe-plucker/gpe-plucker_0.2.bb
similarity index 100%
rename from packages/gpsd/gpsd-qpegps-0.9.2/gcc3.patch
rename to packages/gpe-plucker/gpe-plucker_0.2.bb

diff --git a/packages/gpsd/gpsd_2.6.bb b/packages/gpsd/gpsd_2.6.bb
index e69de29..cfa95b4 100644 (file)
--- a/packages/gpsd/gpsd_2.6.bb
+++ b/packages/gpsd/gpsd_2.6.bb
@@ -0,0 +1,50 @@
+DESCRIPTION = "A TCP/IP Daemon simplifying the communication with GPS devices"
+SECTION = "net"
+PRIORITY = "optional"
+MAINTAINER = "Robert Anderson <rea@sr.unh.edu>"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://ftp.berlios.de/gpsd/gpsd-${PV}.tar.gz"
+
+inherit autotools updater-rc.d
+
+INITSCRIPT_NAME = "gpsd"
+INITSCRIPT_PARAMS = "defaults 35"
+
+LDFLAGS = -lm
+
+do_configure() {
+       oe_runconf 
+}
+
+do_compile() {
+       oe_runmake gpsd gpsd.1 libgps.3 libgpsd.3 gps.h gpsd.h
+}
+
+do_stage () {
+       oe_libinstall -so -C ${S}/.libs libgps ${STAGING_LIBDIR}
+       install -m 0655 ${S}/libgps.la ${STAGING_LIBDIR}
+       install -m 0655 ${S}/gps.h ${STAGING_INCDIR}
+       install -m 0655 ${S}/gpsd.h ${STAGING_INCDIR}
+}
+
+do_install () {
+       install -d ${D}/${sbindir}
+       install -d ${D}/${datadir}/man/man1
+       install -d ${D}/${datadir}/man/man3
+       install -d ${D}/${incdir}
+       install -d ${D}/${libdir}
+       install -d ${D}/${sysconfdir}/init.d
+
+       install -m 0755 ${S}/.libs/gpsd ${D}${sbindir}
+       oe_libinstall -so -C ${S}/.libs libgps ${D}${libdir}
+       install -m 755 gpsd.1 ${D}/usr/share/man/man1/gpsd.1
+       install -m 0755 ${S}/libgps.la ${D}${libdir}libgps.la
+       install -m 0755 ${S}/gps.h ${S}/gpsd.h ${D}/${incdir}
+       install -m 755 libgps.3 libgpsd.3 ${D}/${datadir}/man/man3/
+       install -m 755 gpsd.init ${D}${sysconfdir}/init.d/gpsd
+}
+
+PACKAGES =+ "gpsd-devdoc "
+FILES_${PN}-devdoc = "${datadir}/man/man3 "

diff --git a/packages/gpsd/gpsd-qpegps-0.9.2/nmea-fix.patch b/packages/gtk2-theme-angelistic/gtk2-theme-angelistic-0.3/gtkrc-global
similarity index 100%
rename from packages/gpsd/gpsd-qpegps-0.9.2/nmea-fix.patch
rename to packages/gtk2-theme-angelistic/gtk2-theme-angelistic-0.3/gtkrc-global

diff --git a/packages/gtk2-theme-angelistic/gtk2-theme-angelistic_0.3.bb b/packages/gtk2-theme-angelistic/gtk2-theme-angelistic_0.3.bb
index e69de29..c5e2fc1 100644 (file)
--- a/packages/gtk2-theme-angelistic/gtk2-theme-angelistic_0.3.bb
+++ b/packages/gtk2-theme-angelistic/gtk2-theme-angelistic_0.3.bb
@@ -0,0 +1,15 @@
+SECTION = "x11/base"
+SRC_URI = "file://gtkrc file://gtkrc-global"
+DEPENDS = "gnome-themes"
+RDEPENDS = "gtk-engine-mist"
+PR = "r1"
+
+FILES_${PN} += "${datadir}/themes"
+
+do_install() {
+       install -d ${D}${datadir}/themes/Angelistic/gtk-2.0
+       install -m 0644 ${WORKDIR}/gtkrc ${D}${datadir}/themes/Angelistic/gtk-2.0/
+
+       install -d ${D}${sysconfdir}/gtk-2.0
+       install -m 0644 ${WORKDIR}/gtkrc-global ${D}${sysconfdir}/gtk-2.0/gtkrc
+}

diff --git a/packages/libxrandr/files/autofoo.patch b/packages/libxrandr/files/autofoo.patch
index e69de29..7b1db76 100644 (file)
--- a/packages/libxrandr/files/autofoo.patch
+++ b/packages/libxrandr/files/autofoo.patch
@@ -0,0 +1,30 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- Xrandr/configure.ac~autofoo.patch  2004-07-01 15:01:55.000000000 -0400
++++ Xrandr/configure.ac        2005-01-16 11:22:09.169651616 -0500
+@@ -33,11 +33,11 @@
+ dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
+ dnl
+ AC_INIT(libXrandr, 1.0.2, [keithp@keithp.com], libXrandr)
++AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Check for progs
+ AC_PROG_CC
+--- Xrandr/ChangeLog~autofoo.patch     2004-09-19 04:53:38.000000000 -0400
++++ Xrandr/ChangeLog   2005-01-16 11:52:29.694889712 -0500
+@@ -1,3 +1,7 @@
++2005-01-16  Chris Larson <kergoth@handhelds.org>
++
++      * configure.ac: Fix to work with automake 1.9.x.
++
+ 2004-09-19  Carlos Romero  <kidcrash@freedesktop.org>
+ 
+       * Makefile.am:

diff --git a/packages/gpsd/gpsd_1.10.bb b/packages/libxrandr/libxrandr-1.0.2/autofoo.patch
similarity index 100%
rename from packages/gpsd/gpsd_1.10.bb
rename to packages/libxrandr/libxrandr-1.0.2/autofoo.patch

diff --git a/packages/python/python-pylinda-0.4/honor-datadir.patch b/packages/python/python-pylinda/honor-datadir.patch
similarity index 100%
rename from packages/python/python-pylinda-0.4/honor-datadir.patch
rename to packages/python/python-pylinda/honor-datadir.patch

diff --git a/packages/python/python-pylinda_0.4.bb b/packages/python/python-pylinda_0.4.bb
index e69de29..788db86 100644 (file)
--- a/packages/python/python-pylinda_0.4.bb
+++ b/packages/python/python-pylinda_0.4.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Python Implementation of Linda Tuple Space"
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "LGPL"
+SRCNAME = "linda"
+
+SRC_URI = "http://www-users.cs.york.ac.uk/~aw/pylinda/dist/linda-${PV}.tar.gz \
+           file://honor-datadir.patch;patch=1"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils

diff --git a/packages/gpsd/gpsd_2.4.bb b/packages/xfont/files/autofoo.patch
similarity index 100%
rename from packages/gpsd/gpsd_2.4.bb
rename to packages/xfont/files/autofoo.patch

diff --git a/packages/xfont/xfont_1.4.2.bb b/packages/xfont/xfont_1.4.2.bb
index a709e86..187d355 100644 (file)
--- a/packages/xfont/xfont_1.4.2.bb
+++ b/packages/xfont/xfont_1.4.2.bb
@@ -3,10 +3,11 @@ PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto xtrans zlib"
 DESCRIPTION = "X font library (used by the X server)."
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${XLIBS_MIRROR}/libXfont-${PV}.tar.bz2 \
-       file://scalable.patch;patch=1"
+       file://scalable.patch;patch=1 \
+       file://autofoo.patch;patch=1"
 S = "${WORKDIR}/libXfont-${PV}"
 
 inherit autotools pkgconfig