summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>2018-02-16 14:00:26 +0000
committerLucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>2018-02-16 14:00:26 +0000
commit1e19b92147a0e30bda9dfee7e05b86683792ca15 (patch)
treec7d253abafbe18f02e2646b81626939e00fb353b
parenta8f4071fa72501ae940dc88ca8e572b4b8b8e811 (diff)
downloadmidipix_build-1e19b92147a0e30bda9dfee7e05b86683792ca15.tar.bz2
midipix_build-1e19b92147a0e30bda9dfee7e05b86683792ca15.tar.xz
vars/build.vars:fontconfig: updated to fontconfig v2.12.93 (via Redfoxmoon.)
vars/build.vars:freetype: updated to freetype v2.9 (via Redfoxmoon.) vars/build.vars:host_packages_deps: adds gperf_host v3.1 to build fontconfig v2.12.93. patches/fontconfig-2.12.93.local.patch: updated (via Redfoxmoon.)
-rw-r--r--patches/fontconfig-2.11.95.local.patch11
-rw-r--r--patches/fontconfig-2.12.93.local.patch12
-rw-r--r--vars/build.vars13
3 files changed, 20 insertions, 16 deletions
diff --git a/patches/fontconfig-2.11.95.local.patch b/patches/fontconfig-2.11.95.local.patch
deleted file mode 100644
index 23ff41f7..00000000
--- a/patches/fontconfig-2.11.95.local.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fontconfig-2.11.95/src/fcstat.orig.c 2017-06-06 21:01:30.722966877 +0200
-+++ fontconfig-2.11.95/src/fcstat.c 2017-06-06 21:01:56.538857991 +0200
-@@ -365,7 +365,7 @@
- # endif
- # if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME)
- p = buf.f_fstypename;
--# elif defined(__linux__)
-+# elif defined(__linux__) || defined(__midipix__)
- switch (buf.f_type)
- {
- case 0x6969: /* nfs */
diff --git a/patches/fontconfig-2.12.93.local.patch b/patches/fontconfig-2.12.93.local.patch
new file mode 100644
index 00000000..db221378
--- /dev/null
+++ b/patches/fontconfig-2.12.93.local.patch
@@ -0,0 +1,12 @@
+diff -ru fontconfig-2.12.93.orig/src/fcstat.c fontconfig-2.12.93/src/fcstat.c
+--- fontconfig-2.12.93.orig/src/fcstat.c 2017-10-12 08:51:29.000000000 +0200
++++ fontconfig-2.12.93/src/fcstat.c 2018-02-16 00:41:55.260139637 +0100
+@@ -375,7 +375,7 @@
+ # endif
+ # if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME)
+ p = buf.f_fstypename;
+-# elif defined(__linux__)
++# elif defined(__linux__) || defined(__midipix__)
+ switch (buf.f_type)
+ {
+ case 0x6969: /* nfs */
diff --git a/vars/build.vars b/vars/build.vars
index 3e39a593..c5a56ed6 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -281,7 +281,7 @@ HOST_PACKAGES_DEPS_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX} --program-pr
HOST_PACKAGES_DEPS_LDFLAGS_CONFIGURE="";
HOST_PACKAGES_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix=";
HOST_PACKAGES_DEPS_PACKAGES="
-cmake_host llvm_host clang_host file_host libffi_host glib_host
+cmake_host llvm_host clang_host file_host libffi_host glib_host gperf_host
infounzip_host infozip_host intltool_host python2_host python3_host ruby_host";
HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
: ${PKG_CMAKE_HOST_SHA256SUM:=7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe};
@@ -308,6 +308,9 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
: ${PKG_GLIB_HOST_CONFIGURE_ARGS_EXTRA:="--disable-dtrace --disable-libelf --disable-libmount"};
: ${PKG_GLIB_HOST_ENV_VARS_EXTRA:="LIBFFI_CFLAGS=-I${PREFIX}/lib/libffi-${PKG_LIBFFI_HOST_VERSION}/include:LIBFFI_LIBS=-L${PREFIX}/lib -lffi"};
: ${PKG_GLIB_HOST_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX}/lib};
+: ${PKG_GPERF_HOST_SHA256SUM:=588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2};
+: ${PKG_GPERF_HOST_VERSION:=3.1};
+: ${PKG_GPERF_HOST_URL:=https://ftp.gnu.org/gnu/gperf/gperf-${PKG_GPERF_HOST_VERSION}.tar.gz};
: ${PKG_INFOUNZIP_HOST_URLS_GIT:=infounzip-host=https://github.com/Redfoxmoon3/infounzip.git@master};
: ${PKG_INFOUNZIP_HOST_IN_TREE:=1};
: ${PKG_INFOZIP_HOST_URLS_GIT:=infozip-host=https://github.com/Redfoxmoon3/infozip.git@master};
@@ -576,11 +579,11 @@ NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python";
: ${PKG_LIBXEXT_SHA256SUM:=b518d4d332231f313371fdefac59e3776f4f0823bcb23cf7c7305bfb57b16e35};
: ${PKG_LIBXEXT_VERSION:=1.3.3};
: ${PKG_LIBXEXT_URL:=https://www.x.org/releases/individual/lib/libXext-${PKG_LIBXEXT_VERSION}.tar.bz2};
-: ${PKG_FREETYPE_SHA256SUM:=a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b};
-: ${PKG_FREETYPE_VERSION:=2.8};
+: ${PKG_FREETYPE_SHA256SUM:=e6ffba3c8cef93f557d1f767d7bc3dee860ac7a3aaff588a521e081bc36f4c8a};
+: ${PKG_FREETYPE_VERSION:=2.9};
: ${PKG_FREETYPE_URL:=http://download.savannah.gnu.org/releases/freetype/freetype-${PKG_FREETYPE_VERSION}.tar.bz2};
-: ${PKG_FONTCONFIG_SHA256SUM:=7b165eee7aa22dcc1557db56f58d905b6a14b32f9701c79427452474375b4c89};
-: ${PKG_FONTCONFIG_VERSION:=2.11.95};
+: ${PKG_FONTCONFIG_SHA256SUM:=0d297ce6bbad897c91c248aeeeeb401dbc62e0960cfa958e87ec32fd5c2270c1};
+: ${PKG_FONTCONFIG_VERSION:=2.12.93};
: ${PKG_FONTCONFIG_URL:=https://www.freedesktop.org/software/fontconfig/release/fontconfig-${PKG_FONTCONFIG_VERSION}.tar.bz2};
: ${PKG_FONTCONFIG_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2};
: ${PKG_FONTCONFIG_CONFIGURE_ARGS_EXTRA:=--disable-docs};