audio/ocp: Updated for version 0.2.99. New maintainer.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

7 files changed, 103 insertions, 124 deletions

diff --git a/audio/ocp/README b/audio/ocp/README
index 08e94c54e2..160781bf9e 100644
--- a/audio/ocp/README
+++ b/audio/ocp/README
@@ -1,3 +1,34 @@
-Open Cubic Player is a music file player. It is derived from Cubic
-Player 2.0 which was developed by Niklas Beisert. It can play MOD, IT,
-S3M, XM and many other formats.
+Open Cubic Player is a music file player for Linux, Unix, DOS,
+Windows 95-ME and XP.
+
+OCP is derived from the Cubic Player 2.0 alpha ppe which was developed
+by Niklas Beisert. Linux rewrite/porting is done by Stian Skjelstad.
+OPENCP is published under the GNU General Public License (GPL).
+
+Supported formats:
+    669 - 669 Composer module
+    AMS - Velvet Studio module
+    BPA - Death Ralley archive
+    CDA - compact disk CD audio track
+    DMF - X Tracker module
+    IT - Impulse Tracker module
+    MDL - Digi Tracker module
+    MID - standard midi file
+    MOD - amiga ProTracker 1.1b module and variants
+    MP3 - MPEG audio format level 1-3
+    MTM - Multi Tracker module
+    MXM - Mxmplay module
+    OKT - Oktalyzer module
+    PLS - playlist, works also with M3U and PLT playlist files
+    PTM - Poly Tracker module
+    S3M - Sream Tracker 3 module
+    SID - PSID sid file
+    UMX - Unreal module file
+    ULT - Ultra Tracker module
+    WAV - Microsoft RIFF wave file
+    WOW - WOW Tracker module
+    XM - Fast Tracker 2 module
+
+Depends on unifont ttf support which is not enabled by default by
+gnu-unifont. Please see gnu-unifont README for information on how to
+enable it. In 14.0.04 this was done with FONTFORMATS=otf,ttf,pcf,psf,otb
diff --git a/audio/ocp/configure.ac.diff b/audio/ocp/configure.ac.diff
deleted file mode 100644
index 906aeb8bb1..0000000000
--- a/audio/ocp/configure.ac.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-From 21ebd384f78d9933b6e58554db5726e4b3c42efa Mon Sep 17 00:00:00 2001
-From: Stian Skjelstad <stian.skjelstad@gmail.com>
-Date: Wed, 3 Feb 2021 10:41:31 +0100
-Subject: [PATCH] Do not block unknown compiler-versions. We do deny-list
- instead of allow-list. Fixes #30
-
----
- configure    | 16 +++++-----------
- configure.ac | 14 ++++----------
- 2 files changed, 9 insertions(+), 21 deletions(-)
-
-diff --git a/configure b/configure
-index 004dad4..59227f1 100755
---- a/configure
-+++ b/configure
-@@ -6470,19 +6470,13 @@ else
- 		'')
- 			as_fn_error $? "not found" "$LINENO" 5;
- 			;;
--		2.95.[2-9]|2.95.[2-9][-].*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*|6.*|7*|8*|9*|10*)
--			_cc_major=`echo $cc_version | cut -d '.' -f 1`
--			_cc_minor=`echo $cc_version | cut -d '.' -f 2`
--			_cc_mini=`echo $cc_version | cut -d '.' -f 3`
--			if test $_cc_major -gt 2; then
--				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_version, ok" >&5
--$as_echo "$cc_version, ok" >&6; }
--			else
--				as_fn_error $? "$cc_version, bad" "$LINENO" 5
--			fi
-+# old GCC versions in the 2.95.xx family are known to produce bad crashing binaries (it is still out there on some old systems. In general the all versions before 3.0 is risky
-+		2.95.[2-9]|2.95.[2-9][-].*)
-+			as_fn_error $? "$cc_version, bad" "$LINENO" 5
- 			;;
- 		*)
--			as_fn_error $? "$cc_version, bad" "$LINENO" 5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_version, ok" >&5
-+$as_echo "$cc_version, ok" >&6; }
- 			;;
-        esac
- fi
-diff --git a/configure.ac b/configure.ac
-index fdf3f38..57d9138 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -132,18 +132,12 @@ else
- 		'')
- 			AC_MSG_ERROR([not found]);
- 			;;
--		2.95.[[2-9]]|2.95.[[2-9]][[-]].*|3.[[0-9]]|3.[[0-9]].[[0-9]]|3.[[0-9]]|3.[[0-9]].[[0-9]]-*|4.*|5.*|6.*|7*|8*|9*|10*)
--			_cc_major=`echo $cc_version | cut -d '.' -f 1`
--			_cc_minor=`echo $cc_version | cut -d '.' -f 2`
--			_cc_mini=`echo $cc_version | cut -d '.' -f 3`
--			if test $_cc_major -gt 2; then
--				AC_MSG_RESULT([$cc_version, ok])
--			else
--				AC_MSG_ERROR([$cc_version, bad])
--			fi
-+# old GCC versions in the 2.95.xx family are known to produce bad crashing binaries (it is still out there on some old systems. In general the all versions before 3.0 is risky
-+		2.95.[[2-9]]|2.95.[[2-9]][[-]].*)
-+			AC_MSG_ERROR([$cc_version, bad])
- 			;;
- 		*)
--			AC_MSG_ERROR([$cc_version, bad])
-+			AC_MSG_RESULT([$cc_version, ok])
- 			;;
-        esac
- fi
diff --git a/audio/ocp/doinst.sh b/audio/ocp/doinst.sh
index 63bf9ce82c..4c475479c7 100644
--- a/audio/ocp/doinst.sh
+++ b/audio/ocp/doinst.sh
@@ -1,5 +1,5 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+if [ -x /usr/bin/install-info ]; then
+  chroot . /usr/bin/install-info --info-dir=/usr/info /usr/info/ocp.info.gz 2> /dev/null
 fi
 
 if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
