From 621c75e47e46a6fe7b3901d4baa0c6a9ec96ca5b Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 07:49:29 +1100 Subject: [PATCH] New package: mup-6.3.1. --- srcpkgs/mup/files/post-cross-fix.patch | 29 +++++++++++ srcpkgs/mup/patches/ghostscript-9.50.patch | 13 +++++ srcpkgs/mup/patches/libvga.patch | 18 +++++++ srcpkgs/mup/template | 58 ++++++++++++++++++++++ 4 files changed, 118 insertions(+) create mode 100644 srcpkgs/mup/files/post-cross-fix.patch create mode 100644 srcpkgs/mup/patches/ghostscript-9.50.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 00000000000..251ede68686 --- /dev/null +++ b/srcpkgs/mup/files/post-cross-fix.patch @@ -0,0 +1,29 @@ +--- doc/Makefile.am 2020-10-24 15:35:54.045900486 +1100 ++++ 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/ghostscript-9.50.patch b/srcpkgs/mup/patches/ghostscript-9.50.patch new file mode 100644 index 00000000000..e1d49e16983 --- /dev/null +++ b/srcpkgs/mup/patches/ghostscript-9.50.patch @@ -0,0 +1,13 @@ +dNOSAFER is required for this command since GhostScript 9.50. + +--- src/mup/Makefile.am 2020-10-22 17:38:23.099280764 +1100 ++++ src/mup/Makefile.am 2020-10-22 17:38:36.488345334 +1100 +@@ -37,7 +37,7 @@ + echo "/*" > fontdata.c + $(CAT) ../../LICENSE >> fontdata.c + echo " */" >> fontdata.c +- $(GS) -sDEVICE=nullpage -sOutputFile=/dev/null -dQUIET - < ../../tools/mup/getfontinfo.ps | $(SED) -e "/Warning:/d" >> fontdata.c ++ $(GS) -dNOSAFER -sDEVICE=nullpage -sOutputFile=/dev/null -dQUIET - < ../../tools/mup/getfontinfo.ps | $(SED) -e "/Warning:/d" >> fontdata.c + $(CAT) charnames fontinit >> fontdata.c + rm charnames fontinit + diff --git a/srcpkgs/mup/patches/libvga.patch b/srcpkgs/mup/patches/libvga.patch new file mode 100644 index 00000000000..c5aed76f3a5 --- /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 + +--- configure.ac 2020-10-22 20:19:24.633514760 +1100 ++++ 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 00000000000..33696efd17b --- /dev/null +++ b/srcpkgs/mup/template @@ -0,0 +1,58 @@ +# Template file for 'mup' +pkgname=mup +version=6.8.1 +revision=1 +build_style=gnu-configure +# Multiple things are broken with multithreaded compile +make_build_args="-j1" +hostmakedepends="ghostscript groff flex bison netpbm automake" +makedepends="fltk-devel libXpm-devel" +short_desc="Free, yet very feature rich, music publication program" +maintainer="fosslinux " +license="BSD-3-Clause" +homepage="http://www.arkkra.com/" +distfiles="ftp://ftp.arkkra.com/pub/unix/mup${version//.}src.tar.gz" +checksum=893f4cc794e9c351b5fc8f60b933da808f1ebf05e36c7ced7648f621d52da59c + +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 -Np0 -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 +}