[haiku-commits] haiku: hrev44848 - src/libs/glut build/jam src/tests/kits/opengl/glinfo

• From: kallisti5@xxxxxxxxxxx
• To: haiku-commits@xxxxxxxxxxxxx
• Date: Fri, 16 Nov 2012 20:14:33 +0100 (CET)

hrev44848 adds 2 changesets to branch 'master'
old head: fb32cff77057649e64af9c3e3130b8eaa13466a1
new head: c5324f71f6ad529c810862402bf5ccba51d7249f
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=c5324f7+^fb32cff

----------------------------------------------------------------------------

4ff9f11: GLUT: Break GLUT out from libGL
  
   * It was confirmed that GLUT was *not* in libGL

c5324f7: GLUT: Fix mistake in header license
  
   * We felt that me adding this didn't really
     properly communicate the spirit of the
     email approval. You really can't just
     'change' a license from MIT without author
     approval... so this is superfluous.

                          [ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]

----------------------------------------------------------------------------

17 files changed, 15 insertions(+), 42 deletions(-)
build/jam/HaikuImage                 |  9 ++++-----
headers/os/opengl/GL/glut.h          |  2 --
src/kits/opengl/Jamfile              |  3 ---
src/libs/glut/Jamfile                |  6 +++---
src/libs/glut/glut_bitmap.c          |  2 --
src/libs/glut/glut_bwidth.c          |  2 --
src/libs/glut/glut_ext.c             |  2 --
src/libs/glut/glut_shapes.c          |  2 --
src/libs/glut/glut_stroke.c          |  2 --
src/libs/glut/glut_swidth.c          |  2 --
src/libs/glut/glut_teapot.c          |  2 --
src/libs/glut/glut_util.c            |  2 --
src/libs/glut/glut_vidresize.c       |  2 --
src/libs/glut/glutbitmap.h           |  2 --
src/libs/glut/glutint.h              |  2 --
src/libs/glut/glutstroke.h           |  2 --
src/tests/kits/opengl/glinfo/Jamfile | 13 ++++++++-----

############################################################################

Commit:      4ff9f11a00e866d65d180a3dd4f1cba43ba45327
URL:         http://cgit.haiku-os.org/haiku/commit/?id=4ff9f11
Author:      Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date:        Fri Nov 16 19:02:21 2012 UTC

GLUT: Break GLUT out from libGL

 * It was confirmed that GLUT was *not* in libGL

----------------------------------------------------------------------------

diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index b4b6fd8..58ce155 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -86,8 +86,8 @@ SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo 
$(X86_ONLY)GLTeapot
 SYSTEM_LIBS =
        libbe.so libbsd.so libbnetapi.so
        libdebug.so libdevice.so
-       libgame.so $(X86_ONLY)libGL.so libgnu.so
-       libmail.so libmedia.so libmidi.so libmidi2.so
+       libgame.so $(X86_ONLY)libGL.so $(X86_ONLY)libglut.so
+       libgnu.so libmail.so libmedia.so libmidi.so libmidi2.so
        libnetwork.so
        <revisioned>libroot.so libroot-addon-icu.so
        libscreensaver.so
@@ -305,9 +305,8 @@ if $(HAIKU_GCC_VERSION[1]) = 2 {
 }
 
 
-# libGL.so has GLU (like BeOS) *and* GLUT API built-in
-SYSTEM_LIBS_LIBGL_ALIASES
-       = libGLU.so libglut.so ;
+# libGL.so has GLU (like BeOS) built-in
+SYSTEM_LIBS_LIBGL_ALIASES = libGLU.so ;
 
 if $(TARGET_ARCH) = x86 {
        local lib ;
diff --git a/src/kits/opengl/Jamfile b/src/kits/opengl/Jamfile
index 009ff9f..2b96f1f 100644
--- a/src/kits/opengl/Jamfile
+++ b/src/kits/opengl/Jamfile
@@ -46,9 +46,6 @@ SharedLibrary libGL.so : $(sources) :
        # GLU
        $(HAIKU_GLU_LIBS)
 
-       # Glut
-       <opengl>glut.o
-
        # Mesa libraries (from Mesa optional package):
        $(HAIKU_MESA_LIBS)
 
diff --git a/src/libs/glut/Jamfile b/src/libs/glut/Jamfile
index cb380e8..d5547c2 100644
--- a/src/libs/glut/Jamfile
+++ b/src/libs/glut/Jamfile
@@ -62,9 +62,9 @@ Includes [ FGristFiles $(sourcesCc) $(sourcesCpp) ]
 Includes [ FGristFiles $(sourcesCc) $(sourcesCpp) ]
        : $(HAIKU_MESA_HEADERS_DEPENDENCY) ;
 
-MergeObject <opengl>glut.o :
-       # C++ sources
+SharedLibrary libglut.so :
        $(sourcesCpp)
-       # C sources
        $(sourcesCc)
+       :
+       GL game be $(TARGET_LIBSTDC++)
 ;
diff --git a/src/tests/kits/opengl/glinfo/Jamfile 
b/src/tests/kits/opengl/glinfo/Jamfile
index e02567e..d1b503d 100644
--- a/src/tests/kits/opengl/glinfo/Jamfile
+++ b/src/tests/kits/opengl/glinfo/Jamfile
@@ -24,11 +24,14 @@ Includes [ FGristFiles $(sources) ] : 
$(HAIKU_MESA_HEADERS_DEPENDENCY) ;
        # Dependency needed to trigger downloading/unzipping the package before
        # compiling the files.
 
-Preference GLInfo
-       : $(sources)
-       : be GL translation libcolumnlistview.a $(HAIKU_LOCALE_LIBS)
-               $(TARGET_LIBSUPC++)
-       : GLInfo.rdef
+Preference GLInfo :
+       $(sources)
+       :
+       be GL libglut.so 
+       translation libcolumnlistview.a $(HAIKU_LOCALE_LIBS)
+       $(TARGET_LIBSUPC++)
+       :
+       GLInfo.rdef
 ;
 
 DoCatalogs GLInfo :

############################################################################

Revision:    hrev44848
Commit:      c5324f71f6ad529c810862402bf5ccba51d7249f
URL:         http://cgit.haiku-os.org/haiku/commit/?id=c5324f7
Author:      Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date:        Fri Nov 16 19:07:11 2012 UTC

GLUT: Fix mistake in header license

 * We felt that me adding this didn't really
   properly communicate the spirit of the
   email approval. You really can't just
   'change' a license from MIT without author
   approval... so this is superfluous.

----------------------------------------------------------------------------

diff --git a/headers/os/opengl/GL/glut.h b/headers/os/opengl/GL/glut.h
index be38791..e131205 100644
--- a/headers/os/opengl/GL/glut.h
+++ b/headers/os/opengl/GL/glut.h
@@ -2,8 +2,6 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
- * GPL licensing not permitted.
- *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glut_bitmap.c b/src/libs/glut/glut_bitmap.c
index e136f2d..a17e8d0 100644
--- a/src/libs/glut/glut_bitmap.c
+++ b/src/libs/glut/glut_bitmap.c
@@ -2,8 +2,6 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
- * GPL licensing not permitted.
- *
  * Authors:
  *     Mark Kilgard
  */
diff --git a/src/libs/glut/glut_bwidth.c b/src/libs/glut/glut_bwidth.c
index 804ee5c..a72c33e 100644
--- a/src/libs/glut/glut_bwidth.c
+++ b/src/libs/glut/glut_bwidth.c
@@ -2,8 +2,6 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
- * GPL licensing not permitted.
- *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glut_ext.c b/src/libs/glut/glut_ext.c
index 9a70def..83704ca 100644
--- a/src/libs/glut/glut_ext.c
+++ b/src/libs/glut/glut_ext.c
@@ -2,8 +2,6 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
- * GPL licensing not permitted.
- *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glut_shapes.c b/src/libs/glut/glut_shapes.c
index 0e062ea..1f9d849 100644
--- a/src/libs/glut/glut_shapes.c
+++ b/src/libs/glut/glut_shapes.c
@@ -2,8 +2,6 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
- * GPL licensing not permitted.
- *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glut_stroke.c b/src/libs/glut/glut_stroke.c
index 348f6ee..689ccd2 100644
--- a/src/libs/glut/glut_stroke.c
+++ b/src/libs/glut/glut_stroke.c
@@ -2,8 +2,6 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
- * GPL licensing not permitted.
- *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glut_swidth.c b/src/libs/glut/glut_swidth.c
index e979d71..547aae0 100644
--- a/src/libs/glut/glut_swidth.c
+++ b/src/libs/glut/glut_swidth.c
@@ -2,8 +2,6 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
- * GPL licensing not permitted.
- *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glut_teapot.c b/src/libs/glut/glut_teapot.c
index fd1bb69..366bef7 100644
--- a/src/libs/glut/glut_teapot.c
+++ b/src/libs/glut/glut_teapot.c
@@ -2,8 +2,6 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
- * GPL licensing not permitted.
- *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glut_util.c b/src/libs/glut/glut_util.c
index 88e531f..1461fa8 100644
--- a/src/libs/glut/glut_util.c
+++ b/src/libs/glut/glut_util.c
@@ -2,8 +2,6 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
- * GPL licensing not permitted.
- *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glut_vidresize.c b/src/libs/glut/glut_vidresize.c
index 25f4cc3..afda7bf 100644
--- a/src/libs/glut/glut_vidresize.c
+++ b/src/libs/glut/glut_vidresize.c
@@ -2,8 +2,6 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
- * GPL licensing not permitted.
- *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glutbitmap.h b/src/libs/glut/glutbitmap.h
index f2cd07e..830046f 100644
--- a/src/libs/glut/glutbitmap.h
+++ b/src/libs/glut/glutbitmap.h
@@ -2,8 +2,6 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
- * GPL licensing not permitted.
- *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glutint.h b/src/libs/glut/glutint.h
index 66e5ab5..6f3d724 100644
--- a/src/libs/glut/glutint.h
+++ b/src/libs/glut/glutint.h
@@ -2,8 +2,6 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
- * GPL licensing not permitted.
- *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glutstroke.h b/src/libs/glut/glutstroke.h
index 370b535..12d3235 100644
--- a/src/libs/glut/glutstroke.h
+++ b/src/libs/glut/glutstroke.h
@@ -2,8 +2,6 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
- * GPL licensing not permitted.
- *
  * Authors:
  *      Mark Kilgard
  */

Other related posts:

• » [haiku-commits] haiku: hrev44848 - src/libs/glut build/jam src/tests/kits/opengl/glinfo - kallisti5

1. Home
2. haiku-commits
3. Archive
4. 11-2012

---

• » Previous by Date
• » Next by Date
• » Related Posts
• » View list details
• » Manage your subscription

---