diff options
author | Graeme Gregory <dp@openmoko.hyboria> | 2008-10-16 15:38:09 +0100 |
---|---|---|
committer | Graeme Gregory <dp@openmoko.hyboria> | 2008-10-16 15:38:09 +0100 |
commit | 318a879dbf9b1eb7be921d94b1ad3abc486430ee (patch) | |
tree | a14abc4b987a29010d5d824c62863e5bd9855e39 /packages | |
parent | 7d340cfc052acf1501e11c10826f8e8279593f9e (diff) | |
parent | a9ec52021c385ef43c5748a31b4523f3d613639f (diff) |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages')
-rw-r--r-- | packages/e17/illume-theme-illume_svn.bb | 33 | ||||
-rw-r--r-- | packages/gimp/gimp.inc | 9 | ||||
-rw-r--r-- | packages/gimp/gimp_2.6.0.bb | 8 | ||||
-rw-r--r-- | packages/gtk+/gtk+-1.2_1.2.10.bb | 1 | ||||
-rw-r--r-- | packages/libsdl/ballfield_1.0.bb | 8 | ||||
-rw-r--r-- | packages/tasks/task-x11-illume.bb | 27 | ||||
-rw-r--r-- | packages/tasks/task-x11.bb | 36 | ||||
-rw-r--r-- | packages/xmms/xmms_1.2.10.bb | 4 |
8 files changed, 125 insertions, 1 deletions
diff --git a/packages/e17/illume-theme-illume_svn.bb b/packages/e17/illume-theme-illume_svn.bb new file mode 100644 index 0000000000..eb313e074c --- /dev/null +++ b/packages/e17/illume-theme-illume_svn.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Illume theme for Illume E module" +HOMEPAGE = "http://www.enlightenment.org/" +LICENSE = "MIT/BSD" +DEPENDS = "edje-native eet-native" +PV = "0.0+${PR}-svnr${SRCREV}" +PR = "r1" + +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=THEMES/b_and_w;proto=http" +S = "${WORKDIR}/THEMES/b_and_w" + +do_compile() { + edje_cc illume.edc + edje_cc illume_init.edc +} + +do_install() { + install -d ${D}${sysconfdir}/enlightenment + install -d ${D}${datadir}/enlightenment/data/themes/ + install -d ${D}${datadir}/enlightenment/data/init/ + + # FIXME: hack. should modify profile.cfg and nto use enlightenment_start.oe + echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile + + install -m 0644 ${S}/illume.edj ${D}${datadir}/enlightenment/data/themes/ + install -m 0644 ${S}/illume_init.edj ${D}${datadir}/enlightenment/data/init/ +} + +RPROVIDES_${PN} = "illume-theme" +CONFFILES_${PN} = "${sysconfdir}/enlightenment/default_profile" +FILES_${PN} = "${sysconfdir}/enlightenment ${datadir}/enlightenment" + +PACKAGE_ARCH_${PN} = "all" + diff --git a/packages/gimp/gimp.inc b/packages/gimp/gimp.inc index 171ac79786..b62f544fea 100644 --- a/packages/gimp/gimp.inc +++ b/packages/gimp/gimp.inc @@ -29,7 +29,14 @@ do_stage() { autotools_stage_all } -FILES_${PN} += "${datadir}/icons \ +python populate_packages_prepend () { + cv_libdir = bb.data.expand('${libdir}', d) + do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'GIMP %s library', extra_depends='', allow_links=True) +} + +FILES_${PN} = "${bindir} ${sysconfdir} ${datadir}/gimp* ${libdir}/gimp* \ + ${datadir}/applications \ + ${datadir}/icons \ ${datadir}/mime-info \ ${datadir}/application-registry " diff --git a/packages/gimp/gimp_2.6.0.bb b/packages/gimp/gimp_2.6.0.bb new file mode 100644 index 0000000000..8470b6d5a8 --- /dev/null +++ b/packages/gimp/gimp_2.6.0.bb @@ -0,0 +1,8 @@ +require gimp.inc + +DEPENDS += "lcms gegl hal" + +SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-${PV}.tar.bz2 \ + " + + diff --git a/packages/gtk+/gtk+-1.2_1.2.10.bb b/packages/gtk+/gtk+-1.2_1.2.10.bb index 55e7ac69d8..aa9ba641d5 100644 --- a/packages/gtk+/gtk+-1.2_1.2.10.bb +++ b/packages/gtk+/gtk+-1.2_1.2.10.bb @@ -17,6 +17,7 @@ inherit autotools pkgconfig flow-lossage do_configure_prepend() { install -d m4 rm -f ltconfig libtool ltmain.sh aclocal.m4 + sed -i -e s:AM_LC_MESSAGES:gt_LC_MESSAGES:g acinclude.m4 } FILES_${PN} += "${datadir}/themes" diff --git a/packages/libsdl/ballfield_1.0.bb b/packages/libsdl/ballfield_1.0.bb new file mode 100644 index 0000000000..9b44be5516 --- /dev/null +++ b/packages/libsdl/ballfield_1.0.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "This is a cute little "3D" sprite demo using SDL and SDL_image." +DEPENDS = "vrtual/libsdl libsdl-image" +LICENSE = "GPLv2" + +SRC_URI = "http://olofson.net/download/ballfield-${PV}.tar.gz" + +inherit autotools + diff --git a/packages/tasks/task-x11-illume.bb b/packages/tasks/task-x11-illume.bb new file mode 100644 index 0000000000..a477c6e8c5 --- /dev/null +++ b/packages/tasks/task-x11-illume.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "The Illume Windowing Environment -- install this task to get the Enlightenment Window Manager + the Illume environment." +SECTION = "x11/wm" +LICENSE = "MIT" +PV = "1.0" +PR = "r0" + +# WORK IN PROGRESS + +inherit task + +# Default illume theme +ILLUME_THEME ?= "illume-theme-illume" + +RDEPENDS_${PN} = "\ + task-x11-server \ + task-x11-utils \ +# xserver-kdrive-splash-illume \ + \ + e-wm \ + illume \ + illume-config-illume \ + illume-dicts-english-us \ + illume-keyboards-default \ + illume-keyboards-numbers \ + illume-keyboards-terminal \ + ${ILLUME_THEME} \ +" diff --git a/packages/tasks/task-x11.bb b/packages/tasks/task-x11.bb new file mode 100644 index 0000000000..ad5ca3a412 --- /dev/null +++ b/packages/tasks/task-x11.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "The X Window System -- install this task to get a client/server based display multiplexer." +SECTION = "x11/server" +LICENSE = "MIT" +PV = "1.0" +PR = "r0" + +# WORK IN PROGRESS + +inherit task + +PACKAGES += "\ + ${PN}-server \ + ${PN}-utils \ +" + +RRECOMMENDS_${PN} = "\ + ${PN}-server \ + ${PN}-utils \ +" + +# Some machines don't set a *runtime* provider for X, so default to Xfbdev here +# virtual/xserver won't work, since the kdrive recipes will build multiple xserver packages +XSERVER ?= "xserver-kdrive-fbdev" + +RDEPENDS_${PN}-server = "\ + ${XSERVER} \ +" + +RDEPENDS_${PN}-utils = "\ + xserver-kdrive-common \ + xserver-nodm-init \ + xauth \ + xhost \ + xset \ + xrandr \ +" diff --git a/packages/xmms/xmms_1.2.10.bb b/packages/xmms/xmms_1.2.10.bb index 21b928192a..dfde697809 100644 --- a/packages/xmms/xmms_1.2.10.bb +++ b/packages/xmms/xmms_1.2.10.bb @@ -27,6 +27,10 @@ EXTRA_OECONF = "--disable-opengl --disable-esd \ do_configure_prepend() { cp ${WORKDIR}/acinclude.m4 ${S} rm ${S}/libxmms/acinclude.m4 || true + for i in $(find . -name "Makefile*") ; do + sed -i -e 's:MKINSTALLDIRS = @MKINSTALLDIRS@:MKINSTALLDIRS = @mkdir_p@:g' \ + -e 's:$(SHELL) $(MKINSTALLDIRS):$(MKINSTALLDIRS):g' $i + done } do_install_append() { |