summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2017-08-25 18:01:36 +0200
committerLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2017-08-25 18:01:36 +0200
commitba199bd08e6bbe2602ba0bdff93ea171e16710eb (patch)
tree58fe214c2de2bf5f22b25998e26a2c7fe984cb1b
parent47fff4698e2109c563a241892f3f907faa014268 (diff)
downloadmidipix_build-ba199bd08e6bbe2602ba0bdff93ea171e16710eb.tar.bz2
midipix_build-ba199bd08e6bbe2602ba0bdff93ea171e16710eb.tar.xz
vars/build.vars: move {pixman,cairo} to the end of ${LIB_PACKAGES_PACKAGES_X11} (via Redfoxmoon.)
-rw-r--r--vars/build.vars18
1 files changed, 9 insertions, 9 deletions
diff --git a/vars/build.vars b/vars/build.vars
index 9d10537c..79acf30f 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -253,13 +253,13 @@ LIB_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --targe
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 pixman cairo gzip libarchive
+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
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";
+libXaw libxkbfile pixman cairo";
LIB_PACKAGES_PACKAGES_LIBS="
cmake llvm_host";
LIB_PACKAGES_PACKAGES="
@@ -319,13 +319,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
: ${PKG_GLIB_ENV_VARS_EXTRA:=LIBFFI_CFLAGS=-I${PREFIX_NATIVE}/lib/libffi-3.2.1/include:LIBFFI_LIBS=-L${PREFIX_NATIVE}/lib -lffi};
: ${PKG_GLIB_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib};
: ${PKG_GLIB_MAKEFLAGS_BUILD_EXTRA:=V=99};
-: ${PKG_PIXMAN_VERSION:=0.34.0};
-: ${PKG_PIXMAN_URL:=https://www.cairographics.org/releases/pixman-${PKG_PIXMAN_VERSION}.tar.gz};
-: ${PKG_PIXMAN_SHA256SUM:=21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e};
-: ${PKG_CAIRO_VERSION:=1.15.6};
-: ${PKG_CAIRO_URL:=http://cairographics.org/snapshots/cairo-${PKG_CAIRO_VERSION}.tar.xz};
-: ${PKG_CAIRO_SHA256SUM:=5228e0a1f8fd14317f30f08f3dd72971bca432f8cdd2281d421fdcc2279de58c};
-: ${PKG_CAIRO_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2};
: ${PKG_GZIP_SHA256SUM:=1ff7aedb3d66a0d73f442f6261e4b3860df6fd6c94025c2cb31a202c9c60fe0e};
: ${PKG_GZIP_VERSION:=1.8};
: ${PKG_GZIP_URL:=https://ftp.gnu.org/gnu/gzip/gzip-${PKG_GZIP_VERSION}.tar.gz};
@@ -499,6 +492,13 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
: ${PKG_LIBXKBFILE_SHA256SUM:=51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16a};
: ${PKG_LIBXKBFILE_VERSION:=1.0.9};
: ${PKG_LIBXKBFILE_URL:=https://www.x.org/releases/individual/lib/libxkbfile-${PKG_LIBXKBFILE_VERSION}.tar.bz2};
+: ${PKG_PIXMAN_VERSION:=0.34.0};
+: ${PKG_PIXMAN_URL:=https://www.cairographics.org/releases/pixman-${PKG_PIXMAN_VERSION}.tar.gz};
+: ${PKG_PIXMAN_SHA256SUM:=21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e};
+: ${PKG_CAIRO_VERSION:=1.15.6};
+: ${PKG_CAIRO_URL:=http://cairographics.org/snapshots/cairo-${PKG_CAIRO_VERSION}.tar.xz};
+: ${PKG_CAIRO_SHA256SUM:=5228e0a1f8fd14317f30f08f3dd72971bca432f8cdd2281d421fdcc2279de58c};
+: ${PKG_CAIRO_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2};
: ${PKG_CMAKE_SHA256SUM:=7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe};
: ${PKG_CMAKE_VERSION:=3.6.3};