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

Drop old mesa recipes, patches and packaging shell script

Browse Source
This commit is contained in:
Oliver Tappe
2013-08-25 13:25:32 +02:00
parent fb5ef9aa7e
commit b1faf2d4a7
8 changed files with 0 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
sys-libs/mesa/buildpackage.sh
View File

@@ -1,79 +0,0 @@
#!/bin/bash
# Mesa-O-Matic
# Copyright 2011-2012, Alexander von Gluck IV
# Released under the terms of the MIT license
# This script creates an optional package containing the
# the headers and binary code needed by the opengl kit
# to link libGL.so
# This script is run against a *COMPILED* Mesa source tree
echo " Welcome to Mesa-O-Matic!"
echo "-=-=-=-=-=-=-=-=-=-=-=-=-="
echo ""
if [[ $DEBUG -eq 1 ]]; then
echo "Debugging: enabled"
else
echo "Debugging: disabled"
fi
#######################################################################
# END CONFIG DATA, Dragons below!
#######################################################################
if [[ $( uname ) != "Haiku" ]]; then
echo "*************************************"
echo " I need to be run on a Haiku system!!"
echo "*************************************"
exit 1
fi
if [[ -z $1 ]]; then
echo ""
echo "Usage: $0 <mesa version> <compiled mesa location>"
echo ""
exit 1
fi
MESA_VER="$1"
MESA_TOP="$2"
GCC_VER=`gcc -v 2>&1 | tail -1 | awk '{print $3}' | cut -d. -f1`
DATESTAMP=`date +"%Y-%m-%d"`
echo "Bundling gcc$GCC_VER build of Mesa $MESA_VER..."
cd $MESA_TOP
#######################################################################
# Create Mesa optional pacakge
ZIP_HEADERS=""
echo "Collecting Mesa headers..."
for i in $(find . -name "*.h")
do
ZIP_HEADERS="$ZIP_HEADERS $i"
done
echo "Collecting required Mesa libraries..."
rm -rf lib.haiku
mkdir -p lib.haiku
for i in $( find . -name "*.a" )
do
cp $i lib.haiku/
done
if [[ $DEBUG -eq 0 ]]; then
echo "Stripping debug symbols from Mesa libraries..."
find lib.haiku -exec strip --strip-debug {} \; ;
MESADBG=""
else
MESADBG="dbg"
fi
echo "Creating Mesa OptionalPackage..."
PLATFORM=$( uname -m )
ZIP_FILENAME="/boot/home/mesa-${MESA_VER}-x86${MESADBG}-gcc${GCC_VER}-${DATESTAMP}.zip"
zip -r -9 $ZIP_FILENAME $ZIP_HEADERS ./lib.haiku/*
echo "Great Success! $ZIP_FILENAME created."

26
sys-libs/mesa/mesa-9.0.1.recipe
View File

@@ -1,26 +0,0 @@
###############################################################
# THIS IS NOT FOR GENERAL USE!
# This builds a buildpackage for the Haiku build system to link
# the OpenGL kit!!
###############################################################
DESCRIPTION="Mesa3D is a multi-platform GL implementation"
HOMEPAGE="http://www.freedesktop.org/"
SRC_URI="ftp://freedesktop.org/pub/mesa/9.0.1/MesaLib-9.0.1.tar.bz2"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="scons"
CHECKSUM_MD5="97d6554c05ea7449398afe3a0ede7018"
MESSAGE="This port only builds with gcc4. Not for general use."
BUILD()
{
export DEBUG=0
cd Mesa-9.0.1
scons debug=$DEBUG
cd ..
sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.0.1 ./Mesa-9.0.1
echo "There should be a Mesa OptionalBuild package in your home if everything went well!"
}
LICENSE="MIT"
COPYRIGHT="Copyright (C) 1999-2012 Brian Paul All Rights Reserved."

29
sys-libs/mesa/mesa-9.0.2.recipe
View File

@@ -1,29 +0,0 @@
###############################################################
# THIS IS NOT FOR GENERAL USE!
# This builds a buildpackage for the Haiku build system to link
# the OpenGL kit!!
###############################################################
DESCRIPTION="Mesa3D is a multi-platform GL implementation"
HOMEPAGE="http://www.freedesktop.org/"
SRC_URI="ftp://freedesktop.org/pub/mesa/9.0.2/MesaLib-9.0.2.tar.bz2"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="scons, llvm >= 3.2"
CHECKSUM_MD5="dc45d1192203e418163e0017640e1cfc"
MESSAGE="This port only builds with gcc4. Not for general use."
BUILD()
{
export DEBUG=0
echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
echo "This generates a Mesa3D build package for Haiku... not for general use"
echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
cd Mesa-9.0.2
scons debug=$DEBUG
cd ..
sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.0.2 ./Mesa-9.0.2
echo "There should be a Mesa OptionalBuild package in your home if everything went well!"
}
LICENSE="MIT"
COPYRIGHT="1999-2012 Brian Paul All Rights Reserved."

26
sys-libs/mesa/mesa-9.0.recipe
View File

@@ -1,26 +0,0 @@
###############################################################
# THIS IS NOT FOR GENERAL USE!
# This builds a buildpackage for the Haiku build system to link
# the OpenGL kit!!
###############################################################
DESCRIPTION="Mesa3D is a multi-platform GL implementation"
HOMEPAGE="http://www.freedesktop.org/"
SRC_URI="ftp://freedesktop.org/pub/mesa/9.0/MesaLib-9.0.tar.bz2"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="scons"
CHECKSUM_MD5="60e557ce407be3732711da484ab3db6c"
MESSAGE="This port only builds with gcc4. Not for general use."
BUILD()
{
export DEBUG=0
cd Mesa-9.0
scons debug=$DEBUG
cd ..
sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.0 ./Mesa-9.0
echo "There should be a Mesa OptionalBuild package in your home if everything went well!"
}
LICENSE="MIT"
COPYRIGHT="Copyright (C) 1999-2012 Brian Paul All Rights Reserved."

29
sys-libs/mesa/mesa-9.1.0.recipe
View File

@@ -1,29 +0,0 @@
###############################################################
# THIS IS NOT FOR GENERAL USE!
# This builds a buildpackage for the Haiku build system to link
# the OpenGL kit!!
###############################################################
DESCRIPTION="Mesa3D is a multi-platform GL implementation"
HOMEPAGE="http://www.freedesktop.org/"
SRC_URI="ftp://freedesktop.org/pub/mesa/9.1/MesaLib-9.1.tar.bz2"
REVISION="1"
STATUS_HAIKU="unstable"
DEPEND="scons, llvm >= 3.2"
CHECKSUM_MD5="d3891e02215422e120271d976ff1947e"
MESSAGE="This port only builds with gcc4. Not for general use."
BUILD()
{
export DEBUG=0
echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
echo "This generates a Mesa3D build package for Haiku... not for general use"
echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
cd Mesa-9.1
scons debug=$DEBUG
cd ..
sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.1.0 ./Mesa-9.1
echo "There should be a Mesa OptionalBuild package in your home if everything went well!"
}
LICENSE="MIT"
COPYRIGHT="1999-2012 Brian Paul All Rights Reserved."

52
sys-libs/mesa/patches/mesa-9.0.1.patch
View File

@@ -1,52 +0,0 @@
diff -Naur Mesa-9.0.1/scons/gallium.py Mesa-9.0.1-haiku/scons/gallium.py
--- Mesa-9.0.1/scons/gallium.py 2012-11-09 12:16:31.041680896 -0600
+++ Mesa-9.0.1-haiku/scons/gallium.py 2012-12-19 16:03:56.564658176 -0600
@@ -361,8 +361,7 @@
ccflags += [
'-mstackrealign', # ensure stack is aligned
'-march=i586', # Haiku target is Pentium
- '-mtune=i686', # use i686 where we can
- '-mmmx' # use mmx math where we can
+ '-mtune=i686' # use i686 where we can
]
if env['machine'] == 'x86_64':
ccflags += ['-m64']
diff -Naur Mesa-9.0.1/scons/llvm.py Mesa-9.0.1-haiku/scons/llvm.py
--- Mesa-9.0.1/scons/llvm.py 2012-08-31 18:33:41.041680896 -0500
+++ Mesa-9.0.1-haiku/scons/llvm.py 2012-12-18 23:05:50.677642240 -0600
@@ -183,6 +183,9 @@
if llvm_version >= distutils.version.LooseVersion('3.1'):
components.append('mcjit')
+ if llvm_version >= distutils.version.LooseVersion('3.2'):
+ env.Append(CXXFLAGS = ('-fno-rtti',))
+
env.ParseConfig('llvm-config --libs ' + ' '.join(components))
env.ParseConfig('llvm-config --ldflags')
except OSError:
diff -Naur Mesa-9.0.1/src/gallium/auxiliary/Makefile Mesa-9.0.1-haiku/src/gallium/auxiliary/Makefile
--- Mesa-9.0.1/src/gallium/auxiliary/Makefile 2012-08-31 18:33:41.050331648 -0500
+++ Mesa-9.0.1-haiku/src/gallium/auxiliary/Makefile 2012-12-18 23:06:31.179306496 -0600
@@ -15,6 +15,10 @@
$(GALLIVM_CPP_SOURCES)
endif
+# LLVM >= 3.2 requires -fno-rtti
+ifeq ($(shell expr `echo $(LLVM_VERSION) | sed -e 's/\([0-9]\)\.\([0-9]\)/\10\2/g'` \>= 302),1)
+CXXFLAGS += -fno-rtti
+endif
include ../Makefile.template
diff -Naur Mesa-9.0.1/src/mesa/SConscript Mesa-9.0.1-haiku/src/mesa/SConscript
--- Mesa-9.0.1/src/mesa/SConscript 2012-11-09 12:16:31.015728640 -0600
+++ Mesa-9.0.1-haiku/src/mesa/SConscript 2012-12-19 16:32:37.285736960 -0600
@@ -371,7 +371,7 @@
#
# Assembly sources
#
-if env['gcc'] and env['platform'] not in ('darwin', 'windows'):
+if env['gcc'] and env['platform'] not in ('darwin', 'windows', 'haiku'):
if env['machine'] == 'x86':
env.Append(CPPDEFINES = [
'USE_X86_ASM',

25
sys-libs/mesa/patches/mesa-9.0.2.patch
View File

@@ -1,25 +0,0 @@
diff -Naur Mesa-9.0.2/scons/llvm.py Mesa-9.0.2-haiku/scons/llvm.py
--- Mesa-9.0.2/scons/llvm.py 2013-01-22 18:09:32.066322432 +0000
+++ Mesa-9.0.2-haiku/scons/llvm.py 2013-02-17 21:20:51.626262016 +0000
@@ -183,6 +183,9 @@
if llvm_version >= distutils.version.LooseVersion('3.1'):
components.append('mcjit')
+ if llvm_version >= distutils.version.LooseVersion('3.2'):
+ env.Append(CXXFLAGS = ('-fno-rtti',))
+
env.ParseConfig('llvm-config --libs ' + ' '.join(components))
env.ParseConfig('llvm-config --ldflags')
except OSError:
diff -Naur Mesa-9.0.2/src/mesa/SConscript Mesa-9.0.2-haiku/src/mesa/SConscript
--- Mesa-9.0.2/src/mesa/SConscript 2013-01-22 18:09:32.040370176 +0000
+++ Mesa-9.0.2-haiku/src/mesa/SConscript 2013-02-17 21:20:22.510394368 +0000
@@ -371,7 +371,7 @@
#
# Assembly sources
#
-if env['gcc'] and env['platform'] not in ('darwin', 'windows'):
+if env['gcc'] and env['platform'] not in ('darwin', 'windows', 'haiku'):
if env['machine'] == 'x86':
env.Append(CPPDEFINES = [
'USE_X86_ASM',

42
sys-libs/mesa/patches/mesa-9.0.patch
View File

@@ -1,42 +0,0 @@
diff -Naur Mesa-9.0/src/mesa/sources.mak Mesa-9.0-haiku/src/mesa/sources.mak
--- Mesa-9.0/src/mesa/sources.mak 2012-08-31 23:36:09.036700160 +0000
+++ Mesa-9.0-haiku/src/mesa/sources.mak 2012-10-09 13:17:15.991690752 +0000
@@ -281,7 +281,6 @@
$(SRCDIR)x86/x86_xform.c \
$(SRCDIR)x86/3dnow.c \
$(SRCDIR)x86/sse.c \
- $(SRCDIR)x86/rtasm/x86sse.c \
$(SRCDIR)sparc/sparc.c \
$(SRCDIR)x86-64/x86-64.c
diff -Naur Mesa-9.0/src/mesa/tnl/t_vertex_sse.c Mesa-9.0-haiku/src/mesa/tnl/t_vertex_sse.c
--- Mesa-9.0/src/mesa/tnl/t_vertex_sse.c 2012-08-31 23:33:41.058458112 +0000
+++ Mesa-9.0-haiku/src/mesa/tnl/t_vertex_sse.c 2012-10-09 13:20:34.234356736 +0000
@@ -36,7 +36,7 @@
#if defined(USE_SSE_ASM)
-#include "x86/rtasm/x86sse.h"
+#include "rtasm/rtasm_x86sse.h"
#include "x86/common_x86_asm.h"
@@ -356,7 +356,7 @@
struct x86_reg vp0 = x86_make_reg(file_XMM, 1);
struct x86_reg vp1 = x86_make_reg(file_XMM, 2);
struct x86_reg temp2 = x86_make_reg(file_XMM, 3);
- GLubyte *fixup, *label;
+ GLuint fixup, label;
/* Push a few regs?
*/
@@ -658,7 +658,8 @@
p.identity = x86_make_reg(file_XMM, 6);
p.chan0 = x86_make_reg(file_XMM, 7);
- if (!x86_init_func_size(&p.func, MAX_SSE_CODE_SIZE)) {
+ x86_init_func_size(&p.func, MAX_SSE_CODE_SIZE);
+ if (p.func.caps == 0) {
vtx->emit = NULL;
return;
}