vars/build.vars: provide imlib2 URL from non-SF mirror and build {imlib2,libcaca} after freetype.

1 files changed, 13 insertions, 13 deletions

diff --git a/vars/build.vars b/vars/build.vars
index d989500d..debbd6b0 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -257,12 +257,12 @@ LIB_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 LIB_PACKAGES_PACKAGES_LEAVES="
 expat libxml2 alsa_lib apr apr_util bzip2 curl libz libpng libjpeg_turbo tiff giflib
 libffi gdbm geoip pcre libffi_host glib_host glib gzip libarchive libatomic_ops
-libpipeline libressl libevent libfetch libgpg_error libassuan imlib2 libcaca libfirm
-libgcrypt libksba lua ncurses ncursestw ncursesw npth sqlite3 xz";
+libpipeline libressl libevent libfetch libgpg_error libassuan libfirm libgcrypt
+libksba lua ncurses ncursestw ncursesw npth sqlite3 xz";
 LIB_PACKAGES_PACKAGES_X11="
 inputproto kbproto xcb_proto xproto libXau libpthread_stubs xcb xextproto xtrans libX11
 libXext freetype fontconfig renderproto Xrender libXft libICE libSM libXt libXmu libXpm
-libXaw libxkbfile pixman cairo pango atk gdk";
+libXaw libxkbfile pixman cairo pango atk gdk imlib2 libcaca";
 LIB_PACKAGES_PACKAGES_LIBS="
 cmake llvm_host";
 LIB_PACKAGES_PACKAGES="
@@ -325,11 +325,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_GIFLIB_VERSION:=5.1.4};
 : ${PKG_GIFLIB_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/giflib/giflib-${PKG_GIFLIB_VERSION}.tar.bz2};
 : ${PKG_GIFLIB_CONFIGURE_ARGS_EXTRA:=--disable-static};
-: ${PKG_IMLIB2_SHA256SUM:=3f698cd285cbbfc251c1d6405f249b99fafffafa5e0a5ecf0ca7ae49bbc0a272};
-: ${PKG_IMLIB2_VERSION:=1.4.10};
-: ${PKG_IMLIB2_URL:=http://downloads.sourceforge.net/enlightenment/imlib2-${PKG_IMLIB2_VERSION}.tar.bz2};
-: ${PKG_IMLIB2_CONFIGURE_ARGS_EXTRA:=--disable-mmx --disable-amd64};
-: ${PKG_IMLIB2_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2};
 : ${PKG_PCRE_SHA256SUM:=244838e1f1d14f7e2fa7681b857b3a8566b74215f28133f14a8f5e59241b682c};
 : ${PKG_PCRE_VERSION:=8.41};
 : ${PKG_PCRE_URL:=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PKG_PCRE_VERSION}.tar.gz};
@@ -398,11 +393,6 @@ 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_CONFIGURE_ARGS_EXTRA:=--program-prefix=};
-: ${PKG_LIBCACA_ENV_VARS_EXTRA:="IMLIB2_CFLAGS=-I${PREFIX_NATIVE}:IMLIB2_LIBS=-L${PREFIX_NATIVE}/lib -lImlib2"};
-: ${PKG_LIBCACA_LDFLAGS_BUILD_EXTRA:="-L${PREFIX_NATIVE}/lib -lImlib2"};
-: ${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};
@@ -556,6 +546,16 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_GDK_VERSION:=2.35.5};
 : ${PKG_GDK_SHA256SUM:=108c682022b260c90452f3e83de5faf2e41d5543fc1550e641f3ff9600fde5e6};
 : ${PKG_GDK_URL:=http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_GDK_VERSION%.*}/gdk-pixbuf-${PKG_GDK_VERSION}.tar.xz};
+: ${PKG_IMLIB2_SHA256SUM:=3f698cd285cbbfc251c1d6405f249b99fafffafa5e0a5ecf0ca7ae49bbc0a272};
+: ${PKG_IMLIB2_VERSION:=1.4.10};
+: ${PKG_IMLIB2_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/imlib2/imlib2-${PKG_IMLIB2_VERSION}.tar.bz2};
+: ${PKG_IMLIB2_CONFIGURE_ARGS_EXTRA:=--disable-mmx --disable-amd64};
+: ${PKG_IMLIB2_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2};
+: ${PKG_LIBCACA_URLS_GIT:=libcaca=https://github.com/cacalabs/libcaca@master};
+: ${PKG_LIBCACA_CONFIGURE_ARGS_EXTRA:=--program-prefix=};
+: ${PKG_LIBCACA_ENV_VARS_EXTRA:="IMLIB2_CFLAGS=-I${PREFIX_NATIVE}:IMLIB2_LIBS=-L${PREFIX_NATIVE}/lib -lImlib2"};
+: ${PKG_LIBCACA_LDFLAGS_BUILD_EXTRA:="-L${PREFIX_NATIVE}/lib -lImlib2"};
+: ${PKG_LIBCACA_SUBDIR:=libcaca};
 
 : ${PKG_CMAKE_SHA256SUM:=7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe};
 : ${PKG_CMAKE_VERSION:=3.6.3};