From 57807e40945203eff2e438dbad8ff3eac5bfc3da Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 25 Mar 2016 15:09:40 +0100 Subject: [PATCH 01/18] glib: build with internal pcre Signed-off-by: Stephan Raue --- packages/devel/glib/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk index a915719fab..3e69553c6c 100644 --- a/packages/devel/glib/package.mk +++ b/packages/devel/glib/package.mk @@ -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 From 02986bff4874db1fd69046f64768e8153f43bbfb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 27 Mar 2016 16:56:33 +0200 Subject: [PATCH 02/18] ncurses: create ncurses5-config and ncurses6-config Signed-off-by: Stephan Raue --- packages/devel/ncurses/package.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/devel/ncurses/package.mk b/packages/devel/ncurses/package.mk index d3ab285e4c..8f96f217c3 100644 --- a/packages/devel/ncurses/package.mk +++ b/packages/devel/ncurses/package.mk @@ -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 } From 03042d7410cde938da37a6cce77b4f3a99608308 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 27 Mar 2016 16:56:58 +0200 Subject: [PATCH 03/18] mesa: depends on libressl Signed-off-by: Stephan Raue --- packages/graphics/mesa/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk index d55b3dac16..ba0bd1da49 100644 --- a/packages/graphics/mesa/package.mk +++ b/packages/graphics/mesa/package.mk @@ -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" From b5bc006d8dc48a45dc457ba7dc4dbdf95e3fbd07 Mon Sep 17 00:00:00 2001 From: islipfd19 Date: Mon, 28 Mar 2016 09:30:43 -0400 Subject: [PATCH 04/18] Add Megaraid_sas support Adding this driver support will allow users that use megaraid sas card the ability to install and use OE. RAID functionalities supported by these cards are at the hardware level and no other packages are required. User mladen.perisic84 has tested both a modified 6.95.1 (7.0 beta 1) version of OE Enabling this on the current 7.0 branch will allow for easier upgrading for users that have built modified versions of the build. This user and other users that have this type of hardware and wish to use it will have the ability to. --- projects/Generic/linux/linux.x86_64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 2f449f2770..bc1c873ed7 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -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 From ad6f0bde0c8a97baf4e6cc1b7bcde69a6b621abd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 28 Mar 2016 04:50:39 +0200 Subject: [PATCH 05/18] cmake: update to cmake-3.5.1 Signed-off-by: Stephan Raue --- packages/devel/cmake/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devel/cmake/package.mk b/packages/devel/cmake/package.mk index 7828f65ddc..5046f3ce43 100644 --- a/packages/devel/cmake/package.mk +++ b/packages/devel/cmake/package.mk @@ -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" From a6589782c6d1f2a3c0276024e343b7f1d68ea9cb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 28 Mar 2016 04:50:57 +0200 Subject: [PATCH 06/18] curl: update to curl-7.48.0 Signed-off-by: Stephan Raue --- packages/web/curl/package.mk | 2 +- .../web/curl/patches/curl-01-upstream.patch | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 packages/web/curl/patches/curl-01-upstream.patch diff --git a/packages/web/curl/package.mk b/packages/web/curl/package.mk index 67d2ec6689..744a217830 100644 --- a/packages/web/curl/package.mk +++ b/packages/web/curl/package.mk @@ -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" diff --git a/packages/web/curl/patches/curl-01-upstream.patch b/packages/web/curl/patches/curl-01-upstream.patch new file mode 100644 index 0000000000..07922fdefe --- /dev/null +++ b/packages/web/curl/patches/curl-01-upstream.patch @@ -0,0 +1,27 @@ +From 240cd84b494e0ffee8ad261c43b927d246cf6be1 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +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 From 95c334367d14271ebd662062d06bb7d9acfb4a5e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 28 Mar 2016 11:41:53 +0200 Subject: [PATCH 07/18] tiff: build without OpenGL support Signed-off-by: Stephan Raue --- packages/graphics/tiff/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/graphics/tiff/package.mk b/packages/graphics/tiff/package.mk index 782f35e322..23d5c0ee2e 100644 --- a/packages/graphics/tiff/package.mk +++ b/packages/graphics/tiff/package.mk @@ -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" From d635c271f4ea300abe26d7637a2e3ccb5b345d47 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 28 Mar 2016 11:48:32 +0200 Subject: [PATCH 08/18] mesa: VDPAU support depends on X11 support Signed-off-by: Stephan Raue --- packages/graphics/mesa/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk index ba0bd1da49..fc778b08c6 100644 --- a/packages/graphics/mesa/package.mk +++ b/packages/graphics/mesa/package.mk @@ -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 From 302edefeccb3f159a0a9cadc6e10f8bff2b931fd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 28 Mar 2016 11:48:48 +0200 Subject: [PATCH 09/18] kodi: VDPAU support depends on X11 support Signed-off-by: Stephan Raue --- packages/mediacenter/kodi/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 47205e14cd..fa49b8a36f 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -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 From 162a6e9147ceca2867ecd711d8c4282fa6d02bff Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 28 Mar 2016 11:49:02 +0200 Subject: [PATCH 10/18] ffmpeg: VDPAU support depends on X11 support Signed-off-by: Stephan Raue --- packages/multimedia/ffmpeg/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk index 6ea5768757..98784e4aa2 100644 --- a/packages/multimedia/ffmpeg/package.mk +++ b/packages/multimedia/ffmpeg/package.mk @@ -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 From c57700c72e57f2ff0068989067772d93c587da7a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 28 Mar 2016 11:49:13 +0200 Subject: [PATCH 11/18] debug: VDPAU support depends on X11 support Signed-off-by: Stephan Raue --- packages/virtual/debug/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/virtual/debug/package.mk b/packages/virtual/debug/package.mk index 552e97930e..0e805ef701 100644 --- a/packages/virtual/debug/package.mk +++ b/packages/virtual/debug/package.mk @@ -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 From 10b0fa5d82d16fbd069050f04fbe9494a260c327 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 28 Mar 2016 12:31:09 +0200 Subject: [PATCH 12/18] libxml2: add support for host build Signed-off-by: Stephan Raue --- packages/textproc/libxml2/package.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/textproc/libxml2/package.mk b/packages/textproc/libxml2/package.mk index 6525348e28..f1ab5c10f7 100644 --- a/packages/textproc/libxml2/package.mk +++ b/packages/textproc/libxml2/package.mk @@ -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 From 7d7e38338e2612cade54229de5886a405ca91ac0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 28 Mar 2016 12:51:06 +0200 Subject: [PATCH 13/18] new package: add package 'libxkbcommon' Signed-off-by: Stephan Raue --- packages/wayland/libxkbcommon/package.mk | 40 ++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 packages/wayland/libxkbcommon/package.mk diff --git a/packages/wayland/libxkbcommon/package.mk b/packages/wayland/libxkbcommon/package.mk new file mode 100644 index 0000000000..ea47f29ba7 --- /dev/null +++ b/packages/wayland/libxkbcommon/package.mk @@ -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 . +################################################################################ + +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 From 9a47a9c4b37a5c7d0da19dc55611af920bb130bc Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 28 Mar 2016 12:56:40 +0200 Subject: [PATCH 14/18] libinput: update to libinput-1.2.2 Signed-off-by: Stephan Raue --- packages/wayland/libinput/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/wayland/libinput/package.mk b/packages/wayland/libinput/package.mk index b7c9a3365f..fea5daa2b2 100644 --- a/packages/wayland/libinput/package.mk +++ b/packages/wayland/libinput/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="libinput" -PKG_VERSION="1.2.1" +PKG_VERSION="1.2.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 7474c53be8a2ee2c93e61b9ad3eab4e2443744b8 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 28 Mar 2016 15:40:36 +0200 Subject: [PATCH 15/18] libinput: depends on package 'systemd' Signed-off-by: Stephan Raue --- packages/wayland/libinput/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/wayland/libinput/package.mk b/packages/wayland/libinput/package.mk index fea5daa2b2..b2a77915a5 100644 --- a/packages/wayland/libinput/package.mk +++ b/packages/wayland/libinput/package.mk @@ -23,7 +23,7 @@ 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." From 81473b0a8477b103a265aaf3b49f98942ef6c867 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 30 Mar 2016 00:18:28 +0200 Subject: [PATCH 16/18] mtdev: build statically Signed-off-by: Stephan Raue --- packages/wayland/mtdev/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/wayland/mtdev/package.mk b/packages/wayland/mtdev/package.mk index 9b2c097432..4f9b3948d5 100644 --- a/packages/wayland/mtdev/package.mk +++ b/packages/wayland/mtdev/package.mk @@ -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" \ No newline at end of file From 58a5da22c606421d9cd708fc09ffddd1fb5eb4ef Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 28 Mar 2016 20:03:59 +0200 Subject: [PATCH 17/18] new package: add package 'cairo', moved from unofficial repo and add wayland support Signed-off-by: Stephan Raue --- packages/graphics/cairo/package.mk | 104 +++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 packages/graphics/cairo/package.mk diff --git a/packages/graphics/cairo/package.mk b/packages/graphics/cairo/package.mk new file mode 100644 index 0000000000..239fb2c222 --- /dev/null +++ b/packages/graphics/cairo/package.mk @@ -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 . +################################################################################ + +PKG_NAME="cairo" +PKG_VERSION="1.14.4" +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" From 980d2dfe8cd714a6deb89a7127fcd36f8c113416 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 30 Mar 2016 00:36:45 +0200 Subject: [PATCH 18/18] cairo: update to cairo-1.14.6 Signed-off-by: Stephan Raue --- packages/graphics/cairo/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/cairo/package.mk b/packages/graphics/cairo/package.mk index 239fb2c222..3a689ae0ff 100644 --- a/packages/graphics/cairo/package.mk +++ b/packages/graphics/cairo/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="cairo" -PKG_VERSION="1.14.4" +PKG_VERSION="1.14.6" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL"