diff options
author | Angus Ainslie <nytowl@openmoko.org> | 2009-03-24 07:19:43 -0600 |
---|---|---|
committer | Jan Luebbe <jluebbe@debian.org> | 2009-03-26 11:35:13 +0100 |
commit | 0d1497b316172fc46fe8dd9303a20664fc145a42 (patch) | |
tree | d3fdd443e5c65268df451e8aea50b9345197e65c | |
parent | db00b7cd38ea58418e2a84274ca064a0e1abe55f (diff) | |
download | openembedded-0d1497b316172fc46fe8dd9303a20664fc145a42.tar.gz |
Add orrery to the feed
-rw-r--r-- | conf/checksums.ini | 4 | ||||
-rw-r--r-- | recipes/orrery/orrery/Makefile.am.patch | 67 | ||||
-rw-r--r-- | recipes/orrery/orrery/datadir.patch | 12 | ||||
-rw-r--r-- | recipes/orrery/orrery_2.4.bb | 26 | ||||
-rw-r--r-- | recipes/tasks/task-openmoko-feed.bb | 1 |
5 files changed, 110 insertions, 0 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index e598dd5fb6..305829ec5f 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -17438,6 +17438,10 @@ sha256=2997613ab33ad42dc8269a63b7c40a6938b3552e196780a4a269cc7340dd23bd md5=9613e6be14ba7a0ca5d42a88e6ed3516 sha256=45145ea27333be1552624065297b4d9d76feadf2a4a89fdf0ddafc830ced3a98 +[http://projects.openmoko.org/frs/download.php/581/orrery_2.4_clean.tar.gz] +md5=03da10cffda64a0927a1d929c20eb8f8 +sha256=0a8fd606d12b98e439a95d608c317849b7fe151dca8e1b8b3dee329a3a75292b + [http://download.savannah.nongnu.org/releases/linphone/ortp/sources/ortp-0.7.1.tar.gz] md5=e69ba3f5a2ac76e3b6117826d0c536b2 sha256=2f2fc74a13df58f560c40385cd78683c66623d7a8271cb17941a9de7be07d43f diff --git a/recipes/orrery/orrery/Makefile.am.patch b/recipes/orrery/orrery/Makefile.am.patch new file mode 100644 index 0000000000..23e7798139 --- /dev/null +++ b/recipes/orrery/orrery/Makefile.am.patch @@ -0,0 +1,67 @@ +Nur in files: aclocal.m4. +Nur in files.fixed: autogen.sh. +Nur in files: autom4te.cache. +Nur in files: configure. +diff -uri files/configure.in files.fixed/configure.in +--- files/configure.in 2008-08-17 05:32:06.000000000 +0200 ++++ files.fixed/configure.in 2009-02-18 16:01:30.102497178 +0100 +@@ -2,4 +2,13 @@ + AM_INIT_AUTOMAKE(orrery,1.1) + AC_PROG_CC + AC_PROG_INSTALL ++ ++PKG_CHECK_MODULES(GTK, gtk+-x11-2.0 gthread-2.0) ++PKG_CHECK_MODULES(X11, x11 xext xau xcursor xfixes xdmcp xrender) ++ ++AC_SUBST(GTK_CFLAGS) ++AC_SUBST(GTK_LIBS) ++AC_SUBST(X11_CFLAGS) ++AC_SUBST(X11_LIBS) ++ + AC_OUTPUT(Makefile) +Nur in files: depcomp. +Nur in files: install-sh. +diff -uri files/Makefile.am files.fixed/Makefile.am +--- files/Makefile.am 2008-09-03 08:54:55.000000000 +0200 ++++ files.fixed/Makefile.am 2009-02-18 16:14:19.574262603 +0100 +@@ -1,36 +1,4 @@ +-CFLAGS = -g -O3 -Wall +-CC = $(OM)/build/tmp/cross/arm-angstrom-linux-gnueabi/bin/gcc +-INCLUDES = -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/gtk-2.0/ \ +- -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/cairo/ \ +- -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/glib-2.0/ \ +- -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/pango-1.0/ \ +- -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/gtk-2.0/include \ +- -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/atk-1.0/ +-LDADD = $(OM)/build/tmp/rootfs/usr/lib/libgobject-2.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpangocairo-1.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpango-1.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libcairo.so.2 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgmodule-2.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libglib-2.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libfontconfig.so.1 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXext.so.6 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXrender.so.1 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpopt.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgthread-2.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libX11.so.6 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXcursor.so.1 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXfixes.so.3 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgdk_pixbuf-2.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpangoft2-1.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libz.so.1 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpng12.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libfreetype.so.6 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libexpat.so.1 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXau.so.6 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXdmcp.so.6 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgtk-x11-2.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libatk-1.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgcrypt.so.11.2.2 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgpg-error.so.0.3.0 + bin_PROGRAMS = orrery + orrery_SOURCES = planetInfo.c orrery.c ++orrery_CFLAGS = -g -O3 -Wall @GTK_CFLAGS@ @X11_CFLAGS@ ++orrery_LDADD = @GTK_LIBS@ @X11_LIBS@ -lpopt -lz -lexpat -lgcrypt -lgpg-error +Nur in files: Makefile.in. +Nur in files: missing. diff --git a/recipes/orrery/orrery/datadir.patch b/recipes/orrery/orrery/datadir.patch new file mode 100644 index 0000000000..7a3c204ad9 --- /dev/null +++ b/recipes/orrery/orrery/datadir.patch @@ -0,0 +1,12 @@ +diff -uri files/orrery.c files.datadir/orrery.c +--- files/orrery.c 2009-01-07 11:28:32.000000000 +0100 ++++ files.datadir/orrery.c 2009-02-18 19:08:44.887262837 +0100 +@@ -70,7 +70,7 @@ + + #define FULL_CIRCLE (23040) /* Full circle in calls to draw_arc */ + +-#define DATA_DIR "/media/card/orrery" ++#define DATA_DIR "/usr/share/orrery" + #define N_PLANETS (9) + #define N_SOLAR_SYSTEM_OBJECTS (10) + diff --git a/recipes/orrery/orrery_2.4.bb b/recipes/orrery/orrery_2.4.bb new file mode 100644 index 0000000000..dc5622946e --- /dev/null +++ b/recipes/orrery/orrery_2.4.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "orrery" +SECTION = "x11/scientific" +PV = "2.4" + +inherit autotools + +SRC_URI = "http://projects.openmoko.org/frs/download.php/581/orrery_2.4_clean.tar.gz \ + file://datadir.patch;patch=1 \ + file://Makefile.am.patch;patch=1" +S = "${WORKDIR}/files" + +do_install_append() { + install -d ${D}${datadir}/applications + install -m 0644 ${S}/orrery.desktop ${D}${datadir}/applications + install -d ${D}${datadir}/orrery + cp -a ${S}/data/* ${D}${datadir}/orrery + rm ${D}${datadir}/orrery/icons/orrery.png + install -d ${D}${datadir}/icons + install ${S}/data/icons/orrery.png ${D}${datadir}/icons +} + +FILES_${PN} += "\ + ${datadir}/applications/orrery.desktop \ + ${datadir}/orrery \ + ${datadir}/icons" + diff --git a/recipes/tasks/task-openmoko-feed.bb b/recipes/tasks/task-openmoko-feed.bb index 107b45bd04..a386eaa4b3 100644 --- a/recipes/tasks/task-openmoko-feed.bb +++ b/recipes/tasks/task-openmoko-feed.bb @@ -92,6 +92,7 @@ RDEPENDS_task-openmoko-feed = "\ # qtopia-phone-enable-debug \ git \ navit \ + orrery \ libnotify \ notification-daemon \ libxine \ |