cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make gaia compatible with updated gpsd.

Browse Source 
OK, landry@, jasper@
This commit is contained in:
sebastia 2010-11-25 08:58:49 +00:00
parent 07b6f62d8e
commit f9b6a7fb6f
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/gaia/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.12 2010/11/22 08:36:56 espie Exp $ # $OpenBSD: Makefile,v 1.13 2010/11/25 08:58:49 sebastia Exp $
COMMENT= 3D earth viewer with GPS support COMMENT= 3D earth viewer with GPS support
DISTNAME= gaia-0.1.2 DISTNAME= gaia-0.1.2
REVISION= 5 REVISION= 6
CATEGORIES= x11 geo CATEGORIES= x11 geo
EXTRACT_SUFX= .tar.bz2 EXTRACT_SUFX= .tar.bz2
@ -20,7 +20,8 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaia-clean/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaia-clean/}
WANTLIB= GL GLU c crypto idn m pthread ssl stdc++ z WANTLIB += GL GLU c crypto idn m pthread ssl stdc++ z
WANTLIB += SDL>=6 gps>=19 curl>=4 png>=5 jpeg>=62
MODULES= devel/scons MODULES= devel/scons
MODSCONS_FLAGS= prefix=${PREFIX} \ MODSCONS_FLAGS= prefix=${PREFIX} \
@ -33,7 +34,6 @@ LIB_DEPENDS= devel/sdl \
net/curl \ net/curl \
graphics/png \ graphics/png \
graphics/jpeg graphics/jpeg
WANTLIB += SDL>=6 gps>=16 curl>=4 png>=5 jpeg>=62
pre-configure: pre-configure:
perl -pi -e 's,!!CFLAGS!!,${CFLAGS},g;' \ perl -pi -e 's,!!CFLAGS!!,${CFLAGS},g;' \

16
x11/gaia/patches/patch-programs_gaia_GPSSourceGPSD_cc Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-programs_gaia_GPSSourceGPSD_cc,v 1.1 2010/11/25 08:58:49 sebastia Exp $
Fix build with newer gpsd, patch found in Debian bugzilla:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560242
--- programs/gaia/GPSSourceGPSD.cc.orig Wed Nov 29 04:21:14 2006
+++ programs/gaia/GPSSourceGPSD.cc Tue Nov 2 14:17:20 2010
@@ -23,7 +23,7 @@ GPSSourceGPSD::GPSSourceGPSD(char *server, char *port)
if ((m_GPS = gps_open(server, port)) == 0)
throw Exception("gps_open() failed");
- if (gps_query(m_GPS, "w+x\n") != 0)
+ if (gps_stream(m_GPS, WATCH_ENABLE, NULL) != 0)
throw Exception("initial gps_query() failed");
}