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

Fix 2nd arch for live555 & aplayer; cosmetic edits elsewhere. (#593)

Browse Source 
* live555: Use $developLibDir instead of $developDir/lib since the
  latter is not appropriate for 2nd arch builds.
* aplayer: Drop $secondaryArchSuffix for cmd:nasm in BUILD_PREREQ.
* re2c: use tabs (instead of white spaces) in BUILD_REQUIRES.
* Remove x86_64 from SECONDARY_ARCHITECTURES for sdl2_net, edgar,
  paladin-git and mediainfo-0.7.61.
This commit is contained in:
fbrosson
2016-05-09 20:19:34 +00:00
committed by waddlesplash
parent e2a88cc000
commit bcebdeb6dd
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dev-util/re2c/re2c-0.16.recipe
View File

@@ -20,6 +20,7 @@ else
commandSuffix=
commandBinDir=$prefix/bin
fi
PROVIDES="
re2c$secondaryArchSuffix = $portVersion
cmd:re2c$commandSuffix = $portVersion
@@ -29,8 +30,8 @@ REQUIRES="
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
cmd:autoconf
cmd:awk

1
games-arcade/edgar/edgar-1.16_1.recipe
View File

@@ -15,7 +15,6 @@ SOURCE_DIR="edgar-1.16"
PATCHES="edgar-1.16.patch"
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="?x86 ?x86_64"
PROVIDES="
edgar = $portVersion

2
haiku-apps/aplayer/aplayer-4.0_svn.recipe
View File

@@ -31,7 +31,7 @@ BUILD_PREREQUIRES="
cmd:g++$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:nasm$secondaryArchSuffix
cmd:nasm
"
BUILD()

2
haiku-apps/paladin/paladin-git.recipe
View File

@@ -28,7 +28,7 @@ COPYRIGHT="2001-2010 DarkWyrm
"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
paladin = $portVersion

2
media-libs/mediainfo/mediainfo-0.7.61.recipe
View File

@@ -22,7 +22,7 @@ SOURCE_DIR="MediaInfo_CLI_GNU_FromSource"
PATCHES="mediainfo-0.7.61.patch"
ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
mediainfo$secondaryArchSuffix = $portVersion

2
media-libs/sdl2_mixer/sdl2_mixer-2.0.1.recipe
View File

@@ -14,7 +14,7 @@ SOURCE_DIR="SDL2_mixer-$portVersion"
PATCHES="sdl2_mixer-${portVersion}.patch"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
sdl2_mixer$secondaryArchSuffix = $portVersion compat >= 2.0

2
media-libs/sdl2_net/sdl2_net-2.0.1.recipe
View File

@@ -13,7 +13,7 @@ CHECKSUM_SHA256="15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d2
SOURCE_DIR="SDL2_net-$portVersion"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
sdl2_net$secondaryArchSuffix = $portVersion compat >= 2.0

4
media-video/live555/live555-2016.01.29.recipe
View File

@@ -5,7 +5,7 @@ applications using various audio and video codecs."
HOMEPAGE="http://www.live555.com/liveMedia/"
COPYRIGHT="Live Networks, Inc."
LICENSE="GNU LGPL v2.1"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/xanview/live555/archive/d9e97d7953d531a243a8372870bdb6c7a9bb80cb.tar.gz"
CHECKSUM_SHA256="c6cb4a6ad32a329b95cc16fa97b6c3ac43c70ac27c97bf1b2f56dc4a474759d7"
SOURCE_DIR="live555-d9e97d7953d531a243a8372870bdb6c7a9bb80cb"
@@ -48,6 +48,6 @@ BUILD()
INSTALL()
{
make install PREFIX=$prefix INSTALLDIR=$prefix/bin LIBDIR=$developDir/lib \
make install PREFIX=$prefix INSTALLDIR=$prefix/bin LIBDIR=$developLibDir \
MANDIR=$manDir/man1 BINDIR=$binDir DESTDIR=${DESTDIR}
}