haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Mesa: Update Mesa 7.8.2 patch

Browse Source 
* ifeq vs ifdef to ensure DEBUG is disabled
  properly
* call make haiku vs copying haiku to current
* Fixes #9685 gcc2 debug
This commit is contained in:
Alexander von Gluck IV
2013-04-28 15:13:30 +00:00
parent 8a55428bdc
commit 644976f0d6
2 changed files with 3 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sys-libs/mesa/mesa-7.8.2.bep
View File

@@ -15,7 +15,7 @@ MESSAGE="This port only builds with gcc2. Not for general use."
BUILD {
export DEBUG=0
cd Mesa-7.8.2
make
make haiku
cd ..
sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 7.8.2 ./Mesa-7.8.2
echo "There should be a Mesa OptionalBuild package in your home if everything went well!"

71
sys-libs/mesa/patches/mesa-7.8.2.patch
View File

@@ -234,76 +234,9 @@ diff -Naur Mesa-7.8.2/bin/mklib Mesa-7.8.2-haiku/bin/mklib
+ mv ${FINAL_BINS} ${INSTALLDIR}/
+ fi
fi
diff -Naur Mesa-7.8.2/configs/current Mesa-7.8.2-haiku/configs/current
--- Mesa-7.8.2/configs/current 1970-01-01 00:00:00.000000000 +0000
+++ Mesa-7.8.2-haiku/configs/current 2013-04-24 20:34:52.673972224 +0000
@@ -0,0 +1,63 @@
+# Configuration for Haiku
+# Written by Alexander von Gluck IV
+#
+# Based on the BeOS config
+# written by Philippe Houdoin
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = haiku
+
+# Haiku settings
+
+DEFINES = \
+ -DBEOS_THREADS \
+ -DGNU_ASSEMBLER \
+ -DUSE_X86_ASM \
+ -DUSE_MMX_ASM \
+ -DUSE_3DNOW_ASM \
+ -DUSE_SSE_ASM
+
+MESA_ASM_SOURCES = $(X86_SOURCES)
+GLAPI_ASM_SOURCES = $(X86_API)
+
+CC = gcc
+CXX = g++
+LD = gcc
+
+CFLAGS = -Wall -Wno-multichar $(DEFINES)
+CXXFLAGS = $(CFLAGS)
+LDFLAGS +=
+
+# Work around aliasing bugs - developers should comment this out
+CFLAGS += -fno-strict-aliasing
+#CFLAGS += -std=c99
+CXXFLAGS += -fno-strict-aliasing
+
+# No makedepend on Haiku, this will solve it
+MKDEP = true
+
+# Debug defines
+ifdef DEBUG
+ CFLAGS += -g -O0
+ LDFLAGS += -g
+ DEFINES += -DDEBUG
+else
+ CFLAGS += -O3
+endif
+
+# GLU settings
+GLU_LIB_NAME = libglu.a
+GLU_LIB = glu
+
+# Directories
+SRC_DIRS = glsl mesa/x86 mapi/glapi mesa glu
+GLU_DIRS = sgi
+DRIVER_DIRS =
+PROGRAM_DIRS =
+
+# Library/program dependencies
+GL_LIB_DEPS =
+OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
+GLU_LIB_DEPS =
+APP_LIB_DEPS = -lbe -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB)
diff -Naur Mesa-7.8.2/configs/haiku Mesa-7.8.2-haiku/configs/haiku
--- Mesa-7.8.2/configs/haiku 1970-01-01 00:00:00.000000000 +0000
+++ Mesa-7.8.2-haiku/configs/haiku 2013-04-24 20:34:52.675282944 +0000
+++ Mesa-7.8.2-haiku/configs/haiku 2013-04-28 15:02:58.028573696 +0000
@@ -0,0 +1,63 @@
+# Configuration for Haiku
+# Written by Alexander von Gluck IV
@@ -345,7 +278,7 @@ diff -Naur Mesa-7.8.2/configs/haiku Mesa-7.8.2-haiku/configs/haiku
+MKDEP = true
+
+# Debug defines
+ifdef DEBUG
+ifeq ($(DEBUG),1)
+ CFLAGS += -g -O0
+ LDFLAGS += -g
+ DEFINES += -DDEBUG