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

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

2005/01/02 00:09:43+01:00 handhelds.org!CoreDump
Bump PR

2005/01/02 00:07:10+01:00 handhelds.org!CoreDump
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded

2005/01/02 00:06:44+01:00 handhelds.org!CoreDump
prboom creates a bad config if launched w/o iwad file

2005/01/01 22:46:15+00:00 nexus.co.uk!pb
reinstate lost ${sysconfdir} in FILES_gtk+

BKrev: 41d734d75fyfVmKGMI_SN4EGsKojKQ

diff --git a/packages/gtk+/gtk+_2.4.13.bb b/packages/gtk+/gtk+_2.4.13.bb
index dfc835c..baaff5c 100644 (file)
--- a/packages/gtk+/gtk+_2.4.13.bb
+++ b/packages/gtk+/gtk+_2.4.13.bb
@@ -6,7 +6,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \
            file://no-demos.patch;patch=1 \
@@ -35,7 +35,7 @@ do_configure_prepend() {
 FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
        ${bindir}/gtk-query-immodules-2.0 \
        ${libdir}/lib*.so.* \
-       ${datadir}/themes"
+       ${datadir}/themes ${sysconfdir}"
 FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
 
 RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1"

diff --git a/packages/gtk+/gtk+_2.6.0.bb b/packages/gtk+/gtk+_2.6.0.bb
index e69de29..c812d86 100644 (file)
--- a/packages/gtk+/gtk+_2.6.0.bb
+++ b/packages/gtk+/gtk+_2.6.0.bb
@@ -0,0 +1,72 @@
+LICENSE = LGPL
+DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
+set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
+HOMEPAGE = "http://www.gtk.org"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc"
+PR = "r2"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
+           file://no-demos.patch;patch=1 \
+           file://no-xwc.patch;patch=1;pnum=0 \
+           file://automake-lossage.patch;patch=1 \
+           file://gtk+-handhelds.patch;patch=1 \
+          file://spinbutton.patch;patch=1 \
+          file://hardcoded_libtool.patch;patch=1 \
+          file://disable-tooltips.patch;patch=1 \
+          file://gtklabel-resize-patch;patch=1 \
+          file://menu-deactivate.patch;patch=1 \
+          file://error-dialog.patch;patch=1 \
+          file://xsettings.patch;patch=1 \
+          file://scroll-timings.patch;patch=1 \
+          file://small-gtkfilesel.patch;patch=1 \
+          file://single-click.patch;patch=1"
+
+inherit autotools pkgconfig flow-lossage
+
+FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
+       ${bindir}/gtk-query-immodules-2.0 \
+       ${libdir}/lib*.so.* \
+       ${datadir}/themes ${sysconfdir}"
+FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
+
+RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1"
+
+EXTRA_OECONF = "--without-libtiff --disable-xkb"
+# --disable-cruft
+
+LIBV = "2.4.0"
+
+do_stage () {
+       oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
+
+       autotools_stage_includes
+
+       mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
+       install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
+
+       install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+do_install_append () {
+       install -d ${D}/etc/gtk-2.0
+}
+
+python populate_packages_prepend () {
+       import os.path
+
+       gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
+       loaders_root = os.path.join(gtk_libdir, 'loaders')
+       immodules_root = os.path.join(gtk_libdir, 'immodules')
+
+       do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
+       do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
+
+        if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+                bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
+}

diff --git a/packages/prboom/files/prboom.sh b/packages/prboom/files/prboom.sh
index 0bc43ba..53ffd4f 100644 (file)
--- a/packages/prboom/files/prboom.sh
+++ b/packages/prboom/files/prboom.sh
@@ -2,13 +2,10 @@
 
 model="`cat /proc/cpuinfo | sed -n "/Hardware/s/.*\:\ \(.*\)/\1/p"`"
 
-if ! test -d "$HOME/.prboom"
-then
-       case $model in
-       *Collie)        par="-height 240";;
-       *)              par="";;
-       esac
-fi
+case $model in
+*Collie)       par="-height 240";;
+*)             par="";;
+esac
 
 echo "Model: [$model]"
 echo "Launching prboom $par $*"

diff --git a/packages/prboom/prboom-opie_2.2.6.bb b/packages/prboom/prboom-opie_2.2.6.bb
index 1f59e9e..3c32b75 100644 (file)
--- a/packages/prboom/prboom-opie_2.2.6.bb
+++ b/packages/prboom/prboom-opie_2.2.6.bb
@@ -1,6 +1,6 @@
 include prboom_${PV}.bb
 
-PR = "r3"
+PR = "r4"
 
 S = "${WORKDIR}/prboom-${PV}"