Gnash and Agg updated

haikuports · Dec 30, 2013 · 9f8594c · 9f8594c
1 parent 37a7010
commit 9f8594c
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 28 deletions.
diff --git a/media-video/gnash/gnash-0.8.10.recipe b/media-video/gnash/gnash-0.8.10.recipe
@@ -1,5 +1,5 @@
 SUMMARY="Gnash"
-DESCRIPTION="Gnash"
+DESCRIPTION="Gnash is a player for the Adobe Flash technology"
 HOMEPAGE="http://www.gnu.org/software/gnash/"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/gnash/0.8.10/gnash-0.8.10.tar.bz2"
 CHECKSUM_MD5="63e9f79c41d93d48c5a2fa94856548c4"
@@ -12,6 +12,8 @@ DISABLE_SOURCE_PACKAGE=yes
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
 fi
 SECONDARY_ARCHITECTURES="x86 x86_64"
 
@@ -29,17 +31,18 @@ REQUIRES="
 	lib:libspeex$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
-	boost_thread$secondaryArchSuffix
-	boost_program_options$secondaryArchSuffix
-	boost_iostreams$secondaryArchSuffix
-	boost_serialization$secondaryArchSuffix
-	boost_date_time$secondaryArchSuffix
+	lib:libboost_thread$secondaryArchSuffix
+	lib:libboost_program_options$secondaryArchSuffix
+	lib:libboost_iostreams$secondaryArchSuffix
+	lib:libboost_serialization$secondaryArchSuffix
+	lib:libboost_date_time$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libsdl_sound$secondaryArchSuffix
 	lib:libagg$secondaryArchSuffix
-	#lib:libfreetype$secondaryArchSuffix >= 2.5.0.1
+	#lib:libfreetype$secondaryArchSuffix
 	#lib:libfontconfig$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 "
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
@@ -53,17 +56,18 @@ BUILD_REQUIRES="
 	devel:libexpat$secondaryArchSuffix
 	devel:libcurl$secondaryArchSuffix
 	boost_devel$secondaryArchSuffix
-	boost_thread$secondaryArchSuffix
-	boost_program_options$secondaryArchSuffix
-	boost_iostreams$secondaryArchSuffix
-	boost_serialization$secondaryArchSuffix
-	boost_date_time$secondaryArchSuffix
+	devel:libboost_thread$secondaryArchSuffix
+	devel:libboost_program_options$secondaryArchSuffix
+	devel:libboost_iostreams$secondaryArchSuffix
+	devel:libboost_serialization$secondaryArchSuffix
+	devel:libboost_date_time$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
 	devel:libsdl_sound$secondaryArchSuffix
 	devel:libagg$secondaryArchSuffix
 	#devel:libfontconfig$secondaryArchSuffix
-	#devel:libfreetype$secondaryArchSuffix >= 2.5.0.1
+	#devel:libfreetype$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
 "
 BUILD_PREREQUIRES="
 	cmd:pkg_config
@@ -80,16 +84,25 @@ PATCHES="
 "
 
 BUILD()
-{
-	runConfigure ./configure --enable-renderer=agg --enable-media=ffmpeg \
+{	
+	INCLUDE_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir 
+	LIB_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir
+
+	export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig"
+
+	./configure --enable-renderer=agg --enable-media=ffmpeg \
 		--enable-gui=sdl --enable-sound=sdl --without-gconf --disable-extensions \
-		--with-agg-incl=$portPackageLinksDir/devel~libagg/develop/headers/agg \
-		--with-agg-lib=$portPackageLinksDir/lib~libagg/lib/
+		--with-agg-incl=$INCLUDE_DIR/agg \
+		--with-agg-lib=$LIB_DIR
+		--includedir=$INCLUDE_DIR
+		--bindir=$appsDir
+		--libdir=$LIB_DIR
 	make
 }
 INSTALL()
 {
 	make install
+	addAppDeskbarSymlink $appsDir/Gnash Gnash
 }
 TEST()
 {

diff --git a/x11-libs/agg/agg-2.5.recipe b/x11-libs/agg/agg-2.5.recipe
@@ -8,24 +8,25 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="2002-2006 Maxim Shemanarev"
 
 ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	lib:libagg = $portVersion
+	lib:libagg$secondaryArchSuffix = $portVersion
 "
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libsdl
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libsdl$secondaryArchSuffix
 "
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
-	devel:libsdl
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libsdl$secondaryArchSuffix
 "
 BUILD_PREREQUIRES="
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:autoconf
 	cmd:automake
-	cmd:ld
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 "
 
@@ -47,19 +48,19 @@ BUILD()
 INSTALL()
 {
 	mkdir -p $libDir
-	mkdir -p $developDir/headers/agg
+	mkdir -p $includeDir/agg
 	mkdir -p $developLibDir
 
 	cp src/libagg.so $libDir
 	cp src/libagg.so $developLibDir
-	cp -r include/* $developDir/headers/agg/
+	cp -r include/* $includeDir/agg/
 	packageEntries devel \
 		$developDir
 }
 PROVIDES_devel="
-	devel:libagg = $portVersion
+	devel:libagg$secondaryArchSuffix = $portVersion
 "
 REQUIRES_devel="
-	lib:libagg == $portVersion base
+	lib:libagg$secondaryArchSuffix == $portVersion base
 "