CVS commit: pkgsrc/multimedia/lightspark

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Oct  3 15:53:21 UTC 2019

Modified Files:
        pkgsrc/multimedia/lightspark: Makefile PLIST distinfo
        pkgsrc/multimedia/lightspark/patches: patch-CMakeLists.txt
            patch-src_plugin__ppapi_plugin.cpp
Removed Files:
        pkgsrc/multimedia/lightspark/patches: patch-conf_FindLLVM.cmake

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/lightspark/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/lightspark/PLIST \
    pkgsrc/multimedia/lightspark/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/multimedia/lightspark/patches/patch-CMakeLists.txt \
    pkgsrc/multimedia/lightspark/patches/patch-src_plugin__ppapi_plugin.cpp
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/multimedia/lightspark/patches/patch-conf_FindLLVM.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/lightspark/Makefile
diff -u pkgsrc/multimedia/lightspark/Makefile:1.3 pkgsrc/multimedia/lightspark/Makefile:1.4
--- pkgsrc/multimedia/lightspark/Makefile:1.3   Thu Aug 22 12:23:37 2019
+++ pkgsrc/multimedia/lightspark/Makefile       Thu Oct  3 15:53:21 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2019/08/22 12:23:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2019/10/03 15:53:21 nia Exp $
 
-DISTNAME=      lightspark-0.8.1
-PKGREVISION=   2
+DISTNAME=      lightspark-0.8.2
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=lightspark/}
 
@@ -14,9 +13,7 @@ USE_CMAKE=    yes
 USE_TOOLS+=    pkg-config msgfmt msgmerge
 USE_LANGUAGES= c c++
 
-CMAKE_ARGS+=   -DLLVM_CONFIG_EXECUTABLE=${LLVM_CONFIG_PATH:Q}
 CMAKE_ARGS+=   -DMANUAL_DIRECTORY=${PKGMANDIR}
-CMAKE_ARGS+=   -DGNASH_EXE_PATH=${PREFIX}/bin/gnash
 CMAKE_ARGS+=   -DETCDIR=${PKG_SYSCONFDIR}
 
 TOOL_DEPENDS+= nasm>=1.1:../../devel/nasm
@@ -41,7 +38,6 @@ CONF_FILES+=  ${PREFIX}/share/examples/li
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../lang/libLLVM34/buildlink3.mk"
 .include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../net/rtmpdump/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"

Index: pkgsrc/multimedia/lightspark/PLIST
diff -u pkgsrc/multimedia/lightspark/PLIST:1.1 pkgsrc/multimedia/lightspark/PLIST:1.2
--- pkgsrc/multimedia/lightspark/PLIST:1.1      Tue Jul  9 16:33:30 2019
+++ pkgsrc/multimedia/lightspark/PLIST  Thu Oct  3 15:53:21 2019
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2019/07/09 16:33:30 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/10/03 15:53:21 nia Exp $
 bin/lightspark
-bin/tightspark
 lib/PepperFlash/libpepflashplayer.so
 lib/PepperFlash/manifest.json
 lib/liblightspark.so
Index: pkgsrc/multimedia/lightspark/distinfo
diff -u pkgsrc/multimedia/lightspark/distinfo:1.1 pkgsrc/multimedia/lightspark/distinfo:1.2
--- pkgsrc/multimedia/lightspark/distinfo:1.1   Tue Jul  9 16:33:30 2019
+++ pkgsrc/multimedia/lightspark/distinfo       Thu Oct  3 15:53:21 2019
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.1 2019/07/09 16:33:30 nia Exp $
+$NetBSD: distinfo,v 1.2 2019/10/03 15:53:21 nia Exp $
 
-SHA1 (lightspark-0.8.1.tar.gz) = dd19eb4584b9ffe838f0966a72fadb90c4fbeb73
-RMD160 (lightspark-0.8.1.tar.gz) = e6193626e2733b971da1fee97091340eb1dc2eef
-SHA512 (lightspark-0.8.1.tar.gz) = ee9f02e4aa160d8e68cab743eddce5f4f5de0bb78f5daaaf69890b442701dc42094a59433cef136f6dc85e6fbce989bc8ff7ce8ad1ed1929c8501b13e24f2646
-Size (lightspark-0.8.1.tar.gz) = 1899466 bytes
-SHA1 (patch-CMakeLists.txt) = 5522aed1f23043cfe9b11f3fe72c2dcba5492076
-SHA1 (patch-conf_FindLLVM.cmake) = d9c067e353d65f9995ef94f75a49bd82dddffc82
+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 (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_plugin__ppapi_plugin.cpp) = e0e1be7012c2c75b746b36b8d3801c0aa4d81c95
+SHA1 (patch-src_plugin__ppapi_plugin.cpp) = 52d76189aded5687ba5671623bdc919ebaffd5dd

Index: pkgsrc/multimedia/lightspark/patches/patch-CMakeLists.txt
diff -u pkgsrc/multimedia/lightspark/patches/patch-CMakeLists.txt:1.1 pkgsrc/multimedia/lightspark/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/multimedia/lightspark/patches/patch-CMakeLists.txt:1.1       Tue Jul  9 16:33:30 2019
+++ pkgsrc/multimedia/lightspark/patches/patch-CMakeLists.txt   Thu Oct  3 15:53:21 2019
@@ -1,15 +1,17 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2019/07/09 16:33:30 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2019/10/03 15:53:21 nia Exp $
+
+Hunk 1:
 
 Use /lib for "private libs" (liblightspark). This may be evil,
 but currently the private rpath isn't being added properly.
 
-Recognize LLVM 3.4.x.
+Hunk 2:
 
 Install config file as example.
 
---- CMakeLists.txt.orig        2018-06-02 09:25:36.000000000 +0000
+--- CMakeLists.txt.orig        2019-09-15 15:33:56.000000000 +0000
 +++ CMakeLists.txt
-@@ -171,10 +171,10 @@ IF(UNIX)
+@@ -173,10 +173,10 @@ IF(UNIX)
     SET(DATADIR "share")
     # Absolute path, because this path is embedded in the binary
     SET(LSDATADIR "${CMAKE_INSTALL_PREFIX}/${DATADIR}/lightspark")
@@ -22,16 +24,7 @@ Install config file as example.
     SET(CMAKE_INSTALL_RPATH "${PRIVATELIBDIR}")
  ELSE()
    SET(ETCDIR ".")
-@@ -236,7 +236,7 @@ ENDIF(${LLVM_STRING_VERSION} VERSION_GRE
- IF(${LLVM_STRING_VERSION} VERSION_GREATER 3.3)
-       ADD_DEFINITIONS(-DLLVM_34)
- ENDIF(${LLVM_STRING_VERSION} VERSION_GREATER 3.3)
--IF(${LLVM_STRING_VERSION} VERSION_GREATER 3.4)
-+IF(${LLVM_STRING_VERSION} VERSION_GREATER 3.4 AND NOT ${LLVM_STRING_VERSION} VERSION_LESS 3.5)
-       ADD_DEFINITIONS(-DLLVM_35)
- ENDIF(${LLVM_STRING_VERSION} VERSION_GREATER 3.4)
- IF(NOT (${LLVM_STRING_VERSION} VERSION_LESS 3.6))
-@@ -536,7 +536,7 @@ GETTEXT_CREATE_TRANSLATIONS(i18n/lightsp
+@@ -560,7 +560,7 @@ GETTEXT_CREATE_TRANSLATIONS(i18n/lightsp
  
  if(UNIX)
        INSTALL(FILES etc/xdg/lightspark.conf
Index: pkgsrc/multimedia/lightspark/patches/patch-src_plugin__ppapi_plugin.cpp
diff -u pkgsrc/multimedia/lightspark/patches/patch-src_plugin__ppapi_plugin.cpp:1.1 pkgsrc/multimedia/lightspark/patches/patch-src_plugin__ppapi_plugin.cpp:1.2
--- pkgsrc/multimedia/lightspark/patches/patch-src_plugin__ppapi_plugin.cpp:1.1 Tue Jul  9 16:33:30 2019
+++ pkgsrc/multimedia/lightspark/patches/patch-src_plugin__ppapi_plugin.cpp     Thu Oct  3 15:53:21 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_plugin__ppapi_plugin.cpp,v 1.1 2019/07/09 16:33:30 nia Exp $
+$NetBSD: patch-src_plugin__ppapi_plugin.cpp,v 1.2 2019/10/03 15:53:21 nia Exp $
 
 These are undefined, take advantage of SDL defines instead.
 
---- src/plugin_ppapi/plugin.cpp.orig   2018-06-02 09:25:36.000000000 +0000
+--- src/plugin_ppapi/plugin.cpp.orig   2019-09-15 15:33:56.000000000 +0000
 +++ src/plugin_ppapi/plugin.cpp
 @@ -75,7 +75,7 @@
  #define GL_UNSIGNED_INT_8_8_8_8_HOST GL_UNSIGNED_BYTE
@@ -10,6 +10,6 @@ These are undefined, take advantage of S
  //The interpretation of texture data change with the endianness
 -#if __BYTE_ORDER == __BIG_ENDIAN
 +#if SDL_BYTEORDER == SDL_BIG_ENDIAN
- #define GL_UNSIGNED_INT_8_8_8_8_HOST GL_UNSIGNED_INT_8_8_8_8_REV
- #else
- #define GL_UNSIGNED_INT_8_8_8_8_HOST GL_UNSIGNED_BYTE
+ // TODO
+ // It's unclear if this needs special handling on big endian.
+ // Needs to be tested on a big endian machine.