orrery: bump 2.4 recipe to 2.7

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>

diff --git a/recipes/orrery/files/orrery.png b/recipes/orrery/files/orrery.png
new file mode 100644 (file)
index 0000000..d9865b7
Binary files /dev/null and b/recipes/orrery/files/orrery.png differ

diff --git a/recipes/orrery/orrery/Makefile.am.patch b/recipes/orrery/orrery/Makefile.am.patch
deleted file mode 100644 (file)
index 23e7798..0000000
--- a/recipes/orrery/orrery/Makefile.am.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-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
deleted file mode 100644 (file)
index 7a3c204..0000000
--- a/recipes/orrery/orrery/datadir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644 (file)
index dc56229..0000000
--- a/recipes/orrery/orrery_2.4.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-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/orrery/orrery_2.7.bb b/recipes/orrery/orrery_2.7.bb
new file mode 100644 (file)
index 0000000..7b93ee9
--- /dev/null
+++ b/recipes/orrery/orrery_2.7.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Astronomical application which displays the night sky"
+HOMEPAGE    = "http://projects.openmoko.org/projects/orrery/"
+SECTION = "x11/scientific"
+PV = "2.7"
+PR = "r0"
+inherit autotools
+
+SRC_URI = "http://projects.openmoko.org/frs/download.php/923/orrery_2.7_clean.tar.gz;name=tarball \
+           file://orrery.png \
+          "
+
+SRC_URI[tarball.md5sum]    = "bd62a33e7554ee1030313dfcdefcda8b"
+SRC_URI[tarball.sha256sum] = "645166a5e05b2064ab630534a514697fc47b681951e7fe1d635c259cbdf7a5e6"
+S = "${WORKDIR}/orrery"
+
+do_install_append() {
+                   install -d ${D}${datadir}/orrery
+                   cp -a ${S}/data/* ${D}${datadir}/orrery
+                   install -d ${D}${datadir}/icons
+                   install -m 0755 ${WORKDIR}/orrery.png ${D}${datadir}/icons
+}
+
+FILES_${PN} += "\
+           ${datadir}/icons/orrery.png"
+