1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111 | --- opencsg-1.3.2/debian/patches/debian-changes 2012-04-18 02:36:28.000000000 -0700
+++ opencsg-1.4.0/debian/patches/debian-changes 2015-03-26 09:29:43.000000000 -0700
@@ -1,39 +1,69 @@
-This patch contains all the Debian-specific
-changes mixed together. To review them
-separately, please inspect the GIT history
-at http://gitorious.org/openscad-debian/opencsg.
---- opencsg-1.3.2.orig/Makefile
-+++ opencsg-1.3.2/Makefile
-@@ -1,4 +1,4 @@
--SUBDIRS = glew src example
-+SUBDIRS = src example
-
- all:
- for X in $(SUBDIRS); do make -C $$X ; done
---- opencsg-1.3.2.orig/example/Makefile
-+++ opencsg-1.3.2/example/Makefile
-@@ -19,7 +19,7 @@ YACCFLAGS= -d
- INCPATH = -I. -I../glew/include -I../include -I/usr/X11R6/include -I/usr/X11R6/include
- LINK = g++
- LFLAGS =
--LIBS = $(SUBLIBS) -L/usr/X11R6/lib -L/usr/X11R6/lib -L../lib -lopencsg -lglut -L../glew/lib -lGLEW -lGLU -lGL -lXmu -lXext -lX11
-+LIBS = $(SUBLIBS) -L/usr/X11R6/lib -L/usr/X11R6/lib -L../lib -lopencsg -lglut -L../glew/lib -lGLEW -lGLU -lGL -lm
- AR = ar cqs
- RANLIB =
- MOC = $(QTDIR)/bin/moc
---- opencsg-1.3.2.orig/src/Makefile
-+++ opencsg-1.3.2/src/Makefile
-@@ -16,10 +16,10 @@ CFLAGS = -pipe -Wall -W -O2 -fPIC
- CXXFLAGS = -pipe -Wall -W -O2 -fPIC
- LEXFLAGS =
- YACCFLAGS= -d
--INCPATH = -I. -I../include -I../glew/include -I.. -I/usr/X11R6/include
-+INCPATH = -I. -I../include -I.. -I/usr/X11R6/include
- LINK = g++
--LFLAGS = -shared -Wl,-soname,libopencsg.so.1 -Wl,-rpath,../lib
--LIBS = $(SUBLIBS) -L/usr/X11R6/lib -lGLU -lGL -lXmu
-+LFLAGS = -shared -Wl,-soname,libopencsg.so.1
-+LIBS = $(SUBLIBS) -L/usr/X11R6/lib -lGL -lGLEW
- AR = ar cqs
- RANLIB =
- QMAKE = qmake
+This patch contains all the Debian-specific changes mixed together. To review
+them separately, please inspect the GIT history as described in the Vcs-git
+field.
+--- opencsg-1.4.0.orig/doc/index.html
++++ opencsg-1.4.0/doc/index.html
+@@ -8,7 +8,6 @@
+ <meta name="KeyWords" content="OpenCSG, CSG, image-based, image-based CSG, rendering, SCS, Goldfeather, OpenGL">
+
+ <title>OpenCSG - The CSG rendering library</title>
+- <link rel="shortcut icon" href="http://www.opencsg.org/favicon.ico" type="image/ico">
+ </head>
+
+ <body style="font-family: verdana,arial,sans-serif">
+@@ -463,7 +462,7 @@ Currently, I know of the following appli
+ </td>
+ </tr>
+ <tr>
+-<td valign="top" style="text-align: center;"><a href="http://www.ayam3d.org"><img src="http://ayam.sourceforge.net/gp/ayam-splash-ico
++<td valign="top" style="text-align: center;"><a href="http://www.ayam3d.org">Ayam</a></td>
+ <td>
+ <a href="http://www.ayam3d.org">Ayam</a> is a 3D modelling environment for the RenderMan interface,
+ running on Unix, Win32, and Mac OS X. Since version 1.8, Ayam provides the plugin aycsg for
+@@ -472,7 +471,7 @@ Currently, I know of the following appli
+ </td>
+ </tr>
+ <tr>
+-<td valign="top" style="text-align: center;"><a href="http://neuron-ai.tuke.sk/~wagner/projects-csg.php"><img src="http://neuron-ai.t
++<td valign="top" style="text-align: center;"><a href="http://neuron-ai.tuke.sk/~wagner/projects-csg.php">KoraX CSG-Editor</a></td>
+ <td>
+ <a href="http://neuron-ai.tuke.sk/~wagner/projects-csg.php">koraX's CSG Editor</a>. This editor for
+ MS Windows allows to compose textured CSG shapes from a set of predefined primitives. The application
+--- opencsg-1.4.0.orig/doc/news.html
++++ opencsg-1.4.0/doc/news.html
+@@ -8,7 +8,6 @@
+ <meta name="KeyWords" content="OpenCSG, CSG, image-based, image-based CSG, rendering, SCS, Goldfeather, OpenGL">
+
+ <title>OpenCSG - News</title>
+- <link rel="shortcut icon" href="http://www.opencsg.org/favicon.ico" type="image/ico">
+ </head>
+
+ <body style="font-family: verdana,arial,sans-serif">
+--- opencsg-1.4.0.orig/doc/publications.html
++++ opencsg-1.4.0/doc/publications.html
+@@ -8,7 +8,6 @@
+ <meta name="KeyWords" content="OpenCSG, CSG, image-based, image-based CSG, rendering, SCS, Goldfeather, OpenGL">
+
+ <title>Publications related to OpenCSG</title>
+- <link rel="shortcut icon" href="http://www.opencsg.org/favicon.ico" type="image/ico">
+ </head>
+
+ <body style="font-family: verdana,arial,sans-serif">
+--- opencsg-1.4.0.orig/include/opencsg.h
++++ opencsg-1.4.0/include/opencsg.h
+@@ -33,6 +33,8 @@
+ #define OPENCSG_VERSION 0x0140
+ #define OPENCSG_VERSION_STRING "OpenCSG 1.4.0"
+
++#pragma GCC visibility push(default)
++
+ namespace OpenCSG {
+
+ enum Operation { Intersection, Subtraction };
+@@ -266,4 +268,6 @@ namespace OpenCSG {
+
+ } // namespace OpenCSG
+
++#pragma GCC visibility pop
++
+ #endif // __OpenCSG__opencsg_h__
|