Skip to contentSkip to conversation

Misc. version upgrades

PATCH Superseded Jussi Kukkonen 3 participants 12 messages May 23, 2016 – May 25, 2016

lore
Share & tools
lore

Jussi Kukkonen

author
#0 lore raw

cover Misc. version upgrades

More version upgrades. The tricky one here is mesa-demos (lots of patch changes there).

Thanks,
Jussi

The following changes since commit 32bbf685709d2c6c0d8938e18ef21130d1ea8eef:

meta-yocto-bsp: Enable xf86 modeset for beaglebone (2016-05-22 16:11:49 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib jku/more-upgrades
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/more-upgrades

Jussi Kukkonen (5):
docbook-xsl-stylesheets: Upgrade 1.78.1 -> 1.79.1
dropbear: Upgrade 2015.71 -> 2016.73
fontconfig: Upgrade 2.11.94 -> 2.11.95
mesa-demos: Upgrade 8.2.0 -> 8.3.0
matchbox-keyboard: Upgrade

 .../dropbear/support-out-of-tree-builds.patch      |   43 +
 meta/recipes-core/dropbear/dropbear_2015.71.bb     |    5 -
 meta/recipes-core/dropbear/dropbear_2016.73.bb     |    7 +
 ...1.78.1.bb => docbook-xsl-stylesheets_1.79.1.bb} |   22 +-
 ...ges-made-to-FcConfigAppFontAddDir-recentl.patch |  132 --
 ...fontconfig_2.11.94.bb => fontconfig_2.11.95.bb} |    7 +-
 ...mplement-with-AC_WITH-glut-so-that-withou.patch |   57 -
 ...llow-to-disable-demos-which-require-GLEW-.patch |  119 +-
 ...hen-EGL_MESA_screen_surface-extension-isn.patch |  267 ----
 ...ay-for-EGL_MESA_screen_surface-extension-.patch |   41 -
 .../0007-Install-few-more-test-programs.patch      |   53 +-
 ...10-sharedtex_mt-fix-rendering-thread-hang.patch |   43 -
 ...dependant-on-obsolete-MESA_screen_surface.patch | 1592 --------------------
 .../{mesa-demos_8.2.0.bb => mesa-demos_8.3.0.bb}   |   27 +-
 .../matchbox-keyboard/matchbox-keyboard_git.bb     |   12 +-
 15 files changed, 131 insertions(+), 2296 deletions(-)
 create mode 100644 meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch
 delete mode 100644 meta/recipes-core/dropbear/dropbear_2015.71.bb
 create mode 100644 meta/recipes-core/dropbear/dropbear_2016.73.bb
 rename meta/recipes-devtools/docbook-xml/{docbook-xsl-stylesheets_1.78.1.bb => docbook-xsl-stylesheets_1.79.1.bb} (76%)
 delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig/0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch
 rename meta/recipes-graphics/fontconfig/{fontconfig_2.11.94.bb => fontconfig_2.11.95.bb} (84%)
 delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0011-drop-demos-dependant-on-obsolete-MESA_screen_surface.patch
 rename meta/recipes-graphics/mesa/{mesa-demos_8.2.0.bb => mesa-demos_8.3.0.bb} (68%)
Signature · 1 line
2.1.4
author
#1 lore raw

PATCH 1/5 docbook-xsl-stylesheets: Upgrade 1.78.1 -> 1.79.1

* Use $PV at appropriate places in do_install
* Install some new files, avoid installing 25M of java archives
* License checksum change is just copyright years changing

Signed-off-by Jussi Kukkonen <[email protected]>
---
 ...1.78.1.bb => docbook-xsl-stylesheets_1.79.1.bb} | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
 rename meta/recipes-devtools/docbook-xml/{docbook-xsl-stylesheets_1.78.1.bb => docbook-xsl-stylesheets_1.79.1.bb} (76%)
meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb renamed from meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb +11 -11
similarity index 76%
rename from meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb
rename to meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb
index 52de3ab..a29fe00 100644
@@ -1,15 +1,15 @@
 SUMMARY = "XSL stylesheets for processing DocBook XML to various output formats"
 HOMEPAGE = "http://docbook.sourceforge.net"
 LICENSE = "XSL"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a6eeeed43d498c22a835382533356462"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6beadd98f9c54ab0c387e14211ee4d0e"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-xsl-${PV}.tar.bz2 \
            file://docbook-xsl.xml \
            file://docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch \
 "
 
