From c86b0c5ec49904306a7e25f3e9064d10deef8d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
 <adrian.arroyocalle@gmail.com>
Date: Thu, 26 Dec 2013 00:50:16 +0000
Subject: [PATCH] Gnash 0.8.10

---
 media-video/gnash/gnash-0.8.10.recipe         | 97 +++++++++++++++++++
 media-video/gnash/patches/GnashImageGif.patch | 14 +++
 media-video/gnash/patches/utility.patch       | 13 +++
 3 files changed, 124 insertions(+)
 create mode 100644 media-video/gnash/gnash-0.8.10.recipe
 create mode 100644 media-video/gnash/patches/GnashImageGif.patch
 create mode 100644 media-video/gnash/patches/utility.patch

diff --git a/media-video/gnash/gnash-0.8.10.recipe b/media-video/gnash/gnash-0.8.10.recipe
new file mode 100644
index 000000000..855f94d9b
--- /dev/null
+++ b/media-video/gnash/gnash-0.8.10.recipe
@@ -0,0 +1,97 @@
+SUMMARY="Gnash"
+DESCRIPTION="Gnash"
+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"
+
+DISABLE_SOURCE_PACKAGE=yes
+
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	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
+	boost_thread$secondaryArchSuffix
+	boost_program_options$secondaryArchSuffix
+	boost_iostreams$secondaryArchSuffix
+	boost_serialization$secondaryArchSuffix
+	boost_date_time$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libsdl_sound$secondaryArchSuffix
+	lib:libagg$secondaryArchSuffix
+	#lib:libfreetype$secondaryArchSuffix >= 2.5.0.1
+	#lib:libfontconfig$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
+	boost_thread$secondaryArchSuffix
+	boost_program_options$secondaryArchSuffix
+	boost_iostreams$secondaryArchSuffix
+	boost_serialization$secondaryArchSuffix
+	boost_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
+"
+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()
+{
+	runConfigure ./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/
+	make
+}
+INSTALL()
+{
+	make install
+}
+TEST()
+{
+	make check
+}
diff --git a/media-video/gnash/patches/GnashImageGif.patch b/media-video/gnash/patches/GnashImageGif.patch
new file mode 100644
index 000000000..3d3e502c7
--- /dev/null
+++ b/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;
+ 
diff --git a/media-video/gnash/patches/utility.patch b/media-video/gnash/patches/utility.patch
new file mode 100644
index 000000000..865733ee0
--- /dev/null
+++ b/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>
+ 	{