summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2020-12-03 22:23:33 +0000
committernia <nia@pkgsrc.org>2020-12-03 22:23:33 +0000
commita6459ead4a6d8daca2eb40ca69e0d627db383dd1 (patch)
treeae58aaa2f180a44386fd76d852d47d5b37644ce1 /multimedia
parentd4afdf99a901a8c0348fb05e54e9763128e0c482 (diff)
downloadpkgsrc-a6459ead4a6d8daca2eb40ca69e0d627db383dd1.tar.gz
lightspark: Update to 0.8.3
Changes: fix support for sound in PPAPI plugin better handling of obfuscated code new command line argument to ignore unhandled exceptions support for context menus added partial support for CubeTextures and compressed Textures in Stage3d ability to create screenshot added boost dependency removed fullscreen mode implemented better sound handling, especially for AVM1 better support of older (AVM1) swf files support for xml in AVM1 support for video streaming in AVM1
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/lightspark/Makefile6
-rw-r--r--multimedia/lightspark/distinfo19
-rw-r--r--multimedia/lightspark/patches/patch-CMakeLists.txt15
-rw-r--r--multimedia/lightspark/patches/patch-src_3rdparty_jxrlib_image_decode_segdec.c20
-rw-r--r--multimedia/lightspark/patches/patch-src_main.cpp21
-rw-r--r--multimedia/lightspark/patches/patch-src_platforms_engineutils.cpp8
-rw-r--r--multimedia/lightspark/patches/patch-src_scripting_flash_display_flashdisplay.h14
-rw-r--r--multimedia/lightspark/patches/patch-src_swf.cpp14
-rw-r--r--multimedia/lightspark/patches/patch-src_swf.h14
9 files changed, 61 insertions, 70 deletions
diff --git a/multimedia/lightspark/Makefile b/multimedia/lightspark/Makefile
index 0b239091782..941917aacb1 100644
--- a/multimedia/lightspark/Makefile
+++ b/multimedia/lightspark/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2020/11/13 16:24:20 nia Exp $
+# $NetBSD: Makefile,v 1.14 2020/12/03 22:23:33 nia Exp $
-DISTNAME= lightspark-0.8.2
-PKGREVISION= 8
+DISTNAME= lightspark-0.8.3
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GITHUB:=lightspark/}
@@ -33,7 +32,6 @@ CONF_FILES+= ${PREFIX}/share/examples/lightspark/xdg/lightspark.conf \
.include "../../archivers/xz/buildlink3.mk"
.include "../../audio/SDL2_mixer/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glibmm/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
diff --git a/multimedia/lightspark/distinfo b/multimedia/lightspark/distinfo
index dc705b3c48e..37598571f1d 100644
--- a/multimedia/lightspark/distinfo
+++ b/multimedia/lightspark/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.3 2020/03/29 01:04:06 joerg Exp $
+$NetBSD: distinfo,v 1.4 2020/12/03 22:23:33 nia Exp $
-SHA1 (lightspark-0.8.2.tar.gz) = d1194130aeadc144ef90065782cd8f9bf893d7e8
-RMD160 (lightspark-0.8.2.tar.gz) = 26dd4ff4fdb991c1159f964dd5bee1ab6efafee1
-SHA512 (lightspark-0.8.2.tar.gz) = 0ff636ad59523726232d9c2105843dc9ea835526c300bca7833e6d1a0ebf7630c1d10109143baabc16f95c1c954094603c945b705a6c9fb02f369e94fead034e
-Size (lightspark-0.8.2.tar.gz) = 1996482 bytes
-SHA1 (patch-CMakeLists.txt) = ca9f200bf92ecbdd5d60738ccbad85581ee3d979
+SHA1 (lightspark-0.8.3.tar.gz) = 1e0a8bdf06593bce04d1f6f320c395577c5471f3
+RMD160 (lightspark-0.8.3.tar.gz) = 61cf25abf1906c35daa4579413ea0ab59b351d76
+SHA512 (lightspark-0.8.3.tar.gz) = 023d1872577445a857c77908bc2ec83ebfa086bc77161dfd22b53fc0c38eb5d94cd5bb5c5a7508dee2039d3b8479c917dcee089fe551a984ec5525a5ae781997
+Size (lightspark-0.8.3.tar.gz) = 2374990 bytes
+SHA1 (patch-CMakeLists.txt) = 0303a8e4af91b6db2faf4a9eb6ff98d90368e2c5
+SHA1 (patch-src_3rdparty_jxrlib_image_decode_segdec.c) = e263288ede1f11a780d438c0be836b0f33fef80e
SHA1 (patch-src_backends_urlutils.cpp) = bd1e7584703a1045609b13b7379cf3eddcd13ef0
-SHA1 (patch-src_main.cpp) = 3da1e6f80e07ae3ef9485c006fe7fee23d7f0c82
SHA1 (patch-src_parsing_tags.cpp) = 951f2757ed68f6e0f5964df3fa944aeace4cbda3
-SHA1 (patch-src_platforms_engineutils.cpp) = 884e37623cf8203d86fcb27e479b41af08a509c4
+SHA1 (patch-src_platforms_engineutils.cpp) = d8ab1b6493c0b77125ab827e0700cc2c920026e4
SHA1 (patch-src_plugin__ppapi_plugin.cpp) = 52d76189aded5687ba5671623bdc919ebaffd5dd
-SHA1 (patch-src_scripting_flash_display_flashdisplay.h) = 816ece22cc5377d40324745f52fa3aa618be3269
-SHA1 (patch-src_swf.h) = b8c0545f122322001b49cd0d4efbf95a0495664f
+SHA1 (patch-src_swf.cpp) = 56630c2553c2ac7e7d83025850a2705bdefd1ce3
diff --git a/multimedia/lightspark/patches/patch-CMakeLists.txt b/multimedia/lightspark/patches/patch-CMakeLists.txt
index 8af14c7a2ee..39c0f2ff549 100644
--- a/multimedia/lightspark/patches/patch-CMakeLists.txt
+++ b/multimedia/lightspark/patches/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2019/10/03 15:53:21 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2020/12/03 22:23:33 nia Exp $
Hunk 1:
@@ -9,8 +9,17 @@ Hunk 2:
Install config file as example.
---- CMakeLists.txt.orig 2019-09-15 15:33:56.000000000 +0000
+--- CMakeLists.txt.orig 2020-07-05 10:31:09.000000000 +0000
+++ CMakeLists.txt
+@@ -112,7 +112,7 @@ IF(CMAKE_SIZEOF_VOID_P STREQUAL "8")
+ ADD_DEFINITIONS(-DLIGHTSPARK_64)
+ endif(CMAKE_SIZEOF_VOID_P STREQUAL "8")
+ # Some directory shortcuts
+-SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/conf)
++SET (CMAKE_MODULE_PATH "/home/nia/cvs/pkgsrc/multimedia/lightspark/work/.buildlink/cmake-Modules" ${PROJECT_SOURCE_DIR}/conf)
+ INCLUDE(Pack)
+ # If we're gcc, then use nasm to get fastpath. If MSVC, just use inline asm to get around
+ # CMake issues
@@ -173,10 +173,10 @@ IF(UNIX)
SET(DATADIR "share")
# Absolute path, because this path is embedded in the binary
@@ -24,7 +33,7 @@ Install config file as example.
SET(CMAKE_INSTALL_RPATH "${PRIVATELIBDIR}")
ELSE()
SET(ETCDIR ".")
-@@ -560,7 +560,7 @@ GETTEXT_CREATE_TRANSLATIONS(i18n/lightsp
+@@ -552,7 +552,7 @@ GETTEXT_CREATE_TRANSLATIONS(i18n/lightsp
if(UNIX)
INSTALL(FILES etc/xdg/lightspark.conf
diff --git a/multimedia/lightspark/patches/patch-src_3rdparty_jxrlib_image_decode_segdec.c b/multimedia/lightspark/patches/patch-src_3rdparty_jxrlib_image_decode_segdec.c
new file mode 100644
index 00000000000..f458943ea9d
--- /dev/null
+++ b/multimedia/lightspark/patches/patch-src_3rdparty_jxrlib_image_decode_segdec.c
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_3rdparty_jxrlib_image_decode_segdec.c,v 1.1 2020/12/03 22:23:33 nia Exp $
+
+Use the more likely to be available bswap64 on non-Linux
+
+--- src/3rdparty/jxrlib/image/decode/segdec.c.orig 2020-07-05 10:31:09.000000000 +0000
++++ src/3rdparty/jxrlib/image/decode/segdec.c
+@@ -30,8 +30,13 @@
+ #include "decode.h"
+
+ #ifndef _WIN32
++#ifdef __linux__
+ #include <byteswap.h>
+ #define _byteswap_ulong(x) bswap_64(x)
++#else
++#include <sys/endian.h>
++#define _byteswap_ulong(x) bswap64(x)
++#endif
+ #endif
+
+ #ifdef MEM_TRACE
diff --git a/multimedia/lightspark/patches/patch-src_main.cpp b/multimedia/lightspark/patches/patch-src_main.cpp
deleted file mode 100644
index 2d1e5c70fdc..00000000000
--- a/multimedia/lightspark/patches/patch-src_main.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_main.cpp,v 1.1 2019/07/09 16:33:30 nia Exp $
-
-get_current_dir_name is not portable.
-
---- src/main.cpp.orig 2018-06-02 09:25:36.000000000 +0000
-+++ src/main.cpp
-@@ -396,9 +396,12 @@ int main(int argc, char* argv[])
- //When running in a local sandbox, set the root URL to the current working dir
- else if(sandboxType != SecurityManager::REMOTE)
- {
-- char * cwd = get_current_dir_name();
-+ char cwd[PATH_MAX];
-+ if (getcwd(cwd, PATH_MAX) == NULL) {
-+ LOG(LOG_ERROR,_("getcwd failed"));
-+ exit(1);
-+ }
- string cwdStr = string("file://") + string(cwd);
-- free(cwd);
- cwdStr += "/";
- sys->mainClip->setOrigin(cwdStr, fileName);
- }
diff --git a/multimedia/lightspark/patches/patch-src_platforms_engineutils.cpp b/multimedia/lightspark/patches/patch-src_platforms_engineutils.cpp
index f22e9ec6aae..d03252e16cf 100644
--- a/multimedia/lightspark/patches/patch-src_platforms_engineutils.cpp
+++ b/multimedia/lightspark/patches/patch-src_platforms_engineutils.cpp
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_platforms_engineutils.cpp,v 1.1 2019/07/09 16:33:30 nia Exp $
+$NetBSD: patch-src_platforms_engineutils.cpp,v 1.2 2020/12/03 22:23:33 nia Exp $
These are undefined, take advantage of SDL defines instead.
---- src/platforms/engineutils.cpp.orig 2018-06-02 09:25:36.000000000 +0000
+--- src/platforms/engineutils.cpp.orig 2020-07-05 10:31:09.000000000 +0000
+++ src/platforms/engineutils.cpp
-@@ -29,7 +29,7 @@
- #include "platforms/engineutils.h"
+@@ -33,7 +33,7 @@
+ #include "scripting/flash/events/flashevents.h"
//The interpretation of texture data change with the endianness
-#if __BYTE_ORDER == __BIG_ENDIAN
diff --git a/multimedia/lightspark/patches/patch-src_scripting_flash_display_flashdisplay.h b/multimedia/lightspark/patches/patch-src_scripting_flash_display_flashdisplay.h
deleted file mode 100644
index a9f5095cb37..00000000000
--- a/multimedia/lightspark/patches/patch-src_scripting_flash_display_flashdisplay.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_scripting_flash_display_flashdisplay.h,v 1.1 2020/03/29 01:04:07 joerg Exp $
-
-bimap.hpp needs split_member.hpp with Boost 1.72.
-
---- src/scripting/flash/display/flashdisplay.h.orig 2020-03-28 21:01:36.935735038 +0000
-+++ src/scripting/flash/display/flashdisplay.h
-@@ -20,6 +20,7 @@
- #ifndef SCRIPTING_FLASH_DISPLAY_FLASHDISPLAY_H
- #define SCRIPTING_FLASH_DISPLAY_FLASHDISPLAY_H 1
-
-+#include <boost/serialization/split_member.hpp>
- #include <boost/bimap.hpp>
- #include "compat.h"
-
diff --git a/multimedia/lightspark/patches/patch-src_swf.cpp b/multimedia/lightspark/patches/patch-src_swf.cpp
new file mode 100644
index 00000000000..37fa00e659b
--- /dev/null
+++ b/multimedia/lightspark/patches/patch-src_swf.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_swf.cpp,v 1.1 2020/12/03 22:23:33 nia Exp $
+
+Add missing header for unlink etc.
+
+--- src/swf.cpp.orig 2020-07-05 10:31:09.000000000 +0000
++++ src/swf.cpp
+@@ -17,6 +17,7 @@
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **************************************************************************/
+
++#include <unistd.h>
+ #include <string>
+ #include <algorithm>
+ #include "backends/security.h"
diff --git a/multimedia/lightspark/patches/patch-src_swf.h b/multimedia/lightspark/patches/patch-src_swf.h
deleted file mode 100644
index de7021979de..00000000000
--- a/multimedia/lightspark/patches/patch-src_swf.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_swf.h,v 1.1 2020/03/29 01:04:07 joerg Exp $
-
-bimap.hpp needs split_member.hpp with Boost 1.72.
-
---- src/swf.h.orig 2020-03-28 20:58:17.828100735 +0000
-+++ src/swf.h
-@@ -26,6 +26,7 @@
- #include <queue>
- #include <map>
- #include <unordered_set>
-+#include <boost/serialization/split_member.hpp>
- #include <boost/bimap.hpp>
- #include <string>
- #include "swftypes.h"