mirror of
https://aur.archlinux.org/ocp-git.git
synced 2024-10-22 21:42:56 +00:00
a35019a59f
There have been many updates to the OCP git version. I updated the PKGBUILD file again to work with the latest version. Unfortunately, the MAD support had to be left out for now as there were missing build instructions for charset.o. I'll try to introduce it back again with the new revisions. The package ttf-unifont is now a required dependency. A new patch was needed that changes the font filenames to match the package.
128 lines
6.5 KiB
Diff
128 lines
6.5 KiB
Diff
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();
|
|
}
|
|
|