diff --git a/packages/addons/addon-depends/pango/config/pango.modules b/packages/addons/addon-depends/chrome-depends/pango/config/pango.modules similarity index 100% rename from packages/addons/addon-depends/pango/config/pango.modules rename to packages/addons/addon-depends/chrome-depends/pango/config/pango.modules diff --git a/packages/addons/addon-depends/pango/config/pangorc b/packages/addons/addon-depends/chrome-depends/pango/config/pangorc similarity index 100% rename from packages/addons/addon-depends/pango/config/pangorc rename to packages/addons/addon-depends/chrome-depends/pango/config/pangorc diff --git a/packages/addons/addon-depends/chrome-depends/pango/package.mk b/packages/addons/addon-depends/chrome-depends/pango/package.mk new file mode 100644 index 0000000000..ce90db7f68 --- /dev/null +++ b/packages/addons/addon-depends/chrome-depends/pango/package.mk @@ -0,0 +1,32 @@ +################################################################################ +# This file is part of LibreELEC - https://libreelec.tv +# Copyright (C) 2016-present Team LibreELEC +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# LibreELEC 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. +# +# LibreELEC 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 LibreELEC. If not, see . +################################################################################ + +PKG_NAME="pango" +PKG_VERSION="1.42.1" +PKG_SHA256="915a6756b298578ff27c7a6393f8c2e62e6e382f9411f2504d7af1a13c7bce32" +PKG_ARCH="any" +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" +PKG_DEPENDS_TARGET="toolchain cairo freetype fontconfig fribidi glib harfbuzz libX11 libXft" +PKG_LONGDESC="The Pango library for layout and rendering of internationalized text." +PKG_TOOLCHAIN="meson" + +PKG_MESON_OPTS_TARGET="-Denable_docs=false \ + -Dgir=false" diff --git a/packages/addons/addon-depends/pango/package.mk b/packages/addons/addon-depends/pango/package.mk deleted file mode 100644 index 338f57ae77..0000000000 --- a/packages/addons/addon-depends/pango/package.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program 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, or (at your option) -# any later version. -# -# This Program 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.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="pango" -PKG_VERSION="1.40.6" -PKG_SHA256="ca152b7383a1e9f7fd74ae96023dc6770dc5043414793bfe768ff06b6759e573" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.pango.org/" -PKG_URL="http://ftp.gnome.org/pub/gnome/sources/pango/1.40/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="toolchain glib freetype fontconfig harfbuzz" -PKG_SECTION="x11/toolkits" -PKG_SHORTDESC="pango: Library for layout and rendering of internationalized text" -PKG_LONGDESC="The goal of the Pango project is to provide an open-source framework for the layout and rendering of internationalized text. Pango is an offshoot of the GTK+ and GNOME projects, and the initial focus is operation in those environments, however there is nothing fundamentally GTK+ or GNOME specific about Pango. Pango uses Unicode for all of its encoding, and will eventually support output in all the worlds major languages." -PKG_TOOLCHAIN="autotools" - -PKG_CONFIGURE_OPTS_TARGET="--disable-doc-cross-references \ - --disable-gtk-doc \ - --disable-man \ - --enable-debug=no" - -if [ "$DISPLAYSERVER" = "x11" ] ; then - PKG_DEPENDS_TARGET+=" cairo libX11 libXft" - PKG_CONFIGURE_OPTS_TARGET+=" --with-xft" -fi - -if [ "$DISPLAYSERVER" = "weston" ] ; then - PKG_DEPENDS_TARGET+=" wayland" -fi diff --git a/packages/addons/addon-depends/pango/patches/pango-01_no-gtk-doc.patch b/packages/addons/addon-depends/pango/patches/pango-01_no-gtk-doc.patch deleted file mode 100644 index c4b14271c7..0000000000 --- a/packages/addons/addon-depends/pango/patches/pango-01_no-gtk-doc.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur pango-1.38.1/configure.ac pango-1.38.1.patch/configure.ac ---- pango-1.38.1/configure.ac 2015-10-12 21:13:25.000000000 +0200 -+++ pango-1.38.1.patch/configure.ac 2015-11-14 23:14:05.714344868 +0100 -@@ -483,15 +483,6 @@ - dnl *** Checks for gtk-doc *** - dnl ************************** - --if $have_cairo ; then : ; else -- if test x$enable_gtk_doc = xyes ; then -- AC_MSG_WARN([Cairo not present, disabling doc building]) -- enable_gtk_doc=no -- fi --fi -- --GTK_DOC_CHECK([1.15], [--flavour no-tmpl]) -- - AC_ARG_ENABLE(doc-cross-references, - AC_HELP_STRING([--disable-doc-cross-references], - [cross reference glib and cairo symbols @<:@default=yes@:>@]), -@@ -606,7 +597,6 @@ - pango/pangoxft.rc - pango-view/Makefile - examples/Makefile --docs/Makefile - docs/version.xml - tools/Makefile - tests/Makefile -diff -Naur pango-1.38.1/Makefile.am pango-1.38.1.patch/Makefile.am ---- pango-1.38.1/Makefile.am 2015-04-15 19:37:43.000000000 +0200 -+++ pango-1.38.1.patch/Makefile.am 2015-11-14 23:05:52.738361176 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to create Makefile.in. - --SUBDIRS= pango pango-view examples docs tools tests win32 -+SUBDIRS= pango pango-view examples tools tests win32 - - EXTRA_DIST = \ - autogen.sh \ -@@ -38,7 +38,6 @@ - $(srcdir)/INSTALL \ - $(srcdir)/omf.make \ - $(srcdir)/xmldocs.make \ -- $(srcdir)/gtk-doc.make \ - $(srcdir)/ChangeLog - - ### ChangeLog generation diff --git a/packages/addons/addon-depends/pango/patches/pango-02_meh.patch b/packages/addons/addon-depends/pango/patches/pango-02_meh.patch deleted file mode 100644 index 3b02d3ceca..0000000000 --- a/packages/addons/addon-depends/pango/patches/pango-02_meh.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -Naur pango-1.38.1/Makefile.am pango-1.38.1.patch/Makefile.am ---- pango-1.38.1/Makefile.am 2015-11-14 23:05:52.000000000 +0100 -+++ pango-1.38.1.patch/Makefile.am 2015-11-14 23:19:07.548943525 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to create Makefile.in. - --SUBDIRS= pango pango-view examples tools tests win32 -+SUBDIRS= pango win32 - - EXTRA_DIST = \ - autogen.sh \ -diff -Naur pango-1.38.1/pango/Makefile.am pango-1.38.1.patch/pango/Makefile.am ---- pango-1.38.1/pango/Makefile.am 2015-09-01 00:47:11.000000000 +0200 -+++ pango-1.38.1.patch/pango/Makefile.am 2015-11-14 23:21:14.081145117 +0100 -@@ -31,7 +31,7 @@ - $(LIBTHAI_CFLAGS) \ - $(X_CFLAGS) - --BUILT_SOURCES = pango-enum-types.h pango-enum-types.c pango-features.h -+BUILT_SOURCES = pango-features.h - - pangoincludedir=$(includedir)/pango-1.0/pango - -@@ -127,22 +127,6 @@ - pango-features.h \ - pango-enum-types.h - --pango-enum-types.h: s-enum-types-h --s-enum-types-h: $(pango_headers) Makefile.am pango-enum-types.h.template -- $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \ -- --template pango-enum-types.h.template \ -- $(pango_headers) ) > pango-enum-types.h.tmp \ -- && mv pango-enum-types.h.tmp pango-enum-types.h \ -- && echo timestamp > $@ -- --pango-enum-types.c: s-enum-types-c --s-enum-types-c: $(pango_headers) Makefile.am pango-enum-types.c.template -- $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \ -- --template pango-enum-types.c.template \ -- $(pango_headers) ) > pango-enum-types.c.tmp \ -- && mv pango-enum-types.c.tmp pango-enum-types.c \ -- && echo timestamp > $@ -- - pango-features.h: - $(AM_V_GEN) cd $(top_builddir) && ./config.status pango/pango-features.h - -diff -Naur pango-1.38.1/pango/pango-context.c pango-1.38.1.patch/pango/pango-context.c ---- pango-1.38.1/pango/pango-context.c 2015-09-13 17:05:39.000000000 +0200 -+++ pango-1.38.1.patch/pango/pango-context.c 2015-11-14 23:22:57.512225981 +0100 -@@ -38,6 +38,7 @@ - - #include "pango-engine-private.h" - #include "pango-script-private.h" -+#include "pango-enum-types.h" - - /** - * PangoContext: -diff -Naur pango-1.38.1/pango/pangofc-font.c pango-1.38.1.patch/pango/pangofc-font.c ---- pango-1.38.1/pango/pangofc-font.c 2015-04-15 19:37:43.000000000 +0200 -+++ pango-1.38.1.patch/pango/pangofc-font.c 2015-11-14 23:23:49.840316980 +0100 -@@ -45,6 +45,7 @@ - #include "pango-engine.h" - #include "pango-layout.h" - #include "pango-impl-utils.h" -+#include "pango-enum-types.h" - - #include - -diff -Naur pango-1.38.1/pango/pango-layout.c pango-1.38.1.patch/pango/pango-layout.c ---- pango-1.38.1/pango/pango-layout.c 2015-09-01 18:20:54.000000000 +0200 -+++ pango-1.38.1.patch/pango/pango-layout.c 2015-11-14 23:23:19.280262638 +0100 -@@ -77,6 +77,7 @@ - #include - - #include "pango-layout-private.h" -+#include "pango-enum-types.h" - - - typedef struct _Extents Extents;