mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
Update gnash recipe, still broken
* gnash_x86: missing symbol '_Unwind_Region'
This commit is contained in:
Kacper Kasper
@@ -7,23 +7,23 @@ SRC_URI="ftp://ftp.gnu.org/pub/gnu/gnash/0.8.10/gnash-0.8.10.tar.bz2"
|
||||
CHECKSUM_SHA256="9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224"
|
||||
COPYRIGHT="2005-2012 Free Software Foundation"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="1"
|
||||
REVISION="2"
|
||||
|
||||
ARCHITECTURES="!x86 !x86_64"
|
||||
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
|
||||
ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
|
||||
else
|
||||
ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
|
||||
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
|
||||
fi
|
||||
SECONDARY_ARCHITECTURES="!x86 !x86_64"
|
||||
SECONDARY_ARCHITECTURES="!x86"
|
||||
|
||||
PROVIDES="
|
||||
gnash$secondaryArchSuffix = $portVersion
|
||||
app:Gnash = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix >= $haikuVersion
|
||||
lib:libsdl$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
lib:libbz2$secondaryArchSuffix
|
||||
lib:libpng$secondaryArchSuffix
|
||||
lib:libjpeg$secondaryArchSuffix
|
||||
lib:libgif$secondaryArchSuffix
|
||||
@@ -36,18 +36,21 @@ REQUIRES="
|
||||
lib:libboost_iostreams$secondaryArchSuffix
|
||||
lib:libboost_serialization$secondaryArchSuffix
|
||||
lib:libboost_date_time$secondaryArchSuffix
|
||||
lib:libboost_system$secondaryArchSuffix
|
||||
lib:libssl$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libsdl_sound$secondaryArchSuffix
|
||||
lib:libagg$secondaryArchSuffix
|
||||
#lib:libfreetype$secondaryArchSuffix
|
||||
lib:libfreetype$secondaryArchSuffix
|
||||
#lib:libfontconfig$secondaryArchSuffix
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
lib:libintl$secondaryArchSuffix
|
||||
"
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel >= $haikuVersion
|
||||
devel:libsdl$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
devel:libbz2$secondaryArchSuffix
|
||||
devel:libpng$secondaryArchSuffix
|
||||
devel:libjpeg$secondaryArchSuffix
|
||||
devel:libgif$secondaryArchSuffix
|
||||
@@ -61,43 +64,51 @@ BUILD_REQUIRES="
|
||||
devel:libboost_iostreams$secondaryArchSuffix
|
||||
devel:libboost_serialization$secondaryArchSuffix
|
||||
devel:libboost_date_time$secondaryArchSuffix
|
||||
devel:libboost_system$secondaryArchSuffix
|
||||
devel:libssl$secondaryArchSuffix
|
||||
devel:libcrypto$secondaryArchSuffix
|
||||
devel:libsdl_sound$secondaryArchSuffix
|
||||
devel:libagg$secondaryArchSuffix
|
||||
#devel:libfontconfig$secondaryArchSuffix
|
||||
#devel:libfreetype$secondaryArchSuffix
|
||||
devel:libfreetype$secondaryArchSuffix
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
devel:libintl$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:pkg_config
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:awk
|
||||
cmd:sed
|
||||
cmd:libtoolize
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:automake
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:sdl_config$secondaryArchSuffix
|
||||
cmd:xargs
|
||||
"
|
||||
|
||||
SOURCE_DIR="gnash-0.8.10"
|
||||
|
||||
PATCHES="
|
||||
GnashImageGif.patch
|
||||
utility.patch
|
||||
"
|
||||
PATCHES="gnash-0.8.10.patchset"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
INCLUDE_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir
|
||||
{
|
||||
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
|
||||
libtoolize --force --copy --install
|
||||
aclocal
|
||||
autoconf
|
||||
automake
|
||||
runConfigure ./configure --enable-renderer=agg --enable-media=ffmpeg \
|
||||
--enable-gui=sdl --enable-sound=sdl --without-gconf \
|
||||
--disable-extensions \
|
||||
--with-boost-incl=$INCLUDE_DIR/boost \
|
||||
--with-boost-lib=$LIB_DIR \
|
||||
--includedir=$includeDir \
|
||||
--bindir=$appsDir \
|
||||
--libdir=$libDir
|
||||
make $jobArgs
|
||||
}
|
||||
INSTALL()
|
||||
{
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
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;
|
||||
|
||||
49
media-video/gnash/patches/gnash-0.8.10.patchset
Normal file
49
media-video/gnash/patches/gnash-0.8.10.patchset
Normal file
@@ -0,0 +1,49 @@
|
||||
From 27ea051c05dcc53eb9ea2359f7e71eaacc8c2ada Mon Sep 17 00:00:00 2001
|
||||
From: Kacper Kasper <kacperkasper@gmail.com>
|
||||
Date: Thu, 24 Apr 2014 22:18:34 +0000
|
||||
Subject: fix Haiku build
|
||||
|
||||
|
||||
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/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>
|
||||
{
|
||||
diff --git a/macros/boost.m4 b/macros/boost.m4
|
||||
index 845aaae..5788f57 100644
|
||||
--- a/macros/boost.m4
|
||||
+++ b/macros/boost.m4
|
||||
@@ -37,7 +37,7 @@ AC_DEFUN([GNASH_PATH_BOOST],
|
||||
boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp program_options/options_description.hpp iostreams/stream.hpp"
|
||||
dnl this is a list of *required* libraries. If any of these are missing, this
|
||||
dnl test will return a failure, and Gnash won't build.
|
||||
- boost_libs="thread program_options iostreams"
|
||||
+ boost_libs="thread program_options iostreams system"
|
||||
|
||||
dnl this is a list of *recommended* libraries. If any of these are missing, this
|
||||
dnl test will return a warning, and Gnash will build, but testing won't work.
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
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>
|
||||
{
|
||||
Reference in New Issue
Block a user