diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-11-16 11:47:33 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-11-16 11:47:33 +0100 |
| commit | cd7588272584bb1dbc13d6245c79ce0760d0f913 (patch) | |
| tree | 558b2d9aa395e5fd650f0654bca487c422530409 | |
| parent | 0a77f5de9ca43b967092193f6bd2871ed20ddcfc (diff) | |
| parent | 5a7a77ca096895cd2abffa13bd7eeb461caf1b56 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | packages/cacao/cacao.inc | 2 | ||||
| -rw-r--r-- | packages/qt/qt-x11-free_3.3.7.bb | 2 | ||||
| -rw-r--r-- | packages/quake/quake2_svn.bb | 2 | ||||
| -rw-r--r-- | packages/sylpheed/sylpheed_2.5.0.bb | 32 |
5 files changed, 40 insertions, 2 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index ad2a11bb18..7aab221d49 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -18626,6 +18626,10 @@ sha256=c913105c740fe9cbbf7ab49f663acf5640b812995c2f9c716294f6b44a3185c4 md5=45e9e89775613b0afb732fbc11c73d26 sha256=72a6ab7c8a0baf0d1d432929c19a7d096335ba4adc43e40488b6a77e5995a0f5 +[http://sylpheed.good-day.net/sylpheed/v2.5/sylpheed-2.5.0.tar.bz2] +md5=a6fc9e9c2a33876fddb33f25f40b820f +sha256=d18a8dc51126e25c7677dd649b7499756278e1d82b7b888d37a10fb1d8d38761 + [http://www.logarithmic.net/pfh-files/synaesthesia/synaesthesia-2.4.tar.gz] md5=784105cbeed3ab209231675f0e029497 sha256=48505975e809ebadf416dc3e35a528ef87f01b117f2f1c5498d728ead8786493 diff --git a/packages/cacao/cacao.inc b/packages/cacao/cacao.inc index 7df6c3712e..c22bbffd50 100644 --- a/packages/cacao/cacao.inc +++ b/packages/cacao/cacao.inc @@ -14,6 +14,8 @@ RPROVIDES_cacao = "java2-runtime" inherit java autotools update-alternatives +ARM_INSTRUCTION_SET = "arm" + # Configure options compatible with Cacao >= 0.99 only! EXTRA_OECONF = "\ ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \ diff --git a/packages/qt/qt-x11-free_3.3.7.bb b/packages/qt/qt-x11-free_3.3.7.bb index d5df55cbb4..a2f5c0bcbf 100644 --- a/packages/qt/qt-x11-free_3.3.7.bb +++ b/packages/qt/qt-x11-free_3.3.7.bb @@ -1,4 +1,4 @@ -DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql mesa" +DEPENDS = "uicmoc3-native freetype virtual/libx11 libxmu xft libxext libxrender libxrandr libxcursor mysql mesa" PROVIDES = "qt3x11" PR = "r1" diff --git a/packages/quake/quake2_svn.bb b/packages/quake/quake2_svn.bb index 5ce56dc93b..31491ad419 100644 --- a/packages/quake/quake2_svn.bb +++ b/packages/quake/quake2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Icculus.org quake2 engine" LICENSE = "GPL" -DEPENDS = "libsdl-x11" +DEPENDS = "libsdl-x11 libxxf86dga" SRCREV = "205" PV = "0.16.1+svnr${SRCREV}" diff --git a/packages/sylpheed/sylpheed_2.5.0.bb b/packages/sylpheed/sylpheed_2.5.0.bb new file mode 100644 index 0000000000..94c51e4fce --- /dev/null +++ b/packages/sylpheed/sylpheed_2.5.0.bb @@ -0,0 +1,32 @@ +SECTION = "x11/network" +DESCRIPTION = "Mail user agent" +DEPENDS = "gtk+ gpgme gnutls" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.5/sylpheed-${PV}.tar.bz2 \ + " + +FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" +FILES_${PN}-doc += "${datadir}" + +EXTRA_OECONF = "--disable-ssl --enable-gnutls" + +CFLAGS += "-D_GNU_SOURCE" + +do_configure_prepend() { + mkdir -p m4 + for i in $(find ${S} -name "Makefile.am") ; do + sed -i s:'-I$(includedir)'::g $i + done +} + +inherit autotools + +do_install_append() { + install -d ${D}${datadir}/applications + install -m 0644 sylpheed.desktop ${D}${datadir}/applications/ + install -d ${D}${datadir}/pixmaps + install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/ +} + |