diff --git a/.SRCINFO b/.SRCINFO index 4ac6c10..b93047a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = ocp-git pkgdesc = Open Cubic Player (GIT Version) - pkgver = 0.2.1.r387.fdc6121 + pkgver = 0.2.1.r452.1f28294 pkgrel = 1 url = http://stian.cubic.org/project-ocp.php install = ocp-git.install @@ -12,6 +12,7 @@ pkgbase = ocp-git depends = hicolor-icon-theme depends = libxpm depends = libxxf86vm + depends = ttf-unifont optdepends = adplug: for OPL formats support optdepends = alsa-lib: for ALSA output optdepends = flac: for FLAC audio support @@ -19,10 +20,12 @@ pkgbase = ocp-git optdepends = libvorbis: for Vorbis audio support optdepends = sdl: for SDL user interface support optdepends = sdl2: for SDL2 user interface support - provides = ocp=0.2.1.r387.fdc6121 + provides = ocp=0.2.1.r452.1f28294 conflicts = ocp source = ocp::git://github.com/mywave82/opencubicplayer.git + source = unifont.patch md5sums = SKIP + md5sums = 27d962f746ba8c6b761f6a62ae5d093a pkgname = ocp-git diff --git a/PKGBUILD b/PKGBUILD index 957daf2..7e5e5d4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Ossi Saukko _name=ocp pkgname=ocp-git -pkgver=0.2.1.r387.fdc6121 +pkgver=0.2.1.r452.1f28294 pkgrel=1 pkgdesc="Open Cubic Player (GIT Version)" arch=('i686' 'x86_64') @@ -9,7 +9,8 @@ url="http://stian.cubic.org/project-ocp.php" license=('GPL') depends=('hicolor-icon-theme' 'libxpm' - 'libxxf86vm') + 'libxxf86vm' + 'ttf-unifont') optdepends=('adplug: for OPL formats support' 'alsa-lib: for ALSA output' 'flac: for FLAC audio support' @@ -22,8 +23,16 @@ makedepends=('git' provides=("${_name}=${pkgver}") conflicts=("${_name}") install=$pkgname.install -source=("${_name}::git://github.com/mywave82/opencubicplayer.git") -md5sums=('SKIP') +source=("${_name}::git://github.com/mywave82/opencubicplayer.git" + "unifont.patch") +md5sums=('SKIP' + '27d962f746ba8c6b761f6a62ae5d093a') + +prepare() { + cd "${srcdir}/${_name}" + # The ttf-unifont package changes the file names. This patch changes the OCP source code to use the same names. + patch --forward --strip=2 --input="${srcdir}/unifont.patch" +} pkgver() { cd "${srcdir}/${_name}" @@ -38,12 +47,16 @@ build() { # If both SDL and SDL2 are installed, then disable SDL. # Otherwise there are functions with similar names and linking fails. - CONFIG="--prefix=/usr --sysconfdir=/etc --with-timidity-default-path=/etc/timidity++/" + CONFIG="--prefix=/usr --sysconfdir=/etc --with-timidity-default-path=/etc/timidity++/ --with-unifontdir=/usr/share/fonts/Unifont" if [ -f /usr/include/SDL/SDL.h ] && [ -f /usr/include/SDL2/SDL.h ] then CONFIG="${CONFIG} --without-sdl" fi + # The revision r452.1f28294 lacks instructions on how to build playmp2/charset.o, which prevents us from making the package. + # Let us try to re-introduce MAD again in subsequent revisions. For now, we have to go without it. + CONFIG="${CONFIG} --without-mad" + ./configure ${CONFIG} make } diff --git a/unifont.patch b/unifont.patch new file mode 100644 index 0000000..b4c0af8 --- /dev/null +++ b/unifont.patch @@ -0,0 +1,128 @@ +diff --unified --recursive --text package.orig/ocp/configure package.new/ocp/configure +--- package.orig/ocp/configure 2020-04-19 14:55:17.089021923 +0300 ++++ package.new/ocp/configure 2020-04-19 14:58:43.770238001 +0300 +@@ -9818,15 +9818,15 @@ + prefix=$prefix_save + exec_prefix=$exec_prefix_save + +- as_ac_File=`$as_echo "ac_cv_file_$UNIFONTDIR/unifont.ttf" | $as_tr_sh` +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONTDIR/unifont.ttf" >&5 +-$as_echo_n "checking for $UNIFONTDIR/unifont.ttf... " >&6; } ++ as_ac_File=`$as_echo "ac_cv_file_$UNIFONTDIR/Unifont.ttf" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONTDIR/Unifont.ttf" >&5 ++$as_echo_n "checking for $UNIFONTDIR/Unifont.ttf... " >&6; } + if eval \${$as_ac_File+:} false; then : + $as_echo_n "(cached) " >&6 + else + test "$cross_compiling" = yes && + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +-if test -r "$UNIFONTDIR/unifont.ttf"; then ++if test -r "$UNIFONTDIR/Unifont.ttf"; then + eval "$as_ac_File=yes" + else + eval "$as_ac_File=no" +@@ -9838,18 +9838,18 @@ + if eval test \"x\$"$as_ac_File"\" = x"yes"; then : + + else +- as_fn_error $? "$UNIFONTDIR/unifont.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)" "$LINENO" 5 ++ as_fn_error $? "$UNIFONTDIR/Unifont.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)" "$LINENO" 5 + fi + +- as_ac_File=`$as_echo "ac_cv_file_$UNIFONTDIR/unifont_csur.ttf" | $as_tr_sh` +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONTDIR/unifont_csur.ttf" >&5 +-$as_echo_n "checking for $UNIFONTDIR/unifont_csur.ttf... " >&6; } ++ as_ac_File=`$as_echo "ac_cv_file_$UNIFONTDIR/Unifont_CSUR.ttf" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONTDIR/Unifont_CSUR.ttf" >&5 ++$as_echo_n "checking for $UNIFONTDIR/Unifont_CSUR.ttf... " >&6; } + if eval \${$as_ac_File+:} false; then : + $as_echo_n "(cached) " >&6 + else + test "$cross_compiling" = yes && + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +-if test -r "$UNIFONTDIR/unifont_csur.ttf"; then ++if test -r "$UNIFONTDIR/Unifont_CSUR.ttf"; then + eval "$as_ac_File=yes" + else + eval "$as_ac_File=no" +@@ -9861,18 +9861,18 @@ + if eval test \"x\$"$as_ac_File"\" = x"yes"; then : + + else +- as_fn_error $? "$UNIFONTDIR/unifont_csur.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)" "$LINENO" 5 ++ as_fn_error $? "$UNIFONTDIR/Unifont_CSUR.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)" "$LINENO" 5 + fi + +- as_ac_File=`$as_echo "ac_cv_file_$UNIFONTDIR/unifont_upper.ttf" | $as_tr_sh` +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONTDIR/unifont_upper.ttf" >&5 +-$as_echo_n "checking for $UNIFONTDIR/unifont_upper.ttf... " >&6; } ++ as_ac_File=`$as_echo "ac_cv_file_$UNIFONTDIR/Unifont_Upper.ttf" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONTDIR/Unifont_Upper.ttf" >&5 ++$as_echo_n "checking for $UNIFONTDIR/Unifont_Upper.ttf... " >&6; } + if eval \${$as_ac_File+:} false; then : + $as_echo_n "(cached) " >&6 + else + test "$cross_compiling" = yes && + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +-if test -r "$UNIFONTDIR/unifont_upper.ttf"; then ++if test -r "$UNIFONTDIR/Unifont_Upper.ttf"; then + eval "$as_ac_File=yes" + else + eval "$as_ac_File=no" +@@ -9884,7 +9884,7 @@ + if eval test \"x\$"$as_ac_File"\" = x"yes"; then : + + else +- as_fn_error $? "$UNIFONTDIR/unifont_upper.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)" "$LINENO" 5 ++ as_fn_error $? "$UNIFONTDIR/Unifont_Upper.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)" "$LINENO" 5 + fi + + cat >>confdefs.h <<_ACEOF +diff --unified --recursive --text package.orig/ocp/configure.ac package.new/ocp/configure.ac +--- package.orig/ocp/configure.ac 2020-04-19 14:55:17.089021923 +0300 ++++ package.new/ocp/configure.ac 2020-04-19 14:59:06.190369996 +0300 +@@ -557,9 +557,9 @@ + + dnl locate the ttf-unifont + AS_AC_EXPAND(UNIFONTDIR, $with_unifontdir) +- AC_CHECK_FILE($UNIFONTDIR/unifont.ttf, , AC_MSG_ERROR([$UNIFONTDIR/unifont.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)])) +- AC_CHECK_FILE($UNIFONTDIR/unifont_csur.ttf, , AC_MSG_ERROR([$UNIFONTDIR/unifont_csur.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)])) +- AC_CHECK_FILE($UNIFONTDIR/unifont_upper.ttf, , AC_MSG_ERROR([$UNIFONTDIR/unifont_upper.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)])) ++ AC_CHECK_FILE($UNIFONTDIR/Unifont.ttf, , AC_MSG_ERROR([$UNIFONTDIR/Unifont.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)])) ++ AC_CHECK_FILE($UNIFONTDIR/Unifont_CSUR.ttf, , AC_MSG_ERROR([$UNIFONTDIR/Unifont_CSUR.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)])) ++ AC_CHECK_FILE($UNIFONTDIR/Unifont_Upper.ttf, , AC_MSG_ERROR([$UNIFONTDIR/Unifont_Upper.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)])) + AC_DEFINE_UNQUOTED(UNIFONTDIR, "$UNIFONTDIR") + fi + +diff --unified --recursive --text package.orig/ocp/stuff/poutput-fontengine.c package.new/ocp/stuff/poutput-fontengine.c +--- package.orig/ocp/stuff/poutput-fontengine.c 2020-04-19 14:55:17.159022335 +0300 ++++ package.new/ocp/stuff/poutput-fontengine.c 2020-04-19 14:59:31.597186245 +0300 +@@ -393,22 +393,22 @@ + return 1; + } + +- unifont_bmp = TTF_OpenFontFilename(UNIFONTDIR "/unifont.ttf", 16, 0, 0, 0); ++ unifont_bmp = TTF_OpenFontFilename(UNIFONTDIR "/Unifont.ttf", 16, 0, 0, 0); + if (!unifont_bmp) + { +- fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/unifont.ttf\") failed: %s\n", TTF_GetError()); ++ fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/Unifont.ttf\") failed: %s\n", TTF_GetError()); + TTF_ClearError(); + } +- unifont_csur = TTF_OpenFontFilename(UNIFONTDIR "/unifont_csur.ttf", 16, 0, 0, 0); ++ unifont_csur = TTF_OpenFontFilename(UNIFONTDIR "/Unifont_CSUR.ttf", 16, 0, 0, 0); + if (!unifont_csur) + { +- fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/unifont_csur.ttf\") failed: %s\n", TTF_GetError()); ++ fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/Unifont_CSUR.ttf\") failed: %s\n", TTF_GetError()); + TTF_ClearError(); + } +- unifont_upper = TTF_OpenFontFilename(UNIFONTDIR "/unifont_upper.ttf", 16, 0, 0, 0); ++ unifont_upper = TTF_OpenFontFilename(UNIFONTDIR "/Unifont_Upper.ttf", 16, 0, 0, 0); + if (!unifont_upper) + { +- fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/unifont_upper.ttf\") failed: %s\n", TTF_GetError()); ++ fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/Unifont_Upper.ttf\") failed: %s\n", TTF_GetError()); + TTF_ClearError(); + } +