From 7559cfe7016d7844373d3e8c425ef3ddf4b97b33 Mon Sep 17 00:00:00 2001 From: Xavier Date: Fri, 23 Sep 2022 22:12:18 -0400 Subject: [PATCH] Update to 0.2.100 and finalisation of PKGBUILD refactor. --- .SRCINFO | 5 +- PKGBUILD | 20 ++++---- fix-unifont.diff | 131 ----------------------------------------------- 3 files changed, 14 insertions(+), 142 deletions(-) delete mode 100644 fix-unifont.diff diff --git a/.SRCINFO b/.SRCINFO index 0d217f3..7c989ed 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = ocp pkgdesc = Open Cubic Player - pkgver = 0.2.99 + pkgver = 0.2.100 pkgrel = 1 url = https://stian.cubic.org/project-ocp.php install = ocp.install @@ -24,8 +24,9 @@ pkgbase = ocp depends = ttf-unifont depends = libdiscid depends = cjson + provides = ocp=0.2.100 conflicts = ocp-git - source = git+https://github.com/mywave82/opencubicplayer.git#tag=v0.2.99 + source = ocp::git+https://github.com/mywave82/opencubicplayer.git#tag=v0.2.100 md5sums = SKIP pkgname = ocp diff --git a/PKGBUILD b/PKGBUILD index 3ff851d..862c075 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,17 +1,19 @@ # Maintainer: Xavier (sapphirus at azorium dot net) # Original Maintainer: Ossi Saukko -_pkgbdir=opencubicplayer -pkgname=ocp -pkgver=0.2.99 +_pkgbase=ocp +pkgname=${_pkgbase} +pkgver=0.2.100 pkgrel=1 pkgdesc="Open Cubic Player" arch=('i686' 'x86_64') url="https://stian.cubic.org/project-ocp.php" license=('GPL') -install=ocp.install +install=${_pkgbase}.install + +conflicts=(${_pkgbase}-git) +provides=(${_pkgbase}=${pkgver}) -conflicts=('ocp-git') depends=('hicolor-icon-theme' 'libxxf86vm' @@ -32,22 +34,22 @@ makedepends=('git' 'xa' 'desktop-file-utils') -source=(git+https://github.com/mywave82/opencubicplayer.git#tag=v${pkgver}) +source=(${_pkgbase}::git+https://github.com/mywave82/opencubicplayer.git#tag=v${pkgver}) md5sums=('SKIP') prepare() { - cd $_pkgbdir + cd $_pkgbase git submodule init git submodule update --init --recursive } build() { - cd $_pkgbdir + cd $_pkgbase ./configure --prefix=/usr --sysconfdir=/etc --with-unifontdir=/usr/share/fonts/Unifont --with-unifont-ttf=/usr/share/fonts/Unifont/Unifont.ttf --with-unifont-csur-ttf=/usr/share/fonts/Unifont/Unifont_CSUR.ttf --with-unifont-upper-ttf=/usr/share/fonts/Unifont/Unifont_Upper.ttf make DESTDIR="$pkgdir" } package() { - cd $_pkgbdir + cd $_pkgbase make DESTDIR="$pkgdir" install } diff --git a/fix-unifont.diff b/fix-unifont.diff deleted file mode 100644 index 7fdc8c6..0000000 --- a/fix-unifont.diff +++ /dev/null @@ -1,131 +0,0 @@ -Index: asdf/configure -=================================================================== ---- asdf.orig/configure -+++ asdf/configure -@@ -9916,15 +9916,15 @@ fi - 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" -@@ -9936,18 +9936,18 @@ $as_echo "$ac_res" >&6; } - 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 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; } -+ 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" -@@ -9959,18 +9959,18 @@ $as_echo "$ac_res" >&6; } - 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 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; } -+ 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" -@@ -9982,7 +9982,7 @@ $as_echo "$ac_res" >&6; } - 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 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 -Index: asdf/configure.ac -=================================================================== ---- asdf.orig/configure.ac -+++ asdf/configure.ac -@@ -582,9 +582,9 @@ if test "x$HAVE_SDL" = "x1" || test "x$H - - 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 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 - -Index: asdf/stuff/poutput-fontengine.c -=================================================================== ---- asdf.orig/stuff/poutput-fontengine.c -+++ asdf/stuff/poutput-fontengine.c -@@ -393,22 +393,22 @@ int fontengine_init (void) - 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(); - } -