[Buildroot] [Patch next v2 0/3] Fixes for qt5: bump latest version to 5.10.1

[Buildroot] [Patch next v2 0/3] Fixes for qt5: bump latest version to 5.10.1

[Peter Seiderer]

Some fixes for the 'qt5: bump latest version to  5.10.1' patch
from Ga?l Portray.

Peter Seiderer (3):
  sqlite: add option for meta-data about tables/queries
  qt5base: fix Qt5.10.1 sqlite plugin compile failure
  qt5multimedia: fix Qt5.10.1 target installation


Peter Seiderer (3):
  sqlite: add option for meta-data about tables/queries
  qt5base: fix Qt5.10.1 sqlite plugin compile failure
  qt5multimedia: fix Qt5.10.1 target installation

 package/qt5/qt5base/Config.in              | 1 +
 package/qt5/qt5multimedia/qt5multimedia.mk | 6 ++++--
 package/sqlite/Config.in                   | 7 +++++++
 package/sqlite/sqlite.mk                   | 4 ++++
 4 files changed, 16 insertions(+), 2 deletions(-)

-- 
2.16.2

[Buildroot] [Patch next v2 1/3] sqlite: add option for meta-data about tables/queries

[Peter Seiderer]

Enables SQLITE_ENABLE_COLUMN_METADATA to gain access to:

  - sqlite3_column_database_name()
  - sqlite3_column_database_name16()
  - sqlite3_column_table_name()
  - sqlite3_column_table_name16()
  - sqlite3_column_origin_name()
  - sqlite3_column_origin_name16()

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v1 -> v2:
  - no changes
---
 package/sqlite/Config.in | 7 +++++++
 package/sqlite/sqlite.mk | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in
index ec7396860c..517af50e67 100644
--- a/package/sqlite/Config.in
+++ b/package/sqlite/Config.in
@@ -16,6 +16,13 @@ config BR2_PACKAGE_SQLITE_STAT3
 	  query planner that can help SQLite to choose a better query
 	  plan under certain situations.
 
+config BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA
+	bool "Enable convenient access to meta-data about tables and queries"
+	help
+	  When this option is defined there are some additional APIs
+	  enabled to acces meta-data about tables and queries (see
+	  https://sqlite.org/compile.html).
+
 config BR2_PACKAGE_SQLITE_ENABLE_FTS3
 	bool "Enable version 3 of the full-text search engine"
 	help
diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index e8ce92df56..d0030d43ab 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -15,6 +15,10 @@ ifeq ($(BR2_PACKAGE_SQLITE_STAT3),y)
 SQLITE_CFLAGS += -DSQLITE_ENABLE_STAT3
 endif
 
+ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA),y)
+SQLITE_CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA
+endif
+
 ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_FTS3),y)
 SQLITE_CFLAGS += -DSQLITE_ENABLE_FTS3
 endif
-- 
2.16.2

[Buildroot] [Patch next v2 2/3] qt5base: fix Qt5.10.1 sqlite plugin compile failure

[Peter Seiderer]

Select BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA to gain
access to sqlite3_column_table_name16().

