vars/build.vars: adds libcaca (HEAD) and toilet (HEAD) (via Redfoxmoon.)

patches/{libcaca,toilet}.local.patch: via Redfoxmoon.
vars/{libcaca,toilet}.vars: force config.sub.

5 files changed, 140 insertions, 2 deletions

diff --git a/patches/libcaca.local.patch b/patches/libcaca.local.patch
new file mode 100644
index 00000000..056e4854
--- /dev/null
+++ b/patches/libcaca.local.patch
@@ -0,0 +1,13 @@
+diff -ru libcaca.orig/Makefile.in libcaca/Makefile.in
+--- libcaca.orig/Makefile.in	2017-09-03 17:16:49.749749822 +0200
++++ libcaca/Makefile.in	2017-09-03 17:57:51.004186415 +0200
+@@ -424,8 +424,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I$(top_builddir)/caca
+-SUBDIRS = kernel caca src examples tools \
+-          cxx caca-sharp python ruby java doc
++SUBDIRS = kernel caca src examples tools
+ 
+ DIST_SUBDIRS = $(SUBDIRS) build
+ EXTRA_DIST = NOTES COPYING.GPL COPYING.ISC COPYING.LGPL bootstrap caca-config.in libcaca.spec libcaca.sln
diff --git a/patches/toilet.local.patch b/patches/toilet.local.patch
new file mode 100644
index 00000000..1e4cb555
--- /dev/null
+++ b/patches/toilet.local.patch
@@ -0,0 +1,97 @@
+diff -ru toilet.orig/configure toilet/configure
+--- toilet.orig/configure	2017-09-03 18:16:41.831887603 +0200
++++ toilet/configure	2017-09-03 18:22:18.302580756 +0200
+@@ -4412,81 +4412,6 @@
+ fi
+ 
+ 
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CACA" >&5
+-$as_echo_n "checking for CACA... " >&6; }
+-
+-if test -n "$CACA_CFLAGS"; then
+-    pkg_cv_CACA_CFLAGS="$CACA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"caca >= 0.99.beta18\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "caca >= 0.99.beta18") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_CACA_CFLAGS=`$PKG_CONFIG --cflags "caca >= 0.99.beta18" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$CACA_LIBS"; then
+-    pkg_cv_CACA_LIBS="$CACA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"caca >= 0.99.beta18\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "caca >= 0.99.beta18") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_CACA_LIBS=`$PKG_CONFIG --libs "caca >= 0.99.beta18" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        CACA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "caca >= 0.99.beta18" 2>&1`
+-        else
+-	        CACA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "caca >= 0.99.beta18" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$CACA_PKG_ERRORS" >&5
+-
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-  as_fn_error $? "you need libcaca version 0.99.beta18 or later" "$LINENO" 5
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-  as_fn_error $? "you need libcaca version 0.99.beta18 or later" "$LINENO" 5
+-else
+-	CACA_CFLAGS=$pkg_cv_CACA_CFLAGS
+-	CACA_LIBS=$pkg_cv_CACA_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	:
+-fi
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for release date" >&5
+ $as_echo_n "checking for release date... " >&6; }
+ tmp="${stamp%-*}"
+diff -ru toilet.orig/Makefile.in toilet/Makefile.in
+--- toilet.orig/Makefile.in	2017-09-03 18:16:42.175886270 +0200
++++ toilet/Makefile.in	2017-09-03 18:29:29.600903132 +0200
+@@ -310,7 +310,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = src tools fonts doc test
++SUBDIRS = src tools fonts test
+ DIST_SUBDIRS = $(SUBDIRS)
+ EXTRA_DIST = bootstrap
+ CACA2TLF = $(top_builddir)/tools/caca2tlf
diff --git a/vars/build.vars b/vars/build.vars
index d76486ce..0c8a2ca6 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -254,7 +254,7 @@ LIB_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 LIB_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 LIB_PACKAGES_PACKAGES_LEAVES="
 expat libxml2 apr apr_util bzip2 curl libz libpng libffi gdbm geoip pcre glib gzip libarchive
-libatomic_ops libpipeline libressl libevent libfetch libgpg_error libassuan libfirm libgcrypt
+libatomic_ops libpipeline libressl libevent libfetch libgpg_error libassuan libcaca libfirm libgcrypt
 libjpeg_turbo libksba lua ncurses ncursestw ncursesw npth sqlite3 tiff xz";
 LIB_PACKAGES_PACKAGES_X11="
 inputproto kbproto xcb_proto xproto libXau libpthread_stubs xcb xextproto xtrans libX11
@@ -360,6 +360,8 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_LIBASSUAN_SHA256SUM:=22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71};
 : ${PKG_LIBASSUAN_VERSION:=2.4.3};
 : ${PKG_LIBASSUAN_URL:=https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${PKG_LIBASSUAN_VERSION}.tar.bz2};
+: ${PKG_LIBCACA_URLS_GIT:=libcaca=https://github.com/cacalabs/libcaca@master};
+: ${PKG_LIBCACA_SUBDIR:=libcaca};
 : ${PKG_LIBFIRM_URLS_GIT:="libfirm=http://pp.info.uni-karlsruhe.de/git/libfirm.git@master bfirm=${GITROOT}/compilers/bfirm@main"};
 : ${PKG_LIBFIRM_BUILD_DIR:=cparser+libfirm/build/libfirm};
 : ${PKG_LIBFIRM_CONFIGURE:=bfirm/configure};
@@ -541,7 +543,7 @@ apk_tools bash bc bdwgc bind bison chicken clang_host coreutils cparser cron das
 dos2unix dropbear ed figlet file findutils gawk git gnupg grep hexcurse htop inetutils infounzip infozip irssi
 john ldns less lighttpd lynx make man_db mc mksh mtr nano netcat nginx openlitespeed openssh p7zip
 pacman patch perl procps_ng python3 qpdf rsync rxvt_unicode sed smallbasic socat tar tcsh the_silver_searcher
-tmux util_linux vim weechat wget which whois xeyes xwd zsh";
+tmux toilet util_linux vim weechat wget which whois xeyes xwd zsh";
 if [ -n "$(which ruby 2>/dev/null)" ]; then
 	LEAF_PACKAGES_PACKAGES="${LEAF_PACKAGES_PACKAGES:+${LEAF_PACKAGES_PACKAGES} }ruby";
 fi;
@@ -855,6 +857,10 @@ fi;
 : ${PKG_TMUX_SHA256SUM:=55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b};
 : ${PKG_TMUX_VERSION:=2.3};
 : ${PKG_TMUX_URL:=https://github.com/tmux/tmux/releases/download/${PKG_TMUX_VERSION}/tmux-${PKG_TMUX_VERSION}.tar.gz};
+: ${PKG_TOILET_URLS_GIT:=toilet=https://github.com/cacalabs/toilet@master};
+: ${PKG_TOILET_SUBDIR:=toilet};
+: ${PKG_TOILET_ENV_VARS_EXTRA:="CACA_LIBS=-L${PREFIX_NATIVE}/lib -lcaca"};
+: ${PKG_TOILET_CONFIGURE_ARGS_EXTRA:=--program-prefix=""};
 : ${PKG_UTIL_LINUX_SHA256SUM:=21ede7eb6c3a2a9c7b13eeee241e82428be4f6d5030ff488f638817f419af093};
 : ${PKG_UTIL_LINUX_VERSION:=2.27};
 : ${PKG_UTIL_LINUX_URL:=https://www.kernel.org/pub/linux/utils/util-linux/v${PKG_UTIL_LINUX_VERSION}/util-linux-${PKG_UTIL_LINUX_VERSION}.tar.gz};
diff --git a/vars/libcaca.vars b/vars/libcaca.vars
new file mode 100644
index 00000000..b9d77ac4
--- /dev/null
+++ b/vars/libcaca.vars
@@ -0,0 +1,21 @@
+#
+# set -o errexit -o noglob are assumed.
+#
+
+pkg_libcaca_configure_pre() {
+	find "${WORKDIR}/${PKG_SUBDIR}" -name config.sub				\
+		-exec echo mv -- {} {}.orig \;						\
+		-exec mv -- {} {}.orig \;						\
+		-exec echo install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \;	\
+		-exec install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \;;
+};
+
+pkg_toilet_configure_pre() {
+	find "${WORKDIR}/${PKG_SUBDIR}" -name config.sub				\
+		-exec echo mv -- {} {}.orig \;						\
+		-exec mv -- {} {}.orig \;						\
+		-exec echo install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \;	\
+		-exec install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \;;
+};
+
+# vim:filetype=sh
diff --git a/vars/toilet.vars b/vars/toilet.vars
new file mode 120000
index 00000000..758040c3
--- /dev/null
+++ b/vars/toilet.vars
@@ -0,0 +1 @@
+libcaca.vars
\ No newline at end of file