View | Details | Raw Unified | Return to bug 135034
Collapse All | Expand All

(-)graphics/reallyslick/Makefile (-28 / +31 lines)
Lines 6-16 Link Here
6
#
6
#
7
7
8
PORTNAME=	reallyslick
8
PORTNAME=	reallyslick
9
PORTVERSION=	0.8.1
9
PORTVERSION=	0.9.0
10
PORTREVISION=	5
11
CATEGORIES=	graphics
10
CATEGORIES=	graphics
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	SF/rss-glx
13
MASTER_SITE_SUBDIR=	rss-glx
14
DISTNAME=	rss-glx_${PORTVERSION}
12
DISTNAME=	rss-glx_${PORTVERSION}
15
13
16
MAINTAINER=	ports@FreeBSD.org
14
MAINTAINER=	ports@FreeBSD.org
Lines 18-49 Link Here
18
16
19
LIB_DEPENDS=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
17
LIB_DEPENDS=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
20
18
19
OPTIONS=	FREEALUT "Enable freealut support" off \
20
		GLEW "Enable GLEW support" off
21
21
USE_BZIP2=	yes
22
USE_BZIP2=	yes
22
USE_GL=		yes
23
USE_GL=		glu
24
USE_GNOME=	gnomehack
23
USE_GMAKE=	yes
25
USE_GMAKE=	yes
24
GNU_CONFIGURE=	yes
26
GNU_CONFIGURE=	yes
25
USE_AUTOTOOLS=	libtool:15:env
27
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
26
28
27
CPPFLAGS+=	-I${LOCALBASE}/include `Magick-config --cflags`
29
MAN1=		biof.1 busyspheres.1 colorfire.1 cyclone.1 drempels.1 \
28
LDFLAGS+=	-L${LOCALBASE}/lib `Magick-config --libs`
30
		euphoria.1 feedback.1 fieldlines.1 flocks.1 flux.1 \
29
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
31
		helios.1 hufo_smoke.1 hufo_tunnel.1 hyperspace.1 lattice.1 \
30
		LDFLAGS="${LDFLAGS}"
32
		lorenz.1 matrixview.1 plasma.1 skyrocket.1 solarwinds.1 \
31
33
		spirographx.1 sundancer2.1
32
MAN1=	biof.1 busyspheres.1 colorfire.1 cyclone.1 euphoria.1 fieldlines.1 flocks.1 \
34
33
	flux.1 helios.1 hufo_smoke.1 hufo_tunnel.1 lattice.1 matrixview.1 \
35
CPPFLAGS=	-I${LOCALBASE}/include
34
	plasma.1 skyrocket.1 solarwinds.1 spirographx.1 sundancer2.1
36
LDFLAGS=	-L${LOCALBASE}/lib
35
37
36
post-patch:
38
.include <bsd.port.pre.mk>
37
.for file in config.guess config.sub ltmain.sh
39
38
	${RM} ${WRKSRC}/${file}
40
.if defined(WITH_FREEALUT)
39
	${LN} -s ${LOCALBASE}/share/libtool/${file} ${WRKSRC}
41
LIB_DEPENDS+=	alut.1:${PORTSDIR}/audio/freealut
40
.endfor
42
.else
41
.for file in oglc_src/Makefile.in other_src/Makefile.in \
43
CONFIGURE_ARGS+=	--disable-sound
42
		reallyslick/c_src/Makefile.in reallyslick/cpp_src/Makefile.in
44
.endif
43
	@${REINPLACE_CMD} -E -e 's|(@LIBS@)|\1 -lXext|' ${WRKSRC}/${file}
45
44
.endfor
46
.if defined(WITH_GLEW)
45
# fix lib detection
47
LIB_DEPENDS+=	GLEW.1:${PORTSDIR}/graphics/glew
46
	@${REINPLACE_CMD} -E -e 's@^(LIBS.*-l(GL|MesaGL|GLU))@\1 -lXext@' \