Fixes:

    qt5base-5.10.1/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp:217: undefined reference to `sqlite3_column_table_name16'

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v1 -> v2:
  - no changes
---
 package/qt5/qt5base/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index b5755e2b9c..b9aba2d389 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -103,6 +103,7 @@ config BR2_PACKAGE_QT5BASE_SQLITE_QT
 config BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM
 	bool "System SQLite"
 	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA
 	help
 	  Use system SQLite.
 
-- 
2.16.2

[Buildroot] [Patch next v2 3/3] qt5multimedia: fix Qt5.10.1 target installation

[Peter Seiderer]

Fixes:

  cp: cannot stat ?.../host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libqgsttools*.so.*?: No such file or directory

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v1 -> v2:
  - update descripton (add missing compile error line)
  - move !BR2_PACKAGE_QT5_VERSION_LATEST dependency to the right
    if scope
---
 package/qt5/qt5multimedia/qt5multimedia.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 6120403f30..e2210817c1 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -48,7 +48,9 @@ define QT5MULTIMEDIA_INSTALL_STAGING_CMDS
 endef
 
 ifeq ($(BR2_STATIC_LIBS),)
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y)
+# since Qt5.10.1 libqgsttools was renamed to libQtMultimediaGstTools
+# and is installed by the default target install step below
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)x$(BR2_PACKAGE_GST1_PLUGINS_BASE),xy)
 define QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB
 	cp -dpf $(STAGING_DIR)/usr/lib/libqgsttools*.so.* $(TARGET_DIR)/usr/lib
 endef
@@ -59,7 +61,7 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS
 	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins
 	$(QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB)
 endef
-endif
+endif # !BR2_STATIC_LIBS
 
 # this is only built with quick/opengl support enabled
 ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5_GL_AVAILABLE),yy)
-- 
2.16.2

[Buildroot] [Patch next v2 1/3] sqlite: add option for meta-data about tables/queries

[Arnout Vandecappelle]

On 02-03-18 20:34, Peter Seiderer wrote:
> Enables SQLITE_ENABLE_COLUMN_METADATA to gain access to:
> 
>   - sqlite3_column_database_name()
>   - sqlite3_column_database_name16()
>   - sqlite3_column_table_name()
>   - sqlite3_column_table_name16()
>   - sqlite3_column_origin_name()
>   - sqlite3_column_origin_name16()
> 
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>

 Applied to master, thanks.

 Regards,
 Arnout

> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  package/sqlite/Config.in | 7 +++++++
>  package/sqlite/sqlite.mk | 4 ++++
>  2 files changed, 11 insertions(+)
> 
> diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in
> index ec7396860c..517af50e67 100644
> --- a/package/sqlite/Config.in
> +++ b/package/sqlite/Config.in
> @@ -16,6 +16,13 @@ config BR2_PACKAGE_SQLITE_STAT3
>  	  query planner that can help SQLite to choose a better query
>  	  plan under certain situations.
>  
> +config BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA
> +	bool "Enable convenient access to meta-data about tables and queries"
> +	help
> +	  When this option is defined there are some additional APIs
> +	  enabled to acces meta-data about tables and queries (see
> +	  https://sqlite.org/compile.html).
> +
>  config BR2_PACKAGE_SQLITE_ENABLE_FTS3
>  	bool "Enable version 3 of the full-text search engine"
>  	help
> diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
> index e8ce92df56..d0030d43ab 100644
> --- a/package/sqlite/sqlite.mk
> +++ b/package/sqlite/sqlite.mk
> @@ -15,6 +15,10 @@ ifeq ($(BR2_PACKAGE_SQLITE_STAT3),y)
>  SQLITE_CFLAGS += -DSQLITE_ENABLE_STAT3
>  endif
>  
> +ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA),y)
> +SQLITE_CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA
> +endif
> +
>  ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_FTS3),y)
>  SQLITE_CFLAGS += -DSQLITE_ENABLE_FTS3
>  endif
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [Patch next v2 0/3] Fixes for qt5: bump latest version to 5.10.1

[Arnout Vandecappelle]

On 02-03-18 20:34, Peter Seiderer wrote:
> Some fixes for the 'qt5: bump latest version to  5.10.1' patch
> from Ga?l Portray.
> 
> Peter Seiderer (3):
>   sqlite: add option for meta-data about tables/queries
>   qt5base: fix Qt5.10.1 sqlite plugin compile failure
>   qt5multimedia: fix Qt5.10.1 target installation
> 
> 
> Peter Seiderer (3):
>   sqlite: add option for meta-data about tables/queries
>   qt5base: fix Qt5.10.1 sqlite plugin compile failure
>   qt5multimedia: fix Qt5.10.1 target installation

 I squashed these into the commit doing the version bump and applied all of it
to master.

 For the host-pkg-config utility, we decided not to go for the generic
host-pkg-config as this is not the proper thing to do (as discussed before). So
instead, a host-pkg-config is generated within the qt5webengine package. I also
modified it to do exactly what we do for normal host packages (cfr.
package/Makefile.in). That seems to work for me.

 I also carried over the mesa3d X11 patch that wasn't there yet when Gael
submitted this series.

 Finally, I had to do a whole lot of fixes in legal info, because the filenames
have changed in some modules. Also the chromium license files had to be regenerated.

 Thanks for doing this bump!

 Regards,
 Arnout

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF