diff options
| author | Chris Lord <chris@openedhand.com> | 2004-09-21 00:16:40 +0000 |
|---|---|---|
| committer | Chris Lord <chris@openedhand.com> | 2004-09-21 00:16:40 +0000 |
| commit | 251f9f665f113e658478cf7441e0eb158382b74b (patch) | |
| tree | 8d469ca69a4d048cb66cb657d602f49413574786 | |
| parent | a0d9c5d2964c122a0ecdd508d54e2e12d3ea5462 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into chris.(none):/home/cwiiis/oe/packages
2004/09/21 01:08:29+01:00 (none)!cwiiis
Add gpe-nmf 0.19 and update other packages in relation to it.
2004/09/20 21:33:13+01:00 (none)!cwiiis
Add xdemineur and modify OZ/image files.
BKrev: 414f72e8nEGJ69_B7HNn1N-hWTj3sA
| -rw-r--r-- | conf/openzaurus-3.5.1.conf | 3 | ||||
| -rw-r--r-- | gpe-nmf/gpe-nmf_0.19.oe | 0 | ||||
| -rw-r--r-- | gstreamer/gpe-gst-plugins_0.8.4.oe | 8 | ||||
| -rw-r--r-- | meta/meta-gpe.oe | 3 | ||||
| -rw-r--r-- | xdemineur/xdemineur-2.1.1/Makefile | 0 | ||||
| -rw-r--r-- | xdemineur/xdemineur_2.1.1.oe | 0 |
6 files changed, 10 insertions, 4 deletions
diff --git a/conf/openzaurus-3.5.1.conf b/conf/openzaurus-3.5.1.conf index c26bf2b2aa..6131526845 100644 --- a/conf/openzaurus-3.5.1.conf +++ b/conf/openzaurus-3.5.1.conf @@ -268,10 +268,13 @@ PREFERRED_VERSION_gpe-filemanager = "0.20" PREFERRED_VERSION_gpe-go = "0.05" PREFERRED_VERSION_gpe-irc = "0.07" PREFERRED_VERSION_gpe-lights = "0.12" +PREFERRED_VERSION_gpe-nmf = "0.19" PREFERRED_VERSION_gpe-othello = "0.2-1" PREFERRED_VERSION_gpe-plucker = "0.1" PREFERRED_VERSION_gpe-session-scripts = "0.61" PREFERRED_VERSION_gpe-tetris = "0.6-2" +PREFERRED_VERSION_gsoko = "0.4.2-gpe5" +PREFERRED_VERSION_xdemineur = "2.1.1" PREFERRED_VERSION_matchbox-panel-hacks = "0.3-1" PREFERRED_VERSION_rosetta = "0.0cvs${CVSDATE}" PREFERRED_VERSION_dillo2 = "0.6.6" diff --git a/gpe-nmf/gpe-nmf_0.19.oe b/gpe-nmf/gpe-nmf_0.19.oe new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/gpe-nmf/gpe-nmf_0.19.oe diff --git a/gstreamer/gpe-gst-plugins_0.8.4.oe b/gstreamer/gpe-gst-plugins_0.8.4.oe index 84f07b642c..77061dde96 100644 --- a/gstreamer/gpe-gst-plugins_0.8.4.oe +++ b/gstreamer/gpe-gst-plugins_0.8.4.oe @@ -3,9 +3,9 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Chris Lord <cwiiis@handhelds.org>" PROVIDES = "gst-plugins" -PR = "r1" +PR = "r2" -DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf gnome-vfs" +DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf" SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-${PV}.tar.bz2 \ file://ivorbis.patch;patch=1 \ @@ -21,7 +21,6 @@ EXTRA_OECONF = "--disable-docs-build \ --disable-arts \ --disable-artsc \ --disable-audiofile \ - --disable-cdparanoia \ --disable-dirac \ --disable-divx \ --disable-dts \ @@ -29,6 +28,7 @@ EXTRA_OECONF = "--disable-docs-build \ --disable-dvdnav \ --disable-faac \ --disable-faad \ + --disable-gnome_vfs \ --disable-gsm \ --disable-hermes \ --disable-jack \ @@ -47,6 +47,8 @@ EXTRA_OECONF = "--disable-docs-build \ --disable-mplex \ --disable-musicbrainz \ --disable-nas \ + --disable-opengl \ + --disable-oss \ --disable-pango \ --disable-raw1394 \ --disable-sdl \ diff --git a/meta/meta-gpe.oe b/meta/meta-gpe.oe index d4eb064318..ff28335be0 100644 --- a/meta/meta-gpe.oe +++ b/meta/meta-gpe.oe @@ -82,7 +82,8 @@ gpe-task-games = "\ gpe-lights \ gpe-othello \ gpe-tetris \ - gsoko" + gsoko \ + xdemineur" RDEPENDS_gpe-task-games := "${gpe-task-games}" DEPENDS += " ${gpe-task-games}" diff --git a/xdemineur/xdemineur-2.1.1/Makefile b/xdemineur/xdemineur-2.1.1/Makefile new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/xdemineur/xdemineur-2.1.1/Makefile diff --git a/xdemineur/xdemineur_2.1.1.oe b/xdemineur/xdemineur_2.1.1.oe new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/xdemineur/xdemineur_2.1.1.oe |