From e85a27423c2e1889e1796b06747f86b0ee78f2ef Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sun, 18 Nov 2012 07:56:22 -0600 Subject: [PATCH 1/5] GLUT: Make sure to use GLU headers. * Fixes build, sorry about that. --- src/libs/glut/Jamfile | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libs/glut/Jamfile b/src/libs/glut/Jamfile index d5547c2858..3c777d1016 100644 --- a/src/libs/glut/Jamfile +++ b/src/libs/glut/Jamfile @@ -1,4 +1,5 @@ SubDir HAIKU_TOP src libs glut ; +SubDirSysHdrs $(HAIKU_GLU_HEADERS) ; SubDirSysHdrs $(HAIKU_MESA_HEADERS) ; SetSubDirSupportedPlatformsBeOSCompatible ; From 6308afb12c8cffbcdec43cd7d9453ec5a0b26fb0 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sun, 18 Nov 2012 08:22:38 -0600 Subject: [PATCH 2/5] GL: Make sure to use GLU headers. * The HEADERS_DEPENDENCY isn't needed for GLU as Mesa is a dependency and requires GLU to build * I actually didn't break the build, we were however using the Mesa GLU headers with the external GLU lib which could be bad --- src/add-ons/screen_savers/flurry/Jamfile | 1 + src/add-ons/screen_savers/glife/Jamfile | 1 + src/apps/glteapot/Jamfile | 1 + src/libs/glut/Jamfile | 3 --- src/tests/kits/opengl/glinfo/Jamfile | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/add-ons/screen_savers/flurry/Jamfile b/src/add-ons/screen_savers/flurry/Jamfile index 54357c262c..18e487b6cb 100644 --- a/src/add-ons/screen_savers/flurry/Jamfile +++ b/src/add-ons/screen_savers/flurry/Jamfile @@ -1,4 +1,5 @@ SubDir HAIKU_TOP src add-ons screen_savers flurry ; +SubDirSysHdrs $(HAIKU_GLU_HEADERS) ; SubDirSysHdrs $(HAIKU_MESA_HEADERS) ; # For GCC2 diff --git a/src/add-ons/screen_savers/glife/Jamfile b/src/add-ons/screen_savers/glife/Jamfile index 0b9d9b09d8..23010df29b 100644 --- a/src/add-ons/screen_savers/glife/Jamfile +++ b/src/add-ons/screen_savers/glife/Jamfile @@ -1,4 +1,5 @@ SubDir HAIKU_TOP src add-ons screen_savers glife ; +SubDirSysHdrs $(HAIKU_GLU_HEADERS) ; SubDirSysHdrs $(HAIKU_MESA_HEADERS) ; SetSubDirSupportedPlatformsBeOSCompatible ; diff --git a/src/apps/glteapot/Jamfile b/src/apps/glteapot/Jamfile index d496758179..ce1b93fcf8 100644 --- a/src/apps/glteapot/Jamfile +++ b/src/apps/glteapot/Jamfile @@ -1,4 +1,5 @@ SubDir HAIKU_TOP src apps glteapot ; +SubDirSysHdrs $(HAIKU_GLU_HEADERS) ; SubDirSysHdrs $(HAIKU_MESA_HEADERS) ; SetSubDirSupportedPlatformsBeOSCompatible ; diff --git a/src/libs/glut/Jamfile b/src/libs/glut/Jamfile index 3c777d1016..54750c26bc 100644 --- a/src/libs/glut/Jamfile +++ b/src/libs/glut/Jamfile @@ -56,9 +56,6 @@ if $(HAIKU_GCC_VERSION[1]) < 3 { } -# Ensure GLU dependency is met -Includes [ FGristFiles $(sourcesCc) $(sourcesCpp) ] - : $(HAIKU_GLU_HEADERS_DEPENDENCY) ; # Ensure Mesa dependency is met Includes [ FGristFiles $(sourcesCc) $(sourcesCpp) ] : $(HAIKU_MESA_HEADERS_DEPENDENCY) ; diff --git a/src/tests/kits/opengl/glinfo/Jamfile b/src/tests/kits/opengl/glinfo/Jamfile index d1b503d120..c6c85deed3 100644 --- a/src/tests/kits/opengl/glinfo/Jamfile +++ b/src/tests/kits/opengl/glinfo/Jamfile @@ -1,5 +1,5 @@ SubDir HAIKU_TOP src tests kits opengl glinfo ; - +SubDirSysHdrs $(HAIKU_GLU_HEADERS) ; SubDirSysHdrs $(HAIKU_MESA_HEADERS) ; # For GCC2 From 37b14b15ab10acbcb7baac0461c4cf504d70fbc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sun, 18 Nov 2012 15:30:25 +0100 Subject: [PATCH 3/5] adding missing ARM_ONLY variable --- build/jam/HaikuImage | 1 + 1 file changed, 1 insertion(+) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 58ce1557c5..917b874d29 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -5,6 +5,7 @@ local X86_ONLY = ; local PPC_ONLY = ; local M68K_ONLY = ; +local ARM_ONLY = ; if $(TARGET_ARCH) = x86 { X86_ONLY = "" ; } else if $(TARGET_ARCH) = ppc { From 49d7857e32a5c34fe63a11e46a41a774aa1b2728 Mon Sep 17 00:00:00 2001 From: Julian Harnath Date: Sun, 18 Nov 2012 15:10:32 +0100 Subject: [PATCH 4/5] Fix BDirectWindow::GetClippingRect MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Duval --- src/kits/game/DirectWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kits/game/DirectWindow.cpp b/src/kits/game/DirectWindow.cpp index 5e30f64e4e..ed850a1f51 100644 --- a/src/kits/game/DirectWindow.cpp +++ b/src/kits/game/DirectWindow.cpp @@ -365,7 +365,7 @@ BDirectWindow::GetClippingRegion(BRegion *region, BPoint *origin) const if (IsLocked() || !_LockDirect()) return B_ERROR; - if (fInDirectConnect) { + if (!fInDirectConnect) { _UnlockDirect(); return B_ERROR; } From 8a6451b9fdd949f67cdef090635ce610d1216cce Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sun, 18 Nov 2012 09:52:50 -0600 Subject: [PATCH 5/5] Mesa: Update gcc4 to Mesa 9.0 release * This is a release version of Mesa * A Bep exists on haikuports to generate the zip :) --- build/jam/OptionalBuildFeatures | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures index dd4ea9aca2..811ed22d92 100644 --- a/build/jam/OptionalBuildFeatures +++ b/build/jam/OptionalBuildFeatures @@ -212,8 +212,7 @@ if $(TARGET_ARCH) = x86 { local galliumObjects ; local zipFile ; if $(HAIKU_GCC_VERSION[1]) >= 4 { - HAIKU_MESA_FILE = mesa-8.1devel-x86-gcc4-2012-06-07.zip ; - #HAIKU_MESA_FILE = mesa-8.1develdbg-x86-gcc4-2012-06-07.zip ; + HAIKU_MESA_FILE = mesa-9.0-x86-gcc4-2012-11-17.zip ; glslObject = lib.haiku/libglsl.a ; galliumObjects = lib.haiku/libgallium.a ; } else {