svn commit: r318122 - in head/graphics/libgfx: . files

[Mikhail Teterin]

Author: mi
Date: Mon May 13 18:20:14 2013
New Revision: 318122
URL: http://svnweb.freebsd.org/changeset/ports/318122

Log:
  Stop insisting on particular major versions of the shared libraries we
  depend on.
  
  Make compilable with newer compilers (gcc47, gcc48).

Added:
  head/graphics/libgfx/files/patch-warnings   (contents, props changed)
Modified:
  head/graphics/libgfx/Makefile   (contents, props changed)

Modified: head/graphics/libgfx/Makefile
==============================================================================
--- head/graphics/libgfx/Makefile	Mon May 13 16:46:51 2013	(r318121)
+++ head/graphics/libgfx/Makefile	Mon May 13 18:20:14 2013	(r318122)
@@ -16,11 +16,11 @@ COMMENT=	OpenGL/FLTK development
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk \
-		tiff.4:${PORTSDIR}/graphics/tiff \
+LIB_DEPENDS=	fltk:${PORTSDIR}/x11-toolkits/fltk \
+		tiff:${PORTSDIR}/graphics/tiff \
 		png15:${PORTSDIR}/graphics/png \
-		gzstream.0:${PORTSDIR}/devel/gzstream \
-		jpeg.11:${PORTSDIR}/graphics/jpeg
+		gzstream:${PORTSDIR}/devel/gzstream \
+		jpeg:${PORTSDIR}/graphics/jpeg
 
 BUILD_WRKSRC=	${WRKSRC}/src
 

Added: head/graphics/libgfx/files/patch-warnings
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/libgfx/files/patch-warnings	Mon May 13 18:20:14 2013	(r318122)
@@ -0,0 +1,52 @@
+--- src/raster.cxx	2004-09-27 00:45:31.000000000 -0400
++++ src/raster.cxx	2013-05-13 13:53:50.000000000 -0400
+@@ -10,4 +10,6 @@
+ #include <gfx/raster.h>
+ 
++#include <string.h> /* For memcpy() */
++
+ #include <string>
+ #include <cctype>
+@@ -49,6 +51,6 @@
+ 
+ 
+-static char *img_names[] = {"PPM", "PNG", "TIFF", "JPEG"};
+-static char *img_ext[] = {"ppm", "png", "tif", "jpg"};
++static const char *img_names[] = {"PPM", "PNG", "TIFF", "JPEG"};
++static const char *img_ext[] = {"ppm", "png", "tif", "jpg"};
+ 
+ const char *image_type_name(int type)
+--- src/gltools.cxx	2005-06-18 09:58:15.000000000 -0400
++++ src/gltools.cxx	2013-05-13 13:56:31.000000000 -0400
+@@ -57,5 +57,5 @@
+         GLuint nnames   = *ptr++;
+         GLuint cur_zmin = *ptr++;
+-        /* GLuint cur_zmax = */ *ptr++;
++        ptr++;
+ 
+         if( cur_zmin < zmin )
+--- src/arcball.cxx	2004-09-27 00:45:31.000000000 -0400
++++ src/arcball.cxx	2013-05-13 13:58:11.000000000 -0400
+@@ -20,22 +20,4 @@
+ {
+ 
+-// Converts a unit quaternion to two points on the unit sphere
+-static void quat_to_sphere(const Quat& q, Vec3& from, Vec3& to)
+-{
+-    const Vec3& v = q.vector();
+-
+-    double s = sqrt(v[0]*v[0] + v[1]*v[1]);
+-    if( s==0.0 )
+-	from = Vec3(0.0, 1.0, 0.0);
+-    else
+-	from = Vec3(-v[1]/s, v[0]/s, 0.0);
+-
+-    to[0] = q.scalar()*from[0] - v[2]*from[1];
+-    to[1] = q.scalar()*from[1] + v[2]*from[2];
+-    to[2] = v[0]*from[1] - v[1]*from[0];
+-
+-    if(q.scalar() < 0.0)  from = -from;
+-}
+-
+ // Converts to points on unit sphere into a unit quaternion
+ static Quat quat_from_sphere(const Vec3& from, const Vec3& to)