From 9243cc856805844454e7c652441ea27db2fc23f8 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Feb 2019 18:52:43 +0000 Subject: [PATCH 01/26] config/functions: add cross-compile property support --- config/functions | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/functions b/config/functions index 0d8d532e622..c7012473eee 100644 --- a/config/functions +++ b/config/functions @@ -332,7 +332,7 @@ setup_toolchain() { } create_meson_conf() { - local endian root + local endian root properties case "$1" in target|init) endian="little" root="$SYSROOT_PREFIX/usr" @@ -342,6 +342,8 @@ create_meson_conf() { ;; esac + properties="PKG_MESON_PROPERTIES_${1^^}" + cat > $2 < Date: Thu, 31 Jan 2019 23:20:38 +0000 Subject: [PATCH 02/26] glibc: update to glibc-2.29 --- packages/devel/glibc/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk index a487ed0aa9a..07e93d0b45b 100644 --- a/packages/devel/glibc/package.mk +++ b/packages/devel/glibc/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="glibc" -PKG_VERSION="2.28" -PKG_SHA256="b1900051afad76f7a4f73e71413df4826dce085ef8ddb785a945b66d7d513082" +PKG_VERSION="2.29" +PKG_SHA256="f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/libc/" PKG_URL="http://ftp.gnu.org/pub/gnu/glibc/$PKG_NAME-$PKG_VERSION.tar.xz" From 7ffc044f29d1956d45055a5a02bcd8cb0e0b1a76 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Feb 2019 07:51:50 +0000 Subject: [PATCH 03/26] gdb: update to gdb-8.2.1 --- packages/debug/gdb/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/debug/gdb/package.mk b/packages/debug/gdb/package.mk index 10c51b7229f..ffc3e7c934a 100644 --- a/packages/debug/gdb/package.mk +++ b/packages/debug/gdb/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="gdb" -PKG_VERSION="8.1" -PKG_SHA256="af61a0263858e69c5dce51eab26662ff3d2ad9aa68da9583e8143b5426be4b34" +PKG_VERSION="8.2.1" +PKG_SHA256="0a6a432907a03c5c8eaad3c3cffd50c00a40c3a5e3c4039440624bae703f2202" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/gdb/" PKG_URL="http://ftpmirror.gnu.org/gdb/$PKG_NAME-$PKG_VERSION.tar.xz" From 21c71b7a30fc07a85c76a64d8cbf52d5619f7b7c Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Feb 2019 07:58:18 +0000 Subject: [PATCH 04/26] glib: update to glib-2.59.1, switch to meson --- packages/devel/glib/package.mk | 62 ++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk index a6ee22122af..7fcc34a0568 100644 --- a/packages/devel/glib/package.mk +++ b/packages/devel/glib/package.mk @@ -3,44 +3,48 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="glib" -PKG_VERSION="2.53.5" -PKG_SHA256="991421f41a4ed4cc1637e5f9db0d03fd236d2cbd19f3c5b097a343bec5126602" +PKG_VERSION="2.59.1" +PKG_SHA256="d11f1ca55ccd00dd0abf800c2f42d9cc5e3803be321ff6bc79eb3ce2ca1863f0" PKG_LICENSE="LGPL" PKG_SITE="http://www.gtk.org/" PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_VERSION%.*}/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="toolchain zlib libffi Python2:host util-linux" -PKG_DEPENDS_HOST="libffi:host pcre:host" +PKG_DEPENDS_HOST="libffi:host Python3:host" +PKG_DEPENDS_TARGET="toolchain pcre zlib libffi Python3:host util-linux" PKG_LONGDESC="A library which includes support routines for C such as lists, trees, hashes, memory allocation." -PKG_TOOLCHAIN="autotools" +PKG_TOOLCHAIN="meson" -PKG_CONFIGURE_OPTS_HOST="PCRE_LIBS=-l:libpcre.a \ - --enable-static \ - --disable-shared \ - --disable-libmount \ - --with-python=python" -PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_snprintf_c99=yes \ - ac_cv_func_vsnprintf_c99=yes \ - glib_cv_stack_grows=no \ - glib_cv_uscore=no \ - glib_cv_va_val_copy=no \ - --disable-selinux \ - --disable-fam \ - --enable-xattr \ - --disable-libelf \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-man \ - --disable-dtrace \ - --disable-systemtap \ - --enable-Bsymbolic \ - --with-gnu-ld \ - --with-threads=posix \ - --with-pcre=internal \ - --with-python=python" +PKG_MESON_OPTS_HOST="-Ddefault_library=static \ + -Dinternal_pcre=true \ + -Dinstalled_tests=false \ + -Dlibmount=false" + +PKG_MESON_OPTS_TARGET="-Ddefault_library=shared \ + -Dinternal_pcre=false \ + -Dinstalled_tests=false \ + -Dselinux=disabled \ + -Dfam=false \ + -Dxattr=true \ + -Dgtk_doc=false \ + -Dman=false \ + -Ddtrace=false \ + -Dsystemtap=false \ + -Dbsymbolic_functions=true \ + -Dforce_posix_threads=true" + +PKG_MESON_PROPERTIES_TARGET=" +have_c99_vsnprintf=false +have_c99_snprintf=false +growing_stack=false +va_val_copy=false" + +pre_configure_target() { + LDFLAGS+=" -lz" +} post_makeinstall_target() { rm -rf $INSTALL/usr/bin rm -rf $INSTALL/usr/lib/gdbus-2.0 rm -rf $INSTALL/usr/lib/glib-2.0 + rm -rf $INSTALL/usr/lib/installed-tests rm -rf $INSTALL/usr/share } From 0a3d8698d952c35374c4597acb4e4519e1753cad Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Feb 2019 08:01:20 +0000 Subject: [PATCH 05/26] libaio: update to libaio-0.3.111 --- packages/devel/libaio/package.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/devel/libaio/package.mk b/packages/devel/libaio/package.mk index 4d973e585ac..084f456b04a 100644 --- a/packages/devel/libaio/package.mk +++ b/packages/devel/libaio/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2017 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libaio" -PKG_VERSION="0.3.110" -PKG_SHA256="e019028e631725729376250e32b473012f7cb68e1f7275bfc1bbcdd0f8745f7e" +PKG_VERSION="0.3.111" +PKG_SHA256="62cf871ad8fd09eb3418f00aca7a7d449299b8e1de31c65f28bf6a2ef1fa502a" PKG_LICENSE="GPL" PKG_SITE="http://lse.sourceforge.net/io/aio.html" PKG_URL="http://http.debian.net/debian/pool/main/liba/libaio/${PKG_NAME}_${PKG_VERSION}.orig.tar.gz" From a900ca0c689f756fed4635fdd493b723ad4d3032 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Feb 2019 08:06:02 +0000 Subject: [PATCH 06/26] flatbuffers: update to flatbuffers-1.10.0 --- packages/devel/flatbuffers/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devel/flatbuffers/package.mk b/packages/devel/flatbuffers/package.mk index 7e6f7ea7f8e..cf5ee8a38f8 100644 --- a/packages/devel/flatbuffers/package.mk +++ b/packages/devel/flatbuffers/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="flatbuffers" -PKG_VERSION="1.9.0" -PKG_SHA256="5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3" +PKG_VERSION="1.10.0" +PKG_SHA256="3714e3db8c51e43028e10ad7adffb9a36fc4aa5b1a363c2d0c4303dd1be59a7c" PKG_LICENSE="Apache-2.0" PKG_SITE="https://github.com/google/flatbuffers" PKG_URL="https://github.com/google/flatbuffers/archive/v$PKG_VERSION.tar.gz" From 925bdf959247e830aebdeb105508d4c9415489de Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Feb 2019 08:07:08 +0000 Subject: [PATCH 07/26] elfutils: update to elfutils-0.175 --- packages/devel/elfutils/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devel/elfutils/package.mk b/packages/devel/elfutils/package.mk index 6a2cedbc36a..7b67dd8e210 100644 --- a/packages/devel/elfutils/package.mk +++ b/packages/devel/elfutils/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="elfutils" -PKG_VERSION="0.173" -PKG_SHA256="b76d8c133f68dad46250f5c223482c8299d454a69430d9aa5c19123345a000ff" +PKG_VERSION="0.175" +PKG_SHA256="f7ef925541ee32c6d15ae5cb27da5f119e01a5ccdbe9fe57bf836730d7b7a65b" PKG_LICENSE="GPL" PKG_SITE="https://sourceware.org/elfutils/" PKG_URL="https://sourceware.org/elfutils/ftp/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" From 7bea6bdafc34b18c1fdd367363026fe1cd3b06ef Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Feb 2019 08:10:35 +0000 Subject: [PATCH 08/26] libftdi1: update to libftdi1-1.4 --- packages/devel/libftdi1/package.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/devel/libftdi1/package.mk b/packages/devel/libftdi1/package.mk index 6ec495365e9..855252fc7f8 100644 --- a/packages/devel/libftdi1/package.mk +++ b/packages/devel/libftdi1/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libftdi1" -PKG_VERSION="1.3" -PKG_SHA256="9a8c95c94bfbcf36584a0a58a6e2003d9b133213d9202b76aec76302ffaa81f4" +PKG_VERSION="1.4" +PKG_SHA256="ec36fb49080f834690c24008328a5ef42d3cf584ef4060f3a35aa4681cb31b74" PKG_LICENSE="LGPL" PKG_SITE="http://www.intra2net.com/en/developer/libftdi/" PKG_URL="http://www.intra2net.com/en/developer/libftdi/download/${PKG_NAME}-${PKG_VERSION}.tar.bz2" From 5cb8fbf72b0b52369167dca274ad2a7f76d7c291 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Feb 2019 08:11:30 +0000 Subject: [PATCH 09/26] libusb: update to libusb-1.0.22 --- packages/sysutils/libusb/package.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/libusb/package.mk b/packages/sysutils/libusb/package.mk index e7985a58c8d..c7f88df518b 100644 --- a/packages/sysutils/libusb/package.mk +++ b/packages/sysutils/libusb/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libusb" -PKG_VERSION="1.0.21" -PKG_SHA256="7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b" +PKG_VERSION="1.0.22" +PKG_SHA256="75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157" PKG_LICENSE="LGPLv2.1" PKG_SITE="http://libusb.info/" PKG_URL="$SOURCEFORGE_SRC/libusb/files/$PKG_NAME-$PKG_VERSION.tar.bz2" From 747151e91f927a2ff711637eff47f317dfdf40cd Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Feb 2019 08:12:59 +0000 Subject: [PATCH 10/26] flex: update to flex-2.6.0 --- packages/devel/flex/package.mk | 5 +++-- packages/devel/flex/patches/flex-002-nodocs.patch | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/devel/flex/package.mk b/packages/devel/flex/package.mk index 091e4c2cfa0..b186f9f4ca6 100644 --- a/packages/devel/flex/package.mk +++ b/packages/devel/flex/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="flex" -PKG_VERSION="2.5.39" -PKG_SHA256="add2b55f3bc38cb512b48fad7d72f43b11ef244487ff25fc00aabec1e32b617f" +PKG_VERSION="2.6.0" +PKG_SHA256="24e611ef5a4703a191012f80c1027dc9d12555183ce0ecd46f3636e587e9b8e9" PKG_LICENSE="GPL" PKG_SITE="http://flex.sourceforge.net/" PKG_URL="$SOURCEFORGE_SRC/flex/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/devel/flex/patches/flex-002-nodocs.patch b/packages/devel/flex/patches/flex-002-nodocs.patch index ebe9089ab3b..9ed2daa2c34 100644 --- a/packages/devel/flex/patches/flex-002-nodocs.patch +++ b/packages/devel/flex/patches/flex-002-nodocs.patch @@ -3,7 +3,7 @@ @@ -117,7 +117,6 @@ SUBDIRS = \ lib \ - . \ + src \ - doc \ examples \ po \ From 227fc6caa689782079b518463b848be434432fea Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Feb 2019 08:13:51 +0000 Subject: [PATCH 11/26] fribidi: update to fribidi-1.0.5 --- packages/devel/fribidi/package.mk | 6 ++- .../fribidi/patches/fribidi-001-PR88.patch | 40 +++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 packages/devel/fribidi/patches/fribidi-001-PR88.patch diff --git a/packages/devel/fribidi/package.mk b/packages/devel/fribidi/package.mk index 83dc8ab0061..8079ea2651f 100644 --- a/packages/devel/fribidi/package.mk +++ b/packages/devel/fribidi/package.mk @@ -1,14 +1,16 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="fribidi" -PKG_VERSION="1.0.1" -PKG_SHA256="c1b182d70590b6cdb5545bab8149de33b966800f27f2d9365c68917ed5a174e4" +PKG_VERSION="1.0.5" +PKG_SHA256="6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce" PKG_LICENSE="LGPL" PKG_SITE="http://fribidi.freedesktop.org/" PKG_URL="https://github.com/fribidi/fribidi/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A bidirectional algorithm library." +PKG_TOOLCHAIN="configure" PKG_BUILD_FLAGS="+pic" PKG_CONFIGURE_OPTS_TARGET="--disable-shared \ diff --git a/packages/devel/fribidi/patches/fribidi-001-PR88.patch b/packages/devel/fribidi/patches/fribidi-001-PR88.patch new file mode 100644 index 00000000000..fed4c230327 --- /dev/null +++ b/packages/devel/fribidi/patches/fribidi-001-PR88.patch @@ -0,0 +1,40 @@ +From 96b735d2ca4b59bd0e9211c5f445c804f9e3804a Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Fri, 7 Sep 2018 20:57:11 +0200 +Subject: [PATCH] Build generator executables natively + +They are run during the build and not installed in the end. Without +this one gets the following error from meson: "ERROR: Can not use +target gen-unicode-version as a generator because it is cross-built +and no exe wrapper is defined. You might want to set it to native +instead." + +Closes #87. +--- + gen.tab/meson.build | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/gen.tab/meson.build b/gen.tab/meson.build +index 6006d98..8c21e98 100644 +--- a/gen.tab/meson.build ++++ b/gen.tab/meson.build +@@ -33,7 +33,8 @@ gen_unicode_version = executable('gen-unicode-version', + 'gen-unicode-version.c', + include_directories: incs, + c_args: native_args, +- install: false) ++ install: false, ++ native: true) + + fribidi_unicode_version_h = custom_target('fribidi-unicode-version.h', + input: files('unidata/ReadMe.txt', 'unidata/BidiMirroring.txt'), +@@ -67,7 +68,8 @@ foreach tab : tabs + gen_prog_src, 'packtab.c', + include_directories: incs, + c_args: native_args, +- install: false) ++ install: false, ++ native: true) + + tab_inc_file = custom_target(gen_prog_name, + input: gen_prog_inputs, From bdc0e594418fba6163ee4d6b50a821494e7bd57a Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Feb 2019 08:14:40 +0000 Subject: [PATCH 12/26] mpfr: update to mpfr-4.0.1 --- packages/devel/mpfr/package.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/devel/mpfr/package.mk b/packages/devel/mpfr/package.mk index 31a2e605376..e9b73f0ceb3 100644 --- a/packages/devel/mpfr/package.mk +++ b/packages/devel/mpfr/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mpfr" -PKG_VERSION="3.1.5" -PKG_SHA256="015fde82b3979fbe5f83501986d328331ba8ddf008c1ff3da3c238f49ca062bc" +PKG_VERSION="4.0.1" +PKG_SHA256="67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e" PKG_LICENSE="LGPL" PKG_SITE="http://www.mpfr.org/" PKG_URL="http://ftpmirror.gnu.org/mpfr/$PKG_NAME-$PKG_VERSION.tar.xz" From 6c86e66a52dcd6c4938e0f0db644460bb5ffa5d7 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Feb 2019 08:15:10 +0000 Subject: [PATCH 13/26] mpc: update to mpc-1.1.0 --- packages/devel/mpc/package.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/devel/mpc/package.mk b/packages/devel/mpc/package.mk index f89534c7ec6..351f2e32951 100644 --- a/packages/devel/mpc/package.mk +++ b/packages/devel/mpc/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mpc" -PKG_VERSION="1.0.3" -PKG_SHA256="617decc6ea09889fb08ede330917a00b16809b8db88c29c31bfbb49cbf88ecc3" +PKG_VERSION="1.1.0" +PKG_SHA256="6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e" PKG_LICENSE="LGPL" PKG_SITE="http://www.multiprecision.org" PKG_URL="http://ftpmirror.gnu.org/mpc/$PKG_NAME-$PKG_VERSION.tar.gz" From e8ec14208e7635ade25c7aca3919e22f7cb9c572 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Feb 2019 08:16:05 +0000 Subject: [PATCH 14/26] cmake: update to cmake-3.13.4 --- packages/devel/cmake/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devel/cmake/package.mk b/packages/devel/cmake/package.mk index 97eac133113..a2a1c145ee4 100644 --- a/packages/devel/cmake/package.mk +++ b/packages/devel/cmake/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="cmake" -PKG_VERSION="3.13.2" -PKG_SHA256="c925e7d2c5ba511a69f43543ed7b4182a7d446c274c7480d0e42cd933076ae25" +PKG_VERSION="3.13.4" +PKG_SHA256="fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b" PKG_LICENSE="BSD" PKG_SITE="http://www.cmake.org/" PKG_URL="http://www.cmake.org/files/v${PKG_VERSION%.*}/$PKG_NAME-$PKG_VERSION.tar.gz" From 53cbb9f01a7f85ef6a0050c6f73d92b7a3154700 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Feb 2019 08:16:57 +0000 Subject: [PATCH 15/26] libcap: update to libcap-2.26 --- packages/devel/libcap/package.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/devel/libcap/package.mk b/packages/devel/libcap/package.mk index 73a075aaf32..c922947c0cb 100644 --- a/packages/devel/libcap/package.mk +++ b/packages/devel/libcap/package.mk @@ -1,10 +1,11 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2010-2011 Roman Weber (roman@openelec.tv) # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libcap" -PKG_VERSION="2.25" -PKG_SHA256="693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162" +PKG_VERSION="2.26" +PKG_SHA256="b630b7c484271b3ba867680d6a14b10a86cfa67247a14631b14c06731d5a458b" PKG_LICENSE="GPL" PKG_SITE="" PKG_URL="http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$PKG_NAME-$PKG_VERSION.tar.xz" From e229b0a73fe3e7c071545f24b5a576f8472f4af4 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Feb 2019 08:17:40 +0000 Subject: [PATCH 16/26] libfmt: update to libfmt-5.3.0 --- packages/devel/libfmt/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devel/libfmt/package.mk b/packages/devel/libfmt/package.mk index a2c976f54a2..d1d87c11b57 100644 --- a/packages/devel/libfmt/package.mk +++ b/packages/devel/libfmt/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libfmt" -PKG_VERSION="5.1.0" -PKG_SHA256="73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44" +PKG_VERSION="5.3.0" +PKG_SHA256="defa24a9af4c622a7134076602070b45721a43c51598c8456ec6f2c4dbb51c89" PKG_LICENSE="BSD" PKG_SITE="https://github.com/fmtlib/fmt" PKG_URL="https://github.com/fmtlib/fmt/archive/$PKG_VERSION.tar.gz" From 9a80218954a637ebb78e06320692cfe949b4585d Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Feb 2019 08:18:21 +0000 Subject: [PATCH 17/26] readline: update to readline-8.0 --- packages/devel/readline/package.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/devel/readline/package.mk b/packages/devel/readline/package.mk index 7e3ceba513b..02734e965dd 100644 --- a/packages/devel/readline/package.mk +++ b/packages/devel/readline/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="readline" -PKG_VERSION="7.0" -PKG_SHA256="750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334" +PKG_VERSION="8.0" +PKG_SHA256="e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" PKG_LICENSE="MIT" PKG_SITE="http://www.gnu.org/software/readline/" PKG_URL="http://ftpmirror.gnu.org/readline/$PKG_NAME-$PKG_VERSION.tar.gz" From 4f3bc3eb193bfddaa6e12f631ff159df32a96939 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Feb 2019 18:03:10 +0000 Subject: [PATCH 18/26] meson: update to meson-0.49.1 --- packages/python/devel/meson/package.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/python/devel/meson/package.mk b/packages/python/devel/meson/package.mk index 0e34988c13a..c6b4ced8e59 100644 --- a/packages/python/devel/meson/package.mk +++ b/packages/python/devel/meson/package.mk @@ -2,12 +2,12 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="meson" -PKG_VERSION="0.47.2" -PKG_SHA256="92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb" +PKG_VERSION="0.49.1" +PKG_SHA256="e90c8ee46109d3b9d9a12c76c65811d4a7f7e18503f780eb301866e43d9052cb" PKG_LICENSE="Apache" PKG_SITE="http://mesonbuild.com" PKG_URL="https://github.com/mesonbuild/meson/releases/download/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_HOST="Python3:host pathlib:host" +PKG_DEPENDS_HOST="Python3:host setuptools:host pathlib:host" PKG_LONGDESC="High productivity build system" PKG_TOOLCHAIN="manual" @@ -20,7 +20,5 @@ makeinstall_host() { # Avoid using full path to python3 that may exceed 128 byte limit. # Instead use PATH as we know our toolchain is first. - for f in meson mesonconf mesontest mesonintrospect wraptool; do - sed -i '1 s/^#!.*$/#!\/usr\/bin\/env python3/' $TOOLCHAIN/bin/$f - done + sed -e '1 s/^#!.*$/#!\/usr\/bin\/env python3/' -i $TOOLCHAIN/bin/meson } From ad6c9ea874913b77d0a629114f8577564e45304d Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 2 Feb 2019 13:10:52 +0000 Subject: [PATCH 19/26] systemd: fix meson 0.49.1 compatability https://github.com/systemd/systemd/pull/9885 Drop patch with systemd-241 --- .../systemd/patches/systemd-0300-PR9885.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 packages/sysutils/systemd/patches/systemd-0300-PR9885.patch diff --git a/packages/sysutils/systemd/patches/systemd-0300-PR9885.patch b/packages/sysutils/systemd/patches/systemd-0300-PR9885.patch new file mode 100644 index 00000000000..5369bde373a --- /dev/null +++ b/packages/sysutils/systemd/patches/systemd-0300-PR9885.patch @@ -0,0 +1,40 @@ +From 1c04c791e85f9dd5e16ae846d0c0b0a99a47076e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Sun, 19 Aug 2018 19:11:30 +0200 +Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra + +Meson added -Doptimization and -Ddebug options, which obviously causes +a conflict with our -Ddebug options. Let's rename it. + +Fixes #9883. +--- + meson.build | 2 +- + meson_options.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index f79ac4b12e7..2209c935ad6 100644 +--- a/meson.build ++++ b/meson.build +@@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty')) + + enable_debug_hashmap = false + enable_debug_mmap_cache = false +-foreach name : get_option('debug') ++foreach name : get_option('debug-extra') + if name == 'hashmap' + enable_debug_hashmap = true + elif name == 'mmap-cache' +diff --git a/meson_options.txt b/meson_options.txt +index e3140c8c110..7b1f61bf464 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh', + description : 'path to debug shell binary') + option('debug-tty', type : 'string', value : '/dev/tty9', + description : 'specify the tty device for debug shell') +-option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], ++option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], + description : 'enable extra debugging') + option('memory-accounting-default', type : 'boolean', + description : 'enable MemoryAccounting= by default') From c05928eaa1eb1b08c48b16009d406d68fb978c0a Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 2 Feb 2019 12:05:35 +0000 Subject: [PATCH 20/26] gtk3: update to gtk3-3.24.4 --- .../addons/addon-depends/chrome-depends/gtk3/package.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/addons/addon-depends/chrome-depends/gtk3/package.mk b/packages/addons/addon-depends/chrome-depends/gtk3/package.mk index ad764698c1e..169cded7f0c 100644 --- a/packages/addons/addon-depends/chrome-depends/gtk3/package.mk +++ b/packages/addons/addon-depends/chrome-depends/gtk3/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="gtk3" -PKG_VERSION="3.22.30" -PKG_SHA256="a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567" +PKG_VERSION="3.24.4" +PKG_SHA256="d84f59ff02a87cc90c9df4a572a13eca4e3506e2bf511e2b9cbdb4526fa0cb9c" PKG_LICENSE="LGPL" PKG_SITE="http://www.gtk.org/" PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_VERSION:0:4}/gtk+-$PKG_VERSION.tar.xz" @@ -25,8 +25,9 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-cups \ pre_configure_target() { LIBS="$LIBS -lXcursor" - export PKG_CONFIG_PATH="$(get_build_dir pango)/.$TARGET_NAME" - export CFLAGS="$CFLAGS -I$(get_build_dir pango) -L$(get_build_dir pango)/.$TARGET_NAME/pango" + export PKG_CONFIG_PATH="$(get_build_dir pango)/.$TARGET_NAME/meson-private:$(get_build_dir gdk-pixbuf)/.$TARGET_NAME/meson-private:$(get_build_dir shared-mime-info)/.$TARGET_NAME" + export CFLAGS="$CFLAGS -I$(get_build_dir pango) -I$(get_build_dir pango)/.$TARGET_NAME -L$(get_build_dir pango)/.$TARGET_NAME/pango" + export GLIB_COMPILE_RESOURCES=glib-compile-resources GLIB_MKENUMS=glib-mkenums GLIB_GENMARSHAL=glib-genmarshal } makeinstall_target() { From 5cc1cad7c2223a145b8cec70db721cbb6423592e Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 2 Feb 2019 12:05:56 +0000 Subject: [PATCH 21/26] pango: update to pango-1.43.0 --- packages/addons/addon-depends/chrome-depends/pango/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/chrome-depends/pango/package.mk b/packages/addons/addon-depends/chrome-depends/pango/package.mk index 96cb1188c0b..8ee26acc0b8 100644 --- a/packages/addons/addon-depends/chrome-depends/pango/package.mk +++ b/packages/addons/addon-depends/chrome-depends/pango/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pango" -PKG_VERSION="1.42.1" -PKG_SHA256="915a6756b298578ff27c7a6393f8c2e62e6e382f9411f2504d7af1a13c7bce32" +PKG_VERSION="1.43.0" +PKG_SHA256="d2c0c253a5328a0eccb00cdd66ce2c8713fabd2c9836000b6e22a8b06ba3ddd2" PKG_LICENSE="GPL" PKG_SITE="http://www.pango.org/" PKG_URL="https://ftp.gnome.org/pub/gnome/sources/pango/${PKG_VERSION:0:4}/pango-$PKG_VERSION.tar.xz" From 6214bb7da5805c565410f034446f6951d29045b6 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 2 Feb 2019 12:06:17 +0000 Subject: [PATCH 22/26] gdk-pixbuf: update to gdk-pixbuf-2.38.0 --- .../addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk b/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk index b89b7df98b7..9f742841ed3 100644 --- a/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk +++ b/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="gdk-pixbuf" -PKG_VERSION="2.36.12" -PKG_SHA256="fff85cf48223ab60e3c3c8318e2087131b590fd6f1737e42cb3759a3b427a334" +PKG_VERSION="2.38.0" +PKG_SHA256="dd50973c7757bcde15de6bcd3a6d462a445efd552604ae6435a0532fbbadae47" PKG_LICENSE="OSS" PKG_SITE="http://www.gtk.org/" PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_VERSION:0:4}/gdk-pixbuf-$PKG_VERSION.tar.xz" From 126a0600eb9c241331e0965d5d992eabfab6921f Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 2 Feb 2019 19:03:22 +0000 Subject: [PATCH 23/26] ninja: update to ninja-1.9.0 --- packages/python/devel/ninja/package.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/python/devel/ninja/package.mk b/packages/python/devel/ninja/package.mk index ba0091cfdd3..4d5970bef41 100644 --- a/packages/python/devel/ninja/package.mk +++ b/packages/python/devel/ninja/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ninja" -PKG_VERSION="1.8.2" -PKG_SHA256="86b8700c3d0880c2b44c2ff67ce42774aaf8c28cbf57725cb881569288c1c6f4" +PKG_VERSION="1.9.0" +PKG_SHA256="5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9" PKG_LICENSE="Apache" PKG_SITE="http://martine.github.io/ninja/" PKG_URL="https://github.com/ninja-build/ninja/archive/v$PKG_VERSION.tar.gz" From a8152c358172062935c19ca9d13466ca624158e5 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 2 Feb 2019 22:55:35 +0000 Subject: [PATCH 24/26] libarchive: update to libarchive-3.3.3, drop ninja-1.9.0 incompatible patch static patch causes following libarchive failure when building with ninja-1.9.0: -- Configuring done -- Generating done CMake Warning: Manually-specified variables were not used by the project: ENABLE_SHARED ENABLE_STATIC -- Build files have been written to: /home/ubuntu/projects/LibreELEC.tv/build.LibreELEC-RPi2.arm-9.0-devel/libarchive-3.3.3/.armv7ve-libreelec-linux-gnueabi Executing (target): ninja ninja: error: build.ninja:2600: multiple rules generate libarchive/libarchive.a [-w dupbuild=err] --- packages/compress/libarchive/package.mk | 9 +++++--- .../patches/libarchive-01-die-Werror.patch | 21 ++++++++++++++++--- .../patches/libarchive-02-static-please.patch | 14 ------------- 3 files changed, 24 insertions(+), 20 deletions(-) delete mode 100644 packages/compress/libarchive/patches/libarchive-02-static-please.patch diff --git a/packages/compress/libarchive/package.mk b/packages/compress/libarchive/package.mk index ea25b94429c..9d4bb6f7d6c 100644 --- a/packages/compress/libarchive/package.mk +++ b/packages/compress/libarchive/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libarchive" -PKG_VERSION="3.3.2" -PKG_SHA256="ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce" +PKG_VERSION="3.3.3" +PKG_SHA256="ba7eb1781c9fbbae178c4c6bad1c6eb08edab9a1496c64833d1715d022b30e2e" PKG_LICENSE="GPL" PKG_SITE="https://www.libarchive.org" PKG_URL="https://www.libarchive.org/downloads/$PKG_NAME-$PKG_VERSION.tar.gz" @@ -11,8 +11,11 @@ PKG_DEPENDS_HOST="toolchain" PKG_DEPENDS_TARGET="toolchain" PKG_SHORTDESC="A multi-format archive and compression library." -PKG_CMAKE_OPTS_TARGET="-DENABLE_SHARED=0 -DENABLE_STATIC=1 -DCMAKE_POSITION_INDEPENDENT_CODE=1 -DENABLE_EXPAT=0 -DENABLE_ICONV=0 -DENABLE_LIBXML2=0 -DENABLE_LZO=1 -DENABLE_TEST=0 -DENABLE_COVERAGE=0" +PKG_CMAKE_OPTS_TARGET="-DCMAKE_POSITION_INDEPENDENT_CODE=1 -DENABLE_EXPAT=0 -DENABLE_ICONV=0 -DENABLE_LIBXML2=0 -DENABLE_LZO=1 -DENABLE_TEST=0 -DENABLE_COVERAGE=0" post_makeinstall_target() { rm -rf $INSTALL + + # delete the shared library as we only want static + rm $SYSROOT_PREFIX/usr/lib/libarchive.so* } diff --git a/packages/compress/libarchive/patches/libarchive-01-die-Werror.patch b/packages/compress/libarchive/patches/libarchive-01-die-Werror.patch index 9a831f2a2ec..d3410e234f9 100644 --- a/packages/compress/libarchive/patches/libarchive-01-die-Werror.patch +++ b/packages/compress/libarchive/patches/libarchive-01-die-Werror.patch @@ -1,11 +1,14 @@ -From f3c2f0ca7916288c72da07a2c3352b85b8f96e55 Mon Sep 17 00:00:00 2001 +From cd88d92aa23f6f32aedd54f9a83c118ede4ee799 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Sat, 11 Nov 2017 23:42:40 +0100 Subject: [PATCH] die Werror +--- + CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73bf07b..08e8f49 100644 +index 80871bc..9bd5165 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,7 +96,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$") @@ -26,7 +29,7 @@ index 73bf07b..08e8f49 100644 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow") -@@ -133,7 +133,7 @@ +@@ -133,7 +133,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^XL$") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qflag=w:w") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qinfo=pro:use") ENDIF(CMAKE_C_COMPILER_ID MATCHES "^XL$") @@ -35,3 +38,15 @@ index 73bf07b..08e8f49 100644 ################################################################# # Set compile flags for debug build. # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug" +@@ -172,7 +172,7 @@ IF (MSVC) + ################################################################# + # Set compile flags for release build. + SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Oi") +-ENDIF (MSVC) ++ENDIF (0) + + # Enable CTest/CDash support + include(CTest) +-- +2.7.4 + diff --git a/packages/compress/libarchive/patches/libarchive-02-static-please.patch b/packages/compress/libarchive/patches/libarchive-02-static-please.patch deleted file mode 100644 index fb2bbc275a2..00000000000 --- a/packages/compress/libarchive/patches/libarchive-02-static-please.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- libarchive/libarchive/CMakeLists.txt -+++ libarchive/libarchive/CMakeLists.txt -@@ -224,9 +224,9 @@ - ENDIF() - - # Libarchive is a shared library --ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS}) -+ADD_LIBRARY(archive STATIC ${libarchive_SOURCES} ${include_HEADERS}) - TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS}) --SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION}) -+SET_TARGET_PROPERTIES(archive PROPERTIES COMPILE_DEFINITIONS LIBARCHIVE_STATIC) - - # archive_static is a static library - ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS}) From cb21c54f20ee44c3d1ca5d0eccd5dbfc88cf9fd1 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sun, 3 Feb 2019 10:33:13 +0000 Subject: [PATCH 25/26] binutils: update to binutils-2.32 --- packages/devel/binutils/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devel/binutils/package.mk b/packages/devel/binutils/package.mk index 19c4a738e1f..ea5f57e296f 100644 --- a/packages/devel/binutils/package.mk +++ b/packages/devel/binutils/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="binutils" -PKG_VERSION="2.31.1" -PKG_SHA256="e88f8d36bd0a75d3765a4ad088d819e35f8d7ac6288049780e2fefcad18dde88" +PKG_VERSION="2.32" +PKG_SHA256="9b0d97b3d30df184d302bced12f976aa1e5fbf4b0be696cdebc6cca30411a46e" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/binutils/" PKG_URL="http://ftpmirror.gnu.org/binutils/$PKG_NAME-$PKG_VERSION.tar.gz" From 29d3fa383035aa273b4d96abc386b0081607d99e Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 7 Feb 2019 22:23:15 +0000 Subject: [PATCH 26/26] libretro-mame: fix genie/glibc cross-compile issue --- packages/emulation/libretro-mame/package.mk | 3 ++- .../patches/libretro-mame-0001-fix-makefile.patch | 14 -------------- packages/emulation/libretro-mame2016/package.mk | 3 ++- .../libretro-mame2016-01-crosscompile.patch | 15 --------------- 4 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 packages/emulation/libretro-mame/patches/libretro-mame-0001-fix-makefile.patch delete mode 100644 packages/emulation/libretro-mame2016/patches/libretro-mame2016-01-crosscompile.patch diff --git a/packages/emulation/libretro-mame/package.mk b/packages/emulation/libretro-mame/package.mk index 93bb19566f9..eab96f4dec9 100644 --- a/packages/emulation/libretro-mame/package.mk +++ b/packages/emulation/libretro-mame/package.mk @@ -29,7 +29,8 @@ make_target() { make REGENIE=1 VERBOSE=1 NOWERROR=1 PYTHON_EXECUTABLE=python2 CONFIG=libretro \ LIBRETRO_OS="unix" ARCH="" PROJECT="" LIBRETRO_CPU="$ARCH" DISTRO="debian-stable" \ - CC="$CC" CXX="$CXX" LD="$LD" CROSS_BUILD="" PTR64="$PTR64" TARGET="mame" \ + CROSS_BUILD="1" OVERRIDE_CC="$CC" OVERRIDE_CXX="$CXX" \ + PTR64="$PTR64" TARGET="mame" \ SUBTARGET="arcade" PLATFORM="$ARCH" RETRO=1 OSD="retro" } diff --git a/packages/emulation/libretro-mame/patches/libretro-mame-0001-fix-makefile.patch b/packages/emulation/libretro-mame/patches/libretro-mame-0001-fix-makefile.patch deleted file mode 100644 index 9bd7cd5bff8..00000000000 --- a/packages/emulation/libretro-mame/patches/libretro-mame-0001-fix-makefile.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur a/3rdparty/genie/build/gmake.linux/genie.make b/3rdparty/genie/build/gmake.linux/genie.make ---- a/3rdparty/genie/build/gmake.linux/genie.make 2017-06-28 12:47:18.000000000 -0700 -+++ b/3rdparty/genie/build/gmake.linux/genie.make 2017-07-14 12:21:57.302218319 -0700 -@@ -28,10 +28,6 @@ - RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 - endif - --CC = gcc --CXX = g++ --AR = ar -- - ifndef RESCOMP - ifdef WINDRES - RESCOMP = $(WINDRES) diff --git a/packages/emulation/libretro-mame2016/package.mk b/packages/emulation/libretro-mame2016/package.mk index 5d1b79170bf..5d1f55e48b7 100644 --- a/packages/emulation/libretro-mame2016/package.mk +++ b/packages/emulation/libretro-mame2016/package.mk @@ -23,7 +23,8 @@ make_target() { make REGENIE=1 VERBOSE=1 NOWERROR=1 PYTHON_EXECUTABLE=python2 CONFIG=libretro \ LIBRETRO_OS="unix" ARCH="" PROJECT="" LIBRETRO_CPU="$ARCH" DISTRO="debian-stable" \ - CC="$CC" CXX="$CXX" LD="$LD" CROSS_BUILD="" PTR64="$PTR64" TARGET="mame" \ + CROSS_BUILD="1" OVERRIDE_CC="$CC" OVERRIDE_CXX="$CXX" \ + PTR64="$PTR64" TARGET="mame" \ SUBTARGET="arcade" PLATFORM="$ARCH" RETRO=1 OSD="retro" } diff --git a/packages/emulation/libretro-mame2016/patches/libretro-mame2016-01-crosscompile.patch b/packages/emulation/libretro-mame2016/patches/libretro-mame2016-01-crosscompile.patch deleted file mode 100644 index 6c59619723c..00000000000 --- a/packages/emulation/libretro-mame2016/patches/libretro-mame2016-01-crosscompile.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/makefile -+++ b/makefile -@@ -336,9 +336,9 @@ - else - PYTHON := $(PYTHON_EXECUTABLE) - endif --CC := $(SILENT)gcc --LD := $(SILENT)g++ --CXX:= $(SILENT)g++ -+CC ?= $(SILENT)gcc -+LD ?= $(SILENT)g++ -+CXX?= $(SILENT)g++ - - #------------------------------------------------- - # specify OSD layer: windows, sdl, etc.