summaryrefslogtreecommitdiff
path: root/devel/glui/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/glui/files')
-rw-r--r--devel/glui/files/patch-glui_list.cpp24
-rw-r--r--devel/glui/files/patch-makefile60
2 files changed, 0 insertions, 84 deletions
diff --git a/devel/glui/files/patch-glui_list.cpp b/devel/glui/files/patch-glui_list.cpp
deleted file mode 100644
index f7aca8651352..000000000000
--- a/devel/glui/files/patch-glui_list.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- glui_list.cpp.orig 2007-11-04 08:19:40.000000000 +0300
-+++ glui_list.cpp 2010-02-08 19:59:12.000000000 +0300
-@@ -30,7 +30,7 @@
-
- #include "glui_internal_control.h"
- #include <cmath>
--#include <sys/timeb.h>
-+#include <sys/time.h>
-
- /****************************** GLUI_List::GLUI_List() **********/
-
-@@ -100,9 +100,9 @@
- {
- int tmp_line;
- unsigned long int ms;
-- timeb time;
-- ftime(&time);
-- ms = time.millitm + (time.time)*1000;
-+ struct timeval tv;
-+ gettimeofday(&tv, NULL);
-+ ms = tv.tv_usec/100 + (tv.tv_sec)*1000;
-
- tmp_line = find_line( local_x-x_abs, local_y-y_abs-5 );
- if ( tmp_line == -1 ) {
diff --git a/devel/glui/files/patch-makefile b/devel/glui/files/patch-makefile
deleted file mode 100644
index 0ec894578f82..000000000000
--- a/devel/glui/files/patch-makefile
+++ /dev/null
@@ -1,60 +0,0 @@
---- makefile.orig 2007-08-21 05:59:54.000000000 +0200
-+++ makefile 2011-12-01 11:36:01.000000000 +0100
-@@ -9,12 +9,7 @@
- OPTS=-O0
- #OPTS=-O2
-
--UNAME = $(shell uname)
--
--ifeq ($(UNAME), Linux)
--CXX = g++
--CPPFLAGS += $(OPTS) -Wall -pedantic
--endif
-+CPPFLAGS = $(CXXFLAGS) -Wall -pedantic -fPIC
-
- #######################################
-
-@@ -35,8 +30,8 @@
- # CPPFLAGS += -I/usr/X11R6/include -DGLUI_FREEGLUT
-
- # (3) GLUT
--LIBGLUT = -L/usr/X11R6/lib -lglut
--CPPFLAGS += -I/usr/X11R6/include
-+LIBGLUT = -L${LOCALBASE}/lib -lglut
-+CPPFLAGS += -I${LOCALBASE}/include
-
- #######################################
-
-@@ -44,13 +39,15 @@
-
- GLUI_LIB = lib/libglui.a
-
-+GLUI_DYNLIB = lib/libglui.so
-+
- GLUI_EXAMPLES = bin/example1 bin/example2 bin/example3 bin/example4 bin/example5 bin/example6
-
- GLUI_TOOLS = bin/ppm2array
-
- .PHONY: all setup examples tools clean depend doc doc-pdf doc-dist dist
-
--all: setup $(GLUI_LIB) examples tools
-+all: setup $(GLUI_LIB) $(GLUI_DYNLIB) examples tools
-
- setup:
- mkdir -p bin
-@@ -64,11 +61,14 @@
- $(CXX) $(CPPFLAGS) -o $@ $^
-
- bin/%: example/%.cpp $(GLUI_LIB)
-- $(CXX) $(CPPFLAGS) -o $@ $< $(LIBGLUI) $(LIBGLUT) $(LIBGL) $(LIBS)
-+ $(CXX) $(CPPFLAGS) -o $@ $< $(GLUI_LIB) $(LIBGLUT) $(LIBGL) $(LIBS)
-
- $(GLUI_LIB): $(GLUI_OBJS)
- ar -r $(GLUI_LIB) $(GLUI_OBJS)
-
-+$(GLUI_DYNLIB): $(GLUI_OBJS)
-+ $(CXX) -shared -o $@ $(GLUI_OBJS) $(LIBGLUT) $(LIBGL) $(LIBS)
-+
- .cpp.o:
- $(CXX) $(CPPFLAGS) -c $<
-