rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update buidlroot to version 2016.08.1

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2016-11-16 22:07:29 +01:00
parent 807ab03547
commit a1061efbc2
3636 changed files with 59539 additions and 25783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
bsp/buildroot/package/libgtk3/0004-Fix-undefined-reference-to-get_xkb.patch
View File

@@ -1,33 +0,0 @@
From b64a04250b1f35923434158beb6ddb5726b41eac Mon Sep 17 00:00:00 2001
From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Date: Mon, 27 Oct 2014 10:34:38 +0100
Subject: [PATCH 1/1] Fix undefined reference to get_xkb()
When configuring Gtk+ with --disable-xkb, the build fails because of an
undefined reference to get_xkb().
This patch fixes this issue.
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
gdk/x11/gdkkeys-x11.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index c45a971..6a5481b 100644
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -1498,8 +1498,10 @@ gdk_x11_keymap_map_virtual_modifiers (GdkKeymap *keymap,
int i, j;
gboolean retval;
+#ifdef HAVE_XKB
if (KEYMAP_USE_XKB (keymap))
get_xkb (keymap_x11);
+#endif
retval = TRUE;
--
1.9.1

105
bsp/buildroot/package/libgtk3/0004-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch Normal file
View File

@@ -0,0 +1,105 @@
From 4d09ff324419fe4e671233044e424378da53969b Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Tue, 9 Jun 2015 14:20:30 +0300
Subject: [PATCH] Remove Gdk-dependency from gtk-encode-symbolic-svg
Building gtk-encode-symbolic-svg without building Gdk is useful
as only the icon tools are needed on the native build: this makes
native build much faster and requires much less dependencies.
Upstream-Status: Pending
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
Patch status: taken from yocto, upstream pending
gtk/encodesymbolic.c | 36 ++++++++++--------------------------
1 file changed, 10 insertions(+), 26 deletions(-)
diff --git a/gtk/encodesymbolic.c b/gtk/encodesymbolic.c
index 9f7d015..1f07563 100644
--- a/gtk/encodesymbolic.c
+++ b/gtk/encodesymbolic.c
@@ -19,7 +19,6 @@
#include <glib.h>
#include <gdk-pixbuf/gdk-pixdata.h>
-#include <gdk/gdk.h>
#include <glib/gi18n.h>
#ifdef HAVE_UNISTD_H
@@ -43,30 +42,18 @@ static GdkPixbuf *
load_symbolic_svg (char *file_data, gsize file_len,
int width,
int height,
- const GdkRGBA *fg,
- const GdkRGBA *success_color,
- const GdkRGBA *warning_color,
- const GdkRGBA *error_color,
+ const char *css_fg,
+ const char *css_success,
+ const char *css_warning,
+ const char *css_error,
GError **error)
{
GInputStream *stream;
GdkPixbuf *pixbuf;
- gchar *css_fg;
- gchar *css_success;
- gchar *css_warning;
- gchar *css_error;
gchar *data;
gchar *svg_width, *svg_height;
gchar *escaped_file_data;
- css_fg = gdk_rgba_to_string (fg);
-
- css_success = css_warning = css_error = NULL;
-
- css_warning = gdk_rgba_to_string (warning_color);
- css_error = gdk_rgba_to_string (error_color);
- css_success = gdk_rgba_to_string (success_color);
-
/* Fetch size from the original icon */
stream = g_memory_input_stream_new_from_data (file_data, file_len, NULL);
pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, error);
@@ -105,10 +92,6 @@ load_symbolic_svg (char *file_data, gsize file_len,
"</svg>",
NULL);
g_free (escaped_file_data);
- g_free (css_fg);
- g_free (css_warning);
- g_free (css_error);
- g_free (css_success);
g_free (svg_width);
g_free (svg_height);
@@ -167,7 +150,8 @@ make_symbolic_pixbuf (char *file,
GError **error)
{
- GdkRGBA r = { 1,0,0,1}, g = {0,1,0,1};
+ const char r[] = "rgba(255,0,0,1)";
+ const char g[] = "rgba(0,255,0,1)";
GdkPixbuf *loaded;
GdkPixbuf *pixbuf;
int plane;
@@ -196,10 +180,10 @@ make_symbolic_pixbuf (char *file,
* the "rest", as all color fractions should add up to 1.
*/
loaded = load_symbolic_svg (file_data, file_len, width, height,
- &g,
- plane == 0 ? &r : &g,
- plane == 1 ? &r : &g,
- plane == 2 ? &r : &g,
+ g,
+ plane == 0 ? r : g,
+ plane == 1 ? r : g,
+ plane == 2 ? r : g,
error);
if (loaded == NULL)
return NULL;
--
2.1.4

47
bsp/buildroot/package/libgtk3/0005-do-not-build-extract-strings.patch
View File

@@ -1,47 +0,0 @@
Do not build util/extract-strings
Do not build util/extract-strings, as it will be built by host-libgtk3
and installed in $(HOST_DIR)/usr/bin (thus avoiding the -lint linking
issue with uClibc).
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Index: gtk+-3.14.0/Makefile.am
===================================================================
--- gtk+-3.14.0.orig/Makefile.am 2014-09-22 05:17:44.000000000 +0200
+++ gtk+-3.14.0/Makefile.am 2014-09-25 16:08:32.000000000 +0200
@@ -1,7 +1,7 @@
## Makefile.am for GTK+
include $(top_srcdir)/Makefile.decl
-SRC_SUBDIRS = util gdk gtk libgail-util modules demos tests testsuite examples
+SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
Index: gtk+-3.14.0/gtk/Makefile.am
===================================================================
--- gtk+-3.14.0.orig/gtk/Makefile.am 2014-09-22 05:09:39.000000000 +0200
+++ gtk+-3.14.0/gtk/Makefile.am 2014-09-25 16:09:10.000000000 +0200
@@ -1330,7 +1330,7 @@
%.ui.h: %.ui
$(AM_V_GEN) mkdir -p $(dir $@) \
- && $(top_builddir)/util/extract-strings$(EXEEXT) $< > $@
+ && extract-strings$(EXEEXT) $< > $@
#
# rules to generate built sources
Index: gtk+-3.14.0/gtk/inspector/Makefile.am
===================================================================
--- gtk+-3.14.0.orig/gtk/inspector/Makefile.am 2014-09-04 20:11:33.000000000 +0200
+++ gtk+-3.14.0/gtk/inspector/Makefile.am 2014-09-25 16:09:48.000000000 +0200
@@ -114,7 +114,7 @@
template_headers = $(templates:.ui=.ui.h)
%.ui.h : %.ui
- $(AM_V_GEN) $(top_builddir)/util/extract-strings$(EXEEXT) $< > $@
+ $(AM_V_GEN) extract-strings$(EXEEXT) $< > $@
EXTRA_DIST += \
inspector.gresource.xml \

91
bsp/buildroot/package/libgtk3/Config.in
View File

@@ -1,3 +1,15 @@
comment "libgtk3 needs a toolchain w/ wchar, threads, C++"
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS
comment "libgtk3 needs an OpenGL or OpenGL EGL backend provided by mesa3d"
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && \
!BR2_PACKAGE_HAS_LIBGL
config BR2_PACKAGE_LIBGTK3
bool "libgtk3"
select BR2_PACKAGE_ATK
@@ -5,10 +17,11 @@ config BR2_PACKAGE_LIBGTK3
select BR2_PACKAGE_CAIRO_PS
select BR2_PACKAGE_CAIRO_PDF
select BR2_PACKAGE_CAIRO_SVG
select BR2_PACKAGE_LIBEPOXY
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_PANGO
select BR2_PACKAGE_GDK_PIXBUF
# atleast 1 backend must be enabled
# At least one backend is required
select BR2_PACKAGE_LIBGTK3_BROADWAY if \
!(BR2_PACKAGE_LIBGTK3_X11 || BR2_PACKAGE_LIBGTK3_WAYLAND)
depends on BR2_USE_WCHAR # glib2
@@ -16,6 +29,8 @@ config BR2_PACKAGE_LIBGTK3
depends on BR2_USE_MMU # glib2
depends on BR2_INSTALL_LIBSTDCPP # pango
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
depends on BR2_PACKAGE_MESA3D_OPENGL_EGL || \
BR2_PACKAGE_HAS_LIBGL
help
The GTK+ version 3 graphical user interface library
@@ -23,33 +38,10 @@ config BR2_PACKAGE_LIBGTK3
if BR2_PACKAGE_LIBGTK3
comment "GDK backend"
config BR2_PACKAGE_LIBGTK3_X11
bool "GDK X11 backend"
default y
depends on BR2_PACKAGE_XORG7
select BR2_PACKAGE_FONTCONFIG
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXRENDER
select BR2_PACKAGE_XLIB_LIBXI
help
This enables the X11 backend for GDK.
config BR2_PACKAGE_LIBGTK3_WAYLAND
bool "GDK Wayland backend"
default y
# Needs a libgtk3 bump to match API level
depends on BROKEN
depends on BR2_PACKAGE_WAYLAND
select BR2_PACKAGE_LIBXKBCOMMON
help
This enables the Wayland backend for GDK.
config BR2_PACKAGE_LIBGTK3_BROADWAY
bool "GDK Broadway backend"
help
bool "Broadway GDK backend"
default y
help
This enables the Broadway backend for GDK, which provides support
for displaying GTK+ applications in a web browser, using HTML5 and
web sockets.
@@ -58,14 +50,45 @@ config BR2_PACKAGE_LIBGTK3_BROADWAY
192.168.0.1 and use it from a web browser, execute the following
commands:
$ broadwayd -a 192.168.0.1 -p 8080 :2 &
$ export GDK_BACKEND=broadway
$ export BROADWAY_DISPLAY=:2
$ gtk3-demo
$ broadwayd -a 192.168.0.1 -p 8080 :2 &
$ export GDK_BACKEND=broadway
$ export BROADWAY_DISPLAY=:2
$ gtk3-demo
Then open a web browser at address http://192.168.0.1:8080.
Javascript and web sockets should be enabled.
comment "Wayland GDK backend needs an OpenGL EGL backend provided by mesa3d w/ headers >= 3.17"
depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
config BR2_PACKAGE_LIBGTK3_WAYLAND
bool "Wayland GDK backend"
default y
depends on BR2_PACKAGE_MESA3D_OPENGL_EGL
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
select BR2_PACKAGE_WAYLAND
select BR2_PACKAGE_WAYLAND_PROTOCOLS
select BR2_PACKAGE_LIBXKBCOMMON
help
This enables the Wayland backend for GDK.
comment "X11 GDK backend needs an OpenGL provider"
depends on !BR2_PACKAGE_HAS_LIBGL
config BR2_PACKAGE_LIBGTK3_X11
bool "X11 GDK backend"
default y
depends on BR2_PACKAGE_XORG7
depends on BR2_PACKAGE_HAS_LIBGL
select BR2_PACKAGE_FONTCONFIG
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXRENDER
select BR2_PACKAGE_XLIB_LIBXI
help
This enables the X11 backend for GDK.
config BR2_PACKAGE_LIBGTK3_DEMO
bool "Install libgtk3 demo program"
select BR2_PACKAGE_SHARED_MIME_INFO
@@ -81,9 +104,3 @@ config BR2_PACKAGE_LIBGTK3_TESTS
allows to install them to the target.
endif
comment "libgtk3 needs a toolchain w/ wchar, threads, C++"
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS

4
bsp/buildroot/package/libgtk3/libgtk3.hash
View File

@@ -1,2 +1,2 @@
# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.14/gtk+-3.14.15.sha256sum
sha256 3ac87659112ced9e5ee5bd55d055faa881aafd040f26ca40b0d8ba0fa6509c83 gtk+-3.14.15.tar.xz
# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.20/gtk+-3.20.6.sha256sum
sha256 3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2 gtk+-3.20.6.tar.xz

37
bsp/buildroot/package/libgtk3/libgtk3.mk
View File

@@ -4,8 +4,8 @@
#
################################################################################
LIBGTK3_VERSION_MAJOR = 3.14
LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).15
LIBGTK3_VERSION_MAJOR = 3.20
LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).6
LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz
LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR)
LIBGTK3_LICENSE = LGPLv2+
@@ -24,7 +24,11 @@ LIBGTK3_CONF_OPTS = \
--enable-gtk2-dependency \
--disable-introspection
LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango gdk-pixbuf
# Override pkg-config pkgdatadir variable, it needs the prefix
LIBGTK3_MAKE_OPTS = \
WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols
LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango gdk-pixbuf libepoxy
ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
LIBGTK3_DEPENDENCIES += fontconfig xlib_libX11 xlib_libXext xlib_libXrender xlib_libXi
@@ -38,7 +42,7 @@ LIBGTK3_CONF_OPTS += --disable-x11-backend
endif
ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y)
LIBGTK3_DEPENDENCIES += wayland libxkbcommon
LIBGTK3_DEPENDENCIES += wayland wayland-protocols libxkbcommon
LIBGTK3_CONF_OPTS += --enable-wayland-backend
else
LIBGTK3_CONF_OPTS += --disable-wayland-backend
@@ -136,8 +140,7 @@ LIBGTK3_POST_INSTALL_TARGET_HOOKS += LIBGTK3_COMPILE_GLIB_SCHEMAS
# for both native and target builds).
#
# But no native version of libintl is available (the functions are
# provided by glibc). So gtk-update-icon-cache will not build, and
# extract-strings neither.
# provided by glibc). So gtk-update-icon-cache will not build.
#
# As a workaround, we build gtk-update-icon-cache on our own, set
# --enable-gtk2-dependency=yes and force './configure' to use our version.
@@ -146,10 +149,12 @@ HOST_LIBGTK3_DEPENDENCIES = \
host-libglib2 \
host-libpng \
host-gdk-pixbuf \
host-pkgconf
host-pkgconf \
host-librsvg
HOST_LIBGTK3_CFLAGS = \
`$(HOST_DIR)/usr/bin/pkgconf --cflags --libs gdk-pixbuf-2.0`
`$(HOST_DIR)/usr/bin/pkgconf --cflags --libs gdk-pixbuf-2.0` \
`$(HOST_DIR)/usr/bin/pkgconf --cflags --libs gio-2.0`
define HOST_LIBGTK3_CONFIGURE_CMDS
echo "#define GETTEXT_PACKAGE \"gtk30\"" >> $(@D)/gtk/config.h
@@ -163,17 +168,25 @@ define HOST_LIBGTK3_BUILD_CMDS
$(HOST_LIBGTK3_CFLAGS) \
-o $(@D)/gtk/gtk-update-icon-cache
$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \
$(@D)/util/extract-strings.c \
$(@D)/gtk/encodesymbolic.c \
$(HOST_LIBGTK3_CFLAGS) \
-o $(@D)/util/extract-strings
-o $(@D)/gtk/gtk-encode-symbolic-svg
endef
define HOST_LIBGTK3_INSTALL_CMDS
$(INSTALL) -D -m 0755 $(@D)/gtk/gtk-update-icon-cache \
$(HOST_DIR)/usr/bin/gtk-update-icon-cache
$(INSTALL) -D -m 0755 $(@D)/util/extract-strings \
$(HOST_DIR)/usr/bin/extract-strings
$(INSTALL) -D -m 0755 $(@D)/gtk/gtk-encode-symbolic-svg \
$(HOST_DIR)/usr/bin/gtk-encode-symbolic-svg
endef
# Create icon-theme.cache for each of the icon directories/themes
# It's not strictly necessary but speeds up lookups
define LIBGTK3_UPDATE_ICON_CACHE
find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \
-exec $(HOST_DIR)/usr/bin/gtk-update-icon-cache {} \;
endef
LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE
$(eval $(autotools-package))
$(eval $(host-autotools-package))