@@ -7,7 +7,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
-
-if [ -x /usr/bin/install-info ]; then
-  chroot . /usr/bin/install-info --info-dir=/usr/info /usr/info/ocp.info.gz 2> /dev/null
-fi
diff --git a/audio/ocp/douninst.sh b/audio/ocp/douninst.sh
new file mode 100644
index 0000000000..144841e195
--- /dev/null
+++ b/audio/ocp/douninst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/install-info ]; then
+  chroot . /usr/bin/install-info --remove --info-dir=/usr/info /usr/info/ocp.info.gz 2> /dev/null
+fi
diff --git a/audio/ocp/ocp.SlackBuild b/audio/ocp/ocp.SlackBuild
index 2e77ea3462..a47a0a2ef8 100644
--- a/audio/ocp/ocp.SlackBuild
+++ b/audio/ocp/ocp.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/bash
-#
-# Slackware build script for Open Cubic Player
-#
-# Copyright 2009-2020  Erik W. Hanson, Minneapolis, MN, USA
+
+# Slackware build script for ocp Open Cubic Player
+
+# Copyright 2022 SPN Team
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,25 +11,33 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ocp
-VERSION=${VERSION:-0.2.1}
+VERSION=${VERSION:-0.2.99}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
 # the name of the created package would be, and then exit. This information
 # could be useful to other scripts.
@@ -42,14 +50,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -64,7 +64,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -eu
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -79,28 +79,44 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 <$CWD/configure.ac.diff
-autoconf
-CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition" \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
-  --localstatedir=/var/lib \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux \
+  --with-unifontdir=/usr/share/fonts/TTF/ \
   --infodir=/usr/info \
-  --build=$ARCH-slackware-linux
+  --without-desktop_file_install
 
-make # -j1
+make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*.info*
+
+find $PKG -name perllocal.pod \
+  -o -name ".packlist" \
+  -o -name "*.bs" \
+  | xargs rm -f
 
-mkdir -p $PKG/usr/doc
-mv $PKG/usr/share/doc/ocp $PKG/usr/doc/$PRGNAM-$VERSION
-rmdir $PKG/usr/share/doc
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS BUGS COPYING CREDITS Changelog README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/ocp/ocp.info b/audio/ocp/ocp.info
index 2832ca4e7a..0406d51623 100644
--- a/audio/ocp/ocp.info
+++ b/audio/ocp/ocp.info
@@ -1,10 +1,10 @@
 PRGNAM="ocp"
-VERSION="0.2.1"
-HOMEPAGE="http://stian.cubic.org/project-ocp.php"
-DOWNLOAD="https://stian.cubic.org/ocp/ocp-0.2.1.tar.xz"
-MD5SUM="c50fa1649b4dc3331c13fbe470f147d1"
+VERSION="0.2.99"
+HOMEPAGE="http://cubic.org/player"
+DOWNLOAD="https://stian.cubic.org/ocp/ocp-0.2.99.tar.xz"
+MD5SUM="643c41d973594ede8b866f9b000554c1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
+REQUIRES="gnu-unifont xa cJSON %README%"
+MAINTAINER="SPN Team"
+EMAIL="pwmn-master@hotmail.com"
diff --git a/audio/ocp/slack-desc b/audio/ocp/slack-desc
index 5436f49510..ce8da61797 100644
--- a/audio/ocp/slack-desc
+++ b/audio/ocp/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
    |-----handy-ruler------------------------------------------------------|
-ocp: ocp (A module format music file player)
+ocp: ocp (Open Cubic Player, A music file player)
 ocp:
-ocp: OPENCP is a music file player. It is derived from Cubic Player 2.0
-ocp: which was developed by Niklas Beisert. It can play MOD, IT, S3M, XM
-ocp: and many other formats.
-ocp:
-ocp: Homepage: http://stian.lunafish.org/project-ocp.php
+ocp: OPENCP is a music file player for Linux, Unix, DOS, Windows 95-ME
+ocp: and XP. It is derived from the Cubic Player 2.0 alpha ppe which was
+ocp: developed by Niklas Beisert. Linux rewrite/porting is done by Stian
+ocp: Skjelstad.
 ocp:
 ocp:
 ocp:
 ocp:
+ocp: https://cubic.org/player/