Merge http://openembedded@openembedded.bkbits.net/packages

into mnz66.mn-logistik.de:/usr/src/ramses/oe/packages

2004/09/21 11:30:28+01:00 (none)!cwiiis
Add gpe-soundbite and libgsm, courtesy of bedboi.

2004/09/21 09:49:04+01:00 (none)!cwiiis
Add missing DEPEND on libgnomeui for gnome-desktop (lets meta-gpe build now :)).

BKrev: 41500818q6Vd2QWYH4Q5h93zyoEUHw

diff --git a/conf/openzaurus-3.5.1.conf b/conf/openzaurus-3.5.1.conf
index 6131526..ac113c7 100644 (file)
--- a/conf/openzaurus-3.5.1.conf
+++ b/conf/openzaurus-3.5.1.conf
@@ -227,6 +227,7 @@ PREFERRED_VERSION_libgpepimc = "0.3"
 PREFERRED_VERSION_libgpevtype = "0.4"
 PREFERRED_VERSION_libschedule = "0.13"
 PREFERRED_VERSION_gpe-icons = "0.22"
+PREFERRED_VERSION_libgsm = "1.0.10"
 PREFERRED_VERSION_diet-x11 = "6.2.1"
 PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1"
 PREFERRED_VERSION_rxvt-unicode = "3.7"
@@ -261,6 +262,7 @@ PREFERRED_VERSION_gpe-edit = "0.28"
 PREFERRED_VERSION_gpe-gallery = "0.95"
 PREFERRED_VERSION_gpe-calculator = "0.2"
 PREFERRED_VERSION_gpe-package = "0.0.12"
+PREFERRED_VERSION_gpe-soundbite = "1.0.5"
 PREFERRED_VERSION_gpe-terminal = "1.1"
 PREFERRED_VERSION_gpe-watch = "0.10"
 PREFERRED_VERSION_gpe-what = "0.31"

diff --git a/gnome/gnome-desktop_2.7.90.oe b/gnome/gnome-desktop_2.7.90.oe
index e69de29..033d90a 100644 (file)
--- a/gnome/gnome-desktop_2.7.90.oe
+++ b/gnome/gnome-desktop_2.7.90.oe
@@ -0,0 +1,22 @@
+PR = "r0"
+DESCRIPTION = "GNOME library for reading .desktop files"
+inherit gnome
+
+DEPENDS = "gnome-common libgnomeui"
+
+EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros"
+
+do_configure_prepend () {
+       cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}
+}
+
+do_stage () {
+       install -d ${STAGING_INCDIR}/gnome-desktop-2.0/libgnome/
+#      install -d ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/
+       install -m 0644 libgnome-desktop/libgnome/gnome-desktop-item.h ${STAGING_INCDIR}/gnome-desktop-2.0/libgnome/
+#      install -m 0644 libgnome-desktop/libgnomeui/gnome-ditem-edit.h ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/
+#      install -m 0644 libgnome-desktop/libgnomeui/gnome-hint.h ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/
+       oe_libinstall -C libgnome-desktop/.libs -so libgnome-desktop-2 ${STAGING_LIBDIR}
+       
+ 
+}

diff --git a/gpe-soundbite/gpe-soundbite_1.0.5.oe b/gpe-soundbite/gpe-soundbite_1.0.5.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/libgsm/libgsm-1.0.10/libgsm_patch b/libgsm/libgsm-1.0.10/libgsm_patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/libgsm/libgsm_1.0.10.oe b/libgsm/libgsm_1.0.10.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/meta/meta-gpe.oe b/meta/meta-gpe.oe
index ff28335..c8bb4b1 100644 (file)
--- a/meta/meta-gpe.oe
+++ b/meta/meta-gpe.oe
@@ -67,6 +67,7 @@ gpe-task-apps = "\
     gpe-nmf \
     gpe-package \
     gpe-plucker \
+    gpe-soundbite \
     gpe-terminal \
     gpe-watch \
     gpe-what \

diff --git a/nonworking/gxine/gxine_0.3.3.oe b/nonworking/gxine/gxine_0.3.3.oe
index e69de29..aa6fbe9 100644 (file)
--- a/nonworking/gxine/gxine_0.3.3.oe
+++ b/nonworking/gxine/gxine_0.3.3.oe
@@ -0,0 +1,10 @@
+DESCRIPTION = "gxine is a front-end for libxine."
+MAINTAINER = "Chris Lord <cwiiis@blueyonder.co.uk>"
+DEPENDS = "gtk+ libxine"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/xine/${PN}-${PV}.tar.gz"
+
+EXTRA_OECONF = " --disable-xinetest"
+
+inherit autotools pkgconfig
+