diff options
| author | mew14930xvi <mew14930xvi@inbox.lv> | 2025-09-27 18:24:37 +0300 |
|---|---|---|
| committer | Vladimir Druzenko <vvd@FreeBSD.org> | 2025-09-27 18:27:14 +0300 |
| commit | c5453f6ba0b613ed7db35d128bec1070f5b99138 (patch) | |
| tree | 074a13ac217126581f2f45debca4dee8a848c632 | |
| parent | d97b8c7e278b229e8f7f5c977e9c4af8dbdb1062 (diff) | |
astro/openuniverse: Fix freeglut runtime error, take maintainership
$ openuniverse
freeglut (openuniverse): ERROR: No display callback registered for window 1
PR: 289859
MFH: 2025Q3
(cherry picked from commit c5f57c13a2920628b698c5cebfa1685398c9c3ef)
| -rw-r--r-- | astro/openuniverse/Makefile | 16 | ||||
| -rw-r--r-- | astro/openuniverse/files/patch-src_comet.cpp | 15 | ||||
| -rw-r--r-- | astro/openuniverse/files/patch-src_ou.cpp | 17 | ||||
| -rw-r--r-- | astro/openuniverse/files/patch-src_timeb.h | 49 | ||||
| -rw-r--r-- | astro/openuniverse/pkg-descr | 8 |
5 files changed, 25 insertions, 80 deletions
diff --git a/astro/openuniverse/Makefile b/astro/openuniverse/Makefile index 414b1c2b89af..9d08ff83dd1f 100644 --- a/astro/openuniverse/Makefile +++ b/astro/openuniverse/Makefile @@ -1,10 +1,10 @@ PORTNAME= openuniverse DISTVERSION= 1.0beta3 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= astro -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.0beta3 +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mew14930xvi@inbox.lv COMMENT= OpenGL Solar System simulator for X Window System WWW= https://openuniverse.sourceforge.net/ @@ -12,16 +12,12 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= gl gmake jpeg localbase xorg -USE_CXXSTD= c++14 +USE_CXXSTD= c++98 USE_GL= gl glu glut -USE_XORG= sm ice xmu xi xext x11 +USE_XORG= ice sm x11 xext xi xmu xorgproto GNU_CONFIGURE= yes -CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \ - --libdir="${LOCALBASE}/lib" \ - -CPPFLAGS+= -I${LOCALBASE}/include/GL -LIBS+= -lm -lcompat -lutil +LIBS+= -lutil .include <bsd.port.mk> diff --git a/astro/openuniverse/files/patch-src_comet.cpp b/astro/openuniverse/files/patch-src_comet.cpp index a8dd2baec728..bc52f1753aee 100644 --- a/astro/openuniverse/files/patch-src_comet.cpp +++ b/astro/openuniverse/files/patch-src_comet.cpp @@ -1,11 +1,10 @@ --- src/comet.cpp.orig 2000-05-13 22:48:51 UTC +++ src/comet.cpp -@@ -52,7 +52,7 @@ void CometTail(int body) +@@ -17,6 +17,7 @@ + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#define GL_GLEXT_LEGACY + #include "ou.h" + #ifdef WIN32 - wglPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, quad); - #else --#ifdef GL_EXT_point_parameters -+#if 0 - glPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, quad); - #endif - #endif diff --git a/astro/openuniverse/files/patch-src_ou.cpp b/astro/openuniverse/files/patch-src_ou.cpp index 38cc3f4d10f4..68327b826554 100644 --- a/astro/openuniverse/files/patch-src_ou.cpp +++ b/astro/openuniverse/files/patch-src_ou.cpp @@ -1,11 +1,10 @@ --- src/ou.cpp.orig 2000-06-04 21:29:29 UTC +++ src/ou.cpp -@@ -22,7 +22,7 @@ - #include <string.h> - #include <math.h> - #include <time.h> --#include <sys/timeb.h> -+#include "timeb.h" - #include <setjmp.h> - #include "ou.h" - #include "gui.h" +@@ -560,6 +560,7 @@ int main(int argc, char *argv[]) + #else + glutReshapeFunc(Reshape); + #endif ++ glutDisplayFunc(glutPostRedisplay); + glutMainLoop(); + return 0; + } diff --git a/astro/openuniverse/files/patch-src_timeb.h b/astro/openuniverse/files/patch-src_timeb.h deleted file mode 100644 index 8c2f67c51eae..000000000000 --- a/astro/openuniverse/files/patch-src_timeb.h +++ /dev/null @@ -1,49 +0,0 @@ ---- src/timeb.h.orig 2016-07-26 13:11:57 UTC -+++ src/timeb.h -@@ -0,0 +1,46 @@ -+/* Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public License as -+ published by the Free Software Foundation; either version 2 of the -+ License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public -+ License along with the GNU C Library; see the file COPYING.LIB. If not, -+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. */ -+ -+#ifndef _SYS_TIMEB_H -+#define _SYS_TIMEB_H 1 -+ -+//#include <features.h> -+ -+#define __need_time_t -+#include <time.h> -+ -+ -+__BEGIN_DECLS -+ -+/* Structure returned by the `ftime' function. */ -+ -+struct timeb -+ { -+ time_t time; /* Seconds since epoch, as from `time'. */ -+ unsigned short int millitm; /* Additional milliseconds. */ -+ short int timezone; /* Minutes west of GMT. */ -+ short int dstflag; /* Nonzero if Daylight Savings Time used. */ -+ }; -+ -+/* Fill in TIMEBUF with information about the current time. */ -+ -+extern int ftime __P ((struct timeb *__timebuf)); -+ -+__END_DECLS -+ -+#endif /* sys/timeb.h */ diff --git a/astro/openuniverse/pkg-descr b/astro/openuniverse/pkg-descr index 3e98a8c96480..790dcb35635d 100644 --- a/astro/openuniverse/pkg-descr +++ b/astro/openuniverse/pkg-descr @@ -2,12 +2,12 @@ This program draws the Solar System's bodies in simulated 3-dimensionality. You can view all the planets, their moons and a few spaceships in motion, trace them, follow them, orbit them, and even control them. -OpenUniverse was formerly known as Solar System Simulator (Ssystem). It was +OpenUniverse was formerly known as Solar System Simulator (Ssystem). It was initially released in 1997 with the intent of creating a rotating display of -the Earth on a mainstream PC. Ssystem version 1.0 was only aware of the -planets. Version 1.2 added moons; and 1.6, more means of movement and +the Earth on a mainstream PC. Ssystem version 1.0 was only aware of the +planets. Version 1.2 added moons; and 1.6, more means of movement and better textures. The program has been renamed OpenUniverse 1.0 to underline the concept behind its further development: openness for the whole Universe, not just -the solar system -- open for anyone to use, extend, and change. +the solar system - open for anyone to use, extend, and change. |
