Thu Oct 3 15:53:21 2019 UTC ()
lightspark: Update to 0.8.2

Changes:

    implement support for text input
    implement support for sound streaming (SoundStreamHead/SoundStreamHeadBlock tags)
    direct support for older swf, no need for gnash any more (fallback to gnash ist still available by setting environment variable LIGHTSPARK_USE_GNASH=1)
    PPAPI plugin works again
    make llvm dependency optional (disabled by default)
    implement flash.system.Worker/WorkerDomain
    use libswresample instead of libavresample, if available
    reduce memory usage
    several performance improvements
    add partial support for rtmfp protocol


(nia)
diff -r1.3 -r1.4 pkgsrc/multimedia/lightspark/Makefile
diff -r1.1 -r1.2 pkgsrc/multimedia/lightspark/PLIST
diff -r1.1 -r1.2 pkgsrc/multimedia/lightspark/distinfo
diff -r1.1 -r1.2 pkgsrc/multimedia/lightspark/patches/patch-CMakeLists.txt
diff -r1.1 -r1.2 pkgsrc/multimedia/lightspark/patches/patch-src_plugin__ppapi_plugin.cpp
diff -r1.1 -r0 pkgsrc/multimedia/lightspark/patches/patch-conf_FindLLVM.cmake
cvs diff -r1.3 -r1.4 pkgsrc/multimedia/lightspark/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/lightspark/Makefile 2019/08/22 12:23:37 1.3
+++ pkgsrc/multimedia/lightspark/Makefile 2019/10/03 15:53:21 1.4
@@ -1,50 +1,46 @@ @@ -1,50 +1,46 @@
1# $NetBSD: Makefile,v 1.3 2019/08/22 12:23:37 ryoon Exp $ 1# $NetBSD: Makefile,v 1.4 2019/10/03 15:53:21 nia Exp $
2 2
3DISTNAME= lightspark-0.8.1 3DISTNAME= lightspark-0.8.2
4PKGREVISION= 2 
5CATEGORIES= multimedia 4CATEGORIES= multimedia
6MASTER_SITES= ${MASTER_SITE_GITHUB:=lightspark/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=lightspark/}
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://lightspark.github.io/ 8HOMEPAGE= https://lightspark.github.io/
10COMMENT= Open source Flash player 9COMMENT= Open source Flash player
11LICENSE= gnu-lgpl-v3 10LICENSE= gnu-lgpl-v3
12 11
13USE_CMAKE= yes 12USE_CMAKE= yes
14USE_TOOLS+= pkg-config msgfmt msgmerge 13USE_TOOLS+= pkg-config msgfmt msgmerge
15USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
16 15
17CMAKE_ARGS+= -DLLVM_CONFIG_EXECUTABLE=${LLVM_CONFIG_PATH:Q} 
18CMAKE_ARGS+= -DMANUAL_DIRECTORY=${PKGMANDIR} 16CMAKE_ARGS+= -DMANUAL_DIRECTORY=${PKGMANDIR}
19CMAKE_ARGS+= -DGNASH_EXE_PATH=${PREFIX}/bin/gnash 
20CMAKE_ARGS+= -DETCDIR=${PKG_SYSCONFDIR} 17CMAKE_ARGS+= -DETCDIR=${PKG_SYSCONFDIR}
21 18
22TOOL_DEPENDS+= nasm>=1.1:../../devel/nasm 19TOOL_DEPENDS+= nasm>=1.1:../../devel/nasm
23 20
24# MESSAGE(FATAL_ERROR "GCC 4.6+ is required.") 21# MESSAGE(FATAL_ERROR "GCC 4.6+ is required.")
25GCC_REQD+= 4.6 22GCC_REQD+= 4.6
26 23
27CONF_FILES+= ${PREFIX}/share/examples/lightspark/xdg/lightspark.conf \ 24CONF_FILES+= ${PREFIX}/share/examples/lightspark/xdg/lightspark.conf \
28 ${PKG_SYSCONFDIR}/xdg/lightspark.conf 25 ${PKG_SYSCONFDIR}/xdg/lightspark.conf
29 26
30.include "../../archivers/xz/buildlink3.mk" 27.include "../../archivers/xz/buildlink3.mk"
31.include "../../audio/SDL2_mixer/buildlink3.mk" 28.include "../../audio/SDL2_mixer/buildlink3.mk"
32.include "../../devel/boost-libs/buildlink3.mk" 29.include "../../devel/boost-libs/buildlink3.mk"
33.include "../../devel/gettext-lib/buildlink3.mk" 30.include "../../devel/gettext-lib/buildlink3.mk"
34.include "../../devel/glibmm/buildlink3.mk" 31.include "../../devel/glibmm/buildlink3.mk"
35.include "../../devel/pango/buildlink3.mk" 32.include "../../devel/pango/buildlink3.mk"
36.include "../../devel/pcre/buildlink3.mk" 33.include "../../devel/pcre/buildlink3.mk"
37.include "../../devel/zlib/buildlink3.mk" 34.include "../../devel/zlib/buildlink3.mk"
38.include "../../devel/SDL2/buildlink3.mk" 35.include "../../devel/SDL2/buildlink3.mk"
39.include "../../graphics/MesaLib/buildlink3.mk" 36.include "../../graphics/MesaLib/buildlink3.mk"
40.include "../../graphics/cairo/buildlink3.mk" 37.include "../../graphics/cairo/buildlink3.mk"
41.include "../../graphics/freetype2/buildlink3.mk" 38.include "../../graphics/freetype2/buildlink3.mk"
42.include "../../graphics/glew/buildlink3.mk" 39.include "../../graphics/glew/buildlink3.mk"
43.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 40.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
44.include "../../lang/libLLVM34/buildlink3.mk" 
45.include "../../multimedia/ffmpeg4/buildlink3.mk" 41.include "../../multimedia/ffmpeg4/buildlink3.mk"
46.include "../../net/rtmpdump/buildlink3.mk" 42.include "../../net/rtmpdump/buildlink3.mk"
47.include "../../x11/libXext/buildlink3.mk" 43.include "../../x11/libXext/buildlink3.mk"
48.include "../../www/curl/buildlink3.mk" 44.include "../../www/curl/buildlink3.mk"
49.include "../../mk/jpeg.buildlink3.mk" 45.include "../../mk/jpeg.buildlink3.mk"
50.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/lightspark/PLIST (expand / switch to unified diff)