48
.else
47
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
49
CONFIGURE_ENV+=	ac_cv_header_GL_glew_h=no
50
.endif
48
51
49
.include <bsd.port.mk>
52
.include <bsd.port.post.mk>
(-)graphics/reallyslick/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (rss-glx_0.8.1.tar.bz2) = a2bdf0e10ee4e89c8975f313c5c0ba6f
1
MD5 (rss-glx_0.9.0.tar.bz2) = a8dad80cd33b11443e9d06b33a85fb32
2
SHA256 (rss-glx_0.8.1.tar.bz2) = cf03409ed82f167b39a37b25d21a2de065bb728afeda561bdb2626e7b7ea42bb
2
SHA256 (rss-glx_0.9.0.tar.bz2) = 04383a49f3c57d27708c314ece750dbe7f873aecff6a83a6803635dbeaf720f6
3
SIZE (rss-glx_0.8.1.tar.bz2) = 5248755
3
SIZE (rss-glx_0.9.0.tar.bz2) = 5379720
(-)graphics/reallyslick/files/patch-configure (+56 lines)
Line 0 Link Here
1
--- configure.bak	2009-05-22 00:53:12.000000000 +0900
2
+++ configure	2009-05-22 00:55:34.000000000 +0900
3
@@ -3357,7 +3357,7 @@
4
   fi
5
 else
6
   if test "$GCC" = yes; then
7
-    CFLAGS="-O2"
8
+    CFLAGS="$CFLAGS"
9
   else
10
     CFLAGS=
11
   fi
12
@@ -5047,7 +5047,7 @@
13
 
14
 
15
 if test "x$GCC" = xyes; then
16
-	CFLAGS="-O2"
17
+	CFLAGS="$CFLAGS"
18
 fi
19
 # Check whether --enable-debug was given.
20
 if test "${enable_debug+set}" = set; then
21
@@ -5411,7 +5411,7 @@
22
   fi
23
 else
24
   if test "$GXX" = yes; then
25
-    CXXFLAGS="-O2"
26
+    CXXFLAGS="$CXXFLAGS"
27
   else
28
     CXXFLAGS=
29
   fi
30
@@ -5532,7 +5532,7 @@
31
 
32
 
33
 if test "x$GXX" = xyes; then
34
-	CXXFLAGS="-O2"
35
+	CXXFLAGS="$CXXFLAGS"
36
 fi
37
 # Check whether --enable-debug was given.
38
 if test "${enable_debug+set}" = set; then
39
@@ -7080,7 +7080,7 @@
40
   fi
41
 else
42
   if test "x$ac_cv_f77_compiler_gnu" = xyes; then
43
-    FFLAGS="-O2"
44
+    FFLAGS="$FFLAGS"
45
   else
46
     FFLAGS=
47
   fi
48
@@ -22414,7 +22414,7 @@
49
 fi
50
 
51
 
52
-if test "x${ac_cv_have_x:0:10}" != "xhave_x=yes"; then
53
+if test "x${ac_cv_have_x+set}" = set; then
54
 	{ { echo "$as_me:$LINENO: error: X11 is missing but required." >&5
55
 echo "$as_me: error: X11 is missing but required." >&2;}
56
    { (exit 1); exit 1; }; }
