Merged in Hybrid support fixes to various packages (pull request #195)

2026-04-22 03:30:05 +02:00 · 2014-07-22 21:55:15 +02:00
parent 7711034271 c57346b957
commit 3d17251dcd
6 changed files with 58 additions and 52 deletions
--- a/media-libs/a52dec/a52dec-0.7.4.recipe
+++ b/media-libs/a52dec/a52dec-0.7.4.recipe
@@ -5,7 +5,7 @@ A library for decoding ATSC A/52 streams used in DVD's.
 HOMEPAGE="http://liba52.sourceforge.net/" 
 SRC_URI="http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz"
 CHECKSUM_SHA256="a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33"
-REVISION="1"
+REVISION="2"
 LICENSE="GNU GPL v2"
 COPYRIGHT="Copyright (C) 1999-2002 Aaron Holtzman and Michel Lespinasse"
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
@@ -14,24 +14,23 @@ SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
 PATCHES="a52dec-$portVersion.patch"

 PROVIDES="
-	a52dec${secondaryArchSuffix} = $portVersion
-	lib:liba52
-	cmd:a52dec
-	cmd:extract_a52
+	a52dec$secondaryArchSuffix = $portVersion
+	lib:liba52$secondaryArchSuffix
+	cmd:a52dec$secondaryArchSuffix
+	cmd:extract_a52$secondaryArchSuffix
 	"

 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"

 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
 	"

 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	cmd:gcc${secondaryArchSuffix}
-	cmd:ld${secondaryArchSuffix}
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:libtoolize
 	cmd:aclocal
--- a/media-libs/faac/faac-1.28.recipe
+++ b/media-libs/faac/faac-1.28.recipe
@@ -5,7 +5,7 @@ FAAC is an MPEG-4 and MPEG-2 AAC encoder.
 HOMEPAGE="http://www.audiocoding.com/"
 SRC_URI="http://downloads.sourceforge.net/faac/faac-1.28.tar.bz2"
 CHECKSUM_SHA256="aac475e59d38ae9e29bff760e26bf72b507ccec037a6837cc33e3ac1db3ef352"
-REVISION="1"
+REVISION="2"

 LICENSE="GNU GPL v2"
 COPYRIGHT="Copyright (C) 2003 Krzysztof Nikiel"
@@ -15,12 +15,12 @@ SECONDARY_ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"

 PROVIDES="
 	faac${secondaryArchSuffix} = $portVersion
-	lib:libfaac
-	cmd:faac
+	lib:libfaac$secondaryArchSuffix
+	cmd:faac$secondaryArchSuffix
 	"

 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"

 BUILD_REQUIRES="
@@ -39,7 +39,18 @@ BUILD_PREREQUIRES="

 SOURCE_DIR="faac-${portVersion}"

-PATCHES="faac-${portVersion}.patch"
+#PATCHES="faac-${portVersion}.patch"
+
+PATCH()
+{
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in
+
+	if [ "$targetArchitecture" = x86_gcc2 ]; then
+		sed -i 's/-lstdc++/-lstdc++.r4/' configure.in frontend/Makefile.am
+	else
+		sed -i 's/-lstdc++//' configure.in frontend/Makefile.am
+	fi
+}

 BUILD()
 {
--- a/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
+++ b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
@@ -8,20 +8,20 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="Copyright (C) 1998-2008 VideoLAN"
 SRC_URI="http://download.videolan.org/pub/libdvdcss/1.2.12/libdvdcss-1.2.12.tar.bz2"
 CHECKSUM_SHA256="72465395d494f609b180cab23f9679acf6083fb821bd84979a8e70f7b795db5d"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"

 PATCHES="libdvdcss-${portVersion}.patch"

 PROVIDES="
-	libdvdcss${secondaryArchSuffix} = $portVersion
-	lib:libdvdcss
-	cmd:dvdcss_config
+	libdvdcss$secondaryArchSuffix = $portVersion
+	lib:libdvdcss$secondaryArchSuffix
+	cmd:dvdcss_config$secondaryArchSuffix
 	"

 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"

 BUILD_REQUIRES="
@@ -29,8 +29,8 @@ BUILD_REQUIRES="

 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	cmd:gcc${secondaryArchSuffix}
-	cmd:ld${secondaryArchSuffix}
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:libtoolize
 	cmd:aclocal
@@ -65,9 +65,9 @@ INSTALL()

 PROVIDES_devel="
 	libdvdcss${secondaryArchSuffix}_devel = $portVersion
-	devel:libdvdcss${secondaryArchSuffix} = $portVersion
+	devel:libdvdcss$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_devel="
-	libdvdcss${secondaryArchSuffix} == $portVersion base
+	libdvdcss$secondaryArchSuffix == $portVersion base
 	"

--- a/media-libs/libdvdnav/libdvdnav-4.2.1.recipe
+++ b/media-libs/libdvdnav/libdvdnav-4.2.1.recipe
@@ -9,40 +9,39 @@ COPYRIGHT="2000 Rich Wareham
 	2001-2004 the dvdnav project"
 SRC_URI="http://dvdnav.mplayerhq.hu/releases/libdvdnav-$portVersion.tar.xz"
 CHECKSUM_SHA256="7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372"
-REVISION="1"
+REVISION="2"

 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"

-PATCHES="libdvdnav-4.2.1.patch"
+PATCHES="libdvdnav-4.2.0.patch"

 PROVIDES="
-	libdvdnav${secondaryArchSuffix} = $portVersion
-	lib:libdvdnav
-	cmd:dvdnav_config
+	libdvdnav$secondaryArchSuffix = $portVersion
+	lib:libdvdnav$secondaryArchSuffix
+	cmd:dvdnav_config$secondaryArchSuffix
 	"

 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
-	libdvdread${secondaryArchSuffix}
-	libdvdcss${secondaryArchSuffix}
+	haiku$secondaryArchSuffix >= $haikuVersion
+	libdvdread$secondaryArchSuffix
+	libdvdcss$secondaryArchSuffix
 	"

 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	libdvdread${secondaryArchSuffix}_devel
+	libdvdcss${secondaryArchSuffix}_devel
 	"

 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	libdvdread${secondaryArchSuffix}_devel
-	libdvdcss${secondaryArchSuffix}_devel
-	cmd:gcc${secondaryArchSuffix}
-	cmd:ld${secondaryArchSuffix}
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:libtoolize
 	cmd:aclocal
 	cmd:autoconf
-	cmd:pkg_config
+	cmd:pkg_config$secondaryArchSuffix
 	"

 SOURCE_DIR="libdvdnav-${portVersion}"
--- a/media-libs/libdvdread/libdvdread-4.2.1.recipe
+++ b/media-libs/libdvdread/libdvdread-4.2.1.recipe
@@ -12,7 +12,7 @@ COPYRIGHT="1998-1999 Eric Smith
 	2000-2003 Håkan Hjort, et al."
 SRC_URI="http://dvdnav.mplayerhq.hu/releases/libdvdread-$portVersion.tar.xz"
 CHECKSUM_SHA256="af9b98f049580a6521d56c978b736d3d609562dd12955e11d50e26d97542dcd4"
-REVISION="1"
+REVISION="2"

 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
@@ -20,23 +20,22 @@ SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
 PATCHES="libdvdread-4.2.1.patch"

 PROVIDES="
-	libdvdread${secondaryArchSuffix} = $portVersion
-	lib:libdvdread
-	cmd:dvdread_config
+	libdvdread$secondaryArchSuffix = $portVersion
+	lib:libdvdread$secondaryArchSuffix
+	cmd:dvdread_config$secondaryArchSuffix
 	"

 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"

 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
 	"

 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	cmd:gcc${secondaryArchSuffix}
-	cmd:ld${secondaryArchSuffix}
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:libtoolize
 	cmd:aclocal
--- a/media-libs/libsndfile/libsndfile-1.0.25.recipe
+++ b/media-libs/libsndfile/libsndfile-1.0.25.recipe
@@ -11,13 +11,8 @@ LICENSE="GNU LGPL v2.1"
 SRC_URI="http://www.mega-nerd.com/libsndfile/files/libsndfile-$portVersion.tar.gz"
 CHECKSUM_SHA256="59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882"
 REVISION="2"
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
-SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PATCHES="libsndfile-$portVersion.patchset"

@@ -65,6 +60,9 @@ BUILD()
 	aclocal -I M4
 	autoconf
 	automake
+	if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
+		export CFLAGS=-O1
+	fi
 	runConfigure ./configure
 	make $jobArgs
 }