Merge pull request #64 from lrusak/upstream-changes

Thanks :)
This commit is contained in:
Christian Hewitt 2016-03-30 09:42:05 +04:00
commit f5c8ac208d
16 changed files with 194 additions and 15 deletions

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="cmake"
PKG_VERSION="3.5.0"
PKG_VERSION="3.5.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="BSD"

View File

@ -23,7 +23,7 @@ PKG_ARCH="any"
PKG_LICENSE="LGPL"
PKG_SITE="http://www.gtk.org/"
PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.46/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain zlib libffi pcre Python:host"
PKG_DEPENDS_TARGET="toolchain zlib libffi Python:host"
PKG_DEPENDS_HOST="libffi:host"
PKG_PRIORITY="optional"
PKG_SECTION="devel"
@ -53,7 +53,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_mmap_fixed_mapped=yes \
--enable-Bsymbolic \
--with-gnu-ld \
--with-threads=posix \
--with-pcre=system"
--with-pcre=internal"
post_makeinstall_target() {
mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig

View File

@ -86,6 +86,8 @@ post_makeinstall_target() {
cp misc/ncurses-config $ROOT/$TOOLCHAIN/bin
chmod +x $ROOT/$TOOLCHAIN/bin/ncurses-config
$SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $ROOT/$TOOLCHAIN/bin/ncurses-config
ln -sf ncurses-config $ROOT/$TOOLCHAIN/bin/ncurses5-config
ln -sf ncurses5-config $ROOT/$TOOLCHAIN/bin/ncurses6-config
rm -rf $INSTALL/usr/bin/ncurses*-config
}

View File

@ -0,0 +1,104 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
#
# OpenELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# OpenELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="cairo"
PKG_VERSION="1.14.6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"
PKG_SITE="http://cairographics.org/"
PKG_URL="http://cairographics.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain zlib freetype fontconfig libpng pixman"
PKG_PRIORITY="optional"
PKG_SECTION="graphics"
PKG_SHORTDESC="cairo: Multi-platform 2D graphics library"
PKG_LONGDESC="Cairo is a vector graphics library with cross-device output support. Currently supported output targets include the X Window System and in-memory image buffers. PostScript and PDF file output is planned. Cairo is designed to produce identical output on all output media while taking advantage of display hardware acceleration when available."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no" # ToDo
if [ "$DISPLAYSERVER" = "x11" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libXrender libX11 mesa glu"
PKG_CAIRO_CONFIG="--x-includes="$SYSROOT_PREFIX/usr/include" \
--x-libraries="$SYSROOT_PREFIX/usr/lib" \
--enable-xlib \
--enable-xlib-xrender \
--enable-gl \
--enable-glx \
--disable-glesv2 \
--disable-egl \
--with-x"
elif [ "$DISPLAYSERVER" = "weston" ]; then
PKG_CAIRO_CONFIG="--disable-xlib \
--disable-xlib-xrender \
--disable-gl \
--disable-glx \
--enable-glesv2 \
--enable-egl \
--without-x"
fi
PKG_CONFIGURE_OPTS_TARGET="$PKG_CAIRO_CONFIG \
--disable-silent-rules \
--enable-shared \
--disable-static \
--disable-gtk-doc \
--enable-largefile \
--enable-atomic \
--disable-gcov \
--disable-valgrind \
--disable-xcb \
--disable-xlib-xcb \
--disable-xcb-shm \
--disable-qt \
--disable-quartz \
--disable-quartz-font \
--disable-quartz-image \
--disable-win32 \
--disable-win32-font \
--disable-skia \
--disable-os2 \
--disable-beos \
--disable-cogl \
--disable-drm \
--disable-drm-xr \
--disable-gallium \
--disable-xcb-drm \
--enable-png \
--disable-directfb \
--disable-vg \
--disable-wgl \
--disable-script \
--enable-ft \
--enable-fc \
--enable-ps \
--enable-pdf \
--enable-svg \
--disable-test-surfaces \
--disable-tee \
--disable-xml \
--enable-pthread \
--disable-gobject \
--disable-full-testing \
--disable-trace \
--enable-interpreter \
--disable-symbol-lookup \
--enable-some-floating-point \
--with-gnu-ld"

View File

@ -23,7 +23,7 @@ PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.mesa3d.org/"
PKG_URL="ftp://freedesktop.org/pub/mesa/11.2.0/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain Python:host expat glproto dri2proto presentproto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11 systemd dri3proto libxshmfence"
PKG_DEPENDS_TARGET="toolchain Python:host expat glproto dri2proto presentproto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11 systemd dri3proto libxshmfence libressl"
PKG_PRIORITY="optional"
PKG_SECTION="graphics"
PKG_SHORTDESC="mesa: 3-D graphics library with OpenGL API"
@ -43,7 +43,7 @@ else
MESA_GALLIUM_LLVM="--disable-gallium-llvm"
fi
if [ "$VDPAU_SUPPORT" = "yes" ]; then
if [ "$VDPAU_SUPPORT" = "yes" -a "$DISPLAYSERVER" = "x11" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvdpau"
MESA_VDPAU="--enable-vdpau"
else

View File

@ -37,6 +37,7 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
--disable-shared \
--disable-mdi \
--enable-cxx \
--with-gl=no \
--with-jpeg-lib-dir=$SYSROOT_PREFIX/usr/lib \
--with-jpeg-include-dir=$SYSROOT_PREFIX/usr/include \
--without-x"

View File

@ -208,7 +208,7 @@ if [ ! "$KODIPLAYER_DRIVER" = default ]; then
fi
fi
if [ "$VDPAU_SUPPORT" = yes ]; then
if [ "$VDPAU_SUPPORT" = "yes" -a "$DISPLAYSERVER" = "x11" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvdpau"
KODI_VDPAU="--enable-vdpau"
else

View File

@ -42,7 +42,7 @@ else
FFMPEG_VAAPI="--disable-vaapi"
fi
if [ "$VDPAU_SUPPORT" = yes ]; then
if [ "$VDPAU_SUPPORT" = "yes" -a "$DISPLAYSERVER" = "x11" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvdpau"
FFMPEG_VDPAU="--enable-vdpau"
else

View File

@ -23,6 +23,7 @@ PKG_ARCH="any"
PKG_LICENSE="MIT"
PKG_SITE="http://xmlsoft.org"
PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS_HOST="toolchain zlib:host"
PKG_DEPENDS_TARGET="toolchain zlib"
PKG_PRIORITY="optional"
PKG_SECTION="textproc"
@ -32,16 +33,19 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_ansidecl_h=no \
PKG_CONFIGURE_OPTS_ALL="ac_cv_header_ansidecl_h=no \
--enable-static \
--enable-shared \
--disable-silent-rules \
--enable-ipv6 \
--without-python \
--with-zlib=$SYSROOT_PREFIX/usr \
--with-sysroot=$SYSROOT_PREFIX \
--with-zlib=$ROOT/$TOOLCHAIN \
--without-lzma"
PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_ALL --with-zlib=$ROOT/$TOOLCHAIN"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_ALL --with-zlib=$SYSROOT_PREFIX/usr --with-sysroot=$SYSROOT_PREFIX"
post_makeinstall_target() {
$SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/xml2-config

View File

@ -35,7 +35,7 @@ PKG_AUTORECONF="no"
# configure GPU drivers and dependencies:
get_graphicdrivers
if [ "$VDPAU_SUPPORT" = "yes" ]; then
if [ "$VDPAU_SUPPORT" = "yes" -a "$DISPLAYSERVER" = "x11" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET vdpauinfo"
fi

View File

@ -17,13 +17,13 @@
################################################################################
PKG_NAME="libinput"
PKG_VERSION="1.2.1"
PKG_VERSION="1.2.2"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.freedesktop.org/wiki/Software/libinput/"
PKG_URL="http://www.freedesktop.org/software/libinput/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain libevdev mtdev"
PKG_DEPENDS_TARGET="toolchain systemd libevdev mtdev"
PKG_PRIORITY="optional"
PKG_SECTION="wayland"
PKG_SHORTDESC="libinput is a library to handle input devices in Wayland compositors and to provide a generic X.Org input driver."

View File

@ -0,0 +1,40 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
#
# OpenELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# OpenELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="libxkbcommon"
PKG_VERSION="0.6.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://xkbcommon.org"
PKG_URL="http://xkbcommon.org/download/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_TARGET="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="wayland"
PKG_SHORTDESC="xkbcommon: a library to handle keyboard descriptions"
PKG_LONGDESC="xkbcommon is a library to handle keyboard descriptions, including loading them from disk, parsing them and handling their state. It's mainly meant for client toolkits, window systems, and other system applications; currently that includes Wayland, kmscon, GTK+, Qt, Clutter, and more. It is also used by some XCB applications for proper keyboard support."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
if [ "$DISPLAYSERVER" = "x11" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xkeyboard-config"
PKG_CONFIGURE_OPTS_TARGET="--enable-x11"
else
PKG_CONFIGURE_OPTS_TARGET="--disable-x11"
fi

View File

@ -32,3 +32,4 @@ PKG_LONGDESC="The mtdev is a stand-alone library which transforms all variants o
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"

View File

@ -25,7 +25,7 @@
# there: http://forum.xbmc.org/showthread.php?tid=177557
PKG_NAME="curl"
PKG_VERSION="7.47.1"
PKG_VERSION="7.48.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="MIT"

View File

@ -0,0 +1,27 @@
From 240cd84b494e0ffee8ad261c43b927d246cf6be1 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 23 Mar 2016 10:04:48 +0100
Subject: [PATCH] openssl: fix ERR_remove_thread_state() for boringssl/libressl
The removed arg is only done in OpenSSL
Bug: https://twitter.com/xtraemeat/status/712564874098917376
---
lib/vtls/openssl.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index cbf2d21..b7e4462 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -95,7 +95,9 @@
#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
#define HAVE_ERR_REMOVE_THREAD_STATE 1
-#if (OPENSSL_VERSION_NUMBER >= 0x10100004L)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100004L) && \
+ !defined(LIBRESSL_VERSION_NUMBER) && \
+ !defined(OPENSSL_IS_BORINGSSL)
/* OpenSSL 1.1.0-pre4 removed the argument! */
#define HAVE_ERR_REMOVE_THREAD_STATE_NOARG 1
#endif

View File

@ -1292,7 +1292,7 @@ CONFIG_SCSI_MVSAS=y
# CONFIG_SCSI_ESAS2R is not set
# CONFIG_MEGARAID_NEWGEN is not set
# CONFIG_MEGARAID_LEGACY is not set
# CONFIG_MEGARAID_SAS is not set
CONFIG_MEGARAID_SAS=yes
# CONFIG_SCSI_MPT3SAS is not set
# CONFIG_SCSI_MPT2SAS is not set
# CONFIG_SCSI_UFSHCD is not set