(-)graphics/reallyslick/files/patch-other_src_driver.c (-27 lines)
Lines 1-27 Link Here
1
--- other_src/driver.c.orig	Sun Feb 26 07:16:15 2006
2
+++ other_src/driver.c	Fri Apr 28 09:27:01 2006
3
@@ -152,10 +152,14 @@
4
 {
5
 	int bFPS = False;
6
 	XEvent event;
7
-	Atom XA_WM_PROTOCOLS = XInternAtom (XStuff->display, "WM_PROTOCOLS", False);
8
-	Atom XA_WM_DELETE_WINDOW = XInternAtom (XStuff->display, "WM_DELETE_WINDOW", False);
9
+	Atom XA_WM_PROTOCOLS;
10
+	Atom XA_WM_DELETE_WINDOW;
11
 	struct timeval then, now, fps_time;
12
 	int fps = 0;
13
+	int frameTimeSoFar = 0;
14
+
15
+	XA_WM_PROTOCOLS = XInternAtom (XStuff->display, "WM_PROTOCOLS", False);
16
+	XA_WM_DELETE_WINDOW = XInternAtom (XStuff->display, "WM_DELETE_WINDOW", False);
17
 
18
 	if (!rootWindow) {
19
 		XSetWMProtocols (XStuff->display, XStuff->window, &XA_WM_DELETE_WINDOW, 1);
20
@@ -164,7 +168,6 @@
21
 	clearBuffers();
22
 
23
 	gettimeofday (&now, NULL);
24
-	int frameTimeSoFar = 0;
25
 	while (!signalled) {
26
 		hack_draw (XStuff, (double)now.tv_sec + now.tv_usec / 1000000.0f, frameTimeSoFar / 1000000.0f);
27
 
(-)graphics/reallyslick/files/patch-other_src_matrixview.c (-20 lines)
Lines 1-20 Link Here
1
--- other_src/matrixview.c.orig	Sun Feb 26 08:55:26 2006
2
+++ other_src/matrixview.c	Fri Apr 28 09:33:18 2006
3
@@ -94,13 +94,15 @@
4
 
5
 // Directory scanning + image loading code in a separate function callable either from loadNextImage or another thread if pthreads is available.
6
 void loadNextImageFromDisk() {
7
-	MagickWand *magick_wand = NewMagickWand();
8
+	MagickWand *magick_wand;
9
 	ExceptionInfo exception;
10
 	int dirLoop = 0;
11
+	int imageLoaded = 0;
12
+
13
+	magick_wand = NewMagickWand();
14
 
15
 	GetExceptionInfo (&exception);
16
 
17
-	int imageLoaded = 0;
18
 	do {
19
 		struct dirent *file;
20
 
(-)graphics/reallyslick/files/patch-reallyslick_c_src_driver.c (-27 lines)
Lines 1-27 Link Here
1
--- reallyslick/c_src/driver.c.orig	Sun Feb 26 07:16:15 2006
2
+++ reallyslick/c_src/driver.c	Fri Apr 28 09:39:38 2006
3
@@ -152,10 +152,14 @@
4
 {
5
 	int bFPS = False;
6
 	XEvent event;
7
-	Atom XA_WM_PROTOCOLS = XInternAtom (XStuff->display, "WM_PROTOCOLS", False);
8
-	Atom XA_WM_DELETE_WINDOW = XInternAtom (XStuff->display, "WM_DELETE_WINDOW", False);
9
+	Atom XA_WM_PROTOCOLS;
10
+	Atom XA_WM_DELETE_WINDOW;
11
 	struct timeval then, now, fps_time;
12
 	int fps = 0;
13
+	int frameTimeSoFar = 0;
14
+
15
+	XA_WM_PROTOCOLS = XInternAtom (XStuff->display, "WM_PROTOCOLS", False);
16
+	XA_WM_DELETE_WINDOW = XInternAtom (XStuff->display, "WM_DELETE_WINDOW", False);
17
 
18
 	if (!rootWindow) {
19
 		XSetWMProtocols (XStuff->display, XStuff->window, &XA_WM_DELETE_WINDOW, 1);
20
@@ -164,7 +168,6 @@
21
 	clearBuffers();
22
 
23
 	gettimeofday (&now, NULL);
24
-	int frameTimeSoFar = 0;
25
 	while (!signalled) {
26
 		hack_draw (XStuff, (double)now.tv_sec + now.tv_usec / 1000000.0f, frameTimeSoFar / 1000000.0f);
27
 
(-)graphics/reallyslick/files/patch-reallyslick_c_src_lattice.c (-28 lines)
Lines 1-28 Link Here
1
--- reallyslick/c_src/lattice.c.orig	Sun Feb 26 07:47:35 2006
2
+++ reallyslick/c_src/lattice.c	Fri Apr 28 09:43:41 2006
3
@@ -714,6 +714,7 @@
4
 	static float rollVel = 0.0f, rollAcc = 0.0f;
5
 	int drawDepth = dDrawdepth + 2;
6
 	static float rollChange = 0;	/* rsRandf (10.0f) + 2.0f; */
7
+	float dot, maxSpin, rotationInertia;
8
 
9
 	where += (float)dSpeed * 0.05f * elapsedTime;
10
 	if (where >= 1.0f) {
11
@@ -741,14 +742,14 @@
12
 	rsVec_cross ((float *)&angvel, dir, oldDir); /* Desired axis of rotation */
13
 
14
 	/* Protect against mild "overflow" */
15
-	float dot = MAX(MIN(rsVec_dot (oldDir, dir), -1.0), 1.0);
16
-	float maxSpin = 0.25f * (float)dSpeed * elapsedTime;
17
+	dot = MAX(MIN(rsVec_dot (oldDir, dir), -1.0), 1.0);
18
+	maxSpin = 0.25f * (float)dSpeed * elapsedTime;
19
 	angle = MAX(MIN(acos(dot), -maxSpin), maxSpin);
20
 
21
 	rsVec_scale ((float *)&angvel, angle); /* Desired angular velocity */
22
 	rsVec_subtract (angvel, oldAngvel, (float *)&tempVec); /* Change in angular velocity */
23
 	distance = rsVec_length (tempVec); /* Don't let angular velocity change too much */
24
-	float rotationInertia = 0.007f * (float)dSpeed * elapsedTime;
25
+	rotationInertia = 0.007f * (float)dSpeed * elapsedTime;
26
 	if (distance > rotationInertia * elapsedTime) {
27
 		rsVec_scale ((float *)&tempVec, ((rotationInertia * elapsedTime) / distance));
28
 		rsVec_add (oldAngvel, tempVec, (float *)&angvel);
(-)graphics/reallyslick/files/patch-src__hyperspace.cpp (+17 lines)
Line 0 Link Here
1
--- src/hyperspace.cpp.orig	2009-05-17 07:41:52.000000000 +0900
2
+++ src/hyperspace.cpp	2009-05-21 18:05:29.000000000 +0900
3
@@ -144,6 +144,14 @@
4
 		first = 0;
5
 	}
6
 
7
+	aspectRatio = float(XStuff->windowWidth) / float(XStuff->windowHeight);
8
+	glViewport(0, 0, XStuff->windowWidth, XStuff->windowHeight);
9
+
10
+	// setup projection matrix
11
+	glMatrixMode(GL_PROJECTION);
12
+	glLoadIdentity();
13
+	gluPerspective(float(dFov), aspectRatio, 0.001f, 200.0f);
14
+	glGetDoublev(GL_PROJECTION_MATRIX, projMat);    
15
 	glMatrixMode(GL_MODELVIEW);
16
 
17
 	// Camera movements
(-)graphics/reallyslick/files/patch-src__skyrocket_sound.cpp (+10 lines)
Line 0 Link Here
1
--- src/skyrocket_sound.cpp.orig	2009-04-22 09:41:23.000000000 +0900
2
+++ src/skyrocket_sound.cpp	2009-05-21 18:07:02.000000000 +0900
3
@@ -25,6 +25,7 @@
4
 #include <AL/al.h>
5
 #include <AL/alut.h>
6
 
7
+#include <cstdlib>
8
 #include <list>
9
 
10
 #include "loadTexture.h"
(-)graphics/reallyslick/pkg-descr (-3 / +7 lines)
Lines 1-4 Link Here
1
This is a port of the Really Slick Screensavers collection
1
This is a GLX port of the Really Slick Screensavers collection
2
(http://www.reallyslick.com/). Also included are several other OpenGL
3
screensavers ported from other platforms.
2
4
3
http://rss-glx.sourceforge.net/
5
The screensavers can either be run as stand-alone applications or get
4
WWW: http://www.reallyslick.com/
6
integrated into XScreenSaver's list of active screensavers.
7
8
WWW: http://rss-glx.sourceforge.net/
(-)graphics/reallyslick/pkg-plist (-2 / +5 lines)
Lines 2-8 Link Here
2
bin/busyspheres
2
bin/busyspheres
3
bin/colorfire
3
bin/colorfire
4
bin/cyclone
4
bin/cyclone
5
bin/drempels
5
bin/euphoria
6
bin/euphoria
7
bin/feedback
6
bin/fieldlines
8
bin/fieldlines
7
bin/flocks
9
bin/flocks
8
bin/flux
10
bin/flux
Lines 11-16 Link Here
11
bin/hufo_tunnel
13
bin/hufo_tunnel
12
bin/hyperspace
14
bin/hyperspace
13
bin/lattice
15
bin/lattice
16
bin/lorenz
14
bin/matrixview
17
bin/matrixview
15
bin/plasma
18
bin/plasma
16
bin/rss-glx_install.pl
19
bin/rss-glx_install.pl
Lines 18-24 Link Here
18
bin/solarwinds
21
bin/solarwinds
19
bin/spirographx
22
bin/spirographx
20
bin/sundancer2
23
bin/sundancer2
21
lib/libImplicit.la
22
lib/libImplicit.a
24
lib/libImplicit.a
23
lib/librsMath.la
25
lib/libImplicit.la
24
lib/librsMath.a
26
lib/librsMath.a
27
lib/librsMath.la

Return to bug 135034