mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-21 19:20:08 +02:00
Mesa: link against libbe to use be_bold_font
Fix issues with various BeOS apps which use libGL. Thanks to puckipedia for investigating this!
This commit is contained in:
Adrien Destugues
@@ -1,92 +0,0 @@
|
||||
# NOTE: This recipe doesn't generate packages for general use:
|
||||
# * mesa_devel: Is a service package for the Haiku build system. It contains the
|
||||
# Mesa libraries and headers, which are built into the Haiku system package.
|
||||
# * mesa: Is an empty package which we keep as a dependency for the Haiku system
|
||||
# package, mainly to keep the copyright info.
|
||||
|
||||
SUMMARY="Multi-platform GL implementation"
|
||||
DESCRIPTION="
|
||||
Mesa is an open-source implementation of the OpenGL specification - a system \
|
||||
for rendering interactive 3D graphics.
|
||||
A variety of device drivers allows Mesa to be used in many different \
|
||||
environments ranging from software emulation to complete hardware acceleration \
|
||||
for modern GPUs.
|
||||
Mesa ties into several other open-source projects: the Direct Rendering \
|
||||
Infrastructure and X.org to provide OpenGL support to users of X on Linux, \
|
||||
FreeBSD and other operating systems.
|
||||
"
|
||||
HOMEPAGE="http://www.mesa3d.org/"
|
||||
COPYRIGHT="1999-2012 Brian Paul All Rights Reserved."
|
||||
LICENSE="MIT"
|
||||
SRC_URI="ftp://freedesktop.org/pub/mesa/older-versions/7.x/7.8.2/MesaLib-7.8.2.tar.bz2"
|
||||
CHECKSUM_SHA256="505bf418dceba05837f4ea1b1972b9620c35f8cb94bc4d1e6d573c15f562576d"
|
||||
REVISION="3"
|
||||
ARCHITECTURES="x86_gcc2"
|
||||
if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ]
|
||||
then
|
||||
ARCHITECTURES="$ARCHITECTURES x86"
|
||||
fi
|
||||
SECONDARY_ARCHITECTURES="x86_gcc2"
|
||||
|
||||
PATCHES="mesa-7.8.2.patch"
|
||||
|
||||
PROVIDES="
|
||||
mesa$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix >= $haikuVersion
|
||||
"
|
||||
BUILD_REQUIRES="
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel >= $haikuVersion
|
||||
cmd:find
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:sed
|
||||
"
|
||||
|
||||
SOURCE_DIR="Mesa-$portVersion"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
DEBUG=0 make $jobArgs haiku
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
# "make install" seems to be broken, so we copy the headers and libraries
|
||||
# manually.
|
||||
|
||||
mkdir -p $includeDir
|
||||
cp -r include/* $includeDir
|
||||
|
||||
mkdir -p $developLibDir
|
||||
cp lib/libglu.a src/mesa/*.a src/glsl/*/*.a $developLibDir
|
||||
|
||||
mesaPrivateHeaders=$includeDir/mesa_private
|
||||
for header in $(find src -name '*\.h' | sed "s,^src/,,"); do
|
||||
mkdir -p $mesaPrivateHeaders/$(dirname $header)
|
||||
cp src/$header $mesaPrivateHeaders/$header
|
||||
done
|
||||
|
||||
# devel package
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
|
||||
# ----- devel package -------------------------------------------------------
|
||||
|
||||
PROVIDES_devel="
|
||||
mesa${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libglapi$secondaryArchSuffix = $portVersion
|
||||
devel:libglslcl$secondaryArchSuffix = $portVersion
|
||||
devel:libglslpp$secondaryArchSuffix = $portVersion
|
||||
devel:libglu$secondaryArchSuffix = $portVersion
|
||||
devel:libmesa$secondaryArchSuffix = $portVersion
|
||||
devel:libmesagallium$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES_devel="
|
||||
mesa$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
@@ -13,8 +13,9 @@ SRC_URI="https://github.com/haiku/mesa_legacy/archive/7.9.2-9.tar.gz"
|
||||
SOURCE_DIR="mesa_legacy-7.9.2-9"
|
||||
SRC_FILENAME="mesa_legacy-7.9.2-9.tar.gz"
|
||||
CHECKSUM_SHA256="445c4081c761851343ae732b5f233f269f6751ff422aa0299aae009fe049c273"
|
||||
PATCHES="mesa-7.9.2.patchset"
|
||||
|
||||
REVISION="9"
|
||||
REVISION="10"
|
||||
ARCHITECTURES="x86_gcc2"
|
||||
if [ $effectiveTargetArchitecture != x86 ]; then
|
||||
# x86_gcc2 is fine as primary target architecture as long as we're building
|
||||
|
||||
@@ -1,415 +0,0 @@
|
||||
diff -Naur Mesa-7.8.2/bin/mklib Mesa-7.8.2-haiku/bin/mklib
|
||||
--- Mesa-7.8.2/bin/mklib 2010-06-15 17:43:41.036438016 +0000
|
||||
+++ Mesa-7.8.2-haiku/bin/mklib 2013-04-24 20:34:52.664010752 +0000
|
||||
@@ -260,7 +260,7 @@
|
||||
NEWOBJECTS=""
|
||||
for OBJ in $OBJECTS ; do
|
||||
case $OBJ in
|
||||
- -Wl,*)
|
||||
+ -Wl,*|-L*|-l*)
|
||||
echo "mklib: warning: ignoring $OBJ for static library"
|
||||
;;
|
||||
*)
|
||||
@@ -307,7 +307,7 @@
|
||||
#
|
||||
case $ARCH in
|
||||
|
||||
- 'Linux' | 'OpenBSD' | 'DragonFly' | 'GNU' | GNU/*)
|
||||
+ 'Linux' | 'OpenBSD' | 'DragonFly' | 'GNU' | GNU/* | 'NetBSD')
|
||||
# we assume gcc
|
||||
|
||||
if [ "x$LINK" = "x" ] ; then
|
||||
@@ -494,13 +494,16 @@
|
||||
OPTS="${OPTS} -Wl,-Mmapfile.scope"
|
||||
fi
|
||||
|
||||
- # Check if objects are SPARC v9
|
||||
+ # Check if objects are 64-bit
|
||||
# file says: ELF 64-bit MSB relocatable SPARCV9 Version 1
|
||||
set ${OBJECTS}
|
||||
if [ ${LINK} = "cc" -o ${LINK} = "CC" ] ; then
|
||||
- SPARCV9=`file $1 | grep SPARCV9`
|
||||
- if [ "${SPARCV9}" ] ; then
|
||||
- OPTS="${OPTS} -xarch=v9"
|
||||
+ ABI64=`file $1 | grep "ELF 64-bit"`
|
||||
+ if [ "${ABI64}" ] ; then
|
||||
+ case `uname -p` in
|
||||
+ sparc) OPTS="${OPTS} -xarch=v9" ;;
|
||||
+ i386) OPTS="${OPTS} -xarch=amd64" ;;
|
||||
+ esac
|
||||
fi
|
||||
fi
|
||||
if [ "${ALTOPTS}" ] ; then
|
||||
@@ -571,20 +574,6 @@
|
||||
fi
|
||||
;;
|
||||
|
||||
- 'NetBSD')
|
||||
- if [ $STATIC = 1 ] ; then
|
||||
- LIBNAME="lib${LIBNAME}_pic.a"
|
||||
- echo "mklib: Making NetBSD PIC static library: " ${LIBNAME}
|
||||
- FINAL_LIBS=`make_ar_static_lib cq 1 ${LIBNAME} ${OBJECTS}`
|
||||
- else
|
||||
- LIBNAME="lib${LIBNAME}.so.${MAJOR}.${MINOR}"
|
||||
- echo "mklib: Making NetBSD PIC shared library: " ${LIBNAME}
|
||||
- rm -f ${LIBNAME}
|
||||
- ld -x -Bshareable -Bforcearchive -o ${LIBNAME} ${OBJECTS}
|
||||
- FINAL_LIBS=${LIBNAME}
|
||||
- fi
|
||||
- ;;
|
||||
-
|
||||
'IRIX' | 'IRIX64')
|
||||
if [ $STATIC = 1 ] ; then
|
||||
LIBNAME="lib${LIBNAME}.a"
|
||||
@@ -778,9 +767,8 @@
|
||||
OPTS="${OPTS} -exported_symbols_list ${EXPORTS}"
|
||||
fi
|
||||
|
||||
- LINKNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
|
||||
- LINKNAME2="lib${LIBNAME}.${LIBSUFFIX}"
|
||||
- LIBNAME="lib${LIBNAME}.${MAJOR}.${MINOR}.${LIBSUFFIX}"
|
||||
+ LINKNAME="lib${LIBNAME}.${LIBSUFFIX}"
|
||||
+ LIBNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
|
||||
|
||||
# examine first object to determine ABI
|
||||
set ${OBJECTS}
|
||||
@@ -793,9 +781,6 @@
|
||||
OPTS=${ALTOPTS}
|
||||
fi
|
||||
|
||||
- # XXX can we always add -isysroot /Developer/SDKs/MacOSX10.4u.sdk
|
||||
- # to OPTS here?
|
||||
-
|
||||
# determine linker
|
||||
if [ $CPLUSPLUS = 1 ] ; then
|
||||
LINK="g++"
|
||||
@@ -807,8 +792,7 @@
|
||||
|
||||
${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
|
||||
ln -s ${LIBNAME} ${LINKNAME}
|
||||
- ln -s ${LIBNAME} ${LINKNAME2}
|
||||
- FINAL_LIBS="${LIBNAME} ${LINKNAME} ${LINKNAME2}"
|
||||
+ FINAL_LIBS="${LIBNAME} ${LINKNAME}"
|
||||
fi
|
||||
;;
|
||||
|
||||
@@ -818,22 +802,6 @@
|
||||
FINAL_LIBS=`make_ar_static_lib -ru 0 ${LIBNAME} ${OBJECTS}`
|
||||
;;
|
||||
|
||||
- 'BeOS')
|
||||
- if [ $STATIC = 1 ] ; then
|
||||
- LIBNAME="lib${LIBNAME}.a"
|
||||
- echo "mklib: Making BeOS static library: " ${LIBNAME}
|
||||
- FINAL_LIBS=`make_ar_static_lib -cru 0 ${LIBNAME} ${OBJECTS}`
|
||||
- else
|
||||
- LIBNAME="lib${LIBNAME}.so"
|
||||
- echo "mklib: Making BeOS shared library: " ${LIBNAME}
|
||||
- gcc -nostart -Xlinker "-soname=${LIBNAME}" -L/Be/develop/lib/x86 -lbe ${DEPS} ${OBJECTS} -o "${LIBNAME}"
|
||||
- mimeset -f "${LIBNAME}"
|
||||
- # XXX remove the Mesa3D stuff here since mklib isn't mesa-specific.
|
||||
- setversion "${LIBNAME}" -app ${MAJOR} ${MINOR} ${PATCH} -short "Powered by Mesa3D!" -long "Powered by Mesa3D!"
|
||||
- fi
|
||||
- FINAL_LIBS=${LIBNAME}
|
||||
- ;;
|
||||
-
|
||||
'QNX')
|
||||
LIBNAME="lib${LIBNAME}.a"
|
||||
echo "mklib: Making QNX library: " ${LIBNAME}
|
||||
@@ -927,6 +895,16 @@
|
||||
|
||||
CYGWIN*)
|
||||
# GCC-based environment
|
||||
+
|
||||
+ if [ "x$LINK" = "x" ] ; then
|
||||
+ # -linker was not specified so set default link command now
|
||||
+ if [ $CPLUSPLUS = 1 ] ; then
|
||||
+ LINK=g++
|
||||
+ else
|
||||
+ LINK=gcc
|
||||
+ fi
|
||||
+ fi
|
||||
+
|
||||
if [ $NOPREFIX = 1 ] ; then
|
||||
# No "lib" or ".so" part
|
||||
echo "mklib: Making CYGWIN shared library: " ${LIBNAME}
|
||||
@@ -935,7 +913,7 @@
|
||||
OPTS=${ALTOPTS}
|
||||
fi
|
||||
rm -f ${LIBNAME}
|
||||
- ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
|
||||
+ ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS} || exit $?
|
||||
FINAL_LIBS=${LIBNAME}
|
||||
else
|
||||
CYGNAME="cyg${LIBNAME}" # prefix with "cyg"
|
||||
@@ -943,7 +921,7 @@
|
||||
|
||||
if [ $STATIC = 1 ] ; then
|
||||
LIBNAME=${LIBNAME}.a
|
||||
- echo "mklib: Making" $ARCH "static library: " ${LIBNAME}
|
||||
+ echo "mklib: Making CYGWIN static library: " ${LIBNAME}
|
||||
OPTS="-ru"
|
||||
if [ "${ALTOPTS}" ] ; then
|
||||
OPTS=${ALTOPTS}
|
||||
@@ -961,13 +939,7 @@
|
||||
if [ "${ALTOPTS}" ] ; then
|
||||
OPTS=${ALTOPTS}
|
||||
fi
|
||||
- echo "mklib: Making" $ARCH "shared library: " ${CYGNAME}-${MAJOR}.dll
|
||||
-
|
||||
- if [ $CPLUSPLUS = 1 ] ; then
|
||||
- LINK="g++"
|
||||
- else
|
||||
- LINK="gcc"
|
||||
- fi
|
||||
+ echo "mklib: Making CYGWIN shared library: " ${CYGNAME}-${MAJOR}.dll
|
||||
|
||||
# rm any old libs
|
||||
rm -f ${CYGNAME}-${MAJOR}.dll
|
||||
@@ -976,12 +948,7 @@
|
||||
rm -f ${LIBNAME}.a
|
||||
|
||||
# make lib
|
||||
- ${LINK} ${OPTS} ${LDFLAGS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS}
|
||||
- # make build fail if link failed
|
||||
- es=$?
|
||||
- if [ "$es" -ne "0" ]; then
|
||||
- exit $es
|
||||
- fi
|
||||
+ ${LINK} ${OPTS} ${LDFLAGS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS} || exit $?
|
||||
# make usual symlinks
|
||||
ln -s ${LIBNAME}-${MAJOR}.dll.a ${LIBNAME}.dll.a
|
||||
# finish up
|
||||
@@ -992,6 +959,43 @@
|
||||
fi
|
||||
;;
|
||||
|
||||
+ 'Haiku')
|
||||
+ if [ $STATIC = 1 ] ; then
|
||||
+ LIBNAME="lib${LIBNAME}.a"
|
||||
+ if [ "x$LINK" = "x" ] ; then
|
||||
+ # -linker was not specified so set default link command now
|
||||
+ if [ $CPLUSPLUS = 1 ] ; then
|
||||
+ LINK=g++
|
||||
+ else
|
||||
+ LINK=gcc
|
||||
+ fi
|
||||
+ fi
|
||||
+
|
||||
+ OPTS="-ru"
|
||||
+ if [ "${ALTOPTS}" ] ; then
|
||||
+ OPTS=${ALTOPTS}
|
||||
+ fi
|
||||
+
|
||||
+ echo "mklib: Making static library for Haiku: " ${LIBNAME}
|
||||
+
|
||||
+ # expand .a into .o files
|
||||
+ NEW_OBJECTS=`expand_archives ${LIBNAME}.obj $OBJECTS`
|
||||
+
|
||||
+ # make static lib
|
||||
+ FINAL_LIBS=`make_ar_static_lib ${OPTS} 1 ${LIBNAME} ${NEW_OBJECTS}`
|
||||
+
|
||||
+ # remove temporary extracted .o files
|
||||
+ rm -rf ${LIBNAME}.obj
|
||||
+ else
|
||||
+ LIBNAME="lib${LIBNAME}.so" # prefix with "lib", suffix with ".so"
|
||||
+ OPTS="-shared"
|
||||
+
|
||||
+ echo "mklib: Making shared library for Haiku: " ${LIBNAME}
|
||||
+ ${LINK} ${OPTS} ${LDFLAGS} ${OBJECTS} ${DEPS} -o ${LIBNAME}
|
||||
+ FINAL_LIBS="${LIBNAME}"
|
||||
+ fi
|
||||
+ ;;
|
||||
+
|
||||
'example')
|
||||
# If you're adding support for a new architecture, you can
|
||||
# start with this:
|
||||
@@ -1021,4 +1025,9 @@
|
||||
echo "mklib: Installing" ${FINAL_LIBS} "in" ${INSTALLDIR}
|
||||
test -d ${INSTALLDIR} || mkdir -p ${INSTALLDIR}
|
||||
mv ${FINAL_LIBS} ${INSTALLDIR}/
|
||||
+
|
||||
+ if [ "x${FINAL_BINS}" != "x" ] ; then
|
||||
+ echo "mklib: Installing" ${FINAL_BINS} "in" ${INSTALLDIR}
|
||||
+ mv ${FINAL_BINS} ${INSTALLDIR}/
|
||||
+ fi
|
||||
fi
|
||||
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-28 15:02:58.028573696 +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
|
||||
+ifeq ($(DEBUG),1)
|
||||
+ 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/include/GL/gl.h Mesa-7.8.2-haiku/include/GL/gl.h
|
||||
--- Mesa-7.8.2/include/GL/gl.h 2010-04-27 21:41:21.061865984 +0000
|
||||
+++ Mesa-7.8.2-haiku/include/GL/gl.h 2013-04-24 20:34:52.693895168 +0000
|
||||
@@ -67,7 +67,8 @@
|
||||
#elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */
|
||||
# define GLAPI extern
|
||||
# define GLAPIENTRY __stdcall
|
||||
-#elif defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
|
||||
+#elif (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303) && \
|
||||
+ defined(__ELF__)) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
|
||||
# define GLAPI __attribute__((visibility("default")))
|
||||
# define GLAPIENTRY
|
||||
#endif /* WIN32 && !CYGWIN */
|
||||
diff -Naur Mesa-7.8.2/Makefile Mesa-7.8.2-haiku/Makefile
|
||||
--- Mesa-7.8.2/Makefile 2010-06-16 21:22:57.034865152 +0000
|
||||
+++ Mesa-7.8.2-haiku/Makefile 2013-04-24 20:34:52.695468032 +0000
|
||||
@@ -84,6 +84,7 @@
|
||||
freebsd-dri \
|
||||
freebsd-dri-amd64 \
|
||||
freebsd-dri-x86 \
|
||||
+haiku \
|
||||
hpux10 \
|
||||
hpux10-gcc \
|
||||
hpux10-static \
|
||||
diff -Naur Mesa-7.8.2/src/gallium/auxiliary/draw/draw_private.h Mesa-7.8.2-haiku/src/gallium/auxiliary/draw/draw_private.h
|
||||
--- Mesa-7.8.2/src/gallium/auxiliary/draw/draw_private.h 2010-06-15 17:43:42.048234496 +0000
|
||||
+++ Mesa-7.8.2-haiku/src/gallium/auxiliary/draw/draw_private.h 2013-04-24 20:34:52.704380928 +0000
|
||||
@@ -70,7 +70,7 @@
|
||||
|
||||
/* This will probably become float (*data)[4] soon:
|
||||
*/
|
||||
- float data[][4];
|
||||
+ float (*data)[4];
|
||||
};
|
||||
|
||||
/* NOTE: It should match vertex_id size above */
|
||||
diff -Naur Mesa-7.8.2/src/gallium/auxiliary/os/os_thread.h Mesa-7.8.2-haiku/src/gallium/auxiliary/os/os_thread.h
|
||||
--- Mesa-7.8.2/src/gallium/auxiliary/os/os_thread.h 2010-06-15 17:43:42.058195968 +0000
|
||||
+++ Mesa-7.8.2-haiku/src/gallium/auxiliary/os/os_thread.h 2013-04-24 20:34:52.705953792 +0000
|
||||
@@ -257,7 +257,7 @@
|
||||
* pipe_barrier
|
||||
*/
|
||||
|
||||
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HAIKU)
|
||||
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|
||||
|
||||
typedef pthread_barrier_t pipe_barrier;
|
||||
|
||||
diff -Naur Mesa-7.8.2/src/gallium/auxiliary/util/u_debug.h Mesa-7.8.2-haiku/src/gallium/auxiliary/util/u_debug.h
|
||||
--- Mesa-7.8.2/src/gallium/auxiliary/util/u_debug.h 2010-06-15 17:43:42.001572864 +0000
|
||||
+++ Mesa-7.8.2-haiku/src/gallium/auxiliary/util/u_debug.h 2013-04-24 20:34:52.728498176 +0000
|
||||
@@ -91,8 +91,10 @@
|
||||
(void) format; /* silence warning */
|
||||
#endif
|
||||
}
|
||||
-
|
||||
-#endif /* !PIPE_OS_HAIKU */
|
||||
+#else /* is Haiku */
|
||||
+/* Haiku provides debug_printf in libroot with OS.h */
|
||||
+#include <OS.h>
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* ... isn't portable so we need to pass arguments in parentheses.
|
||||
diff -Naur Mesa-7.8.2/src/glu/sgi/Makefile Mesa-7.8.2-haiku/src/glu/sgi/Makefile
|
||||
--- Mesa-7.8.2/src/glu/sgi/Makefile 2010-02-05 00:10:40.066060288 +0000
|
||||
+++ Mesa-7.8.2-haiku/src/glu/sgi/Makefile 2013-04-24 20:34:52.730071040 +0000
|
||||
@@ -135,13 +135,19 @@
|
||||
-mkdir $(TOP)/$(LIB_DIR)
|
||||
|
||||
# Make the library:
|
||||
-$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
|
||||
+$(TOP)/$(LIB_DIR)/lib$(GLU_LIB).so: $(OBJECTS)
|
||||
$(MKLIB) -o $(GLU_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
|
||||
-major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
|
||||
-cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
|
||||
-exports glu.exports -id $(INSTALL_LIB_DIR)/lib$(GLU_LIB).$(GLU_MAJOR).dylib \
|
||||
$(GLU_LIB_DEPS) $(OBJECTS)
|
||||
|
||||
+$(TOP)/$(LIB_DIR)/lib$(GLU_LIB).a: $(OBJECTS)
|
||||
+ $(MKLIB) -o $(GLU_LIB) -static -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
|
||||
+ -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
|
||||
+ -cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
|
||||
+ -exports glu.exports -id $(INSTALL_LIB_DIR)/lib$(GLU_LIB).$(GLU_MAJOR).dylib \
|
||||
+ $(GLU_LIB_DEPS) $(OBJECTS)
|
||||
|
||||
clean:
|
||||
-rm -f *.o */*.o */*/*.o
|
||||
diff -Naur Mesa-7.8.2/src/mesa/glapi/glapi.h Mesa-7.8.2-haiku/src/mesa/glapi/glapi.h
|
||||
--- Mesa-7.8.2/src/mesa/glapi/glapi.h 2010-06-15 17:43:43.028049408 +0000
|
||||
+++ Mesa-7.8.2-haiku/src/mesa/glapi/glapi.h 2013-04-24 20:34:52.747634688 +0000
|
||||
@@ -62,7 +62,7 @@
|
||||
#endif
|
||||
|
||||
|
||||
-#if defined(__GNUC__)
|
||||
+#if defined(__GNUC__) && __GNUC__ > 2
|
||||
# define likely(x) __builtin_expect(!!(x), 1)
|
||||
# define unlikely(x) __builtin_expect(!!(x), 0)
|
||||
#else
|
||||
diff -Naur Mesa-7.8.2/src/mesa/main/execmem.c Mesa-7.8.2-haiku/src/mesa/main/execmem.c
|
||||
--- Mesa-7.8.2/src/mesa/main/execmem.c 2010-04-27 21:41:21.011272192 +0000
|
||||
+++ Mesa-7.8.2-haiku/src/mesa/main/execmem.c 2013-04-24 20:35:32.244056064 +0000
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
|
||||
|
||||
-#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun)
|
||||
+#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) || defined(__HAIKU__)
|
||||
|
||||
/*
|
||||
* Allocate a large block of memory which can hold code then dole it out
|
||||
24
sys-libs/mesa/patches/mesa-7.9.2.patchset
Normal file
24
sys-libs/mesa/patches/mesa-7.9.2.patchset
Normal file
@@ -0,0 +1,24 @@
|
||||
From 6cca2462d98c1da580faeaae5e33c99daf1a6c82 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@gmail.com>
|
||||
Date: Fri, 7 Nov 2014 09:42:21 +0100
|
||||
Subject: libGL: link against libbe
|
||||
|
||||
* This uses be_bold_font, and some apps (Pixel and other BeOS stuff)
|
||||
would fail to find the symbol otherwise.
|
||||
|
||||
diff --git a/src/hgl/libgl-haiku/Makefile b/src/hgl/libgl-haiku/Makefile
|
||||
index 9d7d301..8195813 100644
|
||||
--- a/src/hgl/libgl-haiku/Makefile
|
||||
+++ b/src/hgl/libgl-haiku/Makefile
|
||||
@@ -43,7 +43,7 @@ $(GLAPI_LIB):
|
||||
|
||||
# Make libGL
|
||||
$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(GLAPI_LIB) Makefile
|
||||
- $(MKLIB) -o $(GL_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
|
||||
+ $(MKLIB) -o $(GL_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS) -lbe' \
|
||||
-cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
|
||||
$(GL_LIB_DEPS) $(GLAPI_LIB) $(OBJECTS) $(GLU_LIB)
|
||||
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
Reference in New Issue
Block a user