| 1 |
jlec 10/11/01 13:59:49 |
| 2 |
|
| 3 |
Added: 1.4-opengl.patch |
| 4 |
Log: |
| 5 |
New addition |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha3/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-libs/sg/files/1.4-opengl.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sg/files/1.4-opengl.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sg/files/1.4-opengl.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 1.4-opengl.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/configure.ac b/configure.ac |
| 18 |
index 68ff24a..a2cd6b5 100644 |
| 19 |
--- a/configure.ac |
| 20 |
+++ b/configure.ac |
| 21 |
@@ -844,9 +844,6 @@ AC_OUTPUT([ |
| 22 |
|
| 23 |
src/base/Makefile |
| 24 |
|
| 25 |
- src/gl/Makefile |
| 26 |
- src/glu/Makefile |
| 27 |
- src/glw/Makefile |
| 28 |
src/ogl/Makefile |
| 29 |
src/vgl/Makefile |
| 30 |
|
| 31 |
diff --git a/src/Makefile.am b/src/Makefile.am |
| 32 |
index ad9562f..7d5173c 100644 |
| 33 |
--- a/src/Makefile.am |
| 34 |
+++ b/src/Makefile.am |
| 35 |
@@ -35,5 +35,5 @@ |
| 36 |
AUTOMAKE_OPTIONS = no-dependencies |
| 37 |
SUFFIXES = .y .l .H .h .m .C .cc .c .f .java .o |
| 38 |
always_built_SUBDIRS = ogl vgl |
| 39 |
-SUBDIRS = base @gl@ @glu@ @glw@ $(always_built_SUBDIRS) aaa_inc aaa_lib . |
| 40 |
+SUBDIRS = base $(always_built_SUBDIRS) aaa_inc aaa_lib . |
| 41 |
|
| 42 |
diff --git a/src/aaa_inc/GL/Makefile.am b/src/aaa_inc/GL/Makefile.am |
| 43 |
index 10efb6b..0d5b8b7 100644 |
| 44 |
--- a/src/aaa_inc/GL/Makefile.am |
| 45 |
+++ b/src/aaa_inc/GL/Makefile.am |
| 46 |
@@ -37,27 +37,6 @@ SUFFIXES = .y .l .H .h .m .C .cc .c .f .java .o |
| 47 |
always_built_SUBDIRS = |
| 48 |
SUBDIRS = $(always_built_SUBDIRS) . |
| 49 |
|
| 50 |
-if BUILD_GL |
| 51 |
-GL_HEADS = gl.h glx.h osmesa.h wmesa.h xmesa.h |
| 52 |
-else |
| 53 |
-GL_HEADS = |
| 54 |
-endif |
| 55 |
- |
| 56 |
-if BUILD_GLU |
| 57 |
-GLU_HEADS = glu.h |
| 58 |
-else |
| 59 |
-GLU_HEADS = |
| 60 |
-endif |
| 61 |
- |
| 62 |
-if BUILD_GLW |
| 63 |
-GLW_HEADS = GLwDrawA.h |
| 64 |
-else |
| 65 |
-GLW_HEADS = |
| 66 |
-endif |
| 67 |
- |
| 68 |
-includedir = ${prefix}/include/GL |
| 69 |
-include_HEADERS = ${GL_HEADS} ${GLU_HEADS} ${GLW_HEADS} |
| 70 |
- |
| 71 |
distclean-local: clean-local |
| 72 |
|
| 73 |
clean-local: |
| 74 |
diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am |
| 75 |
index bb93779..0512c45 100644 |
| 76 |
--- a/src/aaa_lib/Makefile.am |
| 77 |
+++ b/src/aaa_lib/Makefile.am |
| 78 |
@@ -41,32 +41,16 @@ BASE_LIBS = ../base/libbase.la |
| 79 |
OGL_LIBS = ../ogl/libogl.la |
| 80 |
VGL_LIBS = ../vgl/libvgl.la |
| 81 |
|
| 82 |
-GL_LIBS = ../gl/libGL.la |
| 83 |
-if BUILD_GL |
| 84 |
-LIBGL = libGL.la |
| 85 |
-else |
| 86 |
-LIBGL = |
| 87 |
-endif |
| 88 |
+GL_LIBS = ${libdir}/libGL.la |
| 89 |
|
| 90 |
-GLU_LIBS = ../glu/libGLU.la |
| 91 |
-if BUILD_GLU |
| 92 |
-LIBGLU = libGLU.la |
| 93 |
-else |
| 94 |
-LIBGLU = |
| 95 |
-endif |
| 96 |
+GLU_LIBS = ${libdir}/libGLU.la |
| 97 |
|
| 98 |
-GLW_LIBS = ../glw/libGLw.la |
| 99 |
-if BUILD_GLW |
| 100 |
-LIBGLW = libGLw.la |
| 101 |
-else |
| 102 |
-LIBGLW = |
| 103 |
-endif |
| 104 |
+GLW_LIBS = ${libdir}/libGLw.la |
| 105 |
|
| 106 |
-libdir = ${prefix}/lib |
| 107 |
lib_LTLIBRARIES = libsg.la ${LIBGL} ${LIBGLU} ${LIBGLW} |
| 108 |
|
| 109 |
libsg_la_SOURCES = |
| 110 |
-libsg_la_LIBADD = ${BASE_LIBS} ${OGL_LIBS} ${VGL_LIBS} |
| 111 |
+libsg_la_LIBADD = ${BASE_LIBS} ${OGL_LIBS} ${VGL_LIBS} -lGL -lGLU -lGLw -lXm -lmaloc -lXaw |
| 112 |
libsg_la_LDFLAGS = -version-info ${FETK_VERSION} |
| 113 |
|
| 114 |
libGL_la_SOURCES = |
Archives