Merged in AdrianArroyoCalle/haikuports (pull request #90)

Gnash 0.8.10 and Agg 2.5

media-video/gnash/gnash-0.8.10.recipe

@@ -0,0 +1,108 @@
+SUMMARY="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"
+COPYRIGHT="2005-2012 Free Software Foundation"
+LICENSE="GNU GPL v3"
+REVISION="1"
+
+ARCHITECTURES="!x86 !x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="!x86 !x86_64"
+
+PROVIDES="
+	gnash$secondaryArchSuffix = $portVersion
+"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libsdl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libgif$secondaryArchSuffix
+	lib:libavcodec$secondaryArchSuffix
+	lib:libspeex$secondaryArchSuffix
+	lib:libexpat$secondaryArchSuffix
+	lib:libcurl$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
+	#lib:libfontconfig$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libsdl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libgif$secondaryArchSuffix
+	devel:libavcodec$secondaryArchSuffix
+	devel:libspeex$secondaryArchSuffix
+	devel:libexpat$secondaryArchSuffix
+	devel:libcurl$secondaryArchSuffix
+	boost_devel$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
+	devel:libiconv$secondaryArchSuffix
+"
+BUILD_PREREQUIRES="
+	cmd:pkg_config
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+"
+
+SOURCE_DIR="gnash-0.8.10"
+
+PATCHES="
+	GnashImageGif.patch
+	utility.patch
+"
+
+BUILD()
+{	
+	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=$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()
+{
+	make check
+}

media-video/gnash/patches/GnashImageGif.patch

@@ -0,0 +1,14 @@
+diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
+index eeba4b7..bddb452 100644
+--- a/libbase/GnashImageGif.cpp
++++ b/libbase/GnashImageGif.cpp
+@@ -269,7 +269,8 @@ GifInput::processRecord(GifRecordType record)
+ void
+ GifInput::read()
+ {
+-    _gif = DGifOpen(_inStream.get(), &readData); 
++	int error_code;
++    _gif = DGifOpen(_inStream.get(), &readData, &error_code); 
+ 
+     GifRecordType record;
+ 

media-video/gnash/patches/utility.patch

@@ -0,0 +1,13 @@
+diff --git a/libbase/utility.h b/libbase/utility.h
+index 8b9f48c..51ea858 100644
+--- a/libbase/utility.h
++++ b/libbase/utility.h
+@@ -61,7 +61,7 @@ namespace std
+ };
+ #endif
+ 
+-#if defined(__HAIKU__)
++#if defined(__HAIKU_OLD)
+ namespace std {
+ 	class wstring : public std::basic_string<char>
+ 	{

x11-libs/agg/agg-2.5.recipe

@@ -1,27 +1,66 @@
+SUMMARY="Anti-Grain Geometry (AGG)"
 DESCRIPTION="Anti-Grain Geometry (AGG) is an Open Source, free of charge graphic library, written in industrially standard C++." 
 HOMEPAGE="http://antigrain.com" 
 SRC_URI="http://www.antigrain.com/agg-2.5.tar.gz"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
 CHECKSUM_MD5="0229a488bc47be10a2fee6cf0b2febd6"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2002-2006 Maxim Shemanarev"
+
+ARCHITECTURES="?x86_gcc2 ?x86"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+
+PROVIDES="
+	lib:libagg$secondaryArchSuffix = $portVersion
+"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libsdl$secondaryArchSuffix
+"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libsdl$secondaryArchSuffix
+"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:autoconf
+	cmd:automake
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+"
+
+SOURCE_DIR="agg-2.5"
+
 BUILD()
 {
-	cd agg-2.5
-	libtoolize --force --copy --install
-	aclocal
-	autoheader
-	autoconf
-	automake --foreign --add-missing --ignore-deps
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` 
-	make
+	#libtoolize --force --copy --install
+	#aclocal
+	#autoheader
+	#autoconf
+	#automake --foreign --add-missing --ignore-deps
+	#./configure --prefix=$prefix
+	#make
+	cd src
+	g++ -o libagg.so -shared -fPIC *.cpp ctrl/*.cpp -I../include -lbe -ltranslation
 }
 
 INSTALL()
 {
-	cd agg-2.5
-	make install DESTDIR=${DESTDIR}
+	mkdir -p $libDir
+	mkdir -p $includeDir/agg
+	mkdir -p $developLibDir
+	
+	cp src/libagg.so $libDir
+	cp src/libagg.so $developLibDir
+	cp -r include/* $includeDir/agg/
+	packageEntries devel \
+		$developDir
 }
+PROVIDES_devel="
+	devel:libagg$secondaryArchSuffix = $portVersion
+"
+REQUIRES_devel="
+	lib:libagg$secondaryArchSuffix == $portVersion base
+"
 
-LICENSE="GNU GPL v2"
-COPYRIGHT="2002-2006 Maxim Shemanarev"