diff --git a/.SRCINFO b/.SRCINFO index 0132c37..9f5e676 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = ocp-git pkgdesc = Open Cubic Player (GIT Version) - pkgver = 0.2.2.r477.2a03a68 + pkgver = 0.2.2.r482.f55e68c pkgrel = 1 url = http://stian.cubic.org/project-ocp.php install = ocp-git.install @@ -20,12 +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.2.r477.2a03a68 + provides = ocp=0.2.2.r482.f55e68c conflicts = ocp source = ocp::git://github.com/mywave82/opencubicplayer.git source = unifont.patch md5sums = SKIP - md5sums = 27d962f746ba8c6b761f6a62ae5d093a + md5sums = ce9883e1daacd9624c65be1bcdbb9124 pkgname = ocp-git diff --git a/PKGBUILD b/PKGBUILD index 76ee9d7..3535e3f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Ossi Saukko _name=ocp pkgname=ocp-git -pkgver=0.2.2.r477.2a03a68 +pkgver=0.2.2.r482.f55e68c pkgrel=1 pkgdesc="Open Cubic Player (GIT Version)" arch=('i686' 'x86_64') @@ -26,7 +26,7 @@ install=$pkgname.install source=("${_name}::git://github.com/mywave82/opencubicplayer.git" "unifont.patch") md5sums=('SKIP' - '27d962f746ba8c6b761f6a62ae5d093a') + 'ce9883e1daacd9624c65be1bcdbb9124') prepare() { cd "${srcdir}/${_name}" diff --git a/unifont.patch b/unifont.patch index b4c0af8..bade385 100644 --- a/unifont.patch +++ b/unifont.patch @@ -1,10 +1,10 @@ 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 @@ +--- package.orig/ocp/configure 2020-06-06 15:41:09.851035735 +0300 ++++ package.new/ocp/configure 2020-06-06 15:46:16.263149466 +0300 +@@ -9851,15 +9851,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; } @@ -21,14 +21,14 @@ diff --unified --recursive --text package.orig/ocp/configure package.new/ocp/con eval "$as_ac_File=yes" else eval "$as_ac_File=no" -@@ -9838,18 +9838,18 @@ +@@ -9871,18 +9871,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 +- as_fn_error $? "$UNIFONTDIR/unifont.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and SDL2)" "$LINENO" 5 ++ as_fn_error $? "$UNIFONTDIR/Unifont.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and 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; } @@ -45,14 +45,14 @@ diff --unified --recursive --text package.orig/ocp/configure package.new/ocp/con eval "$as_ac_File=yes" else eval "$as_ac_File=no" -@@ -9861,18 +9861,18 @@ +@@ -9894,18 +9894,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 +- as_fn_error $? "$UNIFONTDIR/unifont_csur.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and SDL2)" "$LINENO" 5 ++ as_fn_error $? "$UNIFONTDIR/Unifont_CSUR.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and 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; } @@ -69,38 +69,38 @@ diff --unified --recursive --text package.orig/ocp/configure package.new/ocp/con eval "$as_ac_File=yes" else eval "$as_ac_File=no" -@@ -9884,7 +9884,7 @@ +@@ -9917,7 +9917,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 +- as_fn_error $? "$UNIFONTDIR/unifont_upper.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and SDL2)" "$LINENO" 5 ++ as_fn_error $? "$UNIFONTDIR/Unifont_Upper.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and 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 @@ - +--- package.orig/ocp/configure.ac 2020-06-06 15:41:09.851035735 +0300 ++++ package.new/ocp/configure.ac 2020-06-06 15:47:48.977121525 +0300 +@@ -580,9 +580,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_CHECK_FILE($UNIFONTDIR/unifont.ttf, , AC_MSG_ERROR([$UNIFONTDIR/unifont.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and SDL2)])) +- AC_CHECK_FILE($UNIFONTDIR/unifont_csur.ttf, , AC_MSG_ERROR([$UNIFONTDIR/unifont_csur.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and SDL2)])) +- AC_CHECK_FILE($UNIFONTDIR/unifont_upper.ttf, , AC_MSG_ERROR([$UNIFONTDIR/unifont_upper.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and SDL2)])) ++ AC_CHECK_FILE($UNIFONTDIR/Unifont.ttf, , AC_MSG_ERROR([$UNIFONTDIR/Unifont.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and SDL2)])) ++ AC_CHECK_FILE($UNIFONTDIR/Unifont_CSUR.ttf, , AC_MSG_ERROR([$UNIFONTDIR/Unifont_CSUR.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and SDL2)])) ++ AC_CHECK_FILE($UNIFONTDIR/Unifont_Upper.ttf, , AC_MSG_ERROR([$UNIFONTDIR/Unifont_Upper.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and 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 +--- package.orig/ocp/stuff/poutput-fontengine.c 2020-06-06 15:41:09.891036012 +0300 ++++ package.new/ocp/stuff/poutput-fontengine.c 2020-06-06 15:48:33.550761797 +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) @@ -125,4 +125,4 @@ diff --unified --recursive --text package.orig/ocp/stuff/poutput-fontengine.c pa + fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/Unifont_Upper.ttf\") failed: %s\n", TTF_GetError()); TTF_ClearError(); } - +