From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../orrery/0001-orrery-Fix-sprintf-format.patch | 26 +++++++++ .../recipes-navigation/orrery/orrery/orrery.png | Bin 0 -> 19475 bytes .../orrery/orrery/use.GdkPixbuf.patch | 59 +++++++++++++++++++++ .../recipes-navigation/orrery/orrery_2.7.bb | 35 ++++++++++++ 4 files changed, 120 insertions(+) create mode 100644 meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch create mode 100644 meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/orrery.png create mode 100644 meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch create mode 100644 meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb (limited to 'meta-openembedded/meta-oe/recipes-navigation/orrery') diff --git a/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch new file mode 100644 index 0000000000..eb6241fdd0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch @@ -0,0 +1,26 @@ +From e600d3c09d2f97a197f86e6987d44d142e7b7cdf Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 27 Jun 2017 21:12:17 -0700 +Subject: [PATCH] orrery: Fix sprintf format + +Signed-off-by: Khem Raj +--- + orrery.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/orrery.c b/orrery.c +index e3a1f6d..1b31a9f 100644 +--- a/orrery.c ++++ b/orrery.c +@@ -3767,7 +3767,7 @@ static void drawOptsScreens(void) + displayWidth/2 - gdk_string_width(smallFont, scratchString)/2, + 12, scratchString); + for (day = 0; day < 7; day++) { +- sprintf(scratchString, dayName[day]); ++ sprintf(scratchString, "%s", dayName[day]); + gdk_draw_string(pixmap, smallFont, blueGC, + CAL_DAY_WIDTH/2 + day*CAL_DAY_WIDTH + CAL_LEFT_OFFSET - + gdk_string_width(smallFont, scratchString)/2, +-- +2.13.2 + diff --git a/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/orrery.png b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/orrery.png new file mode 100644 index 0000000000..d9865b70ce Binary files /dev/null and b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/orrery.png differ diff --git a/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch new file mode 100644 index 0000000000..92d194de08 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch @@ -0,0 +1,59 @@ +From: Benjamin Deering +Subject: orrery crashing X +Date: Thursday, September 2, 2010 - 5:25 pm +Link: http://kerneltrap.org/mailarchive/openmoko-community/2010/9/3/13218 + +diff -uNr orrery.orig//orrery.c orrery/orrery.c +--- orrery.orig//orrery.c 2009-11-30 06:59:44.000000000 +0100 ++++ orrery/orrery.c 2010-11-15 22:33:17.000000000 +0100 +@@ -1238,12 +1238,44 @@ + } + currentEntry = currentEntry->forwardPointer; + } +- if (nDarkGreyPoints > 0) +- gdk_draw_points(pixmap, darkGreyGC, darkGreyPoints, nDarkGreyPoints); +- if (nGreyPoints > 0) +- gdk_draw_points(pixmap, greyGC, greyPoints, nGreyPoints); +- if (nWhitePoints > 0) +- gdk_draw_points(pixmap, whiteGC, whitePoints, nWhitePoints); ++ GdkPixbuf* starDrawingBuf = gdk_pixbuf_get_from_drawable( NULL, ++ pixmap, ++ gdk_colormap_get_system() ++ , 0, 0, 0, 0, displayWidth, displayHeight); ++ g_assert (gdk_pixbuf_get_bits_per_sample (starDrawingBuf) == 8); ++ guchar* p; ++ int rowstride = gdk_pixbuf_get_rowstride (starDrawingBuf); ++ guchar* pixels = gdk_pixbuf_get_pixels (starDrawingBuf); ++ int n_channels = gdk_pixbuf_get_n_channels (starDrawingBuf); ++ GdkGCValues starGCval; ++ GdkColor starColor; ++ int pointNum; ++ gdk_gc_get_values(darkGreyGC, &starGCval); ++ gdk_colormap_query_color( gdk_gc_get_colormap(darkGreyGC),starGCval.foreground.pixel, &starColor ); ++ for( pointNum = 0; pointNum < nDarkGreyPoints; pointNum++) { ++ p = pixels + darkGreyPoints[pointNum].y * rowstride + darkGreyPoints[pointNum].x * n_channels; ++ p[0] = starColor.red & 0xff; ++ p[1] = starColor.green & 0xff; ++ p[2] = starColor.blue & 0xff; ++ } ++ gdk_gc_get_values(greyGC, &starGCval); ++ gdk_colormap_query_color( gdk_gc_get_colormap(greyGC), starGCval.foreground.pixel, &starColor ); ++ for( pointNum = 0; pointNum < nGreyPoints; pointNum++) { ++ p = pixels + greyPoints[pointNum].y * rowstride + greyPoints[pointNum].x * n_channels; ++ p[0] = starColor.red & 0xff; ++ p[1] = starColor.green & 0xff; ++ p[2] = starColor.blue & 0xff; ++ } ++ gdk_gc_get_values(whiteGC, &starGCval); ++ gdk_colormap_query_color( gdk_gc_get_colormap(whiteGC), starGCval.foreground.pixel, &starColor ); ++ for( pointNum = 0; pointNum < nWhitePoints; pointNum++) { ++ p = pixels + whitePoints[pointNum].y * rowstride + whitePoints[pointNum].x * n_channels; ++ p[0] = starColor.red & 0xff; ++ p[1] = starColor.green & 0xff; ++ p[2] = starColor.blue & 0xff; ++ } ++ gdk_draw_pixbuf ( pixmap , NULL , starDrawingBuf, ++ 0, 0, 0, 0, displayWidth, displayHeight, GDK_RGB_DITHER_NORMAL, 0, 0 ) ; + } + + void makeTimeString(char *string) diff --git a/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb new file mode 100644 index 0000000000..010f65fb9b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb @@ -0,0 +1,35 @@ +SUMMARY = "Astronomical application which displays the night sky" +HOMEPAGE = "http://projects.openmoko.org/projects/orrery/" +SECTION = "x11/scientific" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://orrery.c;endline=25;md5=d792bdf2b591972da175aecc38d88cfe" +DEPENDS = "gtk+" + +inherit distro_features_check autotools-brokensep pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "http://projects.openmoko.org/frs/download.php/923/orrery_2.7_clean.tar.gz \ + file://orrery.png \ + file://use.GdkPixbuf.patch \ + file://0001-orrery-Fix-sprintf-format.patch \ + " + +SRC_URI[md5sum] = "bd62a33e7554ee1030313dfcdefcda8b" +SRC_URI[sha256sum] = "645166a5e05b2064ab630534a514697fc47b681951e7fe1d635c259cbdf7a5e6" + +S = "${WORKDIR}/${BPN}" + +do_configure_prepend() { + # fix DSO issue with binutils-2.22 + sed -i 's/ -lrt/ -lrt -lm/g' ${S}/Makefile.am +} +do_install_append() { + install -d ${D}${datadir}/orrery + cp -R --no-dereference --preserve=mode,links -v ${S}/data/* ${D}${datadir}/orrery + chown -R root:root ${D}${datadir}/orrery + install -d ${D}${datadir}/icons + install -m 0755 ${WORKDIR}/orrery.png ${D}${datadir}/icons +} + +FILES_${PN} += "${datadir}/icons/orrery.png" -- cgit v1.2.3