[gentoo-commits] repo/gentoo:master commit in: www-plugins/gnash/, www-plugins/gnash/files/

2016-11-02 Thread Johannes Huber 
commit: 2e56c8d3ad3600f4ac7a50384d5ca9952796347f
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Nov  2 20:14:16 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Nov  2 20:35:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e56c8d3

www-plugins/gnash: Remove 0.8.10_p20160329

Package-Manager: portage-2.3.2

 .../gnash/files/gnash-0.8.10-boost-1.50.patch  |  24 --
 .../gnash/files/gnash-0.8.10-gettext-macro.patch   | 170 
 .../gnash/files/gnash-0.8.10-libva-1.6_.patch  |  43 ---
 .../gnash/files/gnash-0.8.10-libva-1.6_0001.patch  |  28 --
 .../files/gnash-0.8.10_p20120903-bytesfmt.patch|  32 ---
 .../files/gnash-0.8.10_p20120903-ffmpeg1.patch | 252 --
 .../files/gnash-0.8.10_p20120903-libav9.patch  |  85 --
 .../gnash/files/gnash-0.8.11-gettext-macro.patch   |  29 ---
 www-plugins/gnash/gnash-0.8.10_p20160329.ebuild| 288 -
 9 files changed, 951 deletions(-)

diff --git a/www-plugins/gnash/files/gnash-0.8.10-boost-1.50.patch 
b/www-plugins/gnash/files/gnash-0.8.10-boost-1.50.patch
deleted file mode 100644
index ed774ed..
--- a/www-plugins/gnash/files/gnash-0.8.10-boost-1.50.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur a/macros/boost.m4 b/macros/boost.m4
 a/macros/boost.m4  2012-09-03 17:11:43.0 +0200
-+++ b/macros/boost.m4  2012-10-16 01:58:28.0 +0200
-@@ -37,7 +37,7 @@
-   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.
-diff -ur a/plugin/npapi/Makefile.am b/plugin/npapi/Makefile.am
 a/plugin/npapi/Makefile.am 2012-09-03 17:11:43.0 +0200
-+++ b/plugin/npapi/Makefile.am 2012-10-16 01:58:57.0 +0200
-@@ -78,7 +78,7 @@
- 
- libgnashplugin_la_LIBADD   = \
-   $(GLIB_LIBS) \
--  -lboost_iostreams \
-+  $(BOOST_LIBS) \
-   $(NULL)
- 
- # Scriptable plugin support

diff --git a/www-plugins/gnash/files/gnash-0.8.10-gettext-macro.patch 
b/www-plugins/gnash/files/gnash-0.8.10-gettext-macro.patch
deleted file mode 100644
index 0501f74..
--- a/www-plugins/gnash/files/gnash-0.8.10-gettext-macro.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -ur a/libdevice/vaapi/VaapiImage.cpp b/libdevice/vaapi/VaapiImage.cpp
 a/libdevice/vaapi/VaapiImage.cpp   2012-01-19 20:17:48.0 +0100
-+++ b/libdevice/vaapi/VaapiImage.cpp   2012-02-23 19:05:13.0 +0100
-@@ -35,7 +35,7 @@
- : _format(format)
- , _image_data(NULL)
- {
--log_debug(_("VaapiImage::VaapiImage(): format '%s'\n", 
string_of_FOURCC(format)));
-+log_debug("VaapiImage::VaapiImage(): format '%s'\n", 
string_of_FOURCC(format));
- 
- memset(&_image, 0, sizeof(_image));
- _image.image_id = VA_INVALID_ID;
-@@ -79,7 +79,7 @@
- if (!vaapi_check_status(status, "vaCreateImage()"))
- return false;
- 
--log_debug(_("  image 0x%08x, format '%s'\n", get(), 
string_of_FOURCC(_format)));
-+log_debug("  image 0x%08x, format '%s'\n", get(), 
string_of_FOURCC(_format));
- 
- return true;
- }
-diff -ur a/libdevice/vaapi/VaapiSubpicture.cpp 
b/libdevice/vaapi/VaapiSubpicture.cpp
 a/libdevice/vaapi/VaapiSubpicture.cpp  2012-01-19 20:17:48.0 
+0100
-+++ b/libdevice/vaapi/VaapiSubpicture.cpp  2012-02-23 19:05:13.0 
+0100
-@@ -32,7 +32,7 @@
- : _image(image)
- , _subpicture(VA_INVALID_ID)
- {
--log_debug(_("VaapiSubpicture::VaapiSubpicture(): format '%s'\n", 
string_of_FOURCC(image->format(;
-+log_debug("VaapiSubpicture::VaapiSubpicture(): format '%s'\n", 
string_of_FOURCC(image->format()));
- 
- if (!create()) {
- boost::format msg;
-diff -ur a/libdevice/vaapi/VaapiSurface.cpp b/libdevice/vaapi/VaapiSurface.cpp
 a/libdevice/vaapi/VaapiSurface.cpp 2012-01-19 20:17:48.0 +0100
-+++ b/libdevice/vaapi/VaapiSurface.cpp 2012-02-23 19:05:13.0 +0100
-@@ -74,7 +74,7 @@
- 
- VaapiSurfaceImpl::~VaapiSurfaceImpl()
- {
--log_debug(_("VaapiSurface::~VaapiSurface(): surface 0x%08x\n", 
surface()));
-+log_debug("VaapiSurface::~VaapiSurface(): surface 0x%08x\n", surface());
- 
- if (surface() == VA_INVALID_SURFACE) {
- return;
-diff -ur a/libdevice/vaapi/VaapiSurfaceGLX.cpp 
b/libdevice/vaapi/VaapiSurfaceGLX.cpp
 a/libdevice/vaapi/VaapiSurfaceGLX.cpp  2012-01-19 20:17:48.0 
+0100
-+++ b/libdevice/vaapi/VaapiSurfaceGLX.cpp  2012-02-23 19:05:13.0 
+0100
-@@

[gentoo-commits] repo/gentoo:master commit in: www-plugins/gnash/, www-plugins/gnash/files/

2016-04-24 Thread Chí-Thanh Christopher Nguyễn 
commit: a4bd272fba3feab333eced74d266dcc6e828f80a
Author: Chí-Thanh Christopher Nguyễn  gentoo  org>
AuthorDate: Sun Apr 24 20:30:10 2016 +
Commit: Chí-Thanh Christopher Nguyễn  gentoo  org>
CommitDate: Sun Apr 24 20:30:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4bd272f

www-plugins/gnash: fix building against newer libva, address repoman warnings

Bug: https://bugs.gentoo.org/show_bug.cgi?id=546584

Package-Manager: portage-2.2.26

 .../gnash/files/gnash-0.8.10-libva-1.6_.patch  | 43 ++
 .../gnash/files/gnash-0.8.10-libva-1.6_0001.patch  | 28 ++
 www-plugins/gnash/gnash-0.8.10_p20150316.ebuild| 26 -
 3 files changed, 87 insertions(+), 10 deletions(-)

diff --git a/www-plugins/gnash/files/gnash-0.8.10-libva-1.6_.patch 
b/www-plugins/gnash/files/gnash-0.8.10-libva-1.6_.patch
new file mode 100644
index 000..d914f4a
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.10-libva-1.6_.patch
@@ -0,0 +1,43 @@
+From e5c08131abde15f7a1e048e35d1a9ff12b2acdaa Mon Sep 17 00:00:00 2001
+From: Bastiaan Jacques 
+Date: Thu, 26 Mar 2015 15:24:21 +
+Subject: Build fix: adjust smart pointers to unique_ptr API.
+
+---
+diff --git a/libdevice/vaapi/VaapiContext.h b/libdevice/vaapi/VaapiContext.h
+index 8d9de72..c49d48a 100644
+--- a/libdevice/vaapi/VaapiContext.h
 b/libdevice/vaapi/VaapiContext.h
+@@ -84,7 +84,7 @@ public:
+ void releaseSurface(std::shared_ptr surface);
+ 
+ /// Set user data
+-void setData(std::unique_ptr user_data) { _user_data = 
user_data; }
++void setData(std::unique_ptr user_data) { _user_data = 
std::move(user_data); }
+ 
+ /// Get user data
+ VaapiContextData *getData() const { return _user_data.get(); }
+diff --git a/libdevice/vaapi/VaapiGlobalContext.cpp 
b/libdevice/vaapi/VaapiGlobalContext.cpp
+index c19ed07..5127a27 100644
+--- a/libdevice/vaapi/VaapiGlobalContext.cpp
 b/libdevice/vaapi/VaapiGlobalContext.cpp
+@@ -33,7 +33,7 @@
+ namespace gnash {
+ 
+ VaapiGlobalContext::VaapiGlobalContext(std::unique_ptr display)
+-: _display(display)
++: _display(std::move(display))
+ {
+ GNASH_REPORT_FUNCTION;
+ 
+@@ -145,7 +145,7 @@ VaapiGlobalContext *VaapiGlobalContext::get()
+ if (!dpy.get()) {
+ return NULL;
+ }
+-vaapi_global_context.reset(new VaapiGlobalContext(dpy));
++vaapi_global_context.reset(new 
VaapiGlobalContext(std::move(dpy)));
+ }
+ catch (...) {
+ vaapi_set_is_enabled(false);
+--
+cgit v0.9.0.2

diff --git a/www-plugins/gnash/files/gnash-0.8.10-libva-1.6_0001.patch 
b/www-plugins/gnash/files/gnash-0.8.10-libva-1.6_0001.patch
new file mode 100644
index 000..4c25a98
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.10-libva-1.6_0001.patch
@@ -0,0 +1,28 @@
+From f5016cc9399c9ffd3c5d32c67bb28fac285559c6 Mon Sep 17 00:00:00 2001
+From: Bastiaan Jacques 
+Date: Wed, 09 Sep 2015 19:25:31 +
+Subject: Compilation fix. See Savannah #44636.
+
+Also skip useless NULL check.
+---
+diff --git a/gui/gtk/gtk_glue_agg_vaapi.cpp b/gui/gtk/gtk_glue_agg_vaapi.cpp
+index 1eda283..6209e89 100644
+--- a/gui/gtk/gtk_glue_agg_vaapi.cpp
 b/gui/gtk/gtk_glue_agg_vaapi.cpp
+@@ -301,11 +301,9 @@ 
GtkAggVaapiGlue::getVideoWindow(std::shared_ptr surface,
+ return NULL;
+ 
+ if (!context->getData()) {
+-std::unique_ptr contextData;
+-contextData.reset(new VaapiVideoWindow(parent_window, rect));
+-if (!contextData.get())
+-return NULL;
+-context->setData(contextData);
++context->setData(
++std::unique_ptr(
++new VaapiVideoWindow(parent_window, rect)));
+ }
+ return dynamic_cast(context->getData());
+ }
+--
+cgit v0.9.0.2

diff --git a/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild 
b/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild
index 441d7ba..0ac3743 100644
--- a/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild
+++ b/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -41,8 +41,8 @@ REQUIRED_USE="dump? ( agg ffmpeg )
 RDEPEND=">=dev-libs/boost-1.41.0:0=
dev-libs/expat
dev-libs/libxml2
-   virtual/jpeg
-   media-libs/libpng
+   virtual/jpeg:0
+   media-libs/libpng:0
net-misc/curl
x11-libs/libX11
x11-libs/libXi
@@ -65,16 +65,17 @@ RDEPEND=">=dev-libs/boost-1.41.0:0=
fbcon? (
x11-libs/tslib
)
-   ffmpeg? (
-   virtual/ffmpeg[vaapi?]
-   )
+   ffmpeg? ( || (
+   !vaapi? ( media-video/libav )
+   media-video/ffmpeg[vaapi?]
+   ) )
gconf? (
gnome-base/gconf
)

[gentoo-commits] repo/gentoo:master commit in: www-plugins/gnash/, www-plugins/gnash/files/

2016-04-09 Thread David Seifert 
commit: 5317471fd578c7501126c6f7481f02f7ff02f248
Author: David Seifert  gentoo  org>
AuthorDate: Sat Apr  9 20:26:02 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Apr  9 20:26:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5317471f

www-plugins/gnash: Add patch for dev-libs/boost-1.60

Gentoo-Bug: 579142

Package-Manager: portage-2.2.28

 .../files/gnash-0.8.10_p20150316-boost-1.60.patch  | 24 ++
 www-plugins/gnash/gnash-0.8.10_p20150316.ebuild|  4 
 2 files changed, 28 insertions(+)

diff --git a/www-plugins/gnash/files/gnash-0.8.10_p20150316-boost-1.60.patch 
b/www-plugins/gnash/files/gnash-0.8.10_p20150316-boost-1.60.patch
new file mode 100644
index 000..6671d36
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.10_p20150316-boost-1.60.patch
@@ -0,0 +1,24 @@
+diff --git i/libbase/accumulator.h w/libbase/accumulator.h
+index 694cbd2..876c669 100644
+--- i/libbase/accumulator.h
 w/libbase/accumulator.h
+@@ -22,6 +22,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -61,6 +62,11 @@ public:
+ 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; }
+ 

diff --git a/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild 
b/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild
index a1747f9..441d7ba 100644
--- a/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild
+++ b/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild
@@ -143,6 +143,10 @@ src_prepare() {
# Fix libamf includes
epatch "${FILESDIR}"/${PN}-0.8.10-amf-include.patch
 
+   # Fix new adjacent_tokens_only() in >=boost-1.59 (bug 579142)
+   # See https://savannah.gnu.org/bugs/?46148
+   epatch "${FILESDIR}"/${P}-boost-1.60.patch
+
eautoreconf
 }
 src_configure() {