Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19867
Modified Files:
xplanet.info xplanet.patch
Log Message:
sync with 10.7/
Index: xplanet.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11/xplanet.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xplanet.patch 2 Nov 2010 15:46:19 -0000 1.3
+++ xplanet.patch 30 Jan 2013 03:45:46 -0000 1.4
@@ -1,59 +1,36 @@
-diff -Nurd -x'*~' xplanet-1.2.1.orig/src/libannotate/Makefile.in
xplanet-1.2.1/src/libannotate/Makefile.in
---- xplanet-1.2.1.orig/src/libannotate/Makefile.in 2009-04-16
11:11:56.000000000 -0400
-+++ xplanet-1.2.1/src/libannotate/Makefile.in 2010-08-08 11:13:35.000000000
-0400
-@@ -200,7 +200,7 @@
- xplanet_ARFLAGS = @xplanet_ARFLAGS@
- xplanet_LDFLAGS = @xplanet_LDFLAGS@
- noinst_LIBRARIES = libannotate.a
--AM_CPPFLAGS = @FREETYPE_CFLAGS@ -I@top_srcdir@/src
-+AM_CPPFLAGS = -I@top_srcdir@/src @FREETYPE_CFLAGS@
- @USE_AR_FALSE@libannotate_a_AR = $(CXX) @xplanet_ARFLAGS@
- @USE_AR_TRUE@libannotate_a_AR = $(AR) cru
- @HAVE_CSPICE_TRUE@spiceFiles = addSpiceObjects.cpp
-diff -Nurd -x'*~' xplanet-1.2.1.orig/src/libdisplay/Makefile.in
xplanet-1.2.1/src/libdisplay/Makefile.in
---- xplanet-1.2.1.orig/src/libdisplay/Makefile.in 2009-04-16
11:11:56.000000000 -0400
-+++ xplanet-1.2.1/src/libdisplay/Makefile.in 2010-08-08 11:13:23.000000000
-0400
-@@ -229,7 +229,7 @@
+diff -ruN xplanet-1.2.2.orig/src/Makefile.in xplanet-1.2.2/src/Makefile.in
+--- xplanet-1.2.2.orig/src/Makefile.in 2011-02-15 19:57:38.000000000 -0500
++++ xplanet-1.2.2/src/Makefile.in 2012-01-31 10:11:02.000000000 -0500
+@@ -263,7 +263,7 @@
+ SUBDIRS = libannotate libdisplay libephemeris libimage libmultiple libplanet
libprojection libsgp4sdp4
+ EXTRA_xplanet_SOURCES = ParseGeom.c ParseGeom.h
+ @HAVE_LIBX11_FALSE@parsegeom = ParseGeom.c ParseGeom.h
+-AM_CPPFLAGS = -DDATADIR=\"$(datadir)@separator@xplanet\" @X_CFLAGS@
@FREETYPE_CFLAGS@
++AM_CPPFLAGS = -DDATADIR=\"$(datadir)@separator@xplanet\" @FREETYPE_CFLAGS@
@X_CFLAGS@
+ AM_LDFLAGS = @xplanet_LDFLAGS@
+ xplanet_SOURCES = \
+ Map.cpp \
+diff -ruN xplanet-1.2.2.orig/src/libdisplay/Makefile.in
xplanet-1.2.2/src/libdisplay/Makefile.in
+--- xplanet-1.2.2.orig/src/libdisplay/Makefile.in 2011-02-15
19:57:38.000000000 -0500
++++ xplanet-1.2.2/src/libdisplay/Makefile.in 2012-01-31 10:08:30.000000000
-0500
+@@ -235,7 +235,7 @@
@HAVE_LIBX11_TRUE@displayx11 = DisplayX11.cpp DisplayX11.h vroot.h
@HAVE_LIBX11_TRUE@timerx11 = TimerX11.h TimerX11.cpp
EXTRA_libdisplay_a_SOURCES = DisplayMacAqua.cpp DisplayMacAqua.h
DisplayMSWin.cpp DisplayMSWin.h TextRendererFT2.cpp TextRendererFT2.h
TextRendererPangoFT2.cpp TextRendererPangoFT2.h DisplayX11.cpp DisplayX11.h
vroot.h TimerMacAqua.cpp TimerMacAqua.h TimerX11.cpp TimerX11.h
--AM_CPPFLAGS = @X_CFLAGS@ @FREETYPE_CFLAGS@ -I@top_srcdir@/src
-+AM_CPPFLAGS = -I@top_srcdir@/src @X_CFLAGS@ @FREETYPE_CFLAGS@
+-AM_CPPFLAGS = -I@top_srcdir@/src @X_CFLAGS@ @FREETYPE_CFLAGS@
++AM_CPPFLAGS = -I@top_srcdir@/src @FREETYPE_CFLAGS@ @X_CFLAGS@
@USE_AR_FALSE@libdisplay_a_AR = $(CXX) @xplanet_ARFLAGS@
@USE_AR_TRUE@libdisplay_a_AR = $(AR) cru
@USE_AR_FALSE@libtimer_a_AR = $(CXX) @xplanet_ARFLAGS@
-diff -Nurd -x'*~' xplanet-1.2.1.orig/src/libmultiple/Makefile.in
xplanet-1.2.1/src/libmultiple/Makefile.in
---- xplanet-1.2.1.orig/src/libmultiple/Makefile.in 2009-04-16
11:11:57.000000000 -0400
-+++ xplanet-1.2.1/src/libmultiple/Makefile.in 2010-08-08 11:12:53.000000000
-0400
-@@ -190,7 +190,7 @@
- xplanet_ARFLAGS = @xplanet_ARFLAGS@
- xplanet_LDFLAGS = @xplanet_LDFLAGS@
- noinst_LIBRARIES = libmultiple.a
--AM_CPPFLAGS = @FREETYPE_CFLAGS@ -I@top_srcdir@/src
+diff -ruN xplanet-1.2.2.orig/src/libimage/Makefile.in
xplanet-1.2.2/src/libimage/Makefile.in
+--- xplanet-1.2.2.orig/src/libimage/Makefile.in 2011-02-15
19:57:38.000000000 -0500
++++ xplanet-1.2.2/src/libimage/Makefile.in 2012-01-31 10:14:21.000000000
-0500
+@@ -218,7 +218,7 @@
+ @HAVE_LIBPNM_TRUE@pnm = pnm.c
+ @HAVE_LIBTIFF_TRUE@tiff = tiff.c
+ EXTRA_libimage_a_SOURCES = bmp.c gif.c jpeg.c png.c pnm.c tiff.c
ReadImage.cpp WriteImage.cpp
+-AM_CPPFLAGS = -I@top_srcdir@/src
+AM_CPPFLAGS = -I@top_srcdir@/src @FREETYPE_CFLAGS@
- @USE_AR_FALSE@libmultiple_a_AR = $(CXX) @xplanet_ARFLAGS@
- @USE_AR_TRUE@libmultiple_a_AR = $(AR) cru
- libmultiple_a_SOURCES = \
-diff -Nurd -x'*~'
xplanet-1.2.1.orig/src/libprojection/ProjectionIcosagnomonic.cpp
xplanet-1.2.1/src/libprojection/ProjectionIcosagnomonic.cpp
---- xplanet-1.2.1.orig/src/libprojection/ProjectionIcosagnomonic.cpp
2009-04-16 11:10:08.000000000 -0400
-+++ xplanet-1.2.1/src/libprojection/ProjectionIcosagnomonic.cpp
2010-08-08 11:11:32.000000000 -0400
-@@ -26,6 +26,19 @@
- #define THIGH 3
- #define RATIO (((THIGH)*sqrt(3.0)/2)/(TWIDE))
-
-+/* signbit() appaired only in FreeBSD 5.1, so we need this hack */
-+#ifndef signbit
-+static int
-+signbit(double x)
-+{
-+
-+ if ((x < 0.0) || (x = -0.0))
-+ return 1;
-+ else
-+ return 0;
-+}
-+#endif /* signbit */
-+
- bool
- ProjectionIcosagnomonic::PointXY::sameSide(const PointXY& p1,
- const PointXY& p2,
+ @USE_AR_FALSE@libdisplay_a_AR = $(CXX) @xplanet_ARFLAGS@
+ @USE_AR_TRUE@libdisplay_a_AR = $(AR) cru
+ @USE_AR_FALSE@libtimer_a_AR = $(CXX) @xplanet_ARFLAGS@
Index: xplanet.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11/xplanet.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- xplanet.info 2 Nov 2010 15:46:19 -0000 1.6
+++ xplanet.info 30 Jan 2013 03:45:46 -0000 1.7
@@ -1,6 +1,6 @@
Package: xplanet
-Version: 1.2.1
-Revision: 1
+Version: 1.2.2
+Revision: 2
Description: Earth and planet renderer
License: GPL
Maintainer: Benjamin Reed <[email protected]>
@@ -18,6 +18,7 @@
cairo (>= 1.8.8-1),
expat1,
fink (>= 0.29.7-1),
+ fink-package-precedence,
fontconfig2-dev (>= 2.4.1-1),
freeglut,
freetype219 (>= 2.3.7-7),
@@ -27,7 +28,7 @@
libgettext8-dev,
libiconv-dev,
libjpeg8,
- libpng3,
+ libpng15,
libtiff,
netpbm10,
pango1-xft2-ft219-dev (>= 1.24.0-1),
@@ -39,9 +40,9 @@
GCC: 4.0
Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 5dca0369ca64fa3c006b616b72b5e1cf
+Source-MD5: b38c3b4cfdd772643f876a9bb15f288b
PatchFile: %n.patch
-PatchFile-MD5: d4dea2cd0c05d7ee3f4ae804f3069e35
+PatchFile-MD5: 726f83d5c583e7ee1964b203be4c09b1
SetCPPFLAGS: -Wall
ConfigureParams: <<
@@ -50,12 +51,15 @@
--with-x --with-xscreensaver \
--with-freetype --with-pango \
--without-cspice \
- --with-aqua --without-quicktime \
+ --with-aqua \
--with-gif --with-jpeg --with-png --with-pnm --with-tiff \
- --disable-dependency-tracking
+ --enable-dependency-tracking
<<
-InstallScript: make -j1 install DESTDIR=%d
+InstallScript: <<
+ fink-package-precedence .
+ make -j1 install DESTDIR=%d
+<<
DocFiles: AUTHORS ChangeLog COPYING NEWS README TODO
Homepage: http://xplanet.sourceforge.net
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_jan
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