-SRC_URI[md5sum] = "6dd0f89131cc35bf4f2ed105a1c17771"
-SRC_URI[sha256sum] = "c98f7296ab5c8ccd2e0bc07634976a37f50847df2d8a59bdb1e157664700b467"
+SRC_URI[md5sum] = "b48cbf929a2ad85e6672f710777ca7bc"
+SRC_URI[sha256sum] = "725f452e12b296956e8bfb876ccece71eeecdd14b94f667f3ed9091761a4a968"
 
 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/docbook/files/docbook-xsl/"
 # Reject versions ending in .0 as those are release candidates

@@ -37,18 +37,18 @@ do_install () {
 	install -v -m755 -d ${D}${datadir}/xml/docbook/xsl-stylesheets-${PV}
 	ln -s xsl-stylesheets-${PV} ${D}${datadir}/xml/docbook/xsl-stylesheets
 
-	cp -v -R VERSION common eclipse epub extensions fo highlighting html \
-		htmlhelp images javahelp lib manpages params profiling \
-		roundtrip slides template tests tools webhelp website \
-		xhtml xhtml-1_1 catalog.xml \
-	${D}${datadir}/xml/docbook/xsl-stylesheets-1.78.1
+	cp -v -R VERSION assembly common eclipse epub epub3 fo \
+		highlighting html htmlhelp images javahelp lib manpages \
+		params profiling roundtrip slides template webhelp website \
+		xhtml xhtml-1_1 xhtml5 catalog.xml \
+		${D}${datadir}/xml/docbook/xsl-stylesheets-${PV}
 
-	ln -s VERSION ${D}/${datadir}/xml/docbook/xsl-stylesheets-1.78.1/VERSION.xsl
+	ln -s VERSION ${D}/${datadir}/xml/docbook/xsl-stylesheets-${PV}/VERSION.xsl
 
 	install -v -m644 -D README \
-		${D}${datadir}/doc/docbook-xsl-1.78.1/README.txt
+		${D}${datadir}/doc/docbook-xsl-${PV}/README.txt
 	install -v -m644    RELEASE-NOTES* NEWS* \
-		${D}${datadir}/doc/docbook-xsl-1.78.1
+		${D}${datadir}/doc/docbook-xsl-${PV} 
 
 	install -d ${D}${sysconfdir}/xml/
 	install -m 755  ${WORKDIR}/docbook-xsl.xml ${D}${sysconfdir}/xml/docbook-xsl.xml
Signature · 1 line
2.1.4
author
#2 lore raw

PATCH 2/5 dropbear: Upgrade 2015.71 -> 2016.73

Backport a patch to fix out-of-tree build.

Signed-off-by Jussi Kukkonen <[email protected]>
---
 .../dropbear/support-out-of-tree-builds.patch      | 43 ++++++++++++++++++++++
 meta/recipes-core/dropbear/dropbear_2015.71.bb     |  5 ---
 meta/recipes-core/dropbear/dropbear_2016.73.bb     |  7 ++++
 3 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch
 delete mode 100644 meta/recipes-core/dropbear/dropbear_2015.71.bb
 create mode 100644 meta/recipes-core/dropbear/dropbear_2016.73.bb
meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch new file +43 -0
new file mode 100644
index 0000000..df6efb4
@@ -0,0 +1,43 @@
+From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= <[email protected]>
+Date: Wed, 11 May 2016 12:35:06 +0200
+Subject: [PATCH] Support out-of-tree builds usign bundled libtom
+
+When building out-of-tree we need both source and generated
+folders in include paths to find both distributed and generated
+headers.
+
+
+
+Signed-off-by: Jussi Kukkonen <[email protected]>
+Upstream-Status: Backport
+---
+ libtomcrypt/Makefile.in | 2 +-
+ libtommath/Makefile.in  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libtomcrypt/Makefile.in b/libtomcrypt/Makefile.in
+index 3056ef0..7970700 100644
+--- a/libtomcrypt/Makefile.in
++++ b/libtomcrypt/Makefile.in
+@@ -19,7 +19,7 @@ srcdir=@srcdir@
+ 
+ # Compilation flags. Note the += does not write over the user's CFLAGS!
+ # The rest of the flags come from the parent Dropbear makefile
+-CFLAGS += -c -I$(srcdir)/src/headers/ -I$(srcdir)/../ -DLTC_SOURCE -I$(srcdir)/../libtommath/
++CFLAGS += -c -Isrc/headers/ -I$(srcdir)/src/headers/ -I../ -I$(srcdir)/../ -DLTC_SOURCE -I../libtommath/ -I$(srcdir)/../libtommath/
+ 
+ # additional warnings (newer GCC 3.4 and higher)
+ ifdef GCC_34
+diff --git a/libtommath/Makefile.in b/libtommath/Makefile.in
+index 06aba68..019c50b 100644
+--- a/libtommath/Makefile.in
++++ b/libtommath/Makefile.in
+@@ -9,7 +9,7 @@ VPATH=@srcdir@
+ srcdir=@srcdir@
+ 
+ # So that libtommath can include Dropbear headers for options and m_burn()
+-CFLAGS += -I$(srcdir)/../libtomcrypt/src/headers/ -I$(srcdir)/../
++CFLAGS += -I. -I$(srcdir) -I../libtomcrypt/src/headers/ -I$(srcdir)/../libtomcrypt/src/headers/ -I../ -I$(srcdir)/../
+ 
+ ifndef IGNORE_SPEED
+
meta/recipes-core/dropbear/dropbear_2015.71.bb deleted +0 -5
deleted file mode 100644
index 6332579..0000000
@@ -1,5 +0,0 @@
-require dropbear.inc
-
-SRC_URI[md5sum] = "2ccc0a2f3e37ca221db12c5af6a88137"
-SRC_URI[sha256sum] = "376214169c0e187ee9f48ae1a99b3f835016ad5b98ede4bfd1cf581deba783af"
-
meta/recipes-core/dropbear/dropbear_2016.73.bb new file +7 -0
new file mode 100644
index 0000000..71a36bd
@@ -0,0 +1,7 @@
+require dropbear.inc
+
+SRC_URI += "file://support-out-of-tree-builds.patch"
+
+SRC_URI[md5sum] = "8d6d78ce60ca52350ec04fcbd711ce9b"
+SRC_URI[sha256sum] = "5c61a4f69b093b688629cd365be38701485ff63cfb23642dab7a05ad250aefd7"
+
Signature · 1 line
2.1.4
author
#3 lore raw

PATCH 3/5 fontconfig: Upgrade 2.11.94 -> 2.11.95

In reply to Jussi Kukkonen

Remove a backported patch.
License checksum stays the same but license location changed.

Signed-off-by Jussi Kukkonen <[email protected]>
---
 ...ges-made-to-FcConfigAppFontAddDir-recentl.patch | 132 ---------------------
 ...fontconfig_2.11.94.bb => fontconfig_2.11.95.bb} |   7 +-
 2 files changed, 3 insertions(+), 136 deletions(-)
 delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig/0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch
 rename meta/recipes-graphics/fontconfig/{fontconfig_2.11.94.bb => fontconfig_2.11.95.bb} (84%)
