diff options
| author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-02-08 07:48:19 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-02-08 07:50:50 +0700 |
| commit | eda86659c978fcc37425d23ef7c99ff227b27159 (patch) | |
| tree | 627d50475255d5fefe7a6d9541e80656df872e75 | |
| parent | e1b15b6852d558cd672100bc4a0f9112076fed17 (diff) | |
| download | slackbuilds-eda86659c978fcc37425d23ef7c99ff227b27159.tar.gz | |
multimedia/gnash: Fix build against new boost.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | multimedia/gnash/gnash.SlackBuild | 6 | ||||
| -rw-r--r-- | multimedia/gnash/patch/gnash-boost.patch | 14 |
2 files changed, 19 insertions, 1 deletions
diff --git a/multimedia/gnash/gnash.SlackBuild b/multimedia/gnash/gnash.SlackBuild index 8f72007ba4..0032d3006f 100644 --- a/multimedia/gnash/gnash.SlackBuild +++ b/multimedia/gnash/gnash.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=gnash VERSION=${VERSION:-0.8.10} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -99,6 +99,10 @@ patch -p1 < $CWD/patch/gnash-0.8.10-cve-2012-1175.patch patch -p1 < $CWD/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch patch -p1 < $CWD/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch +# Fix build with new Boost +# Taken from ARCH +patch -p1 < $CWD/patch/gnash-boost.patch + # The FFmpeg engine doesn't compile with FFmpeg 0.11.1. Patches welcome. # In the meantime, set --enable-media=gst to avoid autodetecting FFmpeg. autoreconf diff --git a/multimedia/gnash/patch/gnash-boost.patch b/multimedia/gnash/patch/gnash-boost.patch new file mode 100644 index 0000000000..55208f1ae3 --- /dev/null +++ b/multimedia/gnash/patch/gnash-boost.patch @@ -0,0 +1,14 @@ +--- gnash-0.8.10/libbase/accumulator.h.orig 2016-02-08 02:56:17.059694787 +0700 ++++ gnash-0.8.10/libbase/accumulator.h 2016-02-08 02:57:58.375615249 +0700 +@@ -61,6 +61,11 @@ + virtual unsigned min_tokens() const { return 0; } + virtual unsigned max_tokens() const { return 0; } + ++ #if BOOST_VERSION >= 105900 ++ /// There are no tokens, so this is indifferent. ++ virtual bool adjacent_tokens_only() const { return false; } ++ #endif ++ + /// Accumulating from different sources is silly. + virtual bool is_composing() const { return false; } + |