* [PATCH 01/19] gdk-pixbuf: Upgrade 2.30.8 -> 2.32.1
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
@ 2015-11-13 9:46 ` Jussi Kukkonen
2015-11-13 9:46 ` [PATCH 02/19] pango: Upgrade 1.36.8 -> 1.38.1 Jussi Kukkonen
` (18 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:46 UTC (permalink / raw)
To: openembedded-core
Remove a backported patch.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
...ps-Be-more-careful-about-integer-overflow.patch | 89 ----------------------
.../{gdk-pixbuf_2.30.8.bb => gdk-pixbuf_2.32.1.bb} | 5 +-
2 files changed, 2 insertions(+), 92 deletions(-)
delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-pixops-Be-more-careful-about-integer-overflow.patch
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.30.8.bb => gdk-pixbuf_2.32.1.bb} (94%)
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-pixops-Be-more-careful-about-integer-overflow.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-pixops-Be-more-careful-about-integer-overflow.patch
deleted file mode 100644
index fe7c1d5..0000000
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-pixops-Be-more-careful-about-integer-overflow.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From ffec86ed5010c5a2be14f47b33bcf4ed3169a199 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Mon, 13 Jul 2015 00:33:40 -0400
-Subject: [PATCH] pixops: Be more careful about integer overflow
-
-Our loader code is supposed to handle out-of-memory and overflow
-situations gracefully, reporting errors instead of aborting. But
-if you load an image at a specific size, we also execute our
-scaling code, which was not careful enough about overflow in some
-places.
-
-This commit makes the scaling code silently return if it fails to
-allocate filter tables. This is the best we can do, since
-gdk_pixbuf_scale() is not taking a GError.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=752297
-
-Upstream-Status: backport
-
-Signed-off-by: Li Zhou <li.zhou@windriver.com>
----
- gdk-pixbuf/pixops/pixops.c | 22 +++++++++++++++++-----
- 1 file changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c
-index 29a1c14..ce51745 100644
---- a/gdk-pixbuf/pixops/pixops.c
-+++ b/gdk-pixbuf/pixops/pixops.c
-@@ -1272,7 +1272,16 @@ make_filter_table (PixopsFilter *filter)
- int i_offset, j_offset;
- int n_x = filter->x.n;
- int n_y = filter->y.n;
-- int *weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y);
-+ gsize n_weights;
-+ int *weights;
-+
-+ n_weights = SUBSAMPLE * SUBSAMPLE * n_x * n_y;
-+ if (n_weights / (SUBSAMPLE * SUBSAMPLE * n_x) != n_y)
-+ return NULL; /* overflow, bail */
-+
-+ weights = g_try_new (int, n_weights);
-+ if (!weights)
-+ return NULL; /* overflow, bail */
-
- for (i_offset=0; i_offset < SUBSAMPLE; i_offset++)
- for (j_offset=0; j_offset < SUBSAMPLE; j_offset++)
-@@ -1347,8 +1356,11 @@ pixops_process (guchar *dest_buf,
- if (x_step == 0 || y_step == 0)
- return; /* overflow, bail out */
-
-- line_bufs = g_new (guchar *, filter->y.n);
- filter_weights = make_filter_table (filter);
-+ if (!filter_weights)
-+ return; /* overflow, bail out */
-+
-+ line_bufs = g_new (guchar *, filter->y.n);
-
- check_shift = check_size ? get_check_shift (check_size) : 0;
-
-@@ -1468,7 +1480,7 @@ tile_make_weights (PixopsFilterDimension *dim,
- double scale)
- {
- int n = ceil (1 / scale + 1);
-- double *pixel_weights = g_new (double, SUBSAMPLE * n);
-+ double *pixel_weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n);
- int offset;
- int i;
-
-@@ -1526,7 +1538,7 @@ bilinear_magnify_make_weights (PixopsFilterDimension *dim,
- }
-
- dim->n = n;
-- dim->weights = g_new (double, SUBSAMPLE * n);
-+ dim->weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n);
-
- pixel_weights = dim->weights;
-
-@@ -1617,7 +1629,7 @@ bilinear_box_make_weights (PixopsFilterDimension *dim,
- double scale)
- {
- int n = ceil (1/scale + 3.0);
-- double *pixel_weights = g_new (double, SUBSAMPLE * n);
-+ double *pixel_weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n);
- double w;
- int offset, i;
-
---
-1.7.9.5
-
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb
similarity index 94%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb
index 68f3850..6e3cb02 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb
@@ -17,11 +17,10 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://extending-libinstall-dependencies.patch \
file://run-ptest \
file://fatal-loader.patch \
- file://0001-pixops-Be-more-careful-about-integer-overflow.patch \
"
-SRC_URI[md5sum] = "4fed0d54432f1b69fc6e66e608bd5542"
-SRC_URI[sha256sum] = "4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be"
+SRC_URI[md5sum] = "b1590189a2e89fab9f871959c168508c"
+SRC_URI[sha256sum] = "4432b74f25538c7d6bcb3ca51adabdd666168955f25812a2568dc9637697f3bc"
inherit autotools pkgconfig gettext pixbufcache ptest-gnome
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 02/19] pango: Upgrade 1.36.8 -> 1.38.1
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
2015-11-13 9:46 ` [PATCH 01/19] gdk-pixbuf: Upgrade 2.30.8 -> 2.32.1 Jussi Kukkonen
@ 2015-11-13 9:46 ` Jussi Kukkonen
2015-11-13 9:46 ` [PATCH 03/19] librsvg: Upgrade 2.40.10 -> 2.40.11 Jussi Kukkonen
` (17 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:46 UTC (permalink / raw)
To: openembedded-core
Pango is now a simple a simple library and no longer has
- modules
- engines
- configuration
Dropping all related things from the recipe.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-graphics/pango/pango.inc | 50 +--------------
.../pango/pango/multilib-fix-clean.patch | 75 ----------------------
meta/recipes-graphics/pango/pango_1.36.8.bb | 10 ---
meta/recipes-graphics/pango/pango_1.38.1.bb | 9 +++
4 files changed, 11 insertions(+), 133 deletions(-)
delete mode 100644 meta/recipes-graphics/pango/pango/multilib-fix-clean.patch
delete mode 100644 meta/recipes-graphics/pango/pango_1.36.8.bb
create mode 100644 meta/recipes-graphics/pango/pango_1.38.1.bb
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index df0fdf6..c0109b2 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -21,51 +21,20 @@ PACKAGECONFIG[ptest] = "--enable-installed-tests,--disable-installed-tests,glib-
BBCLASSEXTEND = "native"
DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native"
-PACKAGES_DYNAMIC += "^pango-module-.*"
-
-RRECOMMENDS_${PN} = "pango-module-basic-fc"
-
inherit gnomebase gtk-doc qemu ptest
-# Create a pango-modules package
-ALLOW_EMPTY_${BPN}-modules = "1"
-PACKAGES += "${BPN}-modules"
-RRECOMMENDS_${BPN}-modules = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("pango-module") != -1])}"
-
-
EXTRA_AUTORECONF = ""
# seems to go wrong with default cflags
FULL_OPTIMIZATION_arm = "-O2"
EXTRA_OECONF = "--disable-introspection \
- --enable-explicit-deps=no \
--disable-debug \
- --with-mlprefix=${MLPREFIX}"
+ "
LEAD_SONAME = "libpango-1.0*"
LIBV = "1.8.0"
-pango_postinst() {
-if ! [ -e $D${sysconfdir}/pango ] ; then
- mkdir -p $D${sysconfdir}/pango
-fi
-
-if [ -n "$D" ]; then
- ${@qemu_run_binary(d, '$D','${bindir}/${MLPREFIX}pango-querymodules')} \
- $D${libdir}/pango/${LIBV}/modules/*.so \
- > $D${sysconfdir}/pango/${MLPREFIX}pango.modules 2>/dev/null
-
- [ $? -ne 0 ] && exit 1
-
- sed -i -e "s:$D::" $D${sysconfdir}/pango/${MLPREFIX}pango.modules
-
- exit 0
-else
- ${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules
-fi
-}
-
# This binary needs to be compiled for the host architecture. This isn't pretty!
do_compile_prepend () {
if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then
@@ -73,22 +42,7 @@ do_compile_prepend () {
fi
}
-do_install_append () {
- if [ "${MLPREFIX}" != "" ]; then
- mv ${D}/${bindir}/pango-querymodules ${D}/${bindir}/${MLPREFIX}pango-querymodules
- fi
-}
-
-
-python populate_packages_prepend () {
- pango_postinst = d.getVar("pango_postinst", True)
-
- modules_root = d.expand('${libdir}/pango/${LIBV}/modules')
-
- do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', pango_postinst)
-}
-
-FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
+FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}"
FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
diff --git a/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch b/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch
deleted file mode 100644
index ad414dd..0000000
--- a/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Upstream-Status: Pending
-
-Updated to apply to pango-1.32.5
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd pango-1.32.5/configure.ac pango-1.32.5/configure.ac
---- pango-1.32.5/configure.ac 2012-12-07 04:43:25.000000000 +0200
-+++ pango-1.32.5/configure.ac 2013-01-09 08:27:40.328516792 +0200
-@@ -213,6 +213,11 @@
-
- AC_SUBST(PANGO_DEBUG_FLAGS)
-
-+AC_ARG_WITH(mlprefix,
-+ AC_HELP_STRING([--with-mlprefix=<ARG>], [multilib prefix]),
-+ mlprefix_str=$withval, mlprefix_str="")
-+AC_DEFINE_UNQUOTED([MLPREFIX], ["$mlprefix_str"], [multilib prefix.])
-+
- AC_ARG_ENABLE(rebuilds,
- [AC_HELP_STRING([--disable-rebuilds],
- [disable all source autogeneration rules])],,
-diff -Nurd pango-1.32.5/pango/modules.c pango-1.32.5/pango/modules.c
---- pango-1.32.5/pango/modules.c 2012-12-17 20:27:56.000000000 +0200
-+++ pango-1.32.5/pango/modules.c 2013-01-09 08:31:16.336512052 +0200
-@@ -555,11 +555,11 @@
- files = g_new (char *, 3);
-
- files[0] = g_build_filename (pango_get_sysconf_subdirectory (),
-- "pango.modules",
-+ MLPREFIX "pango.modules",
- NULL);
- files[1] = g_build_filename (pango_get_lib_subdirectory (),
- MODULE_VERSION,
-- "modules.cache",
-+ MLPREFIX "modules.cache",
- NULL);
- files[2] = NULL;
- }
-@@ -674,7 +674,8 @@
- if (!no_module_warning)
- {
- gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (),
-- "pango.modules",
-+/* For multilib case, keep multiple config file for different libs */
-+ MLPREFIX "pango.modules",
- NULL);
- g_critical ("No modules found:\n"
- "No builtin or dynamically loaded modules were found.\n"
-diff -Nurd pango-1.32.5/pango/modules.c.rej pango-1.32.5/pango/modules.c.rej
---- pango-1.32.5/pango/modules.c.rej 1970-01-01 02:00:00.000000000 +0200
-+++ pango-1.32.5/pango/modules.c.rej 2013-01-09 08:27:40.328516792 +0200
-@@ -0,0 +1,12 @@
-+--- pango/modules.c 2010-09-22 03:37:01.000000000 +0800
-++++ pango/modules.c 2012-05-08 21:21:02.000000000 +0800
-+@@ -529,7 +529,8 @@
-+
-+ if (!file_str)
-+ file_str = g_build_filename (pango_get_sysconf_subdirectory (),
-+- "pango.modules",
-++/* For multilib case, keep multiple config file for different libs */
-++ MLPREFIX "pango.modules",
-+ NULL);
-+
-+ files = pango_split_file_list (file_str);
-diff -Nurd pango-1.32.5/pango/querymodules.c pango-1.32.5/pango/querymodules.c
---- pango-1.32.5/pango/querymodules.c 2012-08-28 15:27:18.000000000 +0300
-+++ pango-1.32.5/pango/querymodules.c 2013-01-09 08:31:47.828511359 +0200
-@@ -304,7 +304,7 @@
-
- cache_file = g_build_filename (pango_get_lib_subdirectory (),
- MODULE_VERSION,
-- "modules.cache",
-+ MLPREFIX "modules.cache",
- NULL);
- err = NULL;
- if (!g_file_set_contents (cache_file, contents->str, -1, &err))
diff --git a/meta/recipes-graphics/pango/pango_1.36.8.bb b/meta/recipes-graphics/pango/pango_1.36.8.bb
deleted file mode 100644
index f4e4250..0000000
--- a/meta/recipes-graphics/pango/pango_1.36.8.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require pango.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-
-SRC_URI += "file://run-ptest \
- file://multilib-fix-clean.patch \
-"
-
-SRC_URI[archive.md5sum] = "217a9a753006275215fa9fa127760ece"
-SRC_URI[archive.sha256sum] = "18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07"
diff --git a/meta/recipes-graphics/pango/pango_1.38.1.bb b/meta/recipes-graphics/pango/pango_1.38.1.bb
new file mode 100644
index 0000000..d85c17b
--- /dev/null
+++ b/meta/recipes-graphics/pango/pango_1.38.1.bb
@@ -0,0 +1,9 @@
+require pango.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
+
+SRC_URI += "file://run-ptest \
+"
+
+SRC_URI[archive.md5sum] = "7fde35d4a127b55ce8bbcefe109bc80d"
+SRC_URI[archive.sha256sum] = "1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7"
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 03/19] librsvg: Upgrade 2.40.10 -> 2.40.11
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
2015-11-13 9:46 ` [PATCH 01/19] gdk-pixbuf: Upgrade 2.30.8 -> 2.32.1 Jussi Kukkonen
2015-11-13 9:46 ` [PATCH 02/19] pango: Upgrade 1.36.8 -> 1.38.1 Jussi Kukkonen
@ 2015-11-13 9:46 ` Jussi Kukkonen
2015-11-13 9:46 ` [PATCH 04/19] adwaita-icon-theme: Upgrade 3.16.2.1 -> 3.18.0 Jussi Kukkonen
` (16 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:46 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-gnome/librsvg/{librsvg_2.40.10.bb => librsvg_2.40.11.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/librsvg/{librsvg_2.40.10.bb => librsvg_2.40.11.bb} (92%)
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.10.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.11.bb
similarity index 92%
rename from meta/recipes-gnome/librsvg/librsvg_2.40.10.bb
rename to meta/recipes-gnome/librsvg/librsvg_2.40.11.bb
index 06552c2..8c5206b 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.40.10.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.40.11.bb
@@ -14,8 +14,8 @@ inherit autotools pkgconfig gnomebase gtk-doc pixbufcache
SRC_URI += "file://gtk-option.patch"
-SRC_URI[archive.md5sum] = "fadebe2e799ab159169ee3198415ff85"
-SRC_URI[archive.sha256sum] = "965c807438ce90b204e930ff80c92eba1606a2f6fd5ccfd09335c99896dd3479"
+SRC_URI[archive.md5sum] = "6b9cd1a048210a8e95bdc04c85fe997f"
+SRC_URI[archive.sha256sum] = "611ac0f544debd0c9bf1ef5509c990d218e83dd1d8c83297075c4b29796a2e02"
CACHED_CONFIGUREVARS = "ac_cv_path_GDK_PIXBUF_QUERYLOADERS=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders"
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 04/19] adwaita-icon-theme: Upgrade 3.16.2.1 -> 3.18.0
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
` (2 preceding siblings ...)
2015-11-13 9:46 ` [PATCH 03/19] librsvg: Upgrade 2.40.10 -> 2.40.11 Jussi Kukkonen
@ 2015-11-13 9:46 ` Jussi Kukkonen
2015-11-13 9:46 ` [PATCH 05/19] gtk+3: Upgrade 3.16.6 -> 3.18.2 Jussi Kukkonen
` (15 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:46 UTC (permalink / raw)
To: openembedded-core
Remove a backported patch.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../Create-symlinks-when-installing-cursors.patch | 178 ---------------------
...me_3.16.2.1.bb => adwaita-icon-theme_3.18.0.bb} | 5 +-
2 files changed, 2 insertions(+), 181 deletions(-)
delete mode 100644 meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch
rename meta/recipes-gnome/gnome/{adwaita-icon-theme_3.16.2.1.bb => adwaita-icon-theme_3.18.0.bb} (85%)
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch
deleted file mode 100644
index 446f9c9..0000000
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-Create symlinks when installing cursors
-
-This cuts down the installed size by ~11MB.
-
-Upstream-Status: Backport
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-
-
-From 1e8c0dd0a2de5e1d5ff60ff11f131e88510c7f50 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
- =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
-Date: Sat, 16 May 2015 07:49:19 +0000
-Subject: [PATCH] Create symlinks when installing cursors
-
-Also support creating symlinks for W32 cursors (including L and XL variants).
-
-https://bugzilla.gnome.org/show_bug.cgi?id=749223
----
- Makefile.am | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac | 24 ++++++++++++++++
- 2 files changed, 117 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index fed3972..4d00268 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6,6 +6,17 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
- cursordir = $(datadir)/icons/Adwaita/cursors
- cursor_DATA = $(wildcard $(srcdir)/Adwaita/cursors/*)
-+if ENABLE_L_XL_VARIANTS
-+cursorldir = $(datadir)/icons/Adwaita-Large/cursors
-+cursorl_DATA = $(wildcard $(srcdir)/Adwaita-Large/cursors/*)
-+cursorxldir = $(datadir)/icons/Adwaita-ExtraLarge/cursors
-+cursorxl_DATA = $(wildcard $(srcdir)/Adwaita-ExtraLarge/cursors/*)
-+else
-+cursorldir =
-+cursorl_DATA =
-+cursorxldir =
-+cursorxl_DATA =
-+endif
-
- theme_in_files = index.theme.in.in
- theme_DATA = $(theme_in_files:.theme.in.in=.theme)
-@@ -99,6 +110,88 @@ install-data-local:
- fi
-
- install-data-hook:
-+ cd $(DESTDIR)$(cursordir) && \
-+ if test "x$(enable_w32_cursors)" = "xyes"; \
-+ then \
-+ cur=.cur && \
-+ ani=.ani; \
-+ else \
-+ cur= && \
-+ ani= ; \
-+ fi; \
-+ if test "x$(enable_l_xl_variants)" = "xyes"; \
-+ then \
-+ themedirs="$(cursordir) $(cursorldir) $(cursorxldir)"; \
-+ else \
-+ themedirs="$(cursordir)"; \
-+ fi; \
-+ for d in $$themedirs; \
-+ do \
-+ cd $(DESTDIR)$$d && \
-+ echo Creating symlinks in $(DESTDIR)$$d && \
-+ $(LN_S) -f dotbox$$cur draped_box$$cur && \
-+ $(LN_S) -f dotbox$$cur icon$$cur && \
-+ $(LN_S) -f dotbox$$cur target$$cur && \
-+ $(LN_S) -f dotbox$$cur dot_box_mask$$cur && \
-+ $(LN_S) -f X_cursor$$cur pirate$$cur && \
-+ $(LN_S) -f left_ptr_watch$$ani 08e8e1c95fe2fc01f976f1e063a24ccd$$ani && \
-+ $(LN_S) -f left_ptr_watch$$ani 3ecb610c1bf2410f44200f48c40d3599$$ani && \
-+ $(LN_S) -f left_ptr$$cur arrow$$cur && \
-+ $(LN_S) -f left_ptr$$cur top_left_arrow$$cur && \
-+ $(LN_S) -f right_ptr$$cur draft_large$$cur && \
-+ $(LN_S) -f right_ptr$$cur draft_small$$cur && \
-+ $(LN_S) -f move$$cur 4498f0e0c1937ffe01fd06f973665830$$cur && \
-+ $(LN_S) -f move$$cur 9081237383d90e509aa00f00170e968f$$cur && \
-+ $(LN_S) -f copy$$cur 1081e37283d90000800003c07f3ef6bf$$cur && \
-+ $(LN_S) -f copy$$cur 6407b0e94181790501fd1e167b474872$$cur && \
-+ $(LN_S) -f cross$$cur cross_reverse$$cur && \
-+ $(LN_S) -f cross$$cur diamond_cross$$cur && \
-+ $(LN_S) -f hand1$$cur grab$$cur && \
-+ $(LN_S) -f hand2$$cur 9d800788f1b08800ae810202380a0822$$cur && \
-+ $(LN_S) -f hand2$$cur e29285e634086352946a0e7090d73106$$cur && \
-+ $(LN_S) -f hand2$$cur hand$$cur && \
-+ $(LN_S) -f grabbing$$cur fleur$$cur && \
-+ $(LN_S) -f question_arrow$$cur d9ce0ab605698f320427677b458ad60b$$cur && \
-+ $(LN_S) -f question_arrow$$cur 5c6cd98b3f3ebcb1f9c7f1c204630408$$cur && \
-+ $(LN_S) -f question_arrow$$cur help$$cur && \
-+ $(LN_S) -f question_arrow$$cur left_ptr_help$$cur && \
-+ $(LN_S) -f link$$cur 3085a0e285430894940527032f8b26df$$cur && \
-+ $(LN_S) -f link$$cur 640fb0e74195791501fd1ed57b41487f$$cur && \
-+ $(LN_S) -f crossed_circle$$cur 03b6e0fcb3499374a867c041f52298f0$$cur && \
-+ $(LN_S) -f fd_double_arrow$$cur fcf1c3c7cd4491d801f1e1c78f100000$$cur && \
-+ $(LN_S) -f bd_double_arrow$$cur c7088f0f3e6c8088236ef8e1e3e70000$$cur && \
-+ $(LN_S) -f sb_h_double_arrow$$cur h_double_arrow$$cur && \
-+ $(LN_S) -f sb_h_double_arrow$$cur 14fef782d02440884392942c11205230$$cur && \
-+ $(LN_S) -f h_double_arrow$$cur 028006030e0e7ebffc7f7070c0600140$$cur && \
-+ $(LN_S) -f sb_v_double_arrow$$cur double_arrow$$cur && \
-+ $(LN_S) -f sb_v_double_arrow$$cur v_double_arrow$$cur && \
-+ $(LN_S) -f sb_v_double_arrow$$cur 2870a09082c103050810ffdffffe0204$$cur && \
-+ $(LN_S) -f v_double_arrow$$cur 00008160000006810000408080010102$$cur && \
-+ $(LN_S) -f left_ptr$$cur default$$cur && \
-+ $(LN_S) -f hand$$cur pointer$$cur && \
-+ $(LN_S) -f left_ptr_watch$$ani progress$$ani && \
-+ $(LN_S) -f watch$$ani wait$$ani && \
-+ $(LN_S) -f cross$$cur crosshair$$cur && \
-+ $(LN_S) -f xterm$$cur text$$cur && \
-+ $(LN_S) -f dnd-link$$cur alias$$cur && \
-+ $(LN_S) -f dnd-copy$$cur copy$$cur && \
-+ $(LN_S) -f dnd-none$$cur no-drop$$cur && \
-+ $(LN_S) -f crossed_circle$$cur not-allowed$$cur && \
-+ $(LN_S) -f sb_h_double_arrow$$cur col-resize$$cur && \
-+ $(LN_S) -f sb_v_double_arrow$$cur row-resize$$cur && \
-+ $(LN_S) -f top_side$$cur n-resize$$cur && \
-+ $(LN_S) -f right_side$$cur e-resize$$cur && \
-+ $(LN_S) -f bottom_side$$cur s-resize$$cur && \
-+ $(LN_S) -f left_side$$cur w-resize$$cur && \
-+ $(LN_S) -f top_right_corner$$cur ne-resize$$cur && \
-+ $(LN_S) -f top_left_corner$$cur nw-resize$$cur && \
-+ $(LN_S) -f bottom_right_corner$$cur se-resize$$cur && \
-+ $(LN_S) -f bottom_left_corner$$cur sw-resize$$cur && \
-+ $(LN_S) -f sb_h_double_arrow$$cur ew-resize$$cur && \
-+ $(LN_S) -f sb_v_double_arrow$$cur ns-resize$$cur && \
-+ $(LN_S) -f fd_double_arrow$$cur nesw-resize$$cur && \
-+ $(LN_S) -f bd_double_arrow$$cur nwse-resize$$cur; \
-+ done
- if test -z "$(DESTDIR)" && test -n "$(GTK_UPDATE_ICON_CACHE)" ; then \
- $(GTK_UPDATE_ICON_CACHE) -q $(DESTDIR)$(themedir); \
- fi
-diff --git a/configure.ac b/configure.ac
-index 9e4d8a0..312b24c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,6 +31,7 @@ AC_SUBST([render_sizes], ["8x8 16x16 22x22 24x24 32x32 48x48 256x256"])
- AC_SUBST([symbolic_render_sizes], [""])
- AC_SUBST([install_sizes], ["8x8 16x16 22x22 24x24 32x32 48x48 64x64 96x96 256x256"])
-
-+AC_PROG_LN_S
- AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache)
-
- # need git, icontool, and inkscape for rendering
-@@ -56,6 +57,29 @@ if test "x$GTK_ENCODE_SYMBOLIC_SVG" = "xfalse"; then
- fi
- AC_SUBST(symbolic_encode_sizes)
-
-+AC_ARG_ENABLE([w32-cursors],
-+ [AS_HELP_STRING([--enable-w32-cursors],
-+ [Make and install Windows cursors (.cur and .ani) instead of X cursors])],
-+ [case "${enableval}" in
-+ yes) enable_w32_cursors=yes ;;
-+ no) enable_w32_cursors=no ;;
-+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-w32-cursors]) ;;
-+ esac],
-+ [enable_w32_cursors=no])
-+AC_SUBST(enable_w32_cursors)
-+
-+AC_ARG_ENABLE([l-xl-variants],
-+ [AS_HELP_STRING([--enable-l-xl-variants],
-+ [Also make and install Large and Extra Large Windows cursor versions])],
-+ [case "${enableval}" in
-+ yes) enable_l_xl_variants=yes ;;
-+ no) enable_l_xl_variants=no ;;
-+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-l-xl-variants]) ;;
-+ esac],
-+ [enable_l_xl_variants=no])
-+AC_SUBST(enable_l_xl_variants)
-+AM_CONDITIONAL([ENABLE_L_XL_VARIANTS], [test x$enable_l_xl_variants = xyes])
-+
- AC_CONFIG_FILES([
- Makefile
- adwaita-icon-theme.pc
---
-2.1.4
-
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.18.0.bb
similarity index 85%
rename from meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb
rename to meta/recipes-gnome/gnome/adwaita-icon-theme_3.18.0.bb
index 0d7fa0c..2052761 100644
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.18.0.bb
@@ -12,11 +12,10 @@ DEPENDS += "intltool-native"
MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
- file://Create-symlinks-when-installing-cursors.patch \
"
-SRC_URI[md5sum] = "9ef86952c947aa27a1a888b7735d60b3"
-SRC_URI[sha256sum] = "b4556dfbf555d4fac12d4d5c12f7519de0d43ec42a1b649611439a50bf7acb96"
+SRC_URI[md5sum] = "ec1fa3fde83ad166ae7075a97dc1ec4b"
+SRC_URI[sha256sum] = "5e9ce726001fdd8ee93c394fdc3cdb9e1603bbed5b7c62df453ccf521ec50e58"
do_install_append() {
# Build uses gtk-encode-symbolic-svg to create png versions:
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 05/19] gtk+3: Upgrade 3.16.6 -> 3.18.2
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
` (3 preceding siblings ...)
2015-11-13 9:46 ` [PATCH 04/19] adwaita-icon-theme: Upgrade 3.16.2.1 -> 3.18.0 Jussi Kukkonen
@ 2015-11-13 9:46 ` Jussi Kukkonen
2015-11-13 9:46 ` [PATCH 06/19] package_regex.inc: Add gtk-icon-utils-native Jussi Kukkonen
` (14 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:46 UTC (permalink / raw)
To: openembedded-core
* Package new development tool gtk-builder-tool.
* Disable colord support (for explicitness, no functional change)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-gnome/gtk+/gtk+3.inc | 5 ++++-
meta/recipes-gnome/gtk+/{gtk+3_3.16.6.bb => gtk+3_3.18.2.bb} | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
rename meta/recipes-gnome/gtk+/{gtk+3_3.16.6.bb => gtk+3_3.18.2.bb} (83%)
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index 22a40d8..1141b90 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -29,6 +29,7 @@ EXTRA_OECONF += " \
--enable-modules \
--disable-cups \
--disable-introspection \
+ --disable-colord \
"
PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \
@@ -79,7 +80,9 @@ FILES_${PN}-dev += " \
${libdir}/gtk-3.0/${LIBV}/engines/*.la \
${libdir}/gtk-3.0/modules/*.la \
${bindir}/gtk-builder-convert \
- ${bindir}/gtk-encode-symbolic-svg"
+ ${bindir}/gtk-encode-symbolic-svg \
+ ${bindir}/gtk-builder-tool \
+ "
FILES_${PN}-dbg += " \
${libdir}/gtk-3.0/${LIBV}/loaders/.debug \
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb b/meta/recipes-gnome/gtk+/gtk+3_3.18.2.bb
similarity index 83%
rename from meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb
rename to meta/recipes-gnome/gtk+/gtk+3_3.18.2.bb
index 381e607..46f0cf9 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.18.2.bb
@@ -8,8 +8,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
file://Do-not-try-to-initialize-GL-without-libGL.patch \
"
-SRC_URI[md5sum] = "fc59e5c8b5a4585b60623dd708df400b"
-SRC_URI[sha256sum] = "4d12726d0856a968b41802ae5c5971d7e9bac532717e309d3f81b9989da5ffbe"
+SRC_URI[md5sum] = "230fd78e42419d35ff790784b457e5f2"
+SRC_URI[sha256sum] = "5dbec561c4a00070073bf9cf4cfdd61fab4a14c8ff5b15d700bd378f8185e152"
S = "${WORKDIR}/gtk+-${PV}"
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 06/19] package_regex.inc: Add gtk-icon-utils-native
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
` (4 preceding siblings ...)
2015-11-13 9:46 ` [PATCH 05/19] gtk+3: Upgrade 3.16.6 -> 3.18.2 Jussi Kukkonen
@ 2015-11-13 9:46 ` Jussi Kukkonen
2015-11-13 9:46 ` [PATCH 07/19] gtk-icon-utils-native: Upgrade 3.16.6 -> 3.18.2 Jussi Kukkonen
` (13 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:46 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/conf/distro/include/package_regex.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/conf/distro/include/package_regex.inc b/meta/conf/distro/include/package_regex.inc
index d12999b..9bf9681 100644
--- a/meta/conf/distro/include/package_regex.inc
+++ b/meta/conf/distro/include/package_regex.inc
@@ -225,6 +225,7 @@ REGEX_pn-pango = "${GNOME_STABLE}"
REGEX_pn-gtk+ = "${GNOME2_STABLE}"
REGEX_pn-gtk+3 = "${GNOME_STABLE}"
REGEX_pn-gtk-engines = "${GNOME2_STABLE}"
+REGEX_pn-gtk-icon-utils-native = "${GNOME2_STABLE}"
REGEX_pn-glib-networking = "${GNOME_STABLE}"
REGEX_pn-librsvg = "${GNOME_STABLE}"
REGEX_pn-libsoup-2.4 = "${GNOME_STABLE}"
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 07/19] gtk-icon-utils-native: Upgrade 3.16.6 -> 3.18.2
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
` (5 preceding siblings ...)
2015-11-13 9:46 ` [PATCH 06/19] package_regex.inc: Add gtk-icon-utils-native Jussi Kukkonen
@ 2015-11-13 9:46 ` Jussi Kukkonen
2015-11-13 9:46 ` [PATCH 08/19] libxi: Upgrade 1.7.4 -> 1.7.5 Jussi Kukkonen
` (12 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:46 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
...tk-icon-utils-native_3.16.6.bb => gtk-icon-utils-native_3.18.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.16.6.bb => gtk-icon-utils-native_3.18.2.bb} (94%)
diff --git a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.16.6.bb b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.2.bb
similarity index 94%
rename from meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.16.6.bb
rename to meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.2.bb
index cba3815..e6c475b 100644
--- a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.16.6.bb
+++ b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.2.bb
@@ -10,8 +10,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
file://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch"
-SRC_URI[md5sum] = "fc59e5c8b5a4585b60623dd708df400b"
-SRC_URI[sha256sum] = "4d12726d0856a968b41802ae5c5971d7e9bac532717e309d3f81b9989da5ffbe"
+SRC_URI[md5sum] = "230fd78e42419d35ff790784b457e5f2"
+SRC_URI[sha256sum] = "5dbec561c4a00070073bf9cf4cfdd61fab4a14c8ff5b15d700bd378f8185e152"
LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 08/19] libxi: Upgrade 1.7.4 -> 1.7.5
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
` (6 preceding siblings ...)
2015-11-13 9:46 ` [PATCH 07/19] gtk-icon-utils-native: Upgrade 3.16.6 -> 3.18.2 Jussi Kukkonen
@ 2015-11-13 9:46 ` Jussi Kukkonen
2015-11-13 9:46 ` [PATCH 09/19] pixman: Upgrade 0.32.6 -> 0.32.8 Jussi Kukkonen
` (11 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:46 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-graphics/xorg-lib/{libxi_1.7.4.bb => libxi_1.7.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libxi_1.7.4.bb => libxi_1.7.5.bb} (81%)
diff --git a/meta/recipes-graphics/xorg-lib/libxi_1.7.4.bb b/meta/recipes-graphics/xorg-lib/libxi_1.7.5.bb
similarity index 81%
rename from meta/recipes-graphics/xorg-lib/libxi_1.7.4.bb
rename to meta/recipes-graphics/xorg-lib/libxi_1.7.5.bb
index 07033a3..f629d3f 100644
--- a/meta/recipes-graphics/xorg-lib/libxi_1.7.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libxi_1.7.5.bb
@@ -17,5 +17,5 @@ PE = "1"
XORG_PN = "libXi"
-SRC_URI[md5sum] = "9c4a69c34b19ec1e4212e849549544cb"
-SRC_URI[sha256sum] = "2cffc2686618dc1803725636cd92b36342c512dc60a7a35cba34bf7192a42244"
+SRC_URI[md5sum] = "9f02462855c598a0cd0ddfd98c6e25f5"
+SRC_URI[sha256sum] = "d964d7deb5d8f7d6b9c358969c625073d7ab273dbda94693130b3540bc0ca229"
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 09/19] pixman: Upgrade 0.32.6 -> 0.32.8
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
` (7 preceding siblings ...)
2015-11-13 9:46 ` [PATCH 08/19] libxi: Upgrade 1.7.4 -> 1.7.5 Jussi Kukkonen
@ 2015-11-13 9:46 ` Jussi Kukkonen
2015-11-13 9:46 ` [PATCH 10/19] libxcb: Upgrade 1.11 -> 1.11.1 Jussi Kukkonen
` (10 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:46 UTC (permalink / raw)
To: openembedded-core
Update Upstream-Status on a patch.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch | 2 +-
meta/recipes-graphics/xorg-lib/{pixman_0.32.6.bb => pixman_0.32.8.bb} | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/xorg-lib/{pixman_0.32.6.bb => pixman_0.32.8.bb} (90%)
diff --git a/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch b/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch
index a60df5f..6b7c1e6 100644
--- a/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch
+++ b/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch
@@ -11,7 +11,7 @@ problematic code in test/utils.c.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Marek Vasut <marex@denx.de>
-Upstream-Status: Submitted
+Upstream-Status: Backport [commit 4297e9058]
---
Changes v1 -> v2:
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb b/meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb
similarity index 90%
rename from meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb
rename to meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb
index 317a568..e13b9ad 100644
--- a/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb
@@ -34,7 +34,7 @@ SRC_URI += "\
file://0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch \
"
-SRC_URI[md5sum] = "8a9e8f14743a39cf303803f369c1f344"
-SRC_URI[sha256sum] = "201fc0d7d6bc0017496f2bd27b3ca14224aea0df6b624c5ee2dc0307a4ff14a4"
+SRC_URI[md5sum] = "18d6b62abdb7bc0f8e6b0ddf48986b2c"
+SRC_URI[sha256sum] = "5c63dbb3523fc4d86ed4186677815918a941b7cb390d5eec4f55cb5d66b59fb1"
REQUIRED_DISTRO_FEATURES = ""
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 10/19] libxcb: Upgrade 1.11 -> 1.11.1
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
` (8 preceding siblings ...)
2015-11-13 9:46 ` [PATCH 09/19] pixman: Upgrade 0.32.6 -> 0.32.8 Jussi Kukkonen
@ 2015-11-13 9:46 ` Jussi Kukkonen
2015-11-13 9:46 ` [PATCH 11/19] libxcb: Remove unused git-version of the recipe Jussi Kukkonen
` (9 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:46 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-graphics/xorg-lib/{libxcb_1.11.bb => libxcb_1.11.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libxcb_1.11.bb => libxcb_1.11.1.bb} (48%)
diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb
similarity index 48%
rename from meta/recipes-graphics/xorg-lib/libxcb_1.11.bb
rename to meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb
index c162702..23a83ef 100644
--- a/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb
+++ b/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb
@@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7"
DEPENDS += "libxdmcp"
-SRC_URI[md5sum] = "5a873ebd383d1a60612dd6ec6b42c781"
-SRC_URI[sha256sum] = "03635d70045b9ede90778e67516135828a57de87ac508f987024f43c03620ff7"
+SRC_URI[md5sum] = "f97a65e6158775de518ac391935634c2"
+SRC_URI[sha256sum] = "b720fd6c7d200e5371affdb3f049cc8f88cff9aed942ff1b824d95eedbf69d30"
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 11/19] libxcb: Remove unused git-version of the recipe
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
` (9 preceding siblings ...)
2015-11-13 9:46 ` [PATCH 10/19] libxcb: Upgrade 1.11 -> 1.11.1 Jussi Kukkonen
@ 2015-11-13 9:46 ` Jussi Kukkonen
2015-11-13 9:46 ` [PATCH 12/19] xserver-xorg: Upgrade 1.17.2 -> 1.18.0 Jussi Kukkonen
` (8 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:46 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-graphics/xorg-lib/libxcb.inc | 30 ------------------------
meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb | 31 +++++++++++++++++++++----
meta/recipes-graphics/xorg-lib/libxcb_git.bb | 10 --------
3 files changed, 27 insertions(+), 44 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libxcb.inc
delete mode 100644 meta/recipes-graphics/xorg-lib/libxcb_git.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxcb.inc b/meta/recipes-graphics/xorg-lib/libxcb.inc
deleted file mode 100644
index fe31f20..0000000
--- a/meta/recipes-graphics/xorg-lib/libxcb.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-SUMMARY = "XCB: The X protocol C binding library"
-DESCRIPTION = "The X protocol C-language Binding (XCB) is a replacement \
-for Xlib featuring a small footprint, latency hiding, direct access to \
-the protocol, improved threading support, and extensibility."
-HOMEPAGE = "http://xcb.freedesktop.org"
-BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB"
-
-BBCLASSEXTEND = "native nativesdk"
-
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-
-DEPENDS = "xcb-proto xproto libxau xcb-proto-native libpthread-stubs"
-
-SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \
- file://xcbincludedir.patch \
- file://disable-check.patch"
-
-PACKAGES_DYNAMIC = "^libxcb-.*"
-
-FILES_${PN} = "${libdir}/libxcb.so.*"
-
-inherit autotools pkgconfig pythonnative distro_features_check
-
-# The libxau and others requires x11 in DISTRO_FEATURES
-REQUIRED_DISTRO_FEATURES = "x11"
-
-python populate_packages_prepend () {
- do_split_packages(d, '${libdir}', '^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True)
-}
diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb
index 23a83ef..1f4852d 100644
--- a/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb
@@ -1,10 +1,33 @@
-include libxcb.inc
+SUMMARY = "XCB: The X protocol C binding library"
+DESCRIPTION = "The X protocol C-language Binding (XCB) is a replacement \
+for Xlib featuring a small footprint, latency hiding, direct access to \
+the protocol, improved threading support, and extensibility."
+HOMEPAGE = "http://xcb.freedesktop.org"
+BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB"
+SECTION = "x11/libs"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7"
-
-DEPENDS += "libxdmcp"
-
+SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \
+ file://xcbincludedir.patch \
+ file://disable-check.patch"
SRC_URI[md5sum] = "f97a65e6158775de518ac391935634c2"
SRC_URI[sha256sum] = "b720fd6c7d200e5371affdb3f049cc8f88cff9aed942ff1b824d95eedbf69d30"
+
+BBCLASSEXTEND = "native nativesdk"
+
+DEPENDS = "xcb-proto xproto libxau xcb-proto-native libpthread-stubs libxdmcp"
+
+PACKAGES_DYNAMIC = "^libxcb-.*"
+
+FILES_${PN} = "${libdir}/libxcb.so.*"
+
+inherit autotools pkgconfig pythonnative distro_features_check
+
+# The libxau and others requires x11 in DISTRO_FEATURES
+REQUIRED_DISTRO_FEATURES = "x11"
+
+python populate_packages_prepend () {
+ do_split_packages(d, '${libdir}', '^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True)
+}
diff --git a/meta/recipes-graphics/xorg-lib/libxcb_git.bb b/meta/recipes-graphics/xorg-lib/libxcb_git.bb
deleted file mode 100644
index 186636e..0000000
--- a/meta/recipes-graphics/xorg-lib/libxcb_git.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFAULT_PREFERENCE = "-1"
-
-include libxcb.inc
-
-SRCREV = "625ed596cae6dd8175aeb6cb6f26784928042f22"
-PV = "1.1.90.1+gitr${SRCPV}"
-PR = "r1"
-
-SRC_URI = "git://anongit.freedesktop.org/git/xcb/libxcb"
-S = "${WORKDIR}/git"
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 12/19] xserver-xorg: Upgrade 1.17.2 -> 1.18.0
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
` (10 preceding siblings ...)
2015-11-13 9:46 ` [PATCH 11/19] libxcb: Remove unused git-version of the recipe Jussi Kukkonen
@ 2015-11-13 9:46 ` Jussi Kukkonen
2015-11-16 17:56 ` [PATCHv2 " Jussi Kukkonen
2015-11-13 9:46 ` [PATCH 13/19] xorg-driver-input: add xorg configuration to FILES Jussi Kukkonen
` (7 subsequent siblings)
19 siblings, 1 reply; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:46 UTC (permalink / raw)
To: openembedded-core
* Remove glibc-guard patch: xserver no longer uses termio.h on linux
in any case.
* Remove "--enable-glx-tls": this hasn't done anything since glapi
was separated from glx
* Note that xserver no longer installs evdev configuration
(evdev and/or libinput should do it instead)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +-
...e-__GLIBC__-guard-for-glibc-specific-code.patch | 31 ----------------------
...erver-xorg_1.17.2.bb => xserver-xorg_1.18.0.bb} | 6 ++---
3 files changed, 3 insertions(+), 36 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.17.2.bb => xserver-xorg_1.18.0.bb} (78%)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 9881c94..c1d87a7 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -133,7 +133,7 @@ PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86dripro
PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto"
# DRI3 requires xshmfence to also be enabled
PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto"
-PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtual/libgl virtual/libx11"
+PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,glproto virtual/libgl virtual/libx11"
PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence"
PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch
deleted file mode 100644
index 21e4ed4..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f242740f6488a25e6ca84968b0e2319a9a3975b4 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 6 Apr 2015 20:52:50 -0700
-Subject: [PATCH] use __GLIBC__ guard for glibc specific code
-
-Using __linux__ is a tad bit wrong assumption since
-linux != glibc
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- hw/xfree86/os-support/xf86_OSlib.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
-index eb0a338..c366ffc 100644
---- a/hw/xfree86/os-support/xf86_OSlib.h
-+++ b/hw/xfree86/os-support/xf86_OSlib.h
-@@ -178,7 +178,7 @@
- #include <sys/types.h>
- #include <assert.h>
-
--#ifdef __linux__
-+#ifdef __GLIBC__
- #include <termio.h>
- #else /* __GLIBC__ */
- #include <termios.h>
---
-2.1.4
-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb
similarity index 78%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb
index 3039d30..6c48bb9 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb
@@ -1,9 +1,7 @@
require xserver-xorg.inc
-SRC_URI += "file://0001-use-__GLIBC__-guard-for-glibc-specific-code.patch \
- "
-SRC_URI[md5sum] = "397e405566651150490ff493e463f1ad"
-SRC_URI[sha256sum] = "f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993"
+SRC_URI[md5sum] = "3c1c1057d3ad27380d8dd87ffcc182cd"
+SRC_URI[sha256sum] = "195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e"
# These extensions are now integrated into the server, so declare the migration
# path for in-place upgrades.
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCHv2 12/19] xserver-xorg: Upgrade 1.17.2 -> 1.18.0
2015-11-13 9:46 ` [PATCH 12/19] xserver-xorg: Upgrade 1.17.2 -> 1.18.0 Jussi Kukkonen
@ 2015-11-16 17:56 ` Jussi Kukkonen
0 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-16 17:56 UTC (permalink / raw)
To: openembedded-core
* Remove glibc-guard patch: xserver no longer uses termio.h on linux
in any case.
* Remove "--enable-glx-tls": this hasn't done anything since glapi
was separated from glx
* Note that xserver no longer installs evdev configuration
(evdev and/or libinput should do it instead)
* Add patch to check for libsystemd correctly
* Add PACKAGECONFIG for libsystemd
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
Changes since v1:
* Add patch to check for libsystemd correctly
(compile failed with systemd)
* Add PACKAGECONFIG for libsystemd
I've force-pushed the jku/x11-gtk-upgrades branch with this change.
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 4 +-
...e-__GLIBC__-guard-for-glibc-specific-code.patch | 31 --------------
....ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch | 50 ++++++++++++++++++++++
...erver-xorg_1.17.2.bb => xserver-xorg_1.18.0.bb} | 7 ++-
4 files changed, 56 insertions(+), 36 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.17.2.bb => xserver-xorg_1.18.0.bb} (78%)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 9881c94..32c4491 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -126,6 +126,7 @@ EXTRA_OECONF += "--with-fop=no \
PACKAGECONFIG ??= "dri2 udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \
${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)} \
"
PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
@@ -133,11 +134,12 @@ PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86dripro
PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto"
# DRI3 requires xshmfence to also be enabled
PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto"
-PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtual/libgl virtual/libx11"
+PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,glproto virtual/libgl virtual/libx11"
PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence"
PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
+PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd"
PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto"
PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland libepoxy"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch
deleted file mode 100644
index 21e4ed4..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f242740f6488a25e6ca84968b0e2319a9a3975b4 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 6 Apr 2015 20:52:50 -0700
-Subject: [PATCH] use __GLIBC__ guard for glibc specific code
-
-Using __linux__ is a tad bit wrong assumption since
-linux != glibc
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- hw/xfree86/os-support/xf86_OSlib.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
-index eb0a338..c366ffc 100644
---- a/hw/xfree86/os-support/xf86_OSlib.h
-+++ b/hw/xfree86/os-support/xf86_OSlib.h
-@@ -178,7 +178,7 @@
- #include <sys/types.h>
- #include <assert.h>
-
--#ifdef __linux__
-+#ifdef __GLIBC__
- #include <termio.h>
- #else /* __GLIBC__ */
- #include <termios.h>
---
-2.1.4
-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch
new file mode 100644
index 0000000..3ac6c5b
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch
@@ -0,0 +1,50 @@
+From 0c2153d468229f56e6fef71d2f002e0cae14aa55 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Mon, 16 Nov 2015 16:18:40 +0200
+Subject: [PATCH] configure.ac: Use libsystemd in REQUIRED_LIBS check
+
+REQUIRED_LIBS needs to be set to the correct systemd library,
+otherwise the later check will either fail or use the wrong
+pc file.
+
+Upstream-status: Submitted [xorg-devel@lists.x.org]
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ configure.ac | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 96c0242..f63eca1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -837,9 +837,16 @@ AC_ARG_WITH([systemd-daemon],
+ [support systemd socket activation (default: auto)]),
+ [WITH_SYSTEMD_DAEMON=$withval], [WITH_SYSTEMD_DAEMON=auto])
+ PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
+- [HAVE_SYSTEMD_DAEMON=yes],
++ [REQUIRED_SYSTEMD_DAEMON=libsystemd-daemon],
+ [PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd],
+- [HAVE_SYSTEMD_DAEMON=yes], [HAVE_SYSTEMD_DAEMON=no])])
++ [REQUIRED_SYSTEMD_DAEMON=libsystemd],
++ [REQUIRED_SYSTEMD_DAEMON=])])
++if test "x$REQUIRED_SYSTEMD_DAEMON" = x; then
++ HAVE_SYSTEMD_DAEMON=no
++else
++ HAVE_SYSTEMD_DAEMON=yes
++fi
++
+ if test "x$WITH_SYSTEMD_DAEMON" = xauto; then
+ WITH_SYSTEMD_DAEMON="$HAVE_SYSTEMD_DAEMON"
+ fi
+@@ -848,7 +855,7 @@ if test "x$WITH_SYSTEMD_DAEMON" = xyes; then
+ AC_MSG_ERROR([systemd support requested but no library has been found])
+ fi
+ AC_DEFINE(HAVE_SYSTEMD_DAEMON, 1, [Define to 1 if libsystemd-daemon is available])
+- REQUIRED_LIBS="$REQUIRED_LIBS libsystemd-daemon"
++ REQUIRED_LIBS="$REQUIRED_LIBS $REQUIRED_SYSTEMD_DAEMON"
+ fi
+ AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"])
+
+--
+2.1.4
+
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb
similarity index 78%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb
index 3039d30..60973c5 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb
@@ -1,9 +1,8 @@
require xserver-xorg.inc
-SRC_URI += "file://0001-use-__GLIBC__-guard-for-glibc-specific-code.patch \
- "
-SRC_URI[md5sum] = "397e405566651150490ff493e463f1ad"
-SRC_URI[sha256sum] = "f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993"
+SRC_URI += "file://configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch"
+SRC_URI[md5sum] = "3c1c1057d3ad27380d8dd87ffcc182cd"
+SRC_URI[sha256sum] = "195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e"
# These extensions are now integrated into the server, so declare the migration
# path for in-place upgrades.
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 13/19] xorg-driver-input: add xorg configuration to FILES
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
` (11 preceding siblings ...)
2015-11-13 9:46 ` [PATCH 12/19] xserver-xorg: Upgrade 1.17.2 -> 1.18.0 Jussi Kukkonen
@ 2015-11-13 9:46 ` Jussi Kukkonen
2015-11-13 9:46 ` [PATCH 14/19] xf86-input-evdev: Upgrade 2.9.2 -> 2.10.0 Jussi Kukkonen
` (6 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:46 UTC (permalink / raw)
To: openembedded-core
It's common for input drivers to to add files into
${datadir}/X11/xorg.conf.d/.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb | 2 --
meta/recipes-graphics/xorg-driver/xorg-driver-input.inc | 4 +++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb
index 19c122f..32db25b 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb
@@ -14,5 +14,3 @@ SRC_URI[md5sum] = "8ed68e8cc674dd61adb280704764aafb"
SRC_URI[sha256sum] = "7b0e164ebd02a680e0c695955e783059f37edb0c2656398e0a972adc8e698c80"
DEPENDS += "libxi mtdev libxtst libevdev"
-
-FILES_${PN} += "${datadir}/X11/xorg.conf.d"
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
index fbec064..21b60c4 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
@@ -7,5 +7,7 @@ python add_xorg_abi_depends() {
}
PACKAGEFUNCS =+ "add_xorg_abi_depends"
-FILES_${PN} += " ${libdir}/xorg/modules/input/*.so"
+FILES_${PN} += " ${libdir}/xorg/modules/input/*.so \
+ ${datadir}/X11/xorg.conf.d \
+ "
FILES_${PN}-dbg += " ${libdir}/xorg/modules/input/.debug"
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 14/19] xf86-input-evdev: Upgrade 2.9.2 -> 2.10.0
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
` (12 preceding siblings ...)
2015-11-13 9:46 ` [PATCH 13/19] xorg-driver-input: add xorg configuration to FILES Jussi Kukkonen
@ 2015-11-13 9:46 ` Jussi Kukkonen
2015-11-13 9:47 ` [PATCH 15/19] xf86-input-synaptics: Upgrade 1.8.2 -> 1.8.3 Jussi Kukkonen
` (5 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:46 UTC (permalink / raw)
To: openembedded-core
This version installs the 10-evdev.conf configuration file
that is no longer included in xserver-xorg.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../{xf86-input-evdev_2.9.2.bb => xf86-input-evdev_2.10.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.9.2.bb => xf86-input-evdev_2.10.0.bb} (83%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.2.bb b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.0.bb
similarity index 83%
rename from meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.2.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.0.bb
index 66428df..3d06f03 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.2.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.0.bb
@@ -16,5 +16,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16"
DEPENDS += "mtdev libevdev"
-SRC_URI[md5sum] = "99eebf171e6c7bffc42d4fc430d47454"
-SRC_URI[sha256sum] = "792329b531afc6928ccda94e4b51a5520d4ddf8ef9a00890a5d0d31898acefec"
+SRC_URI[md5sum] = "b1183c55125981d346102d1be704760b"
+SRC_URI[sha256sum] = "d097298eb07b7a9edf4493b5c3c058041458ca52c8c62dbd4f40b84c5086d117"
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 15/19] xf86-input-synaptics: Upgrade 1.8.2 -> 1.8.3
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
` (13 preceding siblings ...)
2015-11-13 9:46 ` [PATCH 14/19] xf86-input-evdev: Upgrade 2.9.2 -> 2.10.0 Jussi Kukkonen
@ 2015-11-13 9:47 ` Jussi Kukkonen
2015-11-13 9:47 ` [PATCH 16/19] xf86-video-omap: Upgrade 0.4.3 -> 0.4.4 Jussi Kukkonen
` (4 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../{xf86-input-synaptics_1.8.2.bb => xf86-input-synaptics_1.8.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-input-synaptics_1.8.2.bb => xf86-input-synaptics_1.8.3.bb} (79%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.3.bb
similarity index 79%
rename from meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.3.bb
index 32db25b..b47c82c 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.3.bb
@@ -10,7 +10,7 @@ advanced features of the touchpad to become available."
LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398"
-SRC_URI[md5sum] = "8ed68e8cc674dd61adb280704764aafb"
-SRC_URI[sha256sum] = "7b0e164ebd02a680e0c695955e783059f37edb0c2656398e0a972adc8e698c80"
+SRC_URI[md5sum] = "4e3c8bed1ab4a67db2160c2c3d7e2a34"
+SRC_URI[sha256sum] = "d39f100c74f3673778b53f17bab7690161925e25dd998a15dd8cc69b52e83f01"
DEPENDS += "libxi mtdev libxtst libevdev"
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 16/19] xf86-video-omap: Upgrade 0.4.3 -> 0.4.4
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
` (14 preceding siblings ...)
2015-11-13 9:47 ` [PATCH 15/19] xf86-input-synaptics: Upgrade 1.8.2 -> 1.8.3 Jussi Kukkonen
@ 2015-11-13 9:47 ` Jussi Kukkonen
2015-11-13 9:47 ` [PATCH 17/19] xinput: Upgrade 1.6.1 -> 1.6.2 Jussi Kukkonen
` (3 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:47 UTC (permalink / raw)
To: openembedded-core
Remove backported patch.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
...put_dpms-Replace-logical-with-bitwise-ope.patch | 31 ----------------------
...ideo-omap_0.4.3.bb => xf86-video-omap_0.4.4.bb} | 6 ++---
2 files changed, 2 insertions(+), 35 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch
rename meta/recipes-graphics/xorg-driver/{xf86-video-omap_0.4.3.bb => xf86-video-omap_0.4.4.bb} (84%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch
deleted file mode 100644
index 41e77d3..0000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fc653ca3b36435aea281ae409fb90f85e1bc0d81 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 7 Sep 2015 08:44:13 +0000
-Subject: [freedreno][PATCH] drmmode_output_dpms: Replace logical && with bitwise &
- operation
-
-This is a mask calculation so bitbwise & should have been used
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Submitted
-
- src/drmmode_display.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index c3cf4f8..eb54b59 100644
---- a/src/drmmode_display.c
-+++ b/src/drmmode_display.c
-@@ -777,7 +777,7 @@ drmmode_output_dpms(xf86OutputPtr output, int mode)
-
- for (i = 0; i < koutput->count_props; i++) {
- props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
-- if (props && (props->flags && DRM_MODE_PROP_ENUM)) {
-+ if (props && (props->flags & DRM_MODE_PROP_ENUM)) {
- if (!strcmp(props->name, "DPMS")) {
- mode_id = koutput->props[i];
- drmModeFreeProperty(props);
---
-2.5.1
-
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.4.bb
similarity index 84%
rename from meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.4.bb
index 76682ed..7895449 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.4.bb
@@ -24,10 +24,8 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602"
DEPENDS += "virtual/libx11 libdrm xf86driproto"
-SRC_URI += "file://0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch"
-
-SRC_URI[md5sum] = "be35daf6fa4b75092cc4a8978c437bc5"
-SRC_URI[sha256sum] = "db1e0e69fd4c4c8fdca5ef2cb0447bccd7518a718495876a6904bef57b39986d"
+SRC_URI[md5sum] = "a364e151a537948f75bb8c9b840a31da"
+SRC_URI[sha256sum] = "a7192690b8638f5c8d611a1bae07cc13081e22edd4070f37a2f5c3f8d79e7ebc"
CFLAGS += " -I${STAGING_INCDIR}/xorg "
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 17/19] xinput: Upgrade 1.6.1 -> 1.6.2
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
` (15 preceding siblings ...)
2015-11-13 9:47 ` [PATCH 16/19] xf86-video-omap: Upgrade 0.4.3 -> 0.4.4 Jussi Kukkonen
@ 2015-11-13 9:47 ` Jussi Kukkonen
2015-11-13 9:47 ` [PATCH 18/19] xkbcomp: Upgrade 1.3.0 -> 1.3.1 Jussi Kukkonen
` (2 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-graphics/xorg-app/{xinput_1.6.1.bb => xinput_1.6.2.bb} | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
rename meta/recipes-graphics/xorg-app/{xinput_1.6.1.bb => xinput_1.6.2.bb} (66%)
diff --git a/meta/recipes-graphics/xorg-app/xinput_1.6.1.bb b/meta/recipes-graphics/xorg-app/xinput_1.6.2.bb
similarity index 66%
rename from meta/recipes-graphics/xorg-app/xinput_1.6.1.bb
rename to meta/recipes-graphics/xorg-app/xinput_1.6.2.bb
index 5befcc8..25cd047 100644
--- a/meta/recipes-graphics/xorg-app/xinput_1.6.1.bb
+++ b/meta/recipes-graphics/xorg-app/xinput_1.6.2.bb
@@ -8,7 +8,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=881525f89f99cad39c9832bcb72e6fa5"
DEPENDS += " libxi libxrandr libxinerama"
-
-SRC_URI[md5sum] = "305980ac78a6954e306a14d80a54c441"
-SRC_URI[sha256sum] = "b7632d0f228a8a6be93b09857ea413940fcf44091e60f4a0fe9f5fd82efd871f"
-
+SRC_URI[md5sum] = "6a889412eff2e3c1c6bb19146f6fe84c"
+SRC_URI[sha256sum] = "3694d29b4180952fbf13c6d4e59541310cbb11eef5bf888ff3d8b7f4e3aee5c4"
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 18/19] xkbcomp: Upgrade 1.3.0 -> 1.3.1
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
` (16 preceding siblings ...)
2015-11-13 9:47 ` [PATCH 17/19] xinput: Upgrade 1.6.1 -> 1.6.2 Jussi Kukkonen
@ 2015-11-13 9:47 ` Jussi Kukkonen
2015-11-13 9:47 ` [PATCH 19/19] xkeyboard-config: Upgrade 2.15 -> 2.16 Jussi Kukkonen
2015-11-13 14:09 ` [PATCH] packagegroup-core-directfb: Don't depend on pango-modules Jussi Kukkonen
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-graphics/xorg-app/{xkbcomp_1.3.0.bb => xkbcomp_1.3.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-app/{xkbcomp_1.3.0.bb => xkbcomp_1.3.1.bb} (78%)
diff --git a/meta/recipes-graphics/xorg-app/xkbcomp_1.3.0.bb b/meta/recipes-graphics/xorg-app/xkbcomp_1.3.1.bb
similarity index 78%
rename from meta/recipes-graphics/xorg-app/xkbcomp_1.3.0.bb
rename to meta/recipes-graphics/xorg-app/xkbcomp_1.3.1.bb
index efac069..1c98359 100644
--- a/meta/recipes-graphics/xorg-app/xkbcomp_1.3.0.bb
+++ b/meta/recipes-graphics/xorg-app/xkbcomp_1.3.1.bb
@@ -15,5 +15,5 @@ DEPENDS += "libxkbfile"
BBCLASSEXTEND = "native"
-SRC_URI[md5sum] = "0012a8e3092cddf7f87b250f96bb38c5"
-SRC_URI[sha256sum] = "cfac973778fabf5216121ad60b7af8ab74ce7513af0f9260cf8c5309e1622b2a"
+SRC_URI[md5sum] = "a4d8353daf6cb0a9c47379b7413c42c6"
+SRC_URI[sha256sum] = "0304dc9e0d4ac10831a9ef5d5419722375ddbc3eac3ff4413094d57bc1f1923d"
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 19/19] xkeyboard-config: Upgrade 2.15 -> 2.16
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
` (17 preceding siblings ...)
2015-11-13 9:47 ` [PATCH 18/19] xkbcomp: Upgrade 1.3.0 -> 1.3.1 Jussi Kukkonen
@ 2015-11-13 9:47 ` Jussi Kukkonen
2015-11-13 14:09 ` [PATCH] packagegroup-core-directfb: Don't depend on pango-modules Jussi Kukkonen
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 9:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../xorg-lib/{xkeyboard-config_2.15.bb => xkeyboard-config_2.16.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.15.bb => xkeyboard-config_2.16.bb} (88%)
diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.16.bb
similarity index 88%
rename from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb
rename to meta/recipes-graphics/xorg-lib/xkeyboard-config_2.16.bb
index f416990..16a1f4f 100644
--- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.16.bb
@@ -13,8 +13,8 @@ LICENSE = "MIT & MIT-style"
LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9"
SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "4af1deeb7c5f4cad62e65957d98d6758"
-SRC_URI[sha256sum] = "0e443cf7ca2f0b40846472c029647a05933fc705d611e1478c4db8a48a6f38bf"
+SRC_URI[md5sum] = "bf6aa31195584cfce01b2194c3e5ea26"
+SRC_URI[sha256sum] = "1e8a1f212c96b7f71ca0b05da361cac1816d27baae1d8e03e7b53049b58d1d58"
SECTION = "x11/libs"
DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native"
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH] packagegroup-core-directfb: Don't depend on pango-modules
2015-11-13 9:46 [PATCH 00/19] X11 & GTK+ version upgrades Jussi Kukkonen
` (18 preceding siblings ...)
2015-11-13 9:47 ` [PATCH 19/19] xkeyboard-config: Upgrade 2.15 -> 2.16 Jussi Kukkonen
@ 2015-11-13 14:09 ` Jussi Kukkonen
19 siblings, 0 replies; 22+ messages in thread
From: Jussi Kukkonen @ 2015-11-13 14:09 UTC (permalink / raw)
To: openembedded-core
Recent pango upgrade means there is no pango-modules.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
This is supposed to be a reply to my earlier message
"[OE-core][PATCH 00/19] X11 & GTK+ version upgrades".
I'm pushing this on top of the existing branch "jku/x11-gtk-upgrades".
meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
index 53dc0ae..a657a1a 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
@@ -11,7 +11,6 @@ RDEPENDS_${PN} = " \
directfb \
directfb-examples \
pango \
- pango-modules \
fontconfig \
${TOUCH} \
"
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread