diff options
| author | Khem Raj <raj.khem@gmail.com> | 2024-05-13 14:00:02 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2024-05-19 08:27:52 -0700 |
| commit | fbb5911127af89f165d95f6dbf76fe99b713cc4b (patch) | |
| tree | 14a847ba2fafb8f02505479e7c754f68df7b408c | |
| parent | c4a330ab89c84f2a84552b25a9338c546005b311 (diff) | |
| download | meta-openembedded-fbb5911127af89f165d95f6dbf76fe99b713cc4b.tar.gz | |
orrery: Drop recipe
This recipe does not compile with gcc-14, looking at its history this
package comes from maemo5 days, There are no direct dependents in
meta-openembedded so I am proposing to remove it. Last commit to this
repo was made 12+ years ago.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Martin Jansa <martin.jansa@gmail.com>
6 files changed, 0 insertions, 155 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 7544a9fbfa..c5f8dce979 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | |||
| @@ -688,7 +688,6 @@ RDEPENDS:packagegroup-meta-oe-multimedia ="\ | |||
| 688 | RDEPENDS:packagegroup-meta-oe-navigation ="\ | 688 | RDEPENDS:packagegroup-meta-oe-navigation ="\ |
| 689 | geos \ | 689 | geos \ |
| 690 | ${@bb.utils.contains("DISTRO_FEATURES", "bluz4", "gpsd-machine-conf gpsd", "", d)} \ | 690 | ${@bb.utils.contains("DISTRO_FEATURES", "bluz4", "gpsd-machine-conf gpsd", "", d)} \ |
| 691 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "orrery", "", d)} \ | ||
| 692 | geoclue \ | 691 | geoclue \ |
| 693 | libspatialite \ | 692 | libspatialite \ |
| 694 | proj \ | 693 | proj \ |
diff --git a/meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch b/meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch deleted file mode 100644 index 829ace09b5..0000000000 --- a/meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | From e13f15205425c67e1101031a33107fa9cd2d65f9 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 26 May 2023 10:32:53 -0700 | ||
| 4 | Subject: [PATCH] Append cflags instead of overriding in Makefile.am | ||
| 5 | |||
| 6 | Fixes | ||
| 7 | WARNING: orrery-2.7-r0 do_package_qa: QA Issue: File /usr/bin/.debug/orrery in package orrery-dbg contains reference to TMPDIR [buildpaths] | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | Makefile.am | 2 +- | ||
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/Makefile.am b/Makefile.am | ||
| 17 | index b64449f..23637b3 100644 | ||
| 18 | --- a/Makefile.am | ||
| 19 | +++ b/Makefile.am | ||
| 20 | @@ -1,4 +1,4 @@ | ||
| 21 | -CFLAGS = -g -O3 -Wall | ||
| 22 | +CFLAGS += -g -O3 -Wall | ||
| 23 | |||
| 24 | bin_PROGRAMS = orrery | ||
| 25 | orrery_SOURCES = planetInfo.c orrery.c orrery.h phaseConstants.h | ||
| 26 | -- | ||
| 27 | 2.40.1 | ||
| 28 | |||
diff --git a/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch b/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch deleted file mode 100644 index 3d5828011a..0000000000 --- a/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | From e600d3c09d2f97a197f86e6987d44d142e7b7cdf Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 27 Jun 2017 21:12:17 -0700 | ||
| 4 | Subject: [PATCH] orrery: Fix sprintf format | ||
| 5 | |||
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 7 | --- | ||
| 8 | Upstream-Status: Pending | ||
| 9 | |||
| 10 | orrery.c | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/orrery.c b/orrery.c | ||
| 14 | index e3a1f6d..1b31a9f 100644 | ||
| 15 | --- a/orrery.c | ||
| 16 | +++ b/orrery.c | ||
| 17 | @@ -3767,7 +3767,7 @@ static void drawOptsScreens(void) | ||
| 18 | displayWidth/2 - gdk_string_width(smallFont, scratchString)/2, | ||
| 19 | 12, scratchString); | ||
| 20 | for (day = 0; day < 7; day++) { | ||
| 21 | - sprintf(scratchString, dayName[day]); | ||
| 22 | + sprintf(scratchString, "%s", dayName[day]); | ||
| 23 | gdk_draw_string(pixmap, smallFont, blueGC, | ||
| 24 | CAL_DAY_WIDTH/2 + day*CAL_DAY_WIDTH + CAL_LEFT_OFFSET - | ||
| 25 | gdk_string_width(smallFont, scratchString)/2, | ||
| 26 | -- | ||
| 27 | 2.13.2 | ||
| 28 | |||
diff --git a/meta-oe/recipes-navigation/orrery/orrery/orrery.png b/meta-oe/recipes-navigation/orrery/orrery/orrery.png deleted file mode 100644 index d9865b70ce..0000000000 --- a/meta-oe/recipes-navigation/orrery/orrery/orrery.png +++ /dev/null | |||
| Binary files differ | |||
diff --git a/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch b/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch deleted file mode 100644 index 2abb320d83..0000000000 --- a/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch +++ /dev/null | |||
| @@ -1,61 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | From: Benjamin Deering | ||
| 4 | Subject: orrery crashing X | ||
| 5 | Date: Thursday, September 2, 2010 - 5:25 pm | ||
| 6 | Link: http://kerneltrap.org/mailarchive/openmoko-community/2010/9/3/13218 | ||
| 7 | |||
| 8 | diff -uNr orrery.orig//orrery.c orrery/orrery.c | ||
| 9 | --- orrery.orig//orrery.c 2009-11-30 06:59:44.000000000 +0100 | ||
| 10 | +++ orrery/orrery.c 2010-11-15 22:33:17.000000000 +0100 | ||
| 11 | @@ -1238,12 +1238,44 @@ | ||
| 12 | } | ||
| 13 | currentEntry = currentEntry->forwardPointer; | ||
| 14 | } | ||
| 15 | - if (nDarkGreyPoints > 0) | ||
| 16 | - gdk_draw_points(pixmap, darkGreyGC, darkGreyPoints, nDarkGreyPoints); | ||
| 17 | - if (nGreyPoints > 0) | ||
| 18 | - gdk_draw_points(pixmap, greyGC, greyPoints, nGreyPoints); | ||
| 19 | - if (nWhitePoints > 0) | ||
| 20 | - gdk_draw_points(pixmap, whiteGC, whitePoints, nWhitePoints); | ||
| 21 | + GdkPixbuf* starDrawingBuf = gdk_pixbuf_get_from_drawable( NULL, | ||
| 22 | + pixmap, | ||
| 23 | + gdk_colormap_get_system() | ||
| 24 | + , 0, 0, 0, 0, displayWidth, displayHeight); | ||
| 25 | + g_assert (gdk_pixbuf_get_bits_per_sample (starDrawingBuf) == 8); | ||
| 26 | + guchar* p; | ||
| 27 | + int rowstride = gdk_pixbuf_get_rowstride (starDrawingBuf); | ||
| 28 | + guchar* pixels = gdk_pixbuf_get_pixels (starDrawingBuf); | ||
| 29 | + int n_channels = gdk_pixbuf_get_n_channels (starDrawingBuf); | ||
| 30 | + GdkGCValues starGCval; | ||
| 31 | + GdkColor starColor; | ||
| 32 | + int pointNum; | ||
| 33 | + gdk_gc_get_values(darkGreyGC, &starGCval); | ||
| 34 | + gdk_colormap_query_color( gdk_gc_get_colormap(darkGreyGC),starGCval.foreground.pixel, &starColor ); | ||
| 35 | + for( pointNum = 0; pointNum < nDarkGreyPoints; pointNum++) { | ||
| 36 | + p = pixels + darkGreyPoints[pointNum].y * rowstride + darkGreyPoints[pointNum].x * n_channels; | ||
| 37 | + p[0] = starColor.red & 0xff; | ||
| 38 | + p[1] = starColor.green & 0xff; | ||
| 39 | + p[2] = starColor.blue & 0xff; | ||
| 40 | + } | ||
| 41 | + gdk_gc_get_values(greyGC, &starGCval); | ||
| 42 | + gdk_colormap_query_color( gdk_gc_get_colormap(greyGC), starGCval.foreground.pixel, &starColor ); | ||
| 43 | + for( pointNum = 0; pointNum < nGreyPoints; pointNum++) { | ||
| 44 | + p = pixels + greyPoints[pointNum].y * rowstride + greyPoints[pointNum].x * n_channels; | ||
| 45 | + p[0] = starColor.red & 0xff; | ||
| 46 | + p[1] = starColor.green & 0xff; | ||
| 47 | + p[2] = starColor.blue & 0xff; | ||
| 48 | + } | ||
| 49 | + gdk_gc_get_values(whiteGC, &starGCval); | ||
| 50 | + gdk_colormap_query_color( gdk_gc_get_colormap(whiteGC), starGCval.foreground.pixel, &starColor ); | ||
| 51 | + for( pointNum = 0; pointNum < nWhitePoints; pointNum++) { | ||
| 52 | + p = pixels + whitePoints[pointNum].y * rowstride + whitePoints[pointNum].x * n_channels; | ||
| 53 | + p[0] = starColor.red & 0xff; | ||
| 54 | + p[1] = starColor.green & 0xff; | ||
| 55 | + p[2] = starColor.blue & 0xff; | ||
| 56 | + } | ||
| 57 | + gdk_draw_pixbuf ( pixmap , NULL , starDrawingBuf, | ||
| 58 | + 0, 0, 0, 0, displayWidth, displayHeight, GDK_RGB_DITHER_NORMAL, 0, 0 ) ; | ||
| 59 | } | ||
| 60 | |||
| 61 | void makeTimeString(char *string) | ||
diff --git a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb deleted file mode 100644 index 96a7018de2..0000000000 --- a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | SUMMARY = "Astronomical application which displays the night sky" | ||
| 2 | HOMEPAGE = "http://projects.openmoko.org/projects/orrery/" | ||
| 3 | SECTION = "x11/scientific" | ||
| 4 | LICENSE = "GPL-2.0-or-later" | ||
| 5 | LIC_FILES_CHKSUM = "file://orrery.c;endline=25;md5=d792bdf2b591972da175aecc38d88cfe" | ||
| 6 | DEPENDS = "gtk+" | ||
| 7 | |||
| 8 | inherit features_check autotools-brokensep pkgconfig | ||
| 9 | |||
| 10 | REQUIRED_DISTRO_FEATURES = "x11" | ||
| 11 | |||
| 12 | SRC_URI = "http://projects.openmoko.org/frs/download.php/923/orrery_2.7_clean.tar.gz \ | ||
| 13 | file://orrery.png \ | ||
| 14 | file://use.GdkPixbuf.patch \ | ||
| 15 | file://0001-orrery-Fix-sprintf-format.patch \ | ||
| 16 | file://0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch \ | ||
| 17 | " | ||
| 18 | |||
| 19 | SRC_URI[md5sum] = "bd62a33e7554ee1030313dfcdefcda8b" | ||
| 20 | SRC_URI[sha256sum] = "645166a5e05b2064ab630534a514697fc47b681951e7fe1d635c259cbdf7a5e6" | ||
| 21 | |||
| 22 | S = "${WORKDIR}/${BPN}" | ||
| 23 | |||
| 24 | do_configure:prepend() { | ||
| 25 | # fix DSO issue with binutils-2.22 | ||
| 26 | sed -i 's/ -lrt$/ -lrt -lm/g' ${S}/Makefile.am | ||
| 27 | } | ||
| 28 | do_install:append() { | ||
| 29 | install -d ${D}${datadir}/orrery | ||
| 30 | cp -R --no-dereference --preserve=mode,links -v ${S}/data/* ${D}${datadir}/orrery | ||
| 31 | chown -R root:root ${D}${datadir}/orrery | ||
| 32 | install -d ${D}${datadir}/icons | ||
| 33 | install -m 0755 ${WORKDIR}/orrery.png ${D}${datadir}/icons | ||
| 34 | rm -rf ${D}${datadir}/orrery/Makefile* | ||
| 35 | } | ||
| 36 | |||
| 37 | FILES:${PN} += "${datadir}/icons/orrery.png" | ||
