From: fosslinux <fosslinux@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: mup-6.9.
Date: Thu, 01 Jul 2021 08:45:02 +0200 [thread overview]
Message-ID: <20210701064502.PFbVg3Of96jbvUMNmGZUYeDPL1a0NBVqjd5Hw7Dk69I@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25861@inbox.vuxu.org>
[-- 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: 5119 bytes --]
From 0b96b8c51d3f33c5cc21e705e18a36f4b8c49831 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..9183ce746abf
--- /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
+# Multiple things are broken with multithreaded compile
+disable_parallel_builds=yes
+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
+
+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
+}
next prev parent reply other threads:[~2021-07-01 6:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-24 20:56 [PR PATCH] New package: mup-6.3.1 fosslinux
2020-10-30 23:35 ` [PR PATCH] [Updated] " fosslinux
2020-10-31 23:32 ` fosslinux
2021-07-01 3:06 ` [PR PATCH] [Updated] New package: mup-6.8.1 fosslinux
2021-07-01 3:06 ` fosslinux
2021-07-01 4:05 ` [PR REVIEW] New package: mup-6.9 ericonr
2021-07-01 6:43 ` fosslinux
2021-07-01 6:45 ` fosslinux [this message]
2021-07-01 7:42 ` [PR PATCH] [Updated] " fosslinux
2021-07-01 8:57 ` fosslinux
2021-08-12 1:57 ` [PR REVIEW] " ericonr
2021-08-12 23:01 ` fosslinux
2022-04-21 2:12 ` github-actions
2022-05-06 2:08 ` [PR PATCH] [Closed]: " github-actions
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210701064502.PFbVg3Of96jbvUMNmGZUYeDPL1a0NBVqjd5Hw7Dk69I@z \
--to=fosslinux@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).