Re: [PR PATCH] [Updated] New package: mup-6.9.

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

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

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

https://github.com/fosslinux/void-packages mup-new
https://github.com/void-linux/void-packages/pull/25861

New package: mup-6.9.


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

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

From 8d884dc8462dc72a27b0b89172d37d89fea6a6ae Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 07:49:29 +1100
Subject: [PATCH] New package: mup-6.9.

---
 srcpkgs/mup/files/post-cross-fix.patch | 29 +++++++++++++
 srcpkgs/mup/patches/libvga.patch       | 18 ++++++++
 srcpkgs/mup/template                   | 58 ++++++++++++++++++++++++++
 3 files changed, 105 insertions(+)
 create mode 100644 srcpkgs/mup/files/post-cross-fix.patch
 create mode 100644 srcpkgs/mup/patches/libvga.patch
 create mode 100644 srcpkgs/mup/template

diff --git a/srcpkgs/mup/files/post-cross-fix.patch b/srcpkgs/mup/files/post-cross-fix.patch
new file mode 100644
index 000000000000..4d405c4bbec7
--- /dev/null
+++ b/srcpkgs/mup/files/post-cross-fix.patch
@@ -0,0 +1,29 @@
+--- a/doc/Makefile.am	2020-10-24 15:35:54.045900486 +1100
++++ b/doc/Makefile.am	2020-10-24 15:36:15.274015032 +1100
+@@ -214,26 +214,15 @@
+ mup_uguide__DATA = $(uguide_files)
+ 
+ muschar.ps: ../src/include/muschar.h ../tools/doc/mkmuscharps.sh
+-	../tools/doc/mkmuscharps.sh < ../src/include/muschar.h
+ 
+ quickref.ps: quickref.t ../src/mup/prolog.ps muschar.ps
+-	$(GROFF) -t -Tps quickref.t | $(SED) -e "/BeginProlog/r ../src/mup/prolog.ps" > quickref.ps
+ 
+ uguide.mm: uguide.t ../tools/doc/ugexi muschar.ps ext_1.ps ext_2.ps ext_3.ps ext_4.ps ../src/mup/mup
+-	MUPPATH=$$(pwd)/../mup-input/includes MUPQUIET=1 PATH=$$(pwd)/../src/mup:$$PATH ../tools/doc/ugexi < uguide.t > uguide.mm
+ 
+ uguide.ps: uguide.mm ../tools/doc/mvtoc ../src/mup/prolog.ps
+-	$(GROFF) -t -Tps -mm -rN2 uguide.mm | $(SED) -e "/BeginProlog/r ../src/mup/prolog.ps" > uguide.ps.tmp
+-	../tools/doc/mvtoc uguide.ps.tmp > uguide.ps
+-	rm uguide.ps.tmp
+ 
+ ext_1.mup ext_2.mup ext_3.mup ext_4.mup: charlist ../src/mup/fontdata.c ../tools/doc/gen_ext_mup
+-	../tools/doc/gen_ext_mup
+ 
+ ext_1.ps ext_2.ps ext_3.ps ext_4.ps: ext_1.mup ext_2.mup ext_3.mup ext_4.mup ../src/mup/mup
+-	for p in 1 2 3 4 ; do ../src/mup/mup ext_$$p.mup | $(SED) -e "/Copyright/,/Set up extended character set fonts/d" -e "/BeginFeature/,/EndFeature/d" -e "/%%Trailer/,/%%DocumentFonts/d"  -e "/%%Page/d" > ext_$$p.ps; done
+ 
+ $(uguide_files): uguide.mm ../tools/doc/tr2html ../tools/doc/mkuggifs ../src/mup/prolog.ps muschar.ps
+-	mkdir -p uguide
+-	(cd uguide ; cp ../param_index . ; ../../tools/doc/tr2html < ../uguide.mm > /dev/null ; rm param_index)
+-	(cd uguide; ../../tools/doc/mkuggifs  CAT=$(CAT) GS=$(GS) EXPR=$(EXPR) SORT=$(SORT) PPMTOGIF=$(PPMTOGIF) GREP=$(GREP) EGREP=$(EGREP) )
diff --git a/srcpkgs/mup/patches/libvga.patch b/srcpkgs/mup/patches/libvga.patch
new file mode 100644
index 000000000000..563054e9e8e6
--- /dev/null
+++ b/srcpkgs/mup/patches/libvga.patch
@@ -0,0 +1,18 @@
+libvga dosen't exist on void. and it makes cross fail.
+
+checking for /usr/lib/libvga.a... configure: error: cannot check for file existence when cross compiling
+
+--- a/configure.ac	2020-10-22 20:19:24.633514760 +1100
++++ b/configure.ac	2020-10-22 20:19:46.917655818 +1100
+@@ -126,10 +126,7 @@
+ 
+ AS_IF([test "x$enable_mupdisp" != xno],
+ 	[
+-	# Check if libvga.a is available for mupdisp
+-	AC_CHECK_FILE([/usr/lib/libvga.a],[use_vga=yes],)
+-	AC_CHECK_FILE([/usr/lib64/libvga.a],[use_vga=yes],)
+-	test "$use_vga" != "yes" && AC_SUBST([LIBVGA],[-DNO_VGA_LIB])
++	AC_SUBST([LIBVGA],[-DNO_VGA_LIB])
+ 	]
+ )
+ 
diff --git a/srcpkgs/mup/template b/srcpkgs/mup/template
new file mode 100644
index 000000000000..01e7523d99a4
--- /dev/null
+++ b/srcpkgs/mup/template
@@ -0,0 +1,58 @@
+# Template file for 'mup'
+pkgname=mup
+version=6.9
+revision=1
+build_style=gnu-configure
+hostmakedepends="ghostscript groff flex bison netpbm automake"
+makedepends="fltk-devel libXpm-devel"
+short_desc="Free, yet very feature rich, music publication program"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="BSD-3-Clause"
+homepage="http://www.arkkra.com/"
+distfiles="ftp://ftp.arkkra.com/pub/unix/mup${version//.}src.tar.gz"
+checksum=75380d13f6478716471ac4a3aff800097a7b57bc3bd4f0ac49d9a1aa87239285
+# Multiple things are broken with multithreaded compile
+disable_parallel_build=yes
+
+pre_configure() {
+	autoreconf -i
+
+	# Some things need to be compiled and/or run for the host system first
+	# when cross-building.
+	if [ "$CROSS_BUILD" ]; then
+		CC=cc CXX=g++ LD=ld AR=ar RANLIB=ranlib CFLAGS="-static" \
+			CXXFLAGS="-static" LDFLAGS="-static" ./configure
+		for d in lib tools src/mup doc; do
+			pushd $d
+			make
+			popd
+		done
+		# Clean some so they can be repopulated for the target arch.
+		for d in lib tools/test src/mup; do
+			pushd $d
+			make clean
+			popd
+		done
+		# Also don't do docs build again..
+		patch -Np1 -i "${FILESDIR}/post-cross-fix.patch"
+		autoreconf -i
+	fi
+}
+
+pre_build() {
+	# bbox is broken-ish in the Makefile, run it outside of the Makefile.
+	# i.e. compiling + running it outside first *fixes* it re-running it
+	# inside the Makefile..
+	if ! [ "$CROSS_BUILD" ]; then
+		pushd tools/mup
+		make bbox
+		popd
+	fi
+	pushd src/mup
+	../../tools/mup/bbox
+	popd
+}
+
+post_install() {
+	vlicense LICENSE
+}