--- pkgsrc/multimedia/lightspark/PLIST 2019/07/09 16:33:30 1.1
+++ pkgsrc/multimedia/lightspark/PLIST 2019/10/03 15:53:21 1.2
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1@comment $NetBSD: PLIST,v 1.1 2019/07/09 16:33:30 nia Exp $ 1@comment $NetBSD: PLIST,v 1.2 2019/10/03 15:53:21 nia Exp $
2bin/lightspark 2bin/lightspark
3bin/tightspark 
4lib/PepperFlash/libpepflashplayer.so 3lib/PepperFlash/libpepflashplayer.so
5lib/PepperFlash/manifest.json 4lib/PepperFlash/manifest.json
6lib/liblightspark.so 5lib/liblightspark.so
7lib/liblightspark.so.0.8 6lib/liblightspark.so.0.8
8lib/liblightspark.so.${PKGVERSION} 7lib/liblightspark.so.${PKGVERSION}
9lib/mozilla/plugins/liblightsparkplugin.so 8lib/mozilla/plugins/liblightsparkplugin.so
10man/man1/lightspark.1 9man/man1/lightspark.1
11share/applications/lightspark.desktop 10share/applications/lightspark.desktop
12share/examples/lightspark/xdg/lightspark.conf 11share/examples/lightspark/xdg/lightspark.conf
13share/icons/hicolor/128x128/apps/lightspark.png 12share/icons/hicolor/128x128/apps/lightspark.png
14share/icons/hicolor/16x16/apps/lightspark.png 13share/icons/hicolor/16x16/apps/lightspark.png
15share/icons/hicolor/192x192/apps/lightspark.png 14share/icons/hicolor/192x192/apps/lightspark.png
16share/icons/hicolor/22x22/apps/lightspark.png 15share/icons/hicolor/22x22/apps/lightspark.png
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/lightspark/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/lightspark/distinfo 2019/07/09 16:33:30 1.1
+++ pkgsrc/multimedia/lightspark/distinfo 2019/10/03 15:53:21 1.2
@@ -1,13 +1,12 @@ @@ -1,13 +1,12 @@
1$NetBSD: distinfo,v 1.1 2019/07/09 16:33:30 nia Exp $ 1$NetBSD: distinfo,v 1.2 2019/10/03 15:53:21 nia Exp $
2 2
3SHA1 (lightspark-0.8.1.tar.gz) = dd19eb4584b9ffe838f0966a72fadb90c4fbeb73 3SHA1 (lightspark-0.8.2.tar.gz) = d1194130aeadc144ef90065782cd8f9bf893d7e8
4RMD160 (lightspark-0.8.1.tar.gz) = e6193626e2733b971da1fee97091340eb1dc2eef 4RMD160 (lightspark-0.8.2.tar.gz) = 26dd4ff4fdb991c1159f964dd5bee1ab6efafee1
5SHA512 (lightspark-0.8.1.tar.gz) = ee9f02e4aa160d8e68cab743eddce5f4f5de0bb78f5daaaf69890b442701dc42094a59433cef136f6dc85e6fbce989bc8ff7ce8ad1ed1929c8501b13e24f2646 5SHA512 (lightspark-0.8.2.tar.gz) = 0ff636ad59523726232d9c2105843dc9ea835526c300bca7833e6d1a0ebf7630c1d10109143baabc16f95c1c954094603c945b705a6c9fb02f369e94fead034e
6Size (lightspark-0.8.1.tar.gz) = 1899466 bytes 6Size (lightspark-0.8.2.tar.gz) = 1996482 bytes
7SHA1 (patch-CMakeLists.txt) = 5522aed1f23043cfe9b11f3fe72c2dcba5492076 7SHA1 (patch-CMakeLists.txt) = ca9f200bf92ecbdd5d60738ccbad85581ee3d979
8SHA1 (patch-conf_FindLLVM.cmake) = d9c067e353d65f9995ef94f75a49bd82dddffc82 
9SHA1 (patch-src_backends_urlutils.cpp) = bd1e7584703a1045609b13b7379cf3eddcd13ef0 8SHA1 (patch-src_backends_urlutils.cpp) = bd1e7584703a1045609b13b7379cf3eddcd13ef0
10SHA1 (patch-src_main.cpp) = 3da1e6f80e07ae3ef9485c006fe7fee23d7f0c82 9SHA1 (patch-src_main.cpp) = 3da1e6f80e07ae3ef9485c006fe7fee23d7f0c82
11SHA1 (patch-src_parsing_tags.cpp) = 951f2757ed68f6e0f5964df3fa944aeace4cbda3 10SHA1 (patch-src_parsing_tags.cpp) = 951f2757ed68f6e0f5964df3fa944aeace4cbda3
12SHA1 (patch-src_platforms_engineutils.cpp) = 884e37623cf8203d86fcb27e479b41af08a509c4 11SHA1 (patch-src_platforms_engineutils.cpp) = 884e37623cf8203d86fcb27e479b41af08a509c4
13SHA1 (patch-src_plugin__ppapi_plugin.cpp) = e0e1be7012c2c75b746b36b8d3801c0aa4d81c95 12SHA1 (patch-src_plugin__ppapi_plugin.cpp) = 52d76189aded5687ba5671623bdc919ebaffd5dd
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/lightspark/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/multimedia/lightspark/patches/patch-CMakeLists.txt 2019/07/09 16:33:30 1.1
+++ pkgsrc/multimedia/lightspark/patches/patch-CMakeLists.txt 2019/10/03 15:53:21 1.2
@@ -1,42 +1,35 @@ @@ -1,42 +1,35 @@
1$NetBSD: patch-CMakeLists.txt,v 1.1 2019/07/09 16:33:30 nia Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.2 2019/10/03 15:53:21 nia Exp $
 2
 3Hunk 1:
