svn commit: r427544 - in head/graphics/gnash: . files
Dirk Meyer
dinoex at FreeBSD.org
Fri Dec 2 08:10:23 UTC 2016
Author: dinoex
Date: Fri Dec 2 08:10:20 2016
New Revision: 427544
URL: https://svnweb.freebsd.org/changeset/ports/427544
Log:
- fix dependency on kde4
- fix build
- add LICENSE
- add patches from NetBSD
Added:
head/graphics/gnash/files/patch-libbase_GnashSleep.h (contents, props changed)
head/graphics/gnash/files/patch-libbase_IOChannel.h (contents, props changed)
head/graphics/gnash/files/patch-libbase_accumulator.h (contents, props changed)
head/graphics/gnash/files/patch-libbase_rc.cpp (contents, props changed)
head/graphics/gnash/files/patch-libcore_DragState.h (contents, props changed)
head/graphics/gnash/files/patch-libcore_movie__root.cpp (contents, props changed)
head/graphics/gnash/files/patch-libcore_swf_DefineButtonTag.h (contents, props changed)
head/graphics/gnash/files/patch-libdevice_vaapi_VaapiSurface.cpp
- copied unchanged from r427543, head/graphics/gnash/files/patch-libdevice-caapi-VaapiSurface.cpp
head/graphics/gnash/files/patch-libmedia_FLVParser.cpp (contents, props changed)
head/graphics/gnash/files/patch-plugin_npapi_plugin.cpp (contents, props changed)
Deleted:
head/graphics/gnash/files/patch-libdevice-caapi-VaapiSurface.cpp
Modified:
head/graphics/gnash/Makefile
head/graphics/gnash/files/patch-configure
head/graphics/gnash/files/patch-gui-gtk-gtk_canvas.cpp
head/graphics/gnash/pkg-plist
Modified: head/graphics/gnash/Makefile
==============================================================================
--- head/graphics/gnash/Makefile Fri Dec 2 04:33:41 2016 (r427543)
+++ head/graphics/gnash/Makefile Fri Dec 2 08:10:20 2016 (r427544)
@@ -10,6 +10,8 @@ MASTER_SITES= GNU/${PORTNAME}/${PORTVERS
MAINTAINER= ports at FreeBSD.org
COMMENT= GNU Flash movie player
+LICENSE= GPLv3
+
LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
libltdl.so:devel/libltdl \
libcurl.so:ftp/curl \
@@ -19,19 +21,14 @@ LIB_DEPENDS= libboost_thread.so:devel/bo
CONFLICTS= gnash-devel-[0-9]*
-BROKEN= fails to build after many Boost updates
-DEPRECATED= broken on FreeBSD 10+ for more than 2 years
-EXPIRATION_DATE=2016-12-31
-
-USES= cpe gmake jpeg kde:4 libtool pkgconfig tar:bzip2
+USES= cpe tar:bzip2 pkgconfig gmake libtool jpeg
+CPE_VENDOR= gnu
GNU_CONFIGURE= yes
-USE_GCC= any
WANT_GSTREAMER= yes
USE_GNOME= libxml2
USE_XORG= x11 xau xdmcp xext xi xinerama ice sm xv
INSTALLS_ICONS= yes
SYSCONFIGDIR= ${PREFIX}/etc
-CPE_VENDOR= gnu
# jemalloc leads to infinite recursion on FreeBSD
CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/include" \
@@ -69,6 +66,7 @@ FFMPEG2_DESC= ffmpeg2 media handler (bro
GSTREAMER_DESC= GStreamer media handler
VAAPI_DESC= VAAPI support (requires FFMPEG)
+KDE4_USES= kde:4
CYGNAL_CONFIGURE_ENABLE= cygnal
.include <bsd.port.options.mk>
Modified: head/graphics/gnash/files/patch-configure
==============================================================================
--- head/graphics/gnash/files/patch-configure Fri Dec 2 04:33:41 2016 (r427543)
+++ head/graphics/gnash/files/patch-configure Fri Dec 2 08:10:20 2016 (r427544)
@@ -1,6 +1,6 @@
---- configure.orig 2012-01-19 17:19:29.000000000 -0200
-+++ configure 2013-10-09 15:07:40.051081546 -0300
-@@ -30836,12 +30836,17 @@
+--- configure.orig 2016-12-02 06:12:03 UTC
++++ configure
+@@ -30836,12 +30836,17 @@ fi
esac
fi
@@ -21,7 +21,35 @@
else
KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
fi
-@@ -49394,7 +49399,7 @@
+@@ -30994,7 +30999,7 @@ $as_echo_n "checking whether NPString ha
+
+ #include "npapi.h"
+ #include "npruntime.h"
+- int main(int argc, char* argv){
++ int main(int argc, char** argv){
+ NPString str;
+ uint32_t len = str.UTF8Length;
+ return 0;
+@@ -31356,6 +31361,9 @@ else
+ if test x"${with_x11_incl}" != x ; then
+ if test -f ${with_x11_incl}/X11/X.h ; then
+ ac_cv_path_x11_incl="-I`(cd ${with_x11_incl}; pwd)`"
++
++$as_echo "#define HAVE_X11_X_H 1" >>confdefs.h
++
+ else
+ as_fn_error "${with_x11_incl} directory doesn't contain X.h" "$LINENO" 5
+ fi
+@@ -44135,7 +44143,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ dirname=""
+ libname=""
+ 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"
+- boost_libs="thread program_options iostreams"
++ boost_libs="thread program_options iostreams system"
+
+ cygnal_boost_libs="serialization date_time"
+
+@@ -49394,7 +49402,7 @@
if test x$build_agg = xyes; then # {
echo " AGG Pixel format is: $pixelformat"
@@ -30,7 +58,7 @@
if test x"$AGG_CFLAGS" != x; then # {
echo " AGG flags are: $AGG_CFLAGS"
else # }{
-@@ -50044,7 +50049,7 @@
+@@ -50044,7 +50052,7 @@
else
pkg_out_fd=3
@@ -39,7 +67,7 @@
deb_dest="$deb_err"
rpm_dest="$rpm_err"
yast_dest="$yast_err"
-@@ -50063,7 +50068,7 @@
+@@ -50063,7 +50071,7 @@
else
pkg_out_fd=3
Modified: head/graphics/gnash/files/patch-gui-gtk-gtk_canvas.cpp
==============================================================================
--- head/graphics/gnash/files/patch-gui-gtk-gtk_canvas.cpp Fri Dec 2 04:33:41 2016 (r427543)
+++ head/graphics/gnash/files/patch-gui-gtk-gtk_canvas.cpp Fri Dec 2 08:10:20 2016 (r427544)
@@ -1,11 +1,11 @@
---- gui/gtk/gtk_canvas.cpp.orig 2011-02-26 21:11:07.000000000 +0300
-+++ gui/gtk/gtk_canvas.cpp 2011-09-06 23:13:28.000000000 +0400
-@@ -207,7 +207,7 @@
+--- gui/gtk/gtk_canvas.cpp.orig 2012-01-19 19:17:48 UTC
++++ gui/gtk/gtk_canvas.cpp
+@@ -212,7 +212,7 @@ gnash_canvas_setup(GnashCanvas *canvas,
renderer = "agg";
#elif defined (RENDERER_CAIRO)
renderer = "cairo";
-#elif defined (RENDERER_OGL)
+#elif defined (RENDERER_OPENGL)
renderer = "opengl";
- #endif
- }
+ #elif defined (RENDERER_OPENVG)
+ renderer = "openvg";
Added: head/graphics/gnash/files/patch-libbase_GnashSleep.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gnash/files/patch-libbase_GnashSleep.h Fri Dec 2 08:10:20 2016 (r427544)
@@ -0,0 +1,13 @@
+$NetBSD: patch-libbase_GnashSleep.h,v 1.1 2013/02/26 11:04:25 joerg Exp $
+
+--- libbase/GnashSleep.h.orig 2013-02-25 18:39:09.000000000 +0000
++++ libbase/GnashSleep.h
+@@ -38,7 +38,7 @@ inline void gnashSleep(size_t useconds)
+ Sleep(useconds / 1000);
+ #else
+ const size_t m = 1000000;
+- const struct timespec t = { useconds / m, (useconds % m) * 1000 };
++ const struct timespec t = { static_cast<time_t>(useconds / m), static_cast<long>((useconds % m) * 1000) };
+ ::nanosleep(&t, 0);
+ #endif
+ }
Added: head/graphics/gnash/files/patch-libbase_IOChannel.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gnash/files/patch-libbase_IOChannel.h Fri Dec 2 08:10:20 2016 (r427544)
@@ -0,0 +1,12 @@
+$NetBSD: patch-libbase_IOChannel.h,v 1.1 2013/08/31 14:52:14 joerg Exp $
+
+--- libbase/IOChannel.h.orig 2013-08-31 11:55:31.000000000 +0000
++++ libbase/IOChannel.h
+@@ -24,6 +24,7 @@
+ #include <string>
+ #include <boost/cstdint.hpp> // for boost int types
+ #include <iosfwd>
++#include <ios>
+
+ #include "dsodefs.h" // DSOEXPORT
+ #include "GnashException.h" // for IOException inheritance
Added: head/graphics/gnash/files/patch-libbase_accumulator.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gnash/files/patch-libbase_accumulator.h Fri Dec 2 08:10:20 2016 (r427544)
@@ -0,0 +1,12 @@
+$NetBSD: patch-libbase_accumulator.h,v 1.1 2015/09/23 12:00:53 joerg Exp $
+
+--- libbase/accumulator.h.orig 2015-09-17 11:20:41.000000000 +0000
++++ libbase/accumulator.h
+@@ -60,6 +60,7 @@ public:
+ /// There are no tokens for an accumulator_type
+ virtual unsigned min_tokens() const { return 0; }
+ virtual unsigned max_tokens() const { return 0; }
++ virtual bool adjacent_tokens_only() const { return true; }
+
+ /// Accumulating from different sources is silly.
+ virtual bool is_composing() const { return false; }
Added: head/graphics/gnash/files/patch-libbase_rc.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gnash/files/patch-libbase_rc.cpp Fri Dec 2 08:10:20 2016 (r427544)
@@ -0,0 +1,13 @@
+$NetBSD: patch-libbase_rc.cpp,v 1.1 2013/02/26 11:04:25 joerg Exp $
+
+--- libbase/rc.cpp.orig 2013-02-25 18:40:46.000000000 +0000
++++ libbase/rc.cpp
+@@ -83,7 +83,7 @@ RcInitFile::RcInitFile()
+ DEFAULT_FLASH_REV_NUMBER ",0"),
+ // An empty string leaves detection to VM.cpp:
+ _flashSystemOS(""),
+- _flashSystemManufacturer("Gnash "DEFAULT_FLASH_SYSTEM_OS),
++ _flashSystemManufacturer("Gnash " DEFAULT_FLASH_SYSTEM_OS),
+ _actionDump(false),
+ _parserDump(false),
+ _verboseASCodingErrors(false),
Added: head/graphics/gnash/files/patch-libcore_DragState.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gnash/files/patch-libcore_DragState.h Fri Dec 2 08:10:20 2016 (r427544)
@@ -0,0 +1,13 @@
+$NetBSD: patch-libcore_DragState.h,v 1.1 2014/08/19 13:39:24 joerg Exp $
+
+--- libcore/DragState.h.orig 2014-08-19 11:01:44.000000000 +0000
++++ libcore/DragState.h
+@@ -60,7 +60,7 @@ public:
+ boost::int32_t yOffset() const { return _yoffset; }
+
+ bool hasBounds() const {
+- return (_bounds);
++ return bool(_bounds);
+ }
+
+ /// \brief
Added: head/graphics/gnash/files/patch-libcore_movie__root.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gnash/files/patch-libcore_movie__root.cpp Fri Dec 2 08:10:20 2016 (r427544)
@@ -0,0 +1,13 @@
+$NetBSD: patch-libcore_movie__root.cpp,v 1.1 2013/02/26 11:04:25 joerg Exp $
+
+--- libcore/movie_root.cpp.orig 2013-02-25 18:54:08.000000000 +0000
++++ libcore/movie_root.cpp
+@@ -156,7 +156,7 @@ movie_root::movie_root(VirtualClock& clo
+ _hostfd(-1),
+ _controlfd(-1),
+ _quality(QUALITY_HIGH),
+- _alignMode(0),
++ _alignMode(0ULL),
+ _allowScriptAccess(SCRIPT_ACCESS_SAME_DOMAIN),
+ _showMenu(true),
+ _scaleMode(SCALEMODE_SHOWALL),
Added: head/graphics/gnash/files/patch-libcore_swf_DefineButtonTag.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gnash/files/patch-libcore_swf_DefineButtonTag.h Fri Dec 2 08:10:20 2016 (r427544)
@@ -0,0 +1,31 @@
+$NetBSD: patch-libcore_swf_DefineButtonTag.h,v 1.2 2013/12/15 19:42:04 joerg Exp $
+
+--- libcore/swf/DefineButtonTag.h.orig 2012-01-19 19:17:48.000000000 +0000
++++ libcore/swf/DefineButtonTag.h
+@@ -98,7 +98,7 @@ public:
+ /// A ButtonRecord is invalid if it refers to a DisplayObject
+ /// which has not been defined.
+ bool valid() const {
+- return (_definitionTag);
++ return bool(_definitionTag);
+ }
+
+ private:
+@@ -157,8 +157,6 @@ public:
+ return (_conditions & KEYPRESS);
+ }
+
+-private:
+-
+ /// Return the keycode triggering this action
+ //
+ /// Return 0 if no key is supposed to trigger us
+@@ -166,6 +164,8 @@ private:
+ return (_conditions & KEYPRESS) >> 9;
+ }
+
++private:
++
+ enum Condition
+ {
+ IDLE_TO_OVER_UP = 1 << 0,
Copied: head/graphics/gnash/files/patch-libdevice_vaapi_VaapiSurface.cpp (from r427543, head/graphics/gnash/files/patch-libdevice-caapi-VaapiSurface.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gnash/files/patch-libdevice_vaapi_VaapiSurface.cpp Fri Dec 2 08:10:20 2016 (r427544, copy of r427543, head/graphics/gnash/files/patch-libdevice-caapi-VaapiSurface.cpp)
@@ -0,0 +1,13 @@
+--- libdevice/vaapi/VaapiSurface.cpp.orig 2012-01-19 20:17:48.000000000 +0100
++++ libdevice/vaapi/VaapiSurface.cpp 2013-07-05 01:44:21.927681308 +0200
+@@ -62,8 +62,8 @@
+ VAStatus status;
+ VASurfaceID surface_id;
+ status = vaCreateSurfaces(gvactx->display(),
+- width, height, VA_RT_FORMAT_YUV420,
+- 1, &surface_id);
++ VA_RT_FORMAT_YUV420, width, height,
++ &surface_id, 1, NULL, 0);
+ if (!vaapi_check_status(status, "vaCreateSurfaces()")) {
+ return;
+ }
Added: head/graphics/gnash/files/patch-libmedia_FLVParser.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gnash/files/patch-libmedia_FLVParser.cpp Fri Dec 2 08:10:20 2016 (r427544)
@@ -0,0 +1,13 @@
+$NetBSD: patch-libmedia_FLVParser.cpp,v 1.1 2013/08/31 14:52:14 joerg Exp $
+
+--- libmedia/FLVParser.cpp.orig 2013-08-31 11:58:57.000000000 +0000
++++ libmedia/FLVParser.cpp
+@@ -447,7 +447,7 @@ FLVParser::parseNextTag(bool index_only)
+ }
+
+ boost::mutex::scoped_lock lock(_metaTagsMutex);
+- _metaTags.insert(std::make_pair(flvtag.timestamp, metaTag.release()));
++ _metaTags.insert(std::make_pair(boost::uint64_t(flvtag.timestamp), boost::shared_ptr<SimpleBuffer>(metaTag.release())));
+ }
+ else
+ {
Added: head/graphics/gnash/files/patch-plugin_npapi_plugin.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gnash/files/patch-plugin_npapi_plugin.cpp Fri Dec 2 08:10:20 2016 (r427544)
@@ -0,0 +1,35 @@
+$NetBSD: patch-plugin_npapi_plugin.cpp,v 1.1 2013/02/26 11:04:26 joerg Exp $
+
+--- plugin/npapi/plugin.cpp.orig 2012-01-19 19:17:50.000000000 +0000
++++ plugin/npapi/plugin.cpp
+@@ -50,17 +50,17 @@
+ // The name must be this value to get flash movies that check the
+ // plugin version to load.
+ #define PLUGIN_NAME "Shockwave Flash"
+-#define MIME_TYPES_DESCRIPTION MIME_TYPES_HANDLED":swf:"PLUGIN_NAME
++#define MIME_TYPES_DESCRIPTION MIME_TYPES_HANDLED ":swf:" PLUGIN_NAME
+
+ // Some javascript plugin detectors use the description
+ // to decide the flash version to display. They expect the
+ // form (major version).(minor version) r(revision).
+ // e.g. "8.0 r99."
+-#define FLASH_VERSION DEFAULT_FLASH_MAJOR_VERSION"."\
+- DEFAULT_FLASH_MINOR_VERSION" r"DEFAULT_FLASH_REV_NUMBER"."
++#define FLASH_VERSION DEFAULT_FLASH_MAJOR_VERSION "."\
++ DEFAULT_FLASH_MINOR_VERSION" r" DEFAULT_FLASH_REV_NUMBER "."
+
+ #define PLUGIN_DESCRIPTION \
+- "Shockwave Flash "FLASH_VERSION"<br>Gnash "VERSION", the GNU SWF Player. \
++ "Shockwave Flash " FLASH_VERSION "<br>Gnash " VERSION ", the GNU SWF Player. \
+ Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 \
+ <a href=\"http://www.fsf.org\">Free \
+ Software Foundation</a>, Inc. <br> \
+@@ -71,7 +71,7 @@
+ href=\"http://www.gnu.org/software/gnash/\"> \
+ http://www.gnu.org/software/gnash</a>. \
+ <br>\
+- Compatible Shockwave Flash "FLASH_VERSION
++ Compatible Shockwave Flash " FLASH_VERSION
+
+ #include "plugin.h"
+ #include "GnashSystemIOHeaders.h"
Modified: head/graphics/gnash/pkg-plist
==============================================================================
--- head/graphics/gnash/pkg-plist Fri Dec 2 04:33:41 2016 (r427543)
+++ head/graphics/gnash/pkg-plist Fri Dec 2 08:10:20 2016 (r427544)
@@ -219,8 +219,8 @@ man/man1/rtmpget.1.gz
man/man1/soldumper.1.gz
%%GTK2%%man/man1/gnash-gtk-launcher.1.gz
%%GTK2%%man/man1/gtk-gnash.1.gz
-%%KDE4%%man/man1/gnash-qt-launcher.1
-%%KDE4%%man/man1/kde4-gnash.1
+%%KDE4%%man/man1/gnash-qt-launcher.1.gz
+%%KDE4%%man/man1/kde4-gnash.1.gz
%%DATADIR%%/GnashG.png
%%DATADIR%%/gnash-splash.swf
%%DATADIR%%/gnash_128_96.ico
More information about the svn-ports-head
mailing list