mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
www-plugins/gnash: Remove 0.8.10_p20160329
Package-Manager: portage-2.3.2
This commit is contained in:
Johannes Huber
@@ -1,24 +0,0 @@
|
||||
diff -ur a/macros/boost.m4 b/macros/boost.m4
|
||||
--- a/macros/boost.m4 2012-09-03 17:11:43.000000000 +0200
|
||||
+++ b/macros/boost.m4 2012-10-16 01:58:28.000000000 +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.000000000 +0200
|
||||
+++ b/plugin/npapi/Makefile.am 2012-10-16 01:58:57.000000000 +0200
|
||||
@@ -78,7 +78,7 @@
|
||||
|
||||
libgnashplugin_la_LIBADD = \
|
||||
$(GLIB_LIBS) \
|
||||
- -lboost_iostreams \
|
||||
+ $(BOOST_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
# Scriptable plugin support
|
||||
@@ -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.000000000 +0100
|
||||
+++ b/libdevice/vaapi/VaapiImage.cpp 2012-02-23 19:05:13.000000000 +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.000000000 +0100
|
||||
+++ b/libdevice/vaapi/VaapiSubpicture.cpp 2012-02-23 19:05:13.000000000 +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.000000000 +0100
|
||||
+++ b/libdevice/vaapi/VaapiSurface.cpp 2012-02-23 19:05:13.000000000 +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.000000000 +0100
|
||||
+++ b/libdevice/vaapi/VaapiSurfaceGLX.cpp 2012-02-23 19:05:13.000000000 +0100
|
||||
@@ -202,14 +202,14 @@
|
||||
|
||||
reset(reinterpret_cast<uintptr_t>(surface));
|
||||
|
||||
- log_debug(_(" -> surface %p\n", this->surface()));
|
||||
+ log_debug(" -> surface %p\n", this->surface());
|
||||
}
|
||||
|
||||
VaapiSurfaceGLXImpl::~VaapiSurfaceGLXImpl()
|
||||
{
|
||||
// GNASH_REPORT_FUNCTION;
|
||||
|
||||
- log_debug(_("VaapiSurface::~VaapiSurface(): surface %p\n", surface()));
|
||||
+ log_debug("VaapiSurface::~VaapiSurface(): surface %p\n", surface());
|
||||
|
||||
if (!surface()) {
|
||||
return;
|
||||
@@ -263,7 +263,7 @@
|
||||
|
||||
bool VaapiSurfaceGLX::update(boost::shared_ptr<VaapiSurface> surface)
|
||||
{
|
||||
- log_debug(_("VaapiSurfaceGLX::update(): from surface 0x%08x\n", surface->get()));
|
||||
+ log_debug("VaapiSurfaceGLX::update(): from surface 0x%08x\n", surface->get());
|
||||
|
||||
return dynamic_cast<VaapiSurfaceGLXImpl *>(_impl.get())->update(surface);
|
||||
}
|
||||
diff -ur a/libdevice/vaapi/VaapiSurfaceProxy.cpp b/libdevice/vaapi/VaapiSurfaceProxy.cpp
|
||||
--- a/libdevice/vaapi/VaapiSurfaceProxy.cpp 2012-01-19 20:17:48.000000000 +0100
|
||||
+++ b/libdevice/vaapi/VaapiSurfaceProxy.cpp 2012-02-23 19:05:13.000000000 +0100
|
||||
@@ -28,12 +28,12 @@
|
||||
boost::shared_ptr<VaapiContext> context)
|
||||
: _context(context), _surface(surface)
|
||||
{
|
||||
- log_debug(_("VaapiSurfaceProxy::VaapiSurfaceProxy(): surface 0x%08x\n", _surface->get()));
|
||||
+ log_debug("VaapiSurfaceProxy::VaapiSurfaceProxy(): surface 0x%08x\n", _surface->get());
|
||||
}
|
||||
|
||||
VaapiSurfaceProxy::~VaapiSurfaceProxy()
|
||||
{
|
||||
- log_debug(_("VaapiSurfaceProxy::~VaapiSurfaceProxy(): surface 0x%08x\n", _surface->get()));
|
||||
+ log_debug("VaapiSurfaceProxy::~VaapiSurfaceProxy(): surface 0x%08x\n", _surface->get());
|
||||
|
||||
_context->releaseSurface(_surface);
|
||||
}
|
||||
diff -ur a/libdevice/x11/X11Device.cpp b/libdevice/x11/X11Device.cpp
|
||||
--- a/libdevice/x11/X11Device.cpp 2012-01-19 20:17:48.000000000 +0100
|
||||
+++ b/libdevice/x11/X11Device.cpp 2012-02-23 19:05:13.000000000 +0100
|
||||
@@ -85,7 +85,7 @@
|
||||
GNASH_REPORT_FUNCTION;
|
||||
|
||||
if (!initDevice(0, 0)) {
|
||||
- log_error(_("Couldn't initialize X11 device!"));
|
||||
+ log_error("Couldn't initialize X11 device!");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
GNASH_REPORT_FUNCTION;
|
||||
|
||||
if (!initDevice(argc, argv)) {
|
||||
- log_error(_("Couldn't initialize X11 device!"));
|
||||
+ log_error("Couldn't initialize X11 device!");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -139,7 +139,7 @@
|
||||
|
||||
_display = XOpenDisplay(dpyName);
|
||||
if (!_display) {
|
||||
- log_error(_("couldn't open X11 display!"));
|
||||
+ log_error("couldn't open X11 display!");
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -159,7 +159,7 @@
|
||||
_vinfo = XGetVisualInfo(_display, VisualIDMask, &visTemplate, &num_visuals);
|
||||
std::cerr << "Num Visuals: " << num_visuals << std::endl;
|
||||
if (!_vinfo) {
|
||||
- log_error(_("Error: couldn't get X visual\n"));
|
||||
+ log_error("Error: couldn't get X visual\n");
|
||||
exit(1);
|
||||
}
|
||||
std::cerr << "X11 visual is: " << _vinfo->visual << std::endl;
|
||||
@@ -196,7 +196,7 @@
|
||||
if (_display) {
|
||||
XGetErrorText(_display, error, msg, 80);
|
||||
} else {
|
||||
- log_error(_("The default Display is not set!"));
|
||||
+ log_error("The default Display is not set!");
|
||||
}
|
||||
|
||||
return msg;
|
||||
@@ -209,12 +209,12 @@
|
||||
GNASH_REPORT_FUNCTION;
|
||||
|
||||
if (!_display) {
|
||||
- log_error(_("No Display device set!"));
|
||||
+ log_error("No Display device set!");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!_root) {
|
||||
- log_error(_("No drawable window set!"));
|
||||
+ log_error("No drawable window set!");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -279,11 +279,11 @@
|
||||
case KeyPress:
|
||||
{
|
||||
char buffer[10];
|
||||
- int code;
|
||||
+ int r, code;
|
||||
code = XLookupKeysym(&event.xkey, 0);
|
||||
if (!keyPress || !keyPress(code)) {
|
||||
- // int r = XLookupString(&event.xkey, buffer, sizeof(buffer),
|
||||
- // NULL, NULL);
|
||||
+ r = XLookupString(&event.xkey, buffer, sizeof(buffer),
|
||||
+ NULL, NULL);
|
||||
if (buffer[0] == 27) {
|
||||
// escape
|
||||
return;
|
||||
@@ -1,43 +0,0 @@
|
||||
From e5c08131abde15f7a1e048e35d1a9ff12b2acdaa Mon Sep 17 00:00:00 2001
|
||||
From: Bastiaan Jacques <bastiaan@bjacques.org>
|
||||
Date: Thu, 26 Mar 2015 15:24:21 +0000
|
||||
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<VaapiSurface> surface);
|
||||
|
||||
/// Set user data
|
||||
- void setData(std::unique_ptr<VaapiContextData> user_data) { _user_data = user_data; }
|
||||
+ void setData(std::unique_ptr<VaapiContextData> 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<VaapiDisplay> 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
|
||||
@@ -1,28 +0,0 @@
|
||||
From f5016cc9399c9ffd3c5d32c67bb28fac285559c6 Mon Sep 17 00:00:00 2001
|
||||
From: Bastiaan Jacques <bastiaan@bjacques.org>
|
||||
Date: Wed, 09 Sep 2015 19:25:31 +0000
|
||||
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<VaapiSurface> surface,
|
||||
return NULL;
|
||||
|
||||
if (!context->getData()) {
|
||||
- std::unique_ptr<VaapiContextData> contextData;
|
||||
- contextData.reset(new VaapiVideoWindow(parent_window, rect));
|
||||
- if (!contextData.get())
|
||||
- return NULL;
|
||||
- context->setData(contextData);
|
||||
+ context->setData(
|
||||
+ std::unique_ptr<VaapiContextData>(
|
||||
+ new VaapiVideoWindow(parent_window, rect)));
|
||||
}
|
||||
return dynamic_cast<VaapiVideoWindow *>(context->getData());
|
||||
}
|
||||
--
|
||||
cgit v0.9.0.2
|
||||
@@ -1,32 +0,0 @@
|
||||
commit 80989fcd47d33e30336785422ded17f4c607a113
|
||||
Author: Alexis Ballier <aballier@gentoo.org>
|
||||
Date: Thu Feb 14 17:21:50 2013 -0300
|
||||
|
||||
Use av_get_bytes_per_sample in SampleFormatToSampleSize (#38333)
|
||||
|
||||
This is more future proof against the addition of sample formats.
|
||||
|
||||
Signed-off-by: Sandro Santilli <strk@keybit.net>
|
||||
|
||||
diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.cpp b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
|
||||
index 136cc08..83b1d74 100644
|
||||
--- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp
|
||||
+++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
|
||||
@@ -646,6 +646,9 @@ MediaParserFfmpeg::seekMedia(boost::int64_t offset, int whence)
|
||||
boost::uint16_t
|
||||
MediaParserFfmpeg::SampleFormatToSampleSize(AVSampleFormat fmt)
|
||||
{
|
||||
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(51,4,0)
|
||||
+ return av_get_bytes_per_sample(fmt);
|
||||
+#else
|
||||
switch (fmt)
|
||||
{
|
||||
case AV_SAMPLE_FMT_U8: // unsigned 8 bits
|
||||
@@ -668,6 +671,7 @@ MediaParserFfmpeg::SampleFormatToSampleSize(AVSampleFormat fmt)
|
||||
default:
|
||||
return 8; // arbitrary value
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -1,252 +0,0 @@
|
||||
commit 4b3dae970549d42723c2528c250a1f95248145c7
|
||||
Author: Alexis Ballier <aballier@gentoo.org>
|
||||
Date: Wed Feb 13 14:38:44 2013 -0300
|
||||
|
||||
Fix build with latest FFmpeg (second attempt)
|
||||
|
||||
Add ifdefery to be compatible with older versions.
|
||||
See ticket #38122
|
||||
|
||||
Signed-off-by: Sandro Santilli <strk@keybit.net>
|
||||
|
||||
diff --git a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
|
||||
index 067e418..5c8e1ad 100644
|
||||
--- a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
|
||||
+++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
|
||||
@@ -84,8 +84,10 @@ AudioDecoderFfmpeg::~AudioDecoderFfmpeg()
|
||||
|
||||
void AudioDecoderFfmpeg::setup(SoundInfo& info)
|
||||
{
|
||||
- // Init the avdecoder-decoder
|
||||
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,6,2)
|
||||
+ // Starting from this version avcodec_register calls avcodec_init
|
||||
avcodec_init();
|
||||
+#endif
|
||||
avcodec_register_all();// change this to only register need codec?
|
||||
|
||||
enum CodecID codec_id;
|
||||
@@ -158,14 +160,14 @@ void AudioDecoderFfmpeg::setup(SoundInfo& info)
|
||||
case CODEC_ID_PCM_U16LE:
|
||||
_audioCodecCtx->channels = (info.isStereo() ? 2 : 1);
|
||||
_audioCodecCtx->sample_rate = info.getSampleRate();
|
||||
- _audioCodecCtx->sample_fmt = SAMPLE_FMT_S16; // ?! arbitrary ?
|
||||
+ _audioCodecCtx->sample_fmt = AV_SAMPLE_FMT_S16; // ?! arbitrary ?
|
||||
_audioCodecCtx->frame_size = 1;
|
||||
break;
|
||||
|
||||
default:
|
||||
_audioCodecCtx->channels = (info.isStereo() ? 2 : 1);
|
||||
_audioCodecCtx->sample_rate = info.getSampleRate();
|
||||
- _audioCodecCtx->sample_fmt = SAMPLE_FMT_S16; // ?! arbitrary ?
|
||||
+ _audioCodecCtx->sample_fmt = AV_SAMPLE_FMT_S16; // ?! arbitrary ?
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -173,7 +175,10 @@ void AudioDecoderFfmpeg::setup(SoundInfo& info)
|
||||
void AudioDecoderFfmpeg::setup(const AudioInfo& info)
|
||||
{
|
||||
// Init the avdecoder-decoder
|
||||
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,6,2)
|
||||
+ // Starting from this version avcodec_register calls avcodec_init
|
||||
avcodec_init();
|
||||
+#endif
|
||||
avcodec_register_all();// change this to only register need codec?
|
||||
|
||||
enum CodecID codec_id = CODEC_ID_NONE;
|
||||
@@ -297,7 +302,7 @@ void AudioDecoderFfmpeg::setup(const AudioInfo& info)
|
||||
_audioCodecCtx->channels = (info.stereo ? 2 : 1);
|
||||
_audioCodecCtx->sample_rate = info.sampleRate;
|
||||
// was commented out (why?):
|
||||
- _audioCodecCtx->sample_fmt = SAMPLE_FMT_S16;
|
||||
+ _audioCodecCtx->sample_fmt = AV_SAMPLE_FMT_S16;
|
||||
break;
|
||||
}
|
||||
|
||||
diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.cpp b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
|
||||
index d6e6902..136cc08 100644
|
||||
--- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp
|
||||
+++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
|
||||
@@ -344,8 +344,10 @@ MediaParserFfmpeg::initializeParser()
|
||||
{
|
||||
av_register_all(); // TODO: needs to be invoked only once ?
|
||||
|
||||
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52,107,0)
|
||||
_byteIOCxt.buffer = NULL;
|
||||
-
|
||||
+#endif
|
||||
+
|
||||
_inputFmt = probeStream();
|
||||
|
||||
#ifdef GNASH_ALLOW_VCODEC_ENV
|
||||
@@ -366,7 +368,11 @@ MediaParserFfmpeg::initializeParser()
|
||||
// which isn't needed.
|
||||
_byteIOBuffer.reset(new unsigned char[byteIOBufferSize]);
|
||||
|
||||
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52,107,0)
|
||||
init_put_byte(&_byteIOCxt,
|
||||
+#else
|
||||
+ _avIOCxt = avio_alloc_context(
|
||||
+#endif
|
||||
_byteIOBuffer.get(), // buffer
|
||||
byteIOBufferSize, // buffer size
|
||||
0, // write flags
|
||||
@@ -376,7 +382,11 @@ MediaParserFfmpeg::initializeParser()
|
||||
MediaParserFfmpeg::seekMediaWrapper // seeker callback
|
||||
);
|
||||
|
||||
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52,107,0)
|
||||
_byteIOCxt.is_streamed = 1;
|
||||
+#else
|
||||
+ _avIOCxt->seekable = 0;
|
||||
+#endif
|
||||
|
||||
#if !defined(LIBAVCODEC_VERSION_MAJOR) || LIBAVCODEC_VERSION_MAJOR < 52
|
||||
// Needed for Lenny.
|
||||
@@ -387,12 +397,19 @@ MediaParserFfmpeg::initializeParser()
|
||||
|
||||
assert(_formatCtx);
|
||||
|
||||
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52,107,0)
|
||||
// Otherwise av_open_input_stream will reallocate the context.
|
||||
AVFormatParameters ap;
|
||||
std::memset(&ap, 0, sizeof ap);
|
||||
ap.prealloced_context = 1;
|
||||
|
||||
if (av_open_input_stream(&_formatCtx, &_byteIOCxt, "", _inputFmt, &ap) < 0)
|
||||
+#else
|
||||
+
|
||||
+ _formatCtx->pb = _avIOCxt;
|
||||
+
|
||||
+ if (avformat_open_input(&_formatCtx, "", _inputFmt, NULL) < 0)
|
||||
+#endif
|
||||
{
|
||||
throw IOException("MediaParserFfmpeg couldn't open input stream");
|
||||
}
|
||||
@@ -400,10 +417,17 @@ MediaParserFfmpeg::initializeParser()
|
||||
#if defined(LIBAVCODEC_VERSION_MAJOR) && LIBAVCODEC_VERSION_MAJOR >= 52
|
||||
// Note: in at least some versions of ffmpeg, av_open_input_stream does
|
||||
// not parse metadata; not sure why.
|
||||
+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51,5,0)
|
||||
AVMetadata* md = _formatCtx->metadata;
|
||||
if (md) {
|
||||
AVMetadataTag* tag = av_metadata_get(md, "album", 0,
|
||||
AV_METADATA_MATCH_CASE);
|
||||
+#else
|
||||
+ AVDictionary* md = _formatCtx->metadata;
|
||||
+ if (md) {
|
||||
+ AVDictionaryEntry* tag = av_dict_get(md, "album", 0,
|
||||
+ AV_DICT_MATCH_CASE);
|
||||
+#endif
|
||||
if (tag && tag->value) {
|
||||
setId3Info(&Id3Info::album, std::string(tag->value),
|
||||
_id3Object);
|
||||
@@ -620,27 +644,27 @@ MediaParserFfmpeg::seekMedia(boost::int64_t offset, int whence)
|
||||
}
|
||||
|
||||
boost::uint16_t
|
||||
-MediaParserFfmpeg::SampleFormatToSampleSize(SampleFormat fmt)
|
||||
+MediaParserFfmpeg::SampleFormatToSampleSize(AVSampleFormat fmt)
|
||||
{
|
||||
switch (fmt)
|
||||
{
|
||||
- case SAMPLE_FMT_U8: // unsigned 8 bits
|
||||
+ case AV_SAMPLE_FMT_U8: // unsigned 8 bits
|
||||
return 1;
|
||||
|
||||
- case SAMPLE_FMT_S16: // signed 16 bits
|
||||
- case SAMPLE_FMT_FLT: // float
|
||||
+ case AV_SAMPLE_FMT_S16: // signed 16 bits
|
||||
+ case AV_SAMPLE_FMT_FLT: // float
|
||||
return 2;
|
||||
|
||||
#if !defined (LIBAVCODEC_VERSION_MAJOR) || LIBAVCODEC_VERSION_MAJOR < 52
|
||||
// Was dropped for version 52.0.0
|
||||
- case SAMPLE_FMT_S24: // signed 24 bits
|
||||
+ case AV_SAMPLE_FMT_S24: // signed 24 bits
|
||||
return 3;
|
||||
#endif
|
||||
|
||||
- case SAMPLE_FMT_S32: // signed 32 bits
|
||||
+ case AV_SAMPLE_FMT_S32: // signed 32 bits
|
||||
return 4;
|
||||
|
||||
- case SAMPLE_FMT_NONE:
|
||||
+ case AV_SAMPLE_FMT_NONE:
|
||||
default:
|
||||
return 8; // arbitrary value
|
||||
}
|
||||
diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.h b/libmedia/ffmpeg/MediaParserFfmpeg.h
|
||||
index 4e410d8..a14cfb6 100644
|
||||
--- a/libmedia/ffmpeg/MediaParserFfmpeg.h
|
||||
+++ b/libmedia/ffmpeg/MediaParserFfmpeg.h
|
||||
@@ -154,7 +154,13 @@ private:
|
||||
AVStream* _audioStream;
|
||||
|
||||
/// ?
|
||||
- ByteIOContext _byteIOCxt;
|
||||
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52,107,0)
|
||||
+// AVIOContext was introduced a bit earlier but without version bump, so let's
|
||||
+// be safe
|
||||
+ ByteIOContext _byteIOCxt;
|
||||
+#else
|
||||
+ AVIOContext* _avIOCxt;
|
||||
+#endif
|
||||
|
||||
/// Size of the ByteIO context buffer
|
||||
//
|
||||
@@ -172,7 +178,7 @@ private:
|
||||
//
|
||||
/// TODO: move somewhere in ffmpeg utils..
|
||||
///
|
||||
- boost::uint16_t SampleFormatToSampleSize(SampleFormat fmt);
|
||||
+ boost::uint16_t SampleFormatToSampleSize(AVSampleFormat fmt);
|
||||
|
||||
/// Make an EncodedVideoFrame from an AVPacket and push to buffer
|
||||
//
|
||||
diff --git a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
|
||||
index 40a5c80..eeefafe 100644
|
||||
--- a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
|
||||
+++ b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
|
||||
@@ -171,7 +171,10 @@ VideoDecoderFfmpeg::init(enum CodecID codecId, int /*width*/, int /*height*/,
|
||||
boost::uint8_t* extradata, int extradataSize)
|
||||
{
|
||||
// Init the avdecoder-decoder
|
||||
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,6,2)
|
||||
+ // Starting from this version avcodec_register calls avcodec_init
|
||||
avcodec_init();
|
||||
+#endif
|
||||
avcodec_register_all();// change this to only register need codec?
|
||||
|
||||
_videoCodec = avcodec_find_decoder(codecId);
|
||||
@@ -529,7 +532,11 @@ get_buffer(AVCodecContext* avctx, AVFrame* pic)
|
||||
|
||||
static unsigned int pic_num = 0;
|
||||
pic->type = FF_BUFFER_TYPE_USER;
|
||||
+#if LIBAVCODEC_VERSION_MAJOR < 54
|
||||
+ // This field has been unused for longer but has been removed with
|
||||
+ // libavcodec 54.
|
||||
pic->age = ++pic_num - surface->getPicNum();
|
||||
+#endif
|
||||
surface->setPicNum(pic_num);
|
||||
return 0;
|
||||
#endif
|
||||
diff --git a/libmedia/ffmpeg/ffmpegHeaders.h b/libmedia/ffmpeg/ffmpegHeaders.h
|
||||
index 65a8d0c..7710121 100644
|
||||
--- a/libmedia/ffmpeg/ffmpegHeaders.h
|
||||
+++ b/libmedia/ffmpeg/ffmpegHeaders.h
|
||||
@@ -83,5 +83,15 @@ extern "C" {
|
||||
#define HAVE_SWSCALE_H 1
|
||||
#endif
|
||||
|
||||
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,94,1)
|
||||
+#define AV_SAMPLE_FMT_NONE SAMPLE_FMT_NONE
|
||||
+#define AV_SAMPLE_FMT_U8 SAMPLE_FMT_U8
|
||||
+#define AV_SAMPLE_FMT_S16 SAMPLE_FMT_S16
|
||||
+#define AV_SAMPLE_FMT_S32 SAMPLE_FMT_S32
|
||||
+#define AV_SAMPLE_FMT_FLT SAMPLE_FMT_FLT
|
||||
+#define AV_SAMPLE_FMT_DBL SAMPLE_FMT_DBL
|
||||
+
|
||||
+#define AVSampleFormat SampleFormat
|
||||
+#endif
|
||||
|
||||
#endif // GNASH_MEDIA_FFMPEG_HEADERS_H
|
||||
@@ -1,85 +0,0 @@
|
||||
commit dfba5258dc230669a7e1ad309e25ef190c77e854
|
||||
Author: Alexis Ballier <aballier@gentoo.org>
|
||||
Date: Thu Feb 14 16:54:08 2013 -0300
|
||||
|
||||
Fix build with libav-9 (#38333)
|
||||
|
||||
Signed-off-by: Sandro Santilli <strk@keybit.net>
|
||||
|
||||
diff --git a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
|
||||
index 5c8e1ad..50947fb 100644
|
||||
--- a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
|
||||
+++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
|
||||
@@ -133,12 +133,20 @@ void AudioDecoderFfmpeg::setup(SoundInfo& info)
|
||||
}
|
||||
}
|
||||
|
||||
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(53,8,0)
|
||||
+ _audioCodecCtx = avcodec_alloc_context3(_audioCodec);
|
||||
+#else
|
||||
_audioCodecCtx = avcodec_alloc_context();
|
||||
+#endif
|
||||
if (!_audioCodecCtx) {
|
||||
throw MediaException(_("libavcodec couldn't allocate context"));
|
||||
}
|
||||
|
||||
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(53,8,0)
|
||||
+ int ret = avcodec_open2(_audioCodecCtx, _audioCodec, NULL);
|
||||
+#else
|
||||
int ret = avcodec_open(_audioCodecCtx, _audioCodec);
|
||||
+#endif
|
||||
if (ret < 0) {
|
||||
av_free(_audioCodecCtx);
|
||||
_audioCodecCtx=0;
|
||||
@@ -259,7 +267,11 @@ void AudioDecoderFfmpeg::setup(const AudioInfo& info)
|
||||
_needsParsing = (_parser != NULL);
|
||||
|
||||
// Create an audioCodecCtx from the ffmpeg parser if exists/possible
|
||||
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(53,8,0)
|
||||
+ _audioCodecCtx = avcodec_alloc_context3(_audioCodec);
|
||||
+#else
|
||||
_audioCodecCtx = avcodec_alloc_context();
|
||||
+#endif
|
||||
if (!_audioCodecCtx) {
|
||||
throw MediaException(_("AudioDecoderFfmpeg: libavcodec couldn't "
|
||||
"allocate context"));
|
||||
@@ -310,7 +322,11 @@ void AudioDecoderFfmpeg::setup(const AudioInfo& info)
|
||||
#ifdef GNASH_DEBUG_AUDIO_DECODING
|
||||
log_debug(" Opening codec");
|
||||
#endif // GNASH_DEBUG_AUDIO_DECODING
|
||||
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(53,8,0)
|
||||
+ int ret = avcodec_open2(_audioCodecCtx, _audioCodec, NULL);
|
||||
+#else
|
||||
int ret = avcodec_open(_audioCodecCtx, _audioCodec);
|
||||
+#endif
|
||||
if (ret < 0) {
|
||||
//avcodec_close(_audioCodecCtx);
|
||||
av_free(_audioCodecCtx);
|
||||
diff --git a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
|
||||
index eeefafe..e5263c6 100644
|
||||
--- a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
|
||||
+++ b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
|
||||
@@ -183,7 +183,11 @@ VideoDecoderFfmpeg::init(enum CodecID codecId, int /*width*/, int /*height*/,
|
||||
throw MediaException(_("libavcodec can't decode this video format"));
|
||||
}
|
||||
|
||||
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(53,8,0)
|
||||
+ _videoCodecCtx.reset(new CodecContextWrapper(avcodec_alloc_context3(_videoCodec)));
|
||||
+#else
|
||||
_videoCodecCtx.reset(new CodecContextWrapper(avcodec_alloc_context()));
|
||||
+#endif
|
||||
if (!_videoCodecCtx->getContext()) {
|
||||
throw MediaException(_("libavcodec couldn't allocate context"));
|
||||
}
|
||||
@@ -206,7 +210,11 @@ VideoDecoderFfmpeg::init(enum CodecID codecId, int /*width*/, int /*height*/,
|
||||
}
|
||||
#endif
|
||||
|
||||
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(53,8,0)
|
||||
+ int ret = avcodec_open2(ctx, _videoCodec, NULL);
|
||||
+#else
|
||||
int ret = avcodec_open(ctx, _videoCodec);
|
||||
+#endif
|
||||
if (ret < 0) {
|
||||
boost::format msg = boost::format(_("libavcodec "
|
||||
"failed to initialize FFMPEG "
|
||||
@@ -1,29 +0,0 @@
|
||||
diff -ur a/libdevice/vaapi/VaapiSurfaceGLX.cpp b/libdevice/vaapi/VaapiSurfaceGLX.cpp
|
||||
--- a/libdevice/vaapi/VaapiSurfaceGLX.cpp 2013-08-22 19:50:20.000000000 +0200
|
||||
+++ b/libdevice/vaapi/VaapiSurfaceGLX.cpp 2013-08-22 22:43:55.060296748 +0200
|
||||
@@ -202,14 +202,14 @@
|
||||
|
||||
reset(reinterpret_cast<uintptr_t>(surface));
|
||||
|
||||
- log_debug(_(" -> surface %p\n", this->surface()));
|
||||
+ log_debug(_(" -> surface %p\n"), this->surface());
|
||||
}
|
||||
|
||||
VaapiSurfaceGLXImpl::~VaapiSurfaceGLXImpl()
|
||||
{
|
||||
// GNASH_REPORT_FUNCTION;
|
||||
|
||||
- log_debug(_("VaapiSurface::~VaapiSurface(): surface %p\n", surface()));
|
||||
+ log_debug(_("VaapiSurface::~VaapiSurface(): surface %p\n"), surface());
|
||||
|
||||
if (!surface()) {
|
||||
return;
|
||||
@@ -263,7 +263,7 @@
|
||||
|
||||
bool VaapiSurfaceGLX::update(boost::shared_ptr<VaapiSurface> surface)
|
||||
{
|
||||
- log_debug(_("VaapiSurfaceGLX::update(): from surface 0x%08x\n", surface->get()));
|
||||
+ log_debug(_("VaapiSurfaceGLX::update(): from surface 0x%08x\n"), surface->get());
|
||||
|
||||
return dynamic_cast<VaapiSurfaceGLXImpl *>(_impl.get())->update(surface);
|
||||
}
|
||||
@@ -1,288 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
CMAKE_REQUIRED="never"
|
||||
KDE_REQUIRED="optional"
|
||||
AT_M4DIR="cygnal"
|
||||
# won't build with python-3, bug #392969
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit autotools eutils kde4-base multilib nsplugins python-any-r1 flag-o-matic
|
||||
|
||||
DESCRIPTION="GNU Flash movie player that supports many SWF v7,8,9 features"
|
||||
HOMEPAGE="https://www.gnu.org/software/gnash/"
|
||||
|
||||
if [[ ${PV} = 9999* ]]; then
|
||||
SRC_URI=""
|
||||
EGIT_REPO_URI="git://git.savannah.gnu.org/gnash.git"
|
||||
inherit git-2
|
||||
else
|
||||
# Release tarball is b0rked, upstream #35612
|
||||
# SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
|
||||
SRC_URI="mirror://gentoo/${P}.tar.xz"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="X +agg cairo cygnal dbus directfb doc dump egl fbcon +ffmpeg gconf gnome gstreamer gtk harden jemalloc kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi"
|
||||
REQUIRED_USE="dump? ( agg ffmpeg )
|
||||
fbcon? ( agg )
|
||||
nsplugin? ( gtk )
|
||||
openvg? ( egl )
|
||||
python? ( gtk )
|
||||
vaapi? ( agg ffmpeg )
|
||||
|| ( agg cairo opengl openvg )
|
||||
|| ( dump fbcon gtk kde sdl )
|
||||
"
|
||||
|
||||
RDEPEND=">=dev-libs/boost-1.41.0:0=
|
||||
dev-libs/expat
|
||||
dev-libs/libxml2
|
||||
virtual/jpeg:0
|
||||
media-libs/libpng:0
|
||||
net-misc/curl
|
||||
x11-libs/libX11
|
||||
x11-libs/libXi
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
media-libs/giflib
|
||||
x11-proto/xproto
|
||||
agg? ( x11-libs/agg )
|
||||
cairo? ( x11-libs/cairo )
|
||||
directfb? (
|
||||
dev-libs/DirectFB
|
||||
)
|
||||
doc? (
|
||||
>=app-text/docbook2X-0.8.8
|
||||
app-text/docbook-sgml-utils
|
||||
)
|
||||
egl? (
|
||||
media-libs/mesa[egl]
|
||||
)
|
||||
fbcon? (
|
||||
x11-libs/tslib
|
||||
)
|
||||
ffmpeg? (
|
||||
virtual/ffmpeg[vaapi?]
|
||||
)
|
||||
gconf? (
|
||||
gnome-base/gconf
|
||||
)
|
||||
gstreamer? (
|
||||
media-plugins/gst-plugins-ffmpeg:*
|
||||
media-plugins/gst-plugins-mad:*
|
||||
media-plugins/gst-plugins-meta:*
|
||||
)
|
||||
gtk? (
|
||||
x11-libs/gtk+:2
|
||||
python? ( dev-python/pygtk:2 )
|
||||
)
|
||||
jemalloc? ( dev-libs/jemalloc )
|
||||
kde? (
|
||||
$(add_kdebase_dep kdebase-startkde)
|
||||
dev-qt/qtwebkit:4
|
||||
)
|
||||
opengl? (
|
||||
virtual/glu
|
||||
virtual/opengl
|
||||
gtk? ( x11-libs/gtkglext )
|
||||
)
|
||||
openvg? (
|
||||
media-libs/mesa[openvg]
|
||||
)
|
||||
sdl? ( media-libs/libsdl[X] )
|
||||
sdl-sound? ( media-libs/libsdl )
|
||||
media-libs/speex[ogg]
|
||||
sys-libs/zlib
|
||||
>=sys-devel/libtool-2.2
|
||||
mysql? ( virtual/mysql )
|
||||
lirc? ( app-misc/lirc )
|
||||
dbus? ( sys-apps/dbus )
|
||||
ssh? ( >=net-libs/libssh-0.4[server] )
|
||||
ssl? ( dev-libs/openssl:0 )
|
||||
vaapi? ( x11-libs/libva[opengl?] )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
nls? ( sys-devel/gettext )
|
||||
gnome? ( app-text/rarian )
|
||||
nsplugin? ( net-misc/npapi-sdk )
|
||||
test? ( dev-util/dejagnu )"
|
||||
# Tests hang with sandbox, bug #321017
|
||||
RESTRICT="test"
|
||||
|
||||
pkg_setup() {
|
||||
kde4-base_pkg_setup
|
||||
python-any-r1_pkg_setup
|
||||
|
||||
if use !ffmpeg && use !gstreamer; then
|
||||
ewarn "You are trying to build Gnash without choosing a media handler."
|
||||
ewarn "Sound and video playback will not work."
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
# rename git snapshot directory to what portage expects
|
||||
mv ${PN}-*/ ${P} || die
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Fix paths for klash, bug #339610
|
||||
epatch "${FILESDIR}"/${PN}-0.8.9-klash.patch
|
||||
|
||||
# Use external dejagnu for tests, bug #321017
|
||||
epatch "${FILESDIR}"/${PN}-0.8.9-external-dejagnu.patch
|
||||
|
||||
# Fix building on ppc64, bug #342535
|
||||
use ppc64 && append-flags -mminimal-toc
|
||||
|
||||
# Fix kde multilib library path, bug #391283
|
||||
epatch "${FILESDIR}"/${PN}-0.8.9-kde4-libdir.patch
|
||||
|
||||
# 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}"/${PN}-0.8.10_p20150316-boost-1.60.patch
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
src_configure() {
|
||||
local device gui input media myconf myext renderers
|
||||
|
||||
# Set nsplugin install directory.
|
||||
use nsplugin && myconf="${myconf} --with-npapi-plugindir=/usr/$(get_libdir)/gnash/npapi/"
|
||||
|
||||
# Set hardware acceleration.
|
||||
use X && device+=",x11"
|
||||
use directfb && device+=",directfb"
|
||||
use egl && device+=",egl"
|
||||
use fbcon && device+=",rawfb"
|
||||
use vaapi && device+=",vaapi"
|
||||
[[ "${device}x" == "x" ]] && device+=",none"
|
||||
|
||||
# Set rendering engine.
|
||||
use agg && renderers+=",agg"
|
||||
use cairo && renderers+=",cairo"
|
||||
use opengl && renderers+=",opengl"
|
||||
use openvg && renderers+=",openvg"
|
||||
|
||||
# Set kde and konqueror plugin directories.
|
||||
if use kde; then
|
||||
myconf="${myconf}
|
||||
--with-plugins-install=system
|
||||
--with-kde4-incl=${KDEDIR}/include
|
||||
--with-kde4-configdir=${KDEDIR}/share/config
|
||||
--with-kde4-prefix=${KDEDIR}
|
||||
--with-kde4-lib=${KDEDIR}/$(get_libdir)
|
||||
--with-kde-appsdatadir=${KDEDIR}/share/apps/klash
|
||||
--with-kde4-servicesdir=${KDEDIR}/share/kde4/services
|
||||
--with-kde4-plugindir=${KDEDIR}/$(get_libdir)/kde4"
|
||||
fi
|
||||
|
||||
# Set media handler.
|
||||
use ffmpeg || use gstreamer || media+=",none"
|
||||
use ffmpeg && media+=",ffmpeg"
|
||||
use gstreamer && media+=",gst"
|
||||
|
||||
# Set gui.
|
||||
use dump && gui="${gui},dump"
|
||||
use fbcon && gui="${gui},fb"
|
||||
use gtk && gui=",gtk"
|
||||
use kde && gui="${gui},kde4"
|
||||
use sdl && gui="${gui},sdl"
|
||||
|
||||
if use sdl-sound; then
|
||||
myconf="${myconf} --enable-sound=sdl"
|
||||
else
|
||||
myconf="${myconf} --enable-sound=none"
|
||||
fi
|
||||
|
||||
# Set extensions
|
||||
use mysql && myext=",mysql"
|
||||
use gtk && myext="${myext},gtk"
|
||||
use lirc && myext="${myext},lirc"
|
||||
use dbus && myext="${myext},dbus"
|
||||
|
||||
# Strip extra comma from gui, myext, hwaccel and renderers.
|
||||
device=$( echo $device | sed -e 's/,//' )
|
||||
gui=$( echo $gui | sed -e 's/,//' )
|
||||
myext=$( echo $myext | sed -e 's/,//' )
|
||||
renderers=$( echo $renderers | sed -e 's/,//' )
|
||||
media=$( echo $media | sed -e 's/,//' )
|
||||
|
||||
econf \
|
||||
--docdir=/usr/share/doc/${PF} \
|
||||
--disable-dependency-tracking \
|
||||
--disable-kparts3 \
|
||||
$(use_enable cygnal) \
|
||||
$(use_enable cygnal cgibins) \
|
||||
$(use_enable doc docbook) \
|
||||
$(use_enable gnome ghelp) \
|
||||
$(use_enable harden) \
|
||||
$(use_enable jemalloc) \
|
||||
$(use_enable kde kparts4) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable nsplugin npapi) \
|
||||
$(use_enable python) \
|
||||
$(use_enable ssh) \
|
||||
$(use_enable ssl) \
|
||||
$(use_enable test testsuite) \
|
||||
$(use_with gconf) \
|
||||
--enable-gui=${gui} \
|
||||
--enable-device=${device} \
|
||||
--enable-extensions=${myext} \
|
||||
--enable-renderer=${renderers} \
|
||||
--enable-media=${media} \
|
||||
${myconf}
|
||||
}
|
||||
src_test() {
|
||||
local log=testsuite-results.txt
|
||||
cd testsuite
|
||||
emake check || die "make check failed"
|
||||
./anaylse-results.sh > $log || die "results analyze failed"
|
||||
cat $log
|
||||
}
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "emake install failed"
|
||||
|
||||
# Install nsplugin in directory set by --with-npapi-plugindir.
|
||||
if use nsplugin; then
|
||||
emake DESTDIR="${D}" install-plugin || die "install plugins failed"
|
||||
fi
|
||||
|
||||
# Install kde konqueror plugin.
|
||||
if use kde; then
|
||||
pushd "${S}/plugin/klash4" >& /dev/null || die
|
||||
emake DESTDIR="${D}" install-plugin || die "install kde plugins failed"
|
||||
popd >& /dev/null
|
||||
fi
|
||||
# Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplugin install directory.
|
||||
use nsplugin && inst_plugin /usr/$(get_libdir)/gnash/npapi/libgnashplugin.so
|
||||
|
||||
# Remove eglinfo, bug #463654
|
||||
if use egl; then
|
||||
rm -f "${D}"/usr/bin/eglinfo || die
|
||||
fi
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
|
||||
}
|
||||
pkg_postinst() {
|
||||
if use !gnome || use !gstreamer && use !ffmpeg ; then
|
||||
ewarn ""
|
||||
ewarn "Gnash was built without a media handler and or http handler !"
|
||||
ewarn ""
|
||||
ewarn "If you want Gnash to support video then you will need to"
|
||||
ewarn "rebuild Gnash with either the ffmpeg or gstreamer and gnome use flags set."
|
||||
ewarn ""
|
||||
fi
|
||||
ewarn "${PN} is still in heavy development"
|
||||
ewarn "Please first report bugs on upstream gnashdevs and deal with them"
|
||||
ewarn "And then report a Gentoo bug to the maintainer"
|
||||
use kde && kde4-base_pkg_postinst
|
||||
}
|
||||
Reference in New Issue
Block a user