2 4
3Use /lib for "private libs" (liblightspark). This may be evil, 5Use /lib for "private libs" (liblightspark). This may be evil,
4but currently the private rpath isn't being added properly. 6but currently the private rpath isn't being added properly.
5 7
6Recognize LLVM 3.4.x. 8Hunk 2:
7 9
8Install config file as example. 10Install config file as example.
9 11
10--- CMakeLists.txt.orig 2018-06-02 09:25:36.000000000 +0000 12--- CMakeLists.txt.orig 2019-09-15 15:33:56.000000000 +0000
11+++ CMakeLists.txt 13+++ CMakeLists.txt
12@@ -171,10 +171,10 @@ IF(UNIX) 14@@ -173,10 +173,10 @@ IF(UNIX)
13 SET(DATADIR "share") 15 SET(DATADIR "share")
14 # Absolute path, because this path is embedded in the binary 16 # Absolute path, because this path is embedded in the binary
15 SET(LSDATADIR "${CMAKE_INSTALL_PREFIX}/${DATADIR}/lightspark") 17 SET(LSDATADIR "${CMAKE_INSTALL_PREFIX}/${DATADIR}/lightspark")
16- SET(LIBDIR "lib${LIB_SUFFIX}") 18- SET(LIBDIR "lib${LIB_SUFFIX}")
17+ SET(LIBDIR "lib") 19+ SET(LIBDIR "lib")
18 #We need a absolute path here because we use it for rpath 20 #We need a absolute path here because we use it for rpath
19 #later on 21 #later on
20- SET(PRIVATELIBDIR "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/lightspark") 22- SET(PRIVATELIBDIR "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/lightspark")
21+ SET(PRIVATELIBDIR "${CMAKE_INSTALL_PREFIX}/${LIBDIR}") 23+ SET(PRIVATELIBDIR "${CMAKE_INSTALL_PREFIX}/${LIBDIR}")
22 SET(CMAKE_INSTALL_RPATH "${PRIVATELIBDIR}") 24 SET(CMAKE_INSTALL_RPATH "${PRIVATELIBDIR}")
23 ELSE() 25 ELSE()
24 SET(ETCDIR ".") 26 SET(ETCDIR ".")
25@@ -236,7 +236,7 @@ ENDIF(${LLVM_STRING_VERSION} VERSION_GRE 27@@ -560,7 +560,7 @@ GETTEXT_CREATE_TRANSLATIONS(i18n/lightsp
26 IF(${LLVM_STRING_VERSION} VERSION_GREATER 3.3) 
27 ADD_DEFINITIONS(-DLLVM_34) 
28 ENDIF(${LLVM_STRING_VERSION} VERSION_GREATER 3.3) 
29-IF(${LLVM_STRING_VERSION} VERSION_GREATER 3.4) 
30+IF(${LLVM_STRING_VERSION} VERSION_GREATER 3.4 AND NOT ${LLVM_STRING_VERSION} VERSION_LESS 3.5) 
31 ADD_DEFINITIONS(-DLLVM_35) 
32 ENDIF(${LLVM_STRING_VERSION} VERSION_GREATER 3.4) 
33 IF(NOT (${LLVM_STRING_VERSION} VERSION_LESS 3.6)) 
34@@ -536,7 +536,7 @@ GETTEXT_CREATE_TRANSLATIONS(i18n/lightsp 
35  28
36 if(UNIX) 29 if(UNIX)
37 INSTALL(FILES etc/xdg/lightspark.conf 30 INSTALL(FILES etc/xdg/lightspark.conf
38- DESTINATION ${ETCDIR}/xdg/) 31- DESTINATION ${ETCDIR}/xdg/)
39+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/lightspark/xdg) 32+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/lightspark/xdg)
40 ELSE() 33 ELSE()
41 INSTALL(FILES COPYING DESTINATION "." RENAME COPYING.txt) 34 INSTALL(FILES COPYING DESTINATION "." RENAME COPYING.txt)
42 INSTALL(FILES COPYING.LESSER DESTINATION "." RENAME COPYING.LESSER.txt) 35 INSTALL(FILES COPYING.LESSER DESTINATION "." RENAME COPYING.LESSER.txt)
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/lightspark/patches/patch-src_plugin__ppapi_plugin.cpp (expand / switch to unified diff)

--- pkgsrc/multimedia/lightspark/patches/patch-src_plugin__ppapi_plugin.cpp 2019/07/09 16:33:30 1.1
+++ pkgsrc/multimedia/lightspark/patches/patch-src_plugin__ppapi_plugin.cpp 2019/10/03 15:53:21 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-src_plugin__ppapi_plugin.cpp,v 1.1 2019/07/09 16:33:30 nia Exp $ 1$NetBSD: patch-src_plugin__ppapi_plugin.cpp,v 1.2 2019/10/03 15:53:21 nia Exp $
2 2
3These are undefined, take advantage of SDL defines instead. 3These are undefined, take advantage of SDL defines instead.
4 4
5--- src/plugin_ppapi/plugin.cpp.orig 2018-06-02 09:25:36.000000000 +0000 5--- src/plugin_ppapi/plugin.cpp.orig 2019-09-15 15:33:56.000000000 +0000
6+++ src/plugin_ppapi/plugin.cpp 6+++ src/plugin_ppapi/plugin.cpp
7@@ -75,7 +75,7 @@ 7@@ -75,7 +75,7 @@
8 #define GL_UNSIGNED_INT_8_8_8_8_HOST GL_UNSIGNED_BYTE 8 #define GL_UNSIGNED_INT_8_8_8_8_HOST GL_UNSIGNED_BYTE
9 #else 9 #else
10 //The interpretation of texture data change with the endianness 10 //The interpretation of texture data change with the endianness
11-#if __BYTE_ORDER == __BIG_ENDIAN 11-#if __BYTE_ORDER == __BIG_ENDIAN
12+#if SDL_BYTEORDER == SDL_BIG_ENDIAN 12+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
13 #define GL_UNSIGNED_INT_8_8_8_8_HOST GL_UNSIGNED_INT_8_8_8_8_REV 13 // TODO
14 #else 14 // It's unclear if this needs special handling on big endian.
15 #define GL_UNSIGNED_INT_8_8_8_8_HOST GL_UNSIGNED_BYTE 15 // Needs to be tested on a big endian machine.
File Deleted: pkgsrc/multimedia/lightspark/patches/Attic/patch-conf_FindLLVM.cmake