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

Add secondary arch support for wonderbrush and old mesa

Browse Source
This commit is contained in:
Ingo Weinhold
2013-08-17 09:38:54 +02:00
parent d3fff39e6e
commit dee373938d
2 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe
View File

@@ -9,21 +9,26 @@ COPYRIGHT="2005, Stephan Aßmus und Ingo Weinhold GbR"
SRC_URI="http://yellowbites.com/downloads/WonderBrush-2.1.2-x86-gcc2-2013-01-02.zip#noarchive"
CHECKSUM_MD5="28e64a56946c9f5aefa40486f35ffc77"
REVISION="4"
ARCHITECTURES="x86_gcc2 !x86"
ARCHITECTURES="x86_gcc2"
if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ]
then
ARCHITECTURES="$ARCHITECTURES x86"
fi
SECONDARY_ARCHITECTURES="x86_gcc2"
DISABLE_SOURCE_PACKAGE=yes
PROVIDES="
wonderbrush = $portVersion compat >= 2
wonderbrush$secondaryArchSuffix = $portVersion compat >= 2
"
REQUIRES="
haiku >= r1~alpha3_pm-1
lib:libfreetype >= 6
lib:libz >= 1
haiku$secondaryArchSuffix >= r1~alpha3_pm-1
lib:libfreetype$secondaryArchSuffix >= 6
lib:libz$secondaryArchSuffix >= 1
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku
haiku$secondaryArchSuffix
coreutils
cmd:unzip
"
@@ -47,9 +52,9 @@ INSTALL()
# Hack to make libfreetype and libz available under the name WonderBrush
# has been linked against them.
ln -s $portPackageLinksDir/lib~libfreetype/lib/libfreetype.so.6 \
ln -s $portPackageLinksDir/lib~libfreetype$secondaryArchSuffix/lib/libfreetype.so.6 \
$wonderbrushDir/lib/libfreetype.so
ln -s $portPackageLinksDir/lib~libz/lib/libz.so.1 \
ln -s $portPackageLinksDir/lib~libz$secondaryArchSuffix/lib/libz.so.1 \
$wonderbrushDir/lib/libz.so
addAppDeskbarSymlink $wonderbrushDir/WonderBrush

33
sys-libs/mesa/mesa-7.8.2.recipe
View File

@@ -16,21 +16,26 @@ LICENSE="MIT"
SRC_URI="ftp://freedesktop.org/pub/mesa/7.8.2/MesaLib-7.8.2.tar.bz2"
CHECKSUM_MD5="6be2d343a0089bfd395ce02aaf8adb57"
REVISION="3"
ARCHITECTURES="x86_gcc2 !x86"
ARCHITECTURES="x86_gcc2"
if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ]
then
ARCHITECTURES="$ARCHITECTURES x86"
fi
SECONDARY_ARCHITECTURES="x86_gcc2"
PROVIDES="
mesa = $portVersion
mesa$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:find
cmd:gcc
cmd:ld
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:sed
"
@@ -67,14 +72,14 @@ INSTALL()
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
mesa_devel = $portVersion
devel:libglapi = $portVersion
devel:libglslcl = $portVersion
devel:libglslpp = $portVersion
devel:libglu = $portVersion
devel:libmesa = $portVersion
devel:libmesagallium = $portVersion
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 == $portVersion base
mesa$secondaryArchSuffix == $portVersion base
"