Re: [PR PATCH] [Updated] WIP: New package: lightspark

[fosslinux <fosslinux@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 503 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages lightspark
https://github.com/void-linux/void-packages/pull/23555

WIP: New package: lightspark
Try the test suite on musl. It is subtly broken, hanging seemingly randomly every now and then...... No clue what the problem is, or if it is test suite specific, or whatever



A patch file from https://github.com/void-linux/void-packages/pull/23555.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lightspark-23555.patch --]
[-- Type: text/x-diff, Size: 6894 bytes --]

From 0c80f8493d95eaad3c41f7f678f1e99f9c9606c9 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Tue, 14 Jul 2020 10:55:25 +1000
Subject: [PATCH 1/3] New package: xvfb-run-1.20.8.2

---
 srcpkgs/xvfb-run/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/xvfb-run/template

diff --git a/srcpkgs/xvfb-run/template b/srcpkgs/xvfb-run/template
new file mode 100644
index 00000000000..cac13502ede
--- /dev/null
+++ b/srcpkgs/xvfb-run/template
@@ -0,0 +1,22 @@
+# Template file for 'xvfb-run'
+# Adapted from Alpine
+pkgname=xvfb-run
+version=1.20.8.2 # Debian pkgver + pkgrel
+revision=1
+_debian_rel=${version%.*}-${version##*.}
+create_wrksrc=yes
+build_style=fetch
+depends="xorg-server-xvfb xauth"
+short_desc="Wrapper for the Xvfb command simplifying running commands"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="GPL-2.0-or-later"
+homepage="https://salsa.debian.org/xorg-team/xserver/xorg-server/tree/debian-unstable/debian/local"
+distfiles="https://salsa.debian.org/xorg-team/xserver/xorg-server/raw/xorg-server-2_${_debian_rel}/debian/local/xvfb-run
+ https://salsa.debian.org/xorg-team/xserver/xorg-server/raw/xorg-server-2_${_debian_rel}/debian/local/xvfb-run.1"
+checksum="fd05e0f8e6207c3984b980a0f037381c9c4a6f22a6dd94fdcfa995318db2a0a4
+ 08f14f55e14e52e5d98713c4d8f25ae68d67e2ee188dc0247770c6ada6e27c05"
+
+do_install() {
+	vbin xvfb-run
+	vman xvfb-run.1
+}

From ad7e4d0c845575303943da0977bce5541a659f74 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Mon, 13 Jul 2020 08:41:51 +1000
Subject: [PATCH 2/3] New package: adobe-flex-sdk-4.6

---
 srcpkgs/adobe-flex-sdk/template | 44 +++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 srcpkgs/adobe-flex-sdk/template

diff --git a/srcpkgs/adobe-flex-sdk/template b/srcpkgs/adobe-flex-sdk/template
new file mode 100644
index 00000000000..7dd38101817
--- /dev/null
+++ b/srcpkgs/adobe-flex-sdk/template
@@ -0,0 +1,44 @@
+# Template file for 'adobe-flex-sdk'
+pkgname=adobe-flex-sdk
+version=4.6
+revision=1
+create_wrksrc=yes
+depends="openjdk-jre"
+short_desc="Freely develop and deploy Flex applications"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="custom:Adobe License (non free)"
+homepage="https://www.adobe.com/devnet/flex/flex-sdk-download.html"
+distfiles="http://download.macromedia.com/pub/flex/sdk/flex_sdk_${version}.zip"
+checksum=622b63f29de44600ff8d4231174a70fcb3085812c0e146a42e91877ca8b46798
+repository="nonfree"
+restricted=yes
+# strip fails with error free(): invalid pointer
+nostrip=yes
+skiprdeps="/usr/lib/adobe-flex-sdk/lib/android/FlashRuntimeExtensions.so"
+
+post_extract() {
+	rm *.htm *.txt
+	mv 'AIR SDK license.pdf' LICENSE.pdf
+}
+
+do_install() {
+	vlicense LICENSE.pdf
+	rm LICENSE.pdf
+	mkdir -p "${DESTDIR}/usr/lib/adobe-flex-sdk/"
+	cp -rfv * "${DESTDIR}/usr/lib/adobe-flex-sdk/"
+	mkdir -p "${DESTDIR}/usr/bin/"
+	for f in "${DESTDIR}/usr/lib/adobe-flex-sdk/bin/"* ; do
+		f="$(basename ${f})"
+		case ${f} in
+			*.exe) ;;
+			*.bat) ;;
+			jvm.config) ;;
+			*)
+				echo "creating smallscript for ${f} in /usr/bin"
+				echo '#!/bin/sh' > "${DESTDIR}/usr/bin/${f}"
+				echo '/usr/lib/adobe-flex-sdk/bin/'"${f}"' "$@"' >> "${DESTDIR}/usr/bin/${f}"
+				chmod 755 "${DESTDIR}/usr/bin/${f}"
+				;;
+		esac
+	done
+}

From b921d330e9ac7f1fe2ff253bc30019475d918f2f Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Mon, 13 Jul 2020 08:42:40 +1000
Subject: [PATCH 3/3] New package: lightspark-0.8.3

---
 common/shlibs                          |  1 +
 srcpkgs/lightspark/files/avmplus.patch | 22 +++++++++++++
 srcpkgs/lightspark/template            | 44 ++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)
 create mode 100644 srcpkgs/lightspark/files/avmplus.patch
 create mode 100644 srcpkgs/lightspark/template

diff --git a/common/shlibs b/common/shlibs
index 00a0af53fcb..d7f010b4d49 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3977,3 +3977,4 @@ libsepol.so.1 libsepol-3.0_1
 libfrrcares.so.0 libfrr-7.3.1_1
 libhugetlbfs.so.0 libhugetlbfs-2.22_1
 libdolphinvcs.so.5 dolphin-plugins-20.04.2_1
+liblightspark.so.0.8 lightspark-0.8.3_1
diff --git a/srcpkgs/lightspark/files/avmplus.patch b/srcpkgs/lightspark/files/avmplus.patch
new file mode 100644
index 00000000000..da3987df097
--- /dev/null
+++ b/srcpkgs/lightspark/files/avmplus.patch
@@ -0,0 +1,22 @@
+--- AVMPI/MMgcPortUnix.cpp	2020-07-13 19:29:31.368000000 +1000
++++ AVMPI/MMgcPortUnix.cpp	2020-07-13 19:30:14.934000000 +1000
+@@ -46,7 +46,7 @@
+     #define FLUSHWIN()
+ #endif
+ 
+-#if defined linux && !defined VMCFG_MIPS && !defined VMCFG_ARM && !defined ANDROID
++#if defined linux && defined __GLIBC__ && !defined VMCFG_MIPS && !defined VMCFG_ARM && !defined ANDROID
+ #include <execinfo.h>
+ #define HAVE_BACKTRACE
+ #endif
+--- core/exec.cpp	2020-07-13 19:31:28.076000000 +1000
++++ core/exec.cpp	2020-07-13 19:31:36.176000000 +1000
+@@ -806,7 +806,7 @@
+ failure:
+     AvmCore* core = env->core();
+     env->toplevel()->throwTypeError(kCheckTypeFailedError, core->atomToErrorString(atom), core->toErrorString(t));
+-    return unreachableAtom;
++    return 0;
+ }
+ 
+ // Coerce an argument to an expected type, but keep it represented as Atom.
diff --git a/srcpkgs/lightspark/template b/srcpkgs/lightspark/template
new file mode 100644
index 00000000000..0b8cc5068a0
--- /dev/null
+++ b/srcpkgs/lightspark/template
@@ -0,0 +1,44 @@
+# Template file for 'lightspark'
+pkgname=lightspark
+version=0.8.3
+revision=1
+build_style=cmake
+hostmakedepends="nasm pkg-config gettext"
+makedepends="MesaLib-devel glew-devel libcurl-devel ffmpeg-devel pcre-devel
+ librtmp-devel cairo-devel SDL2-devel SDL2_mixer-devel libjpeg-turbo-devel
+ pango-devel liblzma-devel glibmm-devel"
+checkdepends="which xvfb-run adobe-flex-sdk git python"
+short_desc="Open source flash player implementation"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="LGPL-3.0-or-later"
+homepage="https://lightspark.github.io"
+distfiles="https://github.com/lightspark/lightspark/archive/${version}.tar.gz"
+checksum=5276818e6d78ddf12a9304bc8c2ceeec0ca0759a99d56a4521e1fdc06893b1bd
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
+post_extract() {
+	# Remove build script that we are using for the CMake directory
+	rm build
+}
+
+do_check() {
+	cd tests
+	# Compile tamarin tests
+	git clone --depth=1 https://github.com/adobe/avmplus
+	cp /usr/lib/adobe-flex-sdk/lib/asc.jar avmplus/utils/
+	pushd avmplus
+	patch -Np0 -i "${FILESDIR}/avmplus.patch"
+	popd
+	mkdir avmplus/objdir
+	pushd avmplus/objdir
+	python ../configure.py
+	sed -i "s/-Werror/-Wno-narrowing/" Makefile
+	make ${makejobs}
+	popd
+	TAMARIN=$PWD/avmplus ./make-tamarin
+	# run tests
+	./tests -e ../build/x86_64/Release/bin/lightspark -nc
+}