svn commit: r414879 - in head/x11-clocks/glclock: . files
Kurt Jaeger
pi at FreeBSD.org
Mon May 9 18:38:49 UTC 2016
Author: pi
Date: Mon May 9 18:38:47 2016
New Revision: 414879
URL: https://svnweb.freebsd.org/changeset/ports/414879
Log:
x11-clocks/glclock: Removed -fforce-mem -fforce-addr to fix build with clang
- make patches conform to recommended format (makepatch)
PR: 209399
Submitted by: yuri at rawbw.com
Modified:
head/x11-clocks/glclock/Makefile
head/x11-clocks/glclock/files/patch-GLObject.H
head/x11-clocks/glclock/files/patch-GLextensions.H
head/x11-clocks/glclock/files/patch-MString.H
head/x11-clocks/glclock/files/patch-MString.cpp
head/x11-clocks/glclock/files/patch-glclock.H
Modified: head/x11-clocks/glclock/Makefile
==============================================================================
--- head/x11-clocks/glclock/Makefile Mon May 9 18:37:38 2016 (r414878)
+++ head/x11-clocks/glclock/Makefile Mon May 9 18:38:47 2016 (r414879)
@@ -23,7 +23,7 @@ OPTIONS_DEFINE= OPTIMIZED_CFLAGS
OPTIMIZED_CFLAGS_CFLAGS=\
-O3 -fexpensive-optimizations -ffast-math \
- -fomit-frame-pointer -fforce-mem -fforce-addr
+ -fomit-frame-pointer
PROGRAMS= glclock glclockmark
SCRIPTS= chromeclock chromeclock_L crystalclock crystalclock_L \
Modified: head/x11-clocks/glclock/files/patch-GLObject.H
==============================================================================
--- head/x11-clocks/glclock/files/patch-GLObject.H Mon May 9 18:37:38 2016 (r414878)
+++ head/x11-clocks/glclock/files/patch-GLObject.H Mon May 9 18:38:47 2016 (r414879)
@@ -1,5 +1,5 @@
---- GLObject.H.orig Sun Oct 1 20:06:31 2006
-+++ GLObject.H Sun Oct 1 20:06:40 2006
+--- GLObject.H.orig 2000-06-22 14:36:07 UTC
++++ GLObject.H
@@ -11,7 +11,7 @@
#pragma warning(disable : 4051) // ALPHA
#endif
Modified: head/x11-clocks/glclock/files/patch-GLextensions.H
==============================================================================
--- head/x11-clocks/glclock/files/patch-GLextensions.H Mon May 9 18:37:38 2016 (r414878)
+++ head/x11-clocks/glclock/files/patch-GLextensions.H Mon May 9 18:38:47 2016 (r414879)
@@ -1,5 +1,5 @@
---- GLextensions.H.orig Thu Jun 22 16:36:07 2000
-+++ GLextensions.H Sun Oct 1 20:52:59 2006
+--- GLextensions.H.orig 2000-06-22 14:36:07 UTC
++++ GLextensions.H
@@ -12,6 +12,7 @@
#pragma warning(disable : 4051) // ALPHA
#endif
@@ -8,7 +8,7 @@
#include <GL/gl.h>
#include <GL/glut.h>
-@@ -202,7 +203,7 @@
+@@ -202,7 +203,7 @@ float GetOpenGLVersion() ;
// multitexture ¤ò¥µ¥Ý¡¼¥È¤¹¤ë¥Ð¡¼¥¸¥ç¥ó¡Ê̤Äê¡Ë
@@ -17,7 +17,7 @@
#define GL_VERSION_multitexture
#endif
#define GL_VERSION_multitexture_F 9999.9f
-@@ -232,13 +233,13 @@
+@@ -232,13 +233,13 @@ float GetOpenGLVersion() ;
#define GL_VERSION_polygon_offset_F 1.1f
// texture_cube_map ¤ò¥µ¥Ý¡¼¥È¤¹¤ë¥Ð¡¼¥¸¥ç¥ó¡Ê̤Äê¡Ë
@@ -33,7 +33,7 @@
#define GL_VERSION_texture_compression
#endif
#define GL_VERSION_texture_compression_F 9999.9f
-@@ -592,6 +593,8 @@
+@@ -592,6 +593,8 @@ char *IsSupported_multitexture(int flag_
#endif // #ifndef GL_ARB_texture_cube_map
@@ -42,12 +42,12 @@
// EXT_texture_cube_map
#ifndef GL_EXT_texture_cube_map
#define GL_EXT_texture_cube_map
-@@ -687,6 +690,8 @@
- #define GL_COMPRESSED_RGBA_S3TC_DXT3 ((GLenum)0x83F2)
+@@ -688,6 +691,8 @@ char *IsSupported_texture_compression_En
#define GL_COMPRESSED_RGBA_S3TC_DXT5 ((GLenum)0x83F3)
#endif // #ifndef GL_VERSION_texture_compression_s3tc
-+
-+#define GL_EXT_texture_compression_s3tc
++#define GL_EXT_texture_compression_s3tc
++
#ifndef GL_EXT_texture_compression_s3tc
#define GL_EXT_texture_compression_s3tc
+
Modified: head/x11-clocks/glclock/files/patch-MString.H
==============================================================================
--- head/x11-clocks/glclock/files/patch-MString.H Mon May 9 18:37:38 2016 (r414878)
+++ head/x11-clocks/glclock/files/patch-MString.H Mon May 9 18:38:47 2016 (r414879)
@@ -1,5 +1,5 @@
---- MString.H.orig 2000-06-22 23:58:26.000000000 +0900
-+++ MString.H 2014-04-01 01:01:42.000000000 +0900
+--- MString.H.orig 2000-06-22 14:58:26 UTC
++++ MString.H
@@ -66,7 +66,7 @@
#ifndef ___STRING_H___
#define ___STRING_H___
@@ -17,7 +17,7 @@
//#define STRING_DEBUG
-@@ -307,15 +308,15 @@
+@@ -307,15 +308,15 @@ class String
// m ʸ»úÌܤ«¤é n ʸ»ú
String& Mid(int m, int n = 1) ;
Modified: head/x11-clocks/glclock/files/patch-MString.cpp
==============================================================================
--- head/x11-clocks/glclock/files/patch-MString.cpp Mon May 9 18:37:38 2016 (r414878)
+++ head/x11-clocks/glclock/files/patch-MString.cpp Mon May 9 18:38:47 2016 (r414879)
@@ -1,4 +1,4 @@
---- MString.cpp.orig
+--- MString.cpp.orig 2000-06-22 14:58:41 UTC
+++ MString.cpp
@@ -1,6 +1,9 @@
Modified: head/x11-clocks/glclock/files/patch-glclock.H
==============================================================================
--- head/x11-clocks/glclock/files/patch-glclock.H Mon May 9 18:37:38 2016 (r414878)
+++ head/x11-clocks/glclock/files/patch-glclock.H Mon May 9 18:38:47 2016 (r414879)
@@ -1,6 +1,6 @@
---- glclock.H.orig Sun Oct 1 21:29:41 2006
-+++ glclock.H Sun Oct 1 21:29:57 2006
-@@ -279,7 +279,7 @@
+--- glclock.H.orig 2000-06-23 03:16:20 UTC
++++ glclock.H
+@@ -279,7 +279,7 @@ typedef int (APIENTRY * PFNGLCLOCKARGPRO
#define DEFAULT_GAME_MODE_STRING ""
// ¥Ç¥Õ¥©¥ë¥È¥¤¥á¡¼¥¸¥Ñ¥¹
More information about the svn-ports-head
mailing list