meta/recipes-graphics/fontconfig/fontconfig/0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch deleted +0 -132
deleted file mode 100644
index f2fd5d4..0000000
@@ -1,132 +0,0 @@
-From 46ec6a52d4cc447cc3ff4a13b2067ecb76c9db2e Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod <[email protected]>
-Date: Fri, 26 Jun 2015 17:02:13 -0700
-Subject: [PATCH] Revert changes made to FcConfigAppFontAddDir() recently
-
-In 32ac7c75e8db0135ef37cf86f92d8b9be000c8bb the behavior of
-FcConfigAppFontAddFile/Dir() were changed to return false
-if not fonts were found.  While this is welldefined and useful
-for AddFile(), it's quite problematic for AddDir().  For example,
-if the directory is empty, is that a failure or success?  Worse,
-the false value from AddDir() was being propagated all the way
-to FcInit() returning false now.  This only happened upon memory
-allocation failure before, and some clients assert that FcInit()
-is successful.
-
-With this change, AddDir() is reverted back to what it was.
-AddFont() change (which was actually in fcdir.c) from the original
-commit is left in.
-
-Upstream-Status: backport
-
-Signed-off-by: Li Zhou <[email protected]>
----
- doc/fcconfig.fncs |    2 +-
- src/fccfg.c       |   29 +++++++++++------------------
- src/fcint.h       |    3 ---
- src/fcstr.c       |    8 --------
- 4 files changed, 12 insertions(+), 30 deletions(-)
-
-Index: fontconfig-2.11.94/doc/fcconfig.fncs
-===================================================================
---- fontconfig-2.11.94.orig/doc/fcconfig.fncs
-+++ fontconfig-2.11.94/doc/fcconfig.fncs
-@@ -232,7 +232,7 @@ the current configuration is used.
- @DESC@
- Scans the specified directory for fonts, adding each one found to the
- application-specific set of fonts. Returns FcFalse
--if the fonts cannot be added (due to allocation failure or no fonts found).
-+if the fonts cannot be added (due to allocation failure).
- Otherwise returns FcTrue. If <parameter>config</parameter> is NULL,
- the current configuration is used.
- @@
-Index: fontconfig-2.11.94/src/fccfg.c
-===================================================================
---- fontconfig-2.11.94.orig/src/fccfg.c
-+++ fontconfig-2.11.94/src/fccfg.c
-@@ -368,7 +368,6 @@ FcConfigAddDirList (FcConfig *config, Fc
-     FcStrList	    *dirlist;
-     FcChar8	    *dir;
-     FcCache	    *cache;
--    FcBool	     ret = FcFalse;
- 
-     dirlist = FcStrListCreate (dirSet);
-     if (!dirlist)
-@@ -383,10 +382,9 @@ FcConfigAddDirList (FcConfig *config, Fc
- 	    continue;
- 	FcConfigAddCache (config, cache, set, dirSet);
- 	FcDirCacheUnload (cache);
--	ret = FcTrue;
-     }
-     FcStrListDone (dirlist);
--    return ret;
-+    return FcTrue;
- }
- 
- /*
-@@ -2199,7 +2197,6 @@ FcConfigAppFontAddFile (FcConfig    *con
-     FcStrSet	*subdirs;
-     FcStrList	*sublist;
-     FcChar8	*subdir;
--    FcBool	 ret = FcFalse;
- 
-     if (!config)
-     {
-@@ -2229,19 +2226,16 @@ FcConfigAppFontAddFile (FcConfig    *con
- 	FcStrSetDestroy (subdirs);
- 	return FcFalse;
-     }
--    if (subdirs->num == 0)
--	ret = FcTrue;
--    else if ((sublist = FcStrListCreate (subdirs)))
-+    if ((sublist = FcStrListCreate (subdirs)))
-     {
- 	while ((subdir = FcStrListNext (sublist)))
- 	{
--	    if (FcConfigAppFontAddDir (config, subdir))
--		ret = FcTrue;
-+	    FcConfigAppFontAddDir (config, subdir);
- 	}
- 	FcStrListDone (sublist);
-     }
-     FcStrSetDestroy (subdirs);
--    return ret;
-+    return FcTrue;
- }
- 
- FcBool
-@@ -2250,7 +2244,6 @@ FcConfigAppFontAddDir (FcConfig	    *con
- {
-     FcFontSet	*set;
-     FcStrSet	*dirs;
--    FcBool	 ret = FcTrue;
- 
-     if (!config)
-     {
-@@ -2269,8 +2262,8 @@ FcConfigAppFontAddDir (FcConfig	    *con
- 	set = FcFontSetCreate ();
- 	if (!set)
- 	{
--	    ret = FcFalse;
--	    goto bail;
-+	    FcStrSetDestroy (dirs);
-+	    return FcFalse;
- 	}
- 	FcConfigSetFonts (config, set, FcSetApplication);
-     }
-@@ -2278,10 +2271,12 @@ FcConfigAppFontAddDir (FcConfig	    *con
-     FcStrSetAddFilename (dirs, dir);
- 
-     if (!FcConfigAddDirList (config, FcSetApplication, dirs))
--	ret = FcFalse;
--bail:
-+    {
-+	FcStrSetDestroy (dirs);
-+	return FcFalse;
-+    }
-     FcStrSetDestroy (dirs);
--    return ret;
-+    return FcTrue;
- }
- 
- void
meta/recipes-graphics/fontconfig/fontconfig_2.11.95.bb renamed from meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb +3 -4
similarity index 84%
rename from meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb
rename to meta/recipes-graphics/fontconfig/fontconfig_2.11.95.bb
index b427947..5db4436 100644
@@ -14,7 +14,7 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
 LICENSE = "MIT-style & MIT & PD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7a0449e9bc5370402a94c00204beca3d \
                     file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \
-                    file://src/fccache.c;beginline=1199;endline=1214;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
+                    file://src/fccache.c;beginline=1278;endline=1293;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
 
 SECTION = "libs"
 

@@ -22,10 +22,9 @@ DEPENDS = "expat freetype zlib"
 
 SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
            file://revert-static-pkgconfig.patch \
-           file://0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch \
            "
-SRC_URI[md5sum] = "479be870c7f83f15f87bac085b61d641"
-SRC_URI[sha256sum] = "73f6d323c7bcfbde25d78397675191d55b8f4139132c6a9444410f3a2d8a9a95"
+SRC_URI[md5sum] = "da605e910d9c037f8886d65607b06920"
+SRC_URI[sha256sum] = "39da7704b348b3c9c83f449e9aa6e0e131ffe77e3533b68017f3b40a95d75a9c"
 
 PACKAGES =+ "fontconfig-utils"
 FILES_${PN} =+ "${datadir}/xml/*"
Signature · 1 line
2.1.4
author
#4 lore raw

PATCH 4/5 mesa-demos: Upgrade 8.2.0 -> 8.3.0

In reply to Jussi Kukkonen

Drop patches included in upstream and the EGL_MESA_screen_surface extension fixes as the relevant code was removed.

Rebase other patches.

Signed-off-by Jussi Kukkonen <[email protected]>

---

There's quite a bit of churn and our patching here was pretty complex (patches on top of patches on top of patches): CCing people who have recently touched the recipe as a "FYI".

 ...mplement-with-AC_WITH-glut-so-that-withou.patch |   57 -
 ...llow-to-disable-demos-which-require-GLEW-.patch |  119 +-
 ...hen-EGL_MESA_screen_surface-extension-isn.patch |  267 ----
 ...ay-for-EGL_MESA_screen_surface-extension-.patch |   41 -
 .../0007-Install-few-more-test-programs.patch      |   53 +-
 ...10-sharedtex_mt-fix-rendering-thread-hang.patch |   43 -
 ...dependant-on-obsolete-MESA_screen_surface.patch | 1592 --------------------
 .../{mesa-demos_8.2.0.bb => mesa-demos_8.3.0.bb}   |   27 +-
 8 files changed, 59 insertions(+), 2140 deletions(-)
 delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0011-drop-demos-dependant-on-obsolete-MESA_screen_surface.patch
 rename meta/recipes-graphics/mesa/{mesa-demos_8.2.0.bb => mesa-demos_8.3.0.bb} (68%)
meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch deleted +0 -57
deleted file mode 100644
index 09054cb..0000000
@@ -1,57 +0,0 @@
-From 36829a8d7ad2888515fbee95c2a70b3d636d7538 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Wed, 9 Jul 2014 14:30:33 +0200
-Subject: [PATCH 2/9] Correctly implement with AC_WITH(glut) so that
- --without-glut works.
-
-Signed-off-by: Ross Burton <[email protected]>
-Upstream-Status: Submitted (https://patchwork.freedesktop.org/patch/64417/)
-
----
- configure.ac | 26 +++++++++++++++-----------
- 1 file changed, 15 insertions(+), 11 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c4ee12b..9445424 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -67,21 +67,25 @@ DEMO_CFLAGS="$DEMO_CFLAGS $GL_CFLAGS"
- DEMO_LIBS="$DEMO_LIBS $GL_LIBS"
- 
- dnl Check for GLUT
--GLUT_CFLAGS=""
--GLUT_LIBS=-lglut
--glut_enabled=yes
-+glut_enabled=no
- AC_ARG_WITH([glut],
- 	[AS_HELP_STRING([--with-glut=DIR],
- 			[glut install directory])],
- 	[GLUT_CFLAGS="-I$withval/include"
--	 GLUT_LIBS="-L$withval/lib -lglut"])
--AC_CHECK_HEADER([GL/glut.h],
--		[],
--		[glut_enabled=no])
--AC_CHECK_LIB([glut],
--		[glutInit],
--		[],
--		[glut_enabled=no])
-+	 GLUT_LIBS="-L$withval/lib -lglut"],
-+	[GLUT_CFLAGS=""
-+	 GLUT_LIBS="-lglut"]
-+        )
-+AS_IF([test "x$with_glut" != xno],
-+      [AC_CHECK_HEADER([GL/glut.h],
-+                       [],
-+                       [glut_enabled=no])
-+       AC_CHECK_LIB([glut],
-+                    [glutInit],
-+                    [],
-+                    [glut_enabled=no])
-+       glut_enabled=yes
-+])
- 
- dnl Check for FreeGLUT 2.6 or later
- AC_EGREP_HEADER([glutInitContextProfile],
--- 
-2.0.0
-
meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch +36 -83

204 lines not on this page · raw message

meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch deleted +0 -267

267 lines not on this page · raw message

meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch deleted +0 -41

41 lines not on this page · raw message

meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch +12 -41

81 lines not on this page · raw message

meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch deleted +0 -43

43 lines not on this page · raw message

meta/recipes-graphics/mesa/mesa-demos/0011-drop-demos-dependant-on-obsolete-MESA_screen_surface.patch deleted +0 -1592

1,592 lines not on this page · raw message

meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb renamed from meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb +11 -16
similarity index 68%
rename from meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
rename to meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb
index 53bd5e2..ee0bb02 100644
@@ -10,22 +10,17 @@ LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=9142
                     file://src/xdemos/glxdemo.c;beginline=1;endline=8;md5=b01d5ab1aee94d35b7efaa2ef48e1a06"
 
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \
-    file://0001-mesa-demos-Add-missing-data-files.patch \
-    file://0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch \
-    file://0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch \
-    file://0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch \
-    file://0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch \
-    file://0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch \
-    file://0007-Install-few-more-test-programs.patch \
-    file://0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch \
-    file://0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch \
-    file://0010-sharedtex_mt-fix-rendering-thread-hang.patch \
-    file://0011-drop-demos-dependant-on-obsolete-MESA_screen_surface.patch \
-    file://0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch \
-    file://0013-only-build-GLX-demos-if-needed.patch \
-"
-SRC_URI[md5sum] = "72613a2c8c013716db02e3ff59d29061"
-SRC_URI[sha256sum] = "e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92"
+           file://0001-mesa-demos-Add-missing-data-files.patch \
+           file://0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch \
+           file://0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch \
+           file://0007-Install-few-more-test-programs.patch \
+           file://0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch \
+           file://0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch \
+           file://0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch \
+           file://0013-only-build-GLX-demos-if-needed.patch \
+           "
+SRC_URI[md5sum] = "628e75c23c17394f11a316c36f8e4164"
+SRC_URI[sha256sum] = "c173154bbd0d5fb53d732471984def42fb1b14ac85fcb834138fb9518b3e0bef"
 
 inherit autotools pkgconfig distro_features_check
 # depends on virtual/egl, virtual/libgl ...
Signature · 1 line
2.1.4
author
#5 lore raw

PATCH 5/5 matchbox-keyboard: Upgrade

In reply to Jussi Kukkonen

This version includes:
* french keyboard and the Caps improvements it requires
* Gtk+3 input method is now included (not enabled by default yet)

Define some additional PACKAGECONFIGs: the default configuration does not change.

Signed-off-by Jussi Kukkonen <[email protected]>
---
 meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb +8 -4
index eba1970..fb4c6e9 100644
@@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
                     file://src/matchbox-keyboard.h;endline=17;md5=9d6586c69e4a926f3cb0b4425f24ba3c \
                     file://applet/applet.c;endline=18;md5=4a0f721724746b14d95b51ddd42b95e7"
 
-DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
+DEPENDS = "libfakekey expat libxft"
 
-SRCREV = "ebc330eac8b9d38e9aef9f01e7241c904bd01073"
+SRCREV = "69d03e2aceb79cf7a616c07f8e0be4e1f9f7976b"
 PV = "0.0+git${SRCPV}"
-PR = "r4"
 
 SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \
            file://0001-desktop-file-Hide-the-keyboard-from-app-list.patch \

@@ -25,7 +24,12 @@ inherit autotools pkgconfig gettext gtk-immodules-cache distro_features_check
 # The libxft, libfakekey and matchbox-panel-2 requires x11 in DISTRO_FEATURES
 REQUIRED_DISTRO_FEATURES = "x11"
 
-EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet"
+EXTRA_OECONF = "--disable-cairo"
+
+PACKAGECONFIG ??= "gtk2-im applet"
+PACKAGECONFIG[applet] = "--enable-applet,--disable-applet,matchbox-panel-2"
+PACKAGECONFIG[gtk2-im] = "--enable-gtk-im,--disable-gtk-im,gtk+"
+PACKAGECONFIG[gtk3-im] = "--enable-gtk3-im,--disable-gtk3-im,gtk+3"
 
 PACKAGES += "${PN}-im ${PN}-applet"
Signature · 1 line
2.1.4
#6 lore raw

Re: [PATCH 5/5] matchbox-keyboard: Upgrade

meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ · line 14

Quoted 3 lines · Jussi Kukkonen
meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb +1 -1
-SRCREV = "ebc330eac8b9d38e9aef9f01e7241c904bd01073"
+SRCREV = "69d03e2aceb79cf7a616c07f8e0be4e1f9f7976b"
  PV = "0.0+git${SRCPV}"

This is a good moment to start using git version tags instead of just updating commit ids.

Let's bring down the amount of 'unknown' upstream versions to zero or close to it:

http://recipes.yoctoproject.org/rrs/recipes/2.2/M1/?upstream_status=Unknown#

Alex

#7 lore raw

Re: [PATCH 5/5] matchbox-keyboard: Upgrade

Quoted 9 lines · Alexander Kanavin

meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ · line 14

Quoted 3 lines · Jussi Kukkonen
meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb +1 -1
-SRCREV = "ebc330eac8b9d38e9aef9f01e7241c904bd01073"
+SRCREV = "69d03e2aceb79cf7a616c07f8e0be4e1f9f7976b"
  PV = "0.0+git${SRCPV}"

This is a good moment to start using git version tags instead of just updating commit ids.

Quoted 5 lines

Let's bring down the amount of 'unknown' upstream versions to zero or close to it:

http://recipes.yoctoproject.org/rrs/recipes/2.2/M1/?upstream_status=U
nknown#

Sadly, "tags" need a network to resolve them and hence using them means the metadata doesn't work standalone. We can't do that.

However, I thought we'd added functionality where it would list the tags, figure out which ones contained a revision and then figured out if there was a more recent version?

We do have various components that haven't released for a long time and I have wondered if we should do that, then we'd have tarballs and revisions to make things easier.

Cheers,

Richard

#8 lore raw

Re: [PATCH 5/5] matchbox-keyboard: Upgrade

Quoted 7 lines · Richard Purdie
Quoted 7 lines

meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ · line 14

Quoted 3 lines
meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb +1 -1
-SRCREV = "ebc330eac8b9d38e9aef9f01e7241c904bd01073"
+SRCREV = "69d03e2aceb79cf7a616c07f8e0be4e1f9f7976b"
   PV = "0.0+git${SRCPV}"

This is a good moment to start using git version tags instead of just updating commit ids.

Quoted 8 lines
Quoted 5 lines

Let's bring down the amount of 'unknown' upstream versions to zero or close to it:

http://recipes.yoctoproject.org/rrs/recipes/2.2/M1/?upstream_status=U
nknown#

Sadly, "tags" need a network to resolve them and hence using them means the metadata doesn't work standalone. We can't do that.

I need to clarify: I would like the version number in PV to match an existing upstream version tag. So that the upstream version check works correctly.

The actual git revision for builds will continue to be determined by commit ids in SRCREV.

Alex

#9 lore raw

Re: [PATCH 5/5] matchbox-keyboard: Upgrade

Quoted 21 lines · Alexander Kanavin
Quoted 12 lines · Richard Purdie
Quoted 12 lines

meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ · line 14

Quoted 3 lines
meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb +1 -1
-SRCREV = "ebc330eac8b9d38e9aef9f01e7241c904bd01073"
+SRCREV = "69d03e2aceb79cf7a616c07f8e0be4e1f9f7976b"
   PV = "0.0+git${SRCPV}"

This is a good moment to start using git version tags instead of just
updating commit ids.

Let's bring down the amount of 'unknown' upstream versions to zero or
close to it:

Quoted 7 lines
Quoted 3 lines

http://recipes.yoctoproject.org/rrs/recipes/2.2/M1/?upstream_stat
us=U
nknown#

Sadly, "tags" need a network to resolve them and hence using them means
the metadata doesn't work standalone. We can't do that.

Quoted 7 lines

I need to clarify: I would like the version number in PV to match an existing upstream version tag. So that the upstream version check works
correctly.

The actual git revision for builds will continue to be determined by commit ids in SRCREV.

That does indeed make sense. I'd be happy to see some release tarballs for some of these things and some upstream version tags...

Cheers,

Richard

#10 lore raw

Re: [PATCH 1/5] docbook-xsl-stylesheets: Upgrade 1.78.1 -> 1.79.1

In reply to Jussi Kukkonen
Quoted 3 lines · Jussi Kukkonen

* Use $PV at appropriate places in do_install
* Install some new files, avoid installing 25M of java archives
* License checksum change is just copyright years changing

I think something here may be causing:

https://autobuilder.yoctoproject.org/main/builders/nightly-arm-lsb/buil
ds/766/steps/BuildImages/logs/stdio

(the xdg-utils failure)

Its only happening for poky-lsb for some reason. I can't rule out gcc6 but it is possibly unrelated to that, its the first time we've see it.

Cheers,

Richard

author
#11 lore raw

PATCH v2 1/1 docbook-xsl-stylesheets: Upgrade 1.78.1 -> 1.79.1

* Use $PV at appropriate places in do_install
* Install some new files, avoid installing 25M of java archives
* License checksum change is just copyright years changing
* Fix the URI delegation file (that prevents fetches from
http://docbook.sourceforge.net/ during build) to refer to a non-versioned directory

Signed-off-by Jussi Kukkonen <[email protected]>

---

Changes since V1:
* URI delegation file was still referring to /usr/share/xml/docbook/xsl-stylesheets-1.78.1/: fixed this to refer to the non-versioned symlink

I couldn't reproduce the issue but this seems very likely to be the right fix (and I've checked that the paths look correct for both target and native builds)

- Jussi

 .../docbook-xsl-stylesheets/docbook-xsl.xml        |  4 ++--
 ...1.78.1.bb => docbook-xsl-stylesheets_1.79.1.bb} | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)
 rename meta/recipes-devtools/docbook-xml/{docbook-xsl-stylesheets_1.78.1.bb => docbook-xsl-stylesheets_1.79.1.bb} (76%)
meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml +2 -2
index a1a576a..c60555a 100644
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-<delegateURI uriStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///usr/share/xml/docbook/xsl-stylesheets-1.78.1/catalog.xml"/>
-<delegateSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///usr/share/xml/docbook/xsl-stylesheets-1.78.1/catalog.xml"/>
+<delegateURI uriStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///usr/share/xml/docbook/xsl-stylesheets/catalog.xml"/>
+<delegateSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///usr/share/xml/docbook/xsl-stylesheets/catalog.xml"/>
 </catalog>
meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb renamed from meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb +11 -11
similarity index 76%
rename from meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb
rename to meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb
index 52de3ab..aa03a82 100644
@@ -1,15 +1,15 @@
 SUMMARY = "XSL stylesheets for processing DocBook XML to various output formats"
 HOMEPAGE = "http://docbook.sourceforge.net"
 LICENSE = "XSL"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a6eeeed43d498c22a835382533356462"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6beadd98f9c54ab0c387e14211ee4d0e"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-xsl-${PV}.tar.bz2 \
            file://docbook-xsl.xml \
            file://docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch \
 "
 
-SRC_URI[md5sum] = "6dd0f89131cc35bf4f2ed105a1c17771"
-SRC_URI[sha256sum] = "c98f7296ab5c8ccd2e0bc07634976a37f50847df2d8a59bdb1e157664700b467"
+SRC_URI[md5sum] = "b48cbf929a2ad85e6672f710777ca7bc"
+SRC_URI[sha256sum] = "725f452e12b296956e8bfb876ccece71eeecdd14b94f667f3ed9091761a4a968"
 
 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/docbook/files/docbook-xsl/"
 # Reject versions ending in .0 as those are release candidates

@@ -37,18 +37,18 @@ do_install () {
 	install -v -m755 -d ${D}${datadir}/xml/docbook/xsl-stylesheets-${PV}
 	ln -s xsl-stylesheets-${PV} ${D}${datadir}/xml/docbook/xsl-stylesheets
 
-	cp -v -R VERSION common eclipse epub extensions fo highlighting html \
-		htmlhelp images javahelp lib manpages params profiling \
-		roundtrip slides template tests tools webhelp website \
-		xhtml xhtml-1_1 catalog.xml \
-	${D}${datadir}/xml/docbook/xsl-stylesheets-1.78.1
+	cp -v -R VERSION assembly common eclipse epub epub3 fo \
+		highlighting html htmlhelp images javahelp lib manpages \
+		params profiling roundtrip slides template webhelp website \
+		xhtml xhtml-1_1 xhtml5 catalog.xml \
+		${D}${datadir}/xml/docbook/xsl-stylesheets-${PV}
 
-	ln -s VERSION ${D}/${datadir}/xml/docbook/xsl-stylesheets-1.78.1/VERSION.xsl
+	ln -s VERSION ${D}/${datadir}/xml/docbook/xsl-stylesheets-${PV}/VERSION.xsl
 
 	install -v -m644 -D README \
-		${D}${datadir}/doc/docbook-xsl-1.78.1/README.txt
+		${D}${datadir}/doc/docbook-xsl-${PV}/README.txt
 	install -v -m644    RELEASE-NOTES* NEWS* \
-		${D}${datadir}/doc/docbook-xsl-1.78.1
+		${D}${datadir}/doc/docbook-xsl-${PV}
 
 	install -d ${D}${sysconfdir}/xml/
 	install -m 755  ${WORKDIR}/docbook-xsl.xml ${D}${sysconfdir}/xml/docbook-xsl.xml
Signature · 1 line
2.1.4