Adds inputproto v2.3.2, kbproto v1.0.7, xcb v1.12, xcb-proto v1.12, xextproto v7.3.0, xproto v7.0.29, xtrans v1.1, libpthread-stubs v0.3, libX11 v1.6.3, and libXau v1.0.8.

1 files changed, 53 insertions, 12 deletions

diff --git a/build.vars b/build.vars
index 4d93da1c..157c3857 100644
--- a/build.vars
+++ b/build.vars
@@ -16,20 +16,20 @@ else
 	log_msg failexit "Error: invalid architecture \`${ARCH}'.";
 fi;
 if [ "${BUILD:=debug}" = debug ]; then
-	PKG_LVL0_CFLAGS_CONFIGURE="-g2 -O0";
-	PKG_LVL1_CFLAGS_CONFIGURE="-g2 -O0";
-	PKG_LVL2_CFLAGS_CONFIGURE="-g3 -O0";
-	PKG_LVL3_CFLAGS_CONFIGURE="-g2 -O0";
+	PKG_LVL0_CFLAGS_CONFIGURE_DEFAULT="-g2 -O0";
+	PKG_LVL1_CFLAGS_CONFIGURE_DEFAULT="-g2 -O0";
+	PKG_LVL2_CFLAGS_CONFIGURE_DEFAULT="-g3 -O0";
+	PKG_LVL3_CFLAGS_CONFIGURE_DEFAULT="-g2 -O0";
 elif [ "${BUILD}" = release ]; then
-	PKG_LVL0_CFLAGS_CONFIGURE="-g0 -O2";
-	PKG_LVL1_CFLAGS_CONFIGURE="-g0 -O2";
-	PKG_LVL2_CFLAGS_CONFIGURE="-g0 -O2";
-	PKG_LVL3_CFLAGS_CONFIGURE="-g0 -O2";
+	PKG_LVL0_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
+	PKG_LVL1_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
+	PKG_LVL2_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
+	PKG_LVL3_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
 else
 	log_msg failexit "Error: unknown build type \`${BUILD}'.";
 fi;
 
-: ${PREFIX:=${HOME}/midipix/${ARCH}};
+: ${PREFIX:=${HOME}/midipix/${ARCH}/${BUILD}};
 : ${PREFIX_NATIVE:=${PREFIX}/native};
 : ${PREFIX_CROSS:=${PREFIX}/${TARGET}};
 : ${DLCACHEDIR:=${HOME}/midipix/dlcache};
@@ -67,18 +67,21 @@ DEFAULT_MAKEFLAGS_BUILD=-j8;
 PKG_BUILD_VARS="BUILD_CMDLINE BUILD_DIR BUILD_TYPE CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIG_CACHE_EXTRA CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA ENV_VARS_EXTRA FNAME GIT_ARGS_EXTRA INSTALL_FILES INSTALL_TARGET LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN NO_MAKE_INSTALL PREFIX_EXTRA SHA256SUM SLIBTOOL SUBDIR SUBDIR_CREATE URL URL_FNAME URL_TYPE VERSION";
 PKG_LVL0_PREFIX="${PREFIX_CROSS}";
 PKG_LVL0_BUILD_TYPE="host";
+PKG_LVL0_CFLAGS_CONFIGURE="${PKG_LVL0_CFLAGS_CONFIGURE_DEFAULT}";
 PKG_LVL0_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
 PKG_LVL1_PREFIX="${PREFIX_NATIVE}";
+PKG_LVL1_CFLAGS_CONFIGURE="${PKG_LVL1_CFLAGS_CONFIGURE_DEFAULT}";
 PKG_LVL1_CONFIGURE_ARGS="--disable-nls --host=${TARGET} --prefix=/ --target=${TARGET}";
 PKG_LVL1_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 PKG_LVL2_BUILD_TYPE="cross";
 PKG_LVL2_PREFIX="${PREFIX_NATIVE}";
+PKG_LVL2_CFLAGS_CONFIGURE="${PKG_LVL2_CFLAGS_CONFIGURE_DEFAULT}";
 PKG_LVL2_CONFIGURE_ARGS="--prefix= --strict --host=${TARGET}";
 PKG_LVL2_ENV_VARS_EXTRA="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib";
 PKG_LVL2_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 PKG_LVL2_URL_TYPE="git";
 PKG_LVL3_PREFIX="${PREFIX_NATIVE}";
-PKG_LVL3_CFLAGS_CONFIGURE="${PKG_LVL3_CFLAGS_CONFIGURE:+${PKG_LVL3_CFLAGS_CONFIGURE} }--sysroot=${PREFIX_NATIVE}";
+PKG_LVL3_CFLAGS_CONFIGURE="${PKG_LVL3_CFLAGS_CONFIGURE_DEFAULT:+${PKG_LVL3_CFLAGS_CONFIGURE_DEFAULT} }--sysroot=${PREFIX_NATIVE}";
 PKG_LVL3_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 PKG_LVL3_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
 PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
@@ -153,7 +156,7 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_PSXTYPES_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"};
 
 #
-# Build level 3 (3rd party packages)
+# Build level 3, 300-319 (3rd party packages)
 # Dependencies
 #
 : ${PKG_GDBM_VERSION:=1.12};
@@ -240,7 +243,45 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_XZ_URL:=http://tukaani.org/xz/xz-${PKG_XZ_VERSION}.tar.gz};
 
 #
-# Build level 3 (3rd party packages)
+# Build level 3, 320-339 (3rd party packages)
+# X11 dependencies
+#
+: ${PKG_INPUTPROTO_VERSION:=2.3.2};
+: ${PKG_INPUTPROTO_SHA256SUM:=893a6af55733262058a27b38eeb1edc733669f01d404e8581b167f03c03ef31d};
+: ${PKG_INPUTPROTO_URL:=https://www.x.org/releases/individual/proto/inputproto-${PKG_INPUTPROTO_VERSION}.tar.bz2};
+: ${PKG_KBPROTO_VERSION:=1.0.7};
+: ${PKG_KBPROTO_SHA256SUM:=f882210b76376e3fa006b11dbd890e56ec0942bc56e65d1249ff4af86f90b857};
+: ${PKG_KBPROTO_URL:=https://www.x.org/releases/individual/proto/kbproto-${PKG_KBPROTO_VERSION}.tar.bz2};
+: ${PKG_XCB_VERSION:=1.12};
+: ${PKG_XCB_SHA256SUM:=4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b};
+: ${PKG_XCB_URL:=https://www.x.org/releases/individual/xcb/libxcb-${PKG_XCB_VERSION}.tar.bz2};
+: ${PKG_XCB_CONFIGURE_ARGS_EXTRA:=--disable-randr};
+: ${PKG_XCB_MAKEFLAGS_BUILD_EXTRA:=V=99};
+: ${PKG_XCB_PROTO_VERSION:=1.12};
+: ${PKG_XCB_PROTO_SHA256SUM:=5922aba4c664ab7899a29d92ea91a87aa4c1fc7eb5ee550325c3216c480a4906};
+: ${PKG_XCB_PROTO_URL:=https://www.x.org/releases/individual/xcb/xcb-proto-${PKG_XCB_PROTO_VERSION}.tar.bz2};
+: ${PKG_XCB_PROTO_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_NATIVE}/"};
+: ${PKG_XEXTPROTO_VERSION:=7.3.0};
+: ${PKG_XEXTPROTO_SHA256SUM:=f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0};
+: ${PKG_XEXTPROTO_URL:=https://www.x.org/releases/individual/proto/xextproto-${PKG_XEXTPROTO_VERSION}.tar.bz2};
+: ${PKG_XPROTO_VERSION:=7.0.29};
+: ${PKG_XPROTO_SHA256SUM:=6c1a477092ca73233902b8d5f33012635c4b0208f17e7833cc7efe5c93ba9f8a};
+: ${PKG_XPROTO_URL:=https://www.x.org/releases/individual/proto/xproto-${PKG_XPROTO_VERSION}.tar.bz2};
+: ${PKG_XTRANS_VERSION:=1.1};
+: ${PKG_XTRANS_SHA256SUM:=16bc4646f105efd3d0dd105899ac19035d67acf50950ca8c70cf68772508272d};
+: ${PKG_XTRANS_URL:=https://www.x.org/releases/individual/lib/xtrans-${PKG_XTRANS_VERSION}.tar.bz2};
+: ${PKG_LIBPTHREAD_STUBS_VERSION:=0.3};
+: ${PKG_LIBPTHREAD_STUBS_SHA256SUM:=35b6d54e3cc6f3ba28061da81af64b9a92b7b757319098172488a660e3d87299};
+: ${PKG_LIBPTHREAD_STUBS_URL:=https://xcb.freedesktop.org/dist/libpthread-stubs-${PKG_LIBPTHREAD_STUBS_VERSION}.tar.bz2};
+: ${PKG_LIBX11_VERSION:=1.6.3};
+: ${PKG_LIBX11_SHA256SUM:=cf31a7c39f2f52e8ebd0db95640384e63451f9b014eed2bb7f5de03e8adc8111};
+: ${PKG_LIBX11_URL:=https://www.x.org/releases/individual/lib/libX11-${PKG_LIBX11_VERSION}.tar.bz2};
+: ${PKG_LIBXAU_VERSION:=1.0.8};
+: ${PKG_LIBXAU_SHA256SUM:=fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2};
+: ${PKG_LIBXAU_URL:=https://www.x.org/releases/individual/lib/libXau-${PKG_LIBXAU_VERSION}.tar.bz2};
+
+#
+# Build level 3, 340-399 (3rd party packages)
 # Leaf packages
 #
 : ${PKG_APK_TOOLS_VERSION:=2.6.6};