mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] dropbear: enable/disable sha1 include key exchange algorithms
@ 2020-04-03 17:30 Bruno Thomsen
  2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
  0 siblings, 1 reply; 11+ messages in thread
From: Bruno Thomsen @ 2020-04-03 17:30 UTC (permalink / raw)
  To: ptxdist; +Cc: Bruno Thomsen, bth

When enabling or disabling sha1 integrity also keep or remove
key exhange algorithms that rely on sha1.

group14_sha1 - 2048 bit, sha1
group1 - 1024 bit, sha1

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/dropbear.make | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rules/dropbear.make b/rules/dropbear.make
index 8d80ed295..d52efa396 100644
--- a/rules/dropbear.make
+++ b/rules/dropbear.make
@@ -165,9 +165,13 @@ endif
 ifdef PTXCONF_DROPBEAR_SHA1
 	@echo "ptxdist: enabling sha1"
 	@echo "#define DROPBEAR_SHA1_HMAC 1" >> $(DROPBEAR_LOCALOPTIONS)
+	@echo "#define DROPBEAR_DH_GROUP1 1" >> $(DROPBEAR_LOCALOPTIONS)
+	@echo "#define DROPBEAR_DH_GROUP14_SHA1 1" >> $(DROPBEAR_LOCALOPTIONS)
 else
 	@echo "ptxdist: disabling sha1"
 	@echo "#define DROPBEAR_SHA1_HMAC 0" >> $(DROPBEAR_LOCALOPTIONS)
+	@echo "#define DROPBEAR_DH_GROUP1 0" >> $(DROPBEAR_LOCALOPTIONS)
+	@echo "#define DROPBEAR_DH_GROUP14_SHA1 0" >> $(DROPBEAR_LOCALOPTIONS)
 endif
 
 ifdef PTXCONF_DROPBEAR_SHA1_96
-- 
2.25.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [ptxdist] [PATCH v3] syslogng: update to 3.25.1
@ 2020-04-08 12:32 Matthias Schiffer
  2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
  0 siblings, 1 reply; 11+ messages in thread
From: Matthias Schiffer @ 2020-04-08 12:32 UTC (permalink / raw)
  To: ptxdist; +Cc: matthias.schiffer

Update and move out of staging. The new version adds compatiblity with
OpenSSL 1.1.x and switches to Python 3.

The AMQP and MongoDB destinations are removed, they were never buildable
without additional packages not available in plain PTXdist. Various
other modules are disabled explicitly to avoid the build
nondeterministically picking up undeclared dependencies.

A simple replacement for the old systemd unit is added, as the new version
only provides an instanced unit which cannot be linked as syslog.service
(which is necessary to use syslog-ng as the default system logger by
enabling ForwardToSyslog in journald.conf).

Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
---

v3: reduce configure_helper.py diff to path configurations and unused
utilities that don't have a sane "disabled" setting:

-	--disable-python
+	--with-pidfile-dir=path
+	--with-module-dir=path
+	--with-loggen-plugin-dir=path
+	--with-module-path=path
+	--with-timezone-dir=path
+	--with-ld-library-path=path
+	--with-libcurl=DIR
-	--localstatedir=/var/run
+	--with-nosetests=ABSOLUTE_PATH
+	--with-pylint=ABSOLUTE_PATH
+	--with-docbook=FILE

--disable-python and --localstatedir remain because of
configure_helper.py limitations.


 projectroot/etc/syslog-ng.conf                |  6 +-
 .../usr/lib/systemd/system/syslog-ng.service  | 20 +++++
 rules/syslogng.in                             | 30 ++++---
 rules/syslogng.make                           | 84 +++++++++++++++----
 4 files changed, 106 insertions(+), 34 deletions(-)
 create mode 100644 projectroot/usr/lib/systemd/system/syslog-ng.service

diff --git a/projectroot/etc/syslog-ng.conf b/projectroot/etc/syslog-ng.conf
index 254aecfd2..0235b9857 100644
--- a/projectroot/etc/syslog-ng.conf
+++ b/projectroot/etc/syslog-ng.conf
@@ -1,13 +1,15 @@
 #
-# syslog-ng configuration 
+# syslog-ng configuration
 #
 
+@version: 3.25
+
 #
 # Options
 #
 
 # sync every 0 lines
-options { long_hostnames(off); sync(0); };
+options { chain_hostnames(off); flush_lines(0); };
 
 #
 # Sources
diff --git a/projectroot/usr/lib/systemd/system/syslog-ng.service b/projectroot/usr/lib/systemd/system/syslog-ng.service
new file mode 100644
index 000000000..6bf591efd
--- /dev/null
+++ b/projectroot/usr/lib/systemd/system/syslog-ng.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=System Logger Daemon
+Documentation=man:syslog-ng(8)
+Conflicts=emergency.service emergency.target
+Requires=syslog.socket
+Wants=network.target network-online.target
+After=network.target network-online.target
+
+[Service]
+Type=notify
+ExecStartPre=/bin/mkdir -p /var/lib/syslog-ng
+ExecStart=/usr/sbin/syslog-ng -F --enable-core --cfgfile /etc/syslog-ng.conf --control /var/run/syslog-ng.ctl --persist-file /var/lib/syslog-ng/syslog-ng.persist --pidfile /var/run/syslog-ng.pid
+ExecReload=/bin/kill -HUP $MAINPID
+StandardOutput=journal
+StandardError=journal
+Restart=on-failure
+
+[Install]
+Alias=syslog.service
+WantedBy=multi-user.target
diff --git a/rules/syslogng.in b/rules/syslogng.in
index 3b1af844b..7707c8c32 100644
--- a/rules/syslogng.in
+++ b/rules/syslogng.in
@@ -1,6 +1,4 @@
-## SECTION=staging
-## old section:
-### SECTION=networking
+## SECTION=networking
 # syslog-ng configuration
 
 menuconfig SYSLOGNG
@@ -9,7 +7,9 @@ menuconfig SYSLOGNG
 	select EVENTLOG
 	select GLIB
 	select OPENSSL
-	select PYTHON		if SYSLOGNG_PYTHON_DESTINATION
+	select LIBCURL		if SYSLOGNG_HTTP
+	select JSON_C		if SYSLOGNG_JSON
+	select PYTHON3		if SYSLOGNG_PYTHON_DESTINATION
 	select LIBC_NSL
 	select LIBC_RT
 	select LIBNET		if SYSLOGNG_SPOOF_SOURCE
@@ -19,10 +19,6 @@ menuconfig SYSLOGNG
 	help
 	  The next generation syslog daemon.
 
-	  STAGING: remove in ptxdist-2020.01.0
-	  Fails to build with OpenSSL 1.1.x. Update to a new version is
-	  needed.
-
 if SYSLOGNG
 
 config SYSLOGNG_TCP_WRAPPER
@@ -46,28 +42,30 @@ config SYSLOGNG_SPOOF_SOURCE
 	  destinations though the original message can be
 	  received by TCP as well.
 
-config SYSLOGNG_AMQP_DESTINATION
+config SYSLOGNG_HTTP
 	bool
-	prompt "support the AMQP destination"
+	prompt "Enable HTTP support"
 	help
-	  Enables the ability to publish AMQP messages.
+	  Enable support for the http() destination that is based
+	  on libcurl.
 
-config SYSLOGNG_MONGODB_DESTINATION
+config SYSLOGNG_JSON
 	bool
-	prompt "support the MongoDB destination"
+	prompt "Enable JSON support"
 	help
-	  Enables the ability to send messages to a MongoDB database.
+	  JSON support is required for json-parser, and the format-cim
+	  and format-json template functions.
 
 config SYSLOGNG_PYTHON_DESTINATION
 	bool
-	prompt "support the python destination"
+	prompt "Support the python destination"
 	help
 	  Enables the ability to use inline python in the
 	  syslog-ng configuration file.
 
 config SYSLOGNG_STOMP_DESTINATION
 	bool
-	prompt "support the STOMP destination"
+	prompt "Support the STOMP destination"
 	help
 	  Enables the ability to send STOMP messages to message brokers.
 
diff --git a/rules/syslogng.make b/rules/syslogng.make
index 114f72cef..c2d4965b6 100644
--- a/rules/syslogng.make
+++ b/rules/syslogng.make
@@ -16,9 +16,9 @@ PACKAGES-$(PTXCONF_SYSLOGNG) += syslogng
 #
 # Paths and names
 #
-SYSLOGNG_VERSION	:= 3.7.3
-SYSLOG_LIBVERSION	:= 3.7
-SYSLOGNG_MD5		:= 803d61a713d6d41a973942d417fec999
+SYSLOGNG_VERSION	:= 3.25.1
+SYSLOG_LIBVERSION	:= 3.25
+SYSLOGNG_MD5		:= 07c2ebb712ddacd201b24b265b857b0d
 SYSLOGNG		:= syslog-ng-$(SYSLOGNG_VERSION)
 SYSLOGNG_SUFFIX		:= tar.gz
 SYSLOGNG_URL		:= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOGNG_VERSION)/$(SYSLOGNG).$(SYSLOGNG_SUFFIX)
@@ -32,29 +32,79 @@ SYSLOGNG_LICENSE	:= GPL-2.0-or-later AND LGPL-2.1-only
 
 SYSLOGNG_ENV 	= \
 	$(CROSS_ENV) \
-	ac_cv_path_PYTHON=$(CROSS_PYTHON)
+	ac_cv_path_PYTHON=$(CROSS_PYTHON3)
 
 #
 # autoconf
 #
 SYSLOGNG_AUTOCONF = \
 	$(CROSS_AUTOCONF_USR) \
-	$(GLOBAL_IPV6_OPTION) \
-	--enable-dynamic-linking \
+	--enable-forced-server-mode \
 	--disable-debug \
-	--disable-sun-streams \
-	--$(call ptx/endis, PTXCONF_SYSLOGNG_AMQP_DESTINATION)-amqp \
-	--$(call ptx/endis, PTXCONF_SYSLOGNG_MONGODB_DESTINATION)-mongodb \
-	--$(call ptx/endis, PTXCONF_SYSLOGNG_PYTHON_DESTINATION)-python \
-	--$(call ptx/endis, PTXCONF_SYSLOGNG_SYSTEMD)-systemd \
+	--enable-force-gnu99 \
+	--disable-extra-warnings \
+	--disable-env-wrapper \
+	--disable-gprof \
+	--disable-memtrace \
+	--enable-dynamic-linking \
+	--disable-mixed-linking \
+	$(GLOBAL_IPV6_OPTION) \
+	--$(call ptx/endis, PTXCONF_SYSLOGNG_TCP_WRAPPER)-tcp-wrapper \
 	--$(call ptx/endis, PTXCONF_SYSLOGNG_SPOOF_SOURCE)-spoof-source \
+	--disable-sun-streams \
+	--disable-openbsd-system-source \
+	--disable-sql \
+	--disable-pacct \
+	--disable-linux-caps \
+	--disable-gcov \
+	--disable-mongodb \
+	--disable-legacy-mongodb-options \
+	--$(call ptx/endis, PTXCONF_SYSLOGNG_JSON)-json \
+	--disable-amqp \
 	--$(call ptx/endis, PTXCONF_SYSLOGNG_STOMP_DESTINATION)-stomp \
-	--$(call ptx/endis, PTXCONF_SYSLOGNG_TCP_WRAPPER)-tcp-wrapper \
-	--with-systemd-journal=$(call ptx/ifdef, PTXCONF_SYSLOGNG_SYSTEMD,system,no) \
-	--with-systemdsystemunitdir=/usr/lib/systemd/system \
-	--localstatedir=/var/run \
+	--disable-smtp \
+	--$(call ptx/endis, PTXCONF_SYSLOGNG_HTTP)-http \
+	--disable-redis \
+	--$(call ptx/endis, PTXCONF_SYSLOGNG_SYSTEMD)-systemd \
+	--disable-geoip2 \
+	--disable-riemann \
+	--with-python=$(PYTHON3_MAJORMINOR) \
+	--$(call ptx/endis, PTXCONF_SYSLOGNG_PYTHON_DESTINATION)-python \
+	--disable-kafka \
+	--disable-manpages \
+	--disable-java \
+	--disable-java-modules \
+	--enable-native \
+	--disable-snmp-dest \
+	--disable-all-modules \
+	$(GLOBAL_LARGE_FILE_OPTION) \
+	--disable-valgrind \
 	--with-libnet=$(SYSROOT)/usr/bin \
-	--with-python=$(PYTHON_MAJORMINOR)
+	--without-net-snmp \
+	--with-systemdsystemunitdir=/usr/lib/systemd/system \
+	--with-jsonc=$(if $(PTXCONF_SYSLOGNG_JSON),system,no) \
+	--with-ivykis=internal \
+	--without-libesmtp \
+	--without-libhiredis \
+	--without-compile-date \
+	--with-systemd-journal=$(call ptx/ifdef, PTXCONF_SYSLOGNG_SYSTEMD,system,no) \
+	--localstatedir=/var/run
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/syslogng.install:
+	@$(call targetinfo)
+
+	@$(call world/install, SYSLOGNG)
+
+	@rm "$(SYSLOGNG_PKGDIR)/usr/bin/loggen"
+	@rm -r "$(SYSLOGNG_PKGDIR)/usr/lib/libloggen_"*
+	@rm -r "$(SYSLOGNG_PKGDIR)/usr/lib/syslog-ng/loggen"
+
+	@$(call touch)
+
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -73,6 +123,8 @@ $(STATEDIR)/syslogng.targetinstall:
 	@$(call install_copy, syslogng, 0, 0, 0755, -, \
 		/usr/sbin/syslog-ng)
 	@$(call install_lib, syslogng, 0, 0, 0644, libsyslog-ng-$(SYSLOG_LIBVERSION))
+	@$(call install_lib, syslogng, 0, 0, 0644, libevtlog-$(SYSLOG_LIBVERSION))
+	@$(call install_lib, syslogng, 0, 0, 0644, libsecret-storage)
 	@$(call install_glob, syslogng, 0, 0, -, /usr/lib/syslog-ng, *.so)
 
 #	# config
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [ptxdist] [PATCH] xorg-lib-x11: version bump 1.6.8 -> 1.6.9
@ 2020-04-08 12:47 Lucas Stach
  2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
  0 siblings, 1 reply; 11+ messages in thread
From: Lucas Stach @ 2020-04-08 12:47 UTC (permalink / raw)
  To: ptxdist

Fixes a linking issue, caused by trying to static link libc in the
previous version. Fixed upstream, so just bump to the latest release.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/xorg-lib-X11.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make
index 7cced137cd9f..dd7fe5e31472 100644
--- a/rules/xorg-lib-X11.make
+++ b/rules/xorg-lib-X11.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_XORG_LIB_X11) += xorg-lib-x11
 #
 # Paths and names
 #
-XORG_LIB_X11_VERSION	:= 1.6.8
-XORG_LIB_X11_MD5	:= c5fa5a86a20e3591bed6c046498d4b8f
+XORG_LIB_X11_VERSION	:= 1.6.9
+XORG_LIB_X11_MD5	:= 55adbfb6d4370ecac5e70598c4e7eed2
 XORG_LIB_X11		:= libX11-$(XORG_LIB_X11_VERSION)
 XORG_LIB_X11_SUFFIX	:= tar.bz2
 XORG_LIB_X11_URL	:= $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX))
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [ptxdist] [PATCH 1/4] libwpe: new package
@ 2020-04-08 19:29 Lucas Stach
  2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
  0 siblings, 1 reply; 11+ messages in thread
From: Lucas Stach @ 2020-04-08 19:29 UTC (permalink / raw)
  To: ptxdist

General-purpose library for the WebPlatformForEmbedded-flavored port of WebKit.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/libwpe.in   | 12 +++++++++
 rules/libwpe.make | 63 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 rules/libwpe.in
 create mode 100644 rules/libwpe.make

diff --git a/rules/libwpe.in b/rules/libwpe.in
new file mode 100644
index 000000000000..6b566d06a5c9
--- /dev/null
+++ b/rules/libwpe.in
@@ -0,0 +1,12 @@
+## SECTION=system_libraries
+
+config LIBWPE
+	tristate
+	prompt "libwpe"
+	select HOST_CMAKE
+	select HOST_NINJA
+	select MESALIB
+	select MESALIB_EGL
+	select LIBXKBCOMMON
+	help
+	  General-purpose library for the WebPlatformForEmbedded-flavored port of WebKit.
diff --git a/rules/libwpe.make b/rules/libwpe.make
new file mode 100644
index 000000000000..cc24f995db48
--- /dev/null
+++ b/rules/libwpe.make
@@ -0,0 +1,63 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2018 by Steffen Trumtrar <s.trumtrar@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBWPE) += libwpe
+
+#
+# Paths and names
+#
+LIBWPE_VERSION		:= 1.6.0
+LIBWPE_LIBRARY_VERSION	:= 1.0
+LIBWPE_MD5		:= 6e8a2c279dcc3617db5ec7ac4c03d628
+LIBWPE			:= libwpe-$(LIBWPE_VERSION)
+LIBWPE_SUFFIX		:= tar.xz
+LIBWPE_URL		:= https://wpewebkit.org/releases/$(LIBWPE).$(LIBWPE_SUFFIX)
+LIBWPE_SOURCE		:= $(SRCDIR)/$(LIBWPE).$(LIBWPE_SUFFIX)
+LIBWPE_DIR		:= $(BUILDDIR)/$(LIBWPE)
+LIBWPE_LICENSE		:= BSD-2-Clause
+LIBWPE_LICENSE_FILES	:= file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# cmake
+#
+LIBWPE_CONF_TOOL	:= cmake
+LIBWPE_CONF_OPT	:= \
+	$(CROSS_CMAKE_USR) \
+	-G Ninja \
+	-DBUILD_DOCS=OFF \
+	-DWPE_BACKEND= \
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libwpe.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, libwpe)
+	@$(call install_fixup, libwpe,PRIORITY,optional)
+	@$(call install_fixup, libwpe,SECTION,base)
+	@$(call install_fixup, libwpe,AUTHOR,"Steffen Trumtrar <s.trumtrar@pengutronix.de>")
+	@$(call install_fixup, libwpe,DESCRIPTION,missing)
+
+	@$(call install_lib, libwpe, 0, 0, 0644, libwpe-$(LIBWPE_LIBRARY_VERSION))
+
+	@$(call install_finish, libwpe)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [ptxdist] [PATCH 2/4] wpebackend-fdo: new package
  2020-04-08 19:29 [ptxdist] [PATCH 1/4] libwpe: new package Lucas Stach
@ 2020-04-08 19:30 Lucas Stach
  2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
  0 siblings, 1 reply; 11+ messages in thread
From: Lucas Stach @ 2020-04-08 19:30 UTC (permalink / raw)
  To: ptxdist

WPE backend based on freedesktop.org stack.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/wpebackend-fdo.in   | 15 ++++++++
 rules/wpebackend-fdo.make | 72 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100644 rules/wpebackend-fdo.in
 create mode 100644 rules/wpebackend-fdo.make

diff --git a/rules/wpebackend-fdo.in b/rules/wpebackend-fdo.in
new file mode 100644
index 000000000000..d4f48ad4fea4
--- /dev/null
+++ b/rules/wpebackend-fdo.in
@@ -0,0 +1,15 @@
+## SECTION=multimedia_libs
+
+config WPEBACKEND_FDO
+	tristate
+	prompt "wpebackend-fdo"
+	select HOST_CMAKE
+	select HOST_NINJA
+	select LIBWPE
+	select GLIB
+	select MESALIB
+	select MESALIB_EGL
+	select WAYLAND
+	help
+	  WPE backend based on freedesktop.org stack
+
diff --git a/rules/wpebackend-fdo.make b/rules/wpebackend-fdo.make
new file mode 100644
index 000000000000..95e48fa21a8e
--- /dev/null
+++ b/rules/wpebackend-fdo.make
@@ -0,0 +1,72 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2018 by Steffen Trumtrar <s.trumtrar@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_WPEBACKEND_FDO) += wpebackend-fdo
+
+#
+# Paths and names
+#
+WPEBACKEND_FDO_VERSION		:= 1.6.0
+WPEBACKEND_FDO_LIBRARY_VERSION	:= 1.0
+WPEBACKEND_FDO_MD5		:= 456afeed22f6749f7b2a97c11660835d
+WPEBACKEND_FDO			:= wpebackend-fdo-$(WPEBACKEND_FDO_VERSION)
+WPEBACKEND_FDO_SUFFIX		:= tar.xz
+WPEBACKEND_FDO_URL		:= https://wpewebkit.org/releases/$(WPEBACKEND_FDO).$(WPEBACKEND_FDO_SUFFIX)
+WPEBACKEND_FDO_SOURCE		:= $(SRCDIR)/$(WPEBACKEND_FDO).$(WPEBACKEND_FDO_SUFFIX)
+WPEBACKEND_FDO_DIR		:= $(BUILDDIR)/$(WPEBACKEND_FDO)
+WPEBACKEND_FDO_LICENSE		:= BSD-2-Clause
+WPEBACKEND_FDO_LICENSE_FILES	:= file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# cmake
+#
+WPEBACKEND_FDO_CONF_TOOL	:= cmake
+WPEBACKEND_FDO_CONF_OPT	:= \
+	$(CROSS_CMAKE_USR) \
+	-G Ninja \
+	-DBUILD_DOCS=OFF \
+	-DEXPORTABLE_EGL=ON
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/wpebackend-fdo.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, wpebackend-fdo)
+	@$(call install_fixup, wpebackend-fdo,PRIORITY,optional)
+	@$(call install_fixup, wpebackend-fdo,SECTION,base)
+	@$(call install_fixup, wpebackend-fdo,AUTHOR,"Steffen Trumtrar <s.trumtrar@pengutronix.de>")
+	@$(call install_fixup, wpebackend-fdo,DESCRIPTION,missing)
+
+	@$(call install_lib, wpebackend-fdo, 0, 0, 0644, \
+		libWPEBackend-fdo-$(WPEBACKEND_FDO_LIBRARY_VERSION))
+
+	@$(call install_link, wpebackend-fdo, \
+		libWPEBackend-fdo-$(WPEBACKEND_FDO_LIBRARY_VERSION).so.1.6.1, \
+		/usr/lib/libWPEBackend-default.so)
+	@$(call install_link, wpebackend-fdo, \
+		libWPEBackend-fdo-$(WPEBACKEND_FDO_LIBRARY_VERSION).so.1.6.1, \
+		/usr/lib/libWPEBackend-fdo-$(WPEBACKEND_FDO_LIBRARY_VERSION).so)
+
+
+	@$(call install_finish, wpebackend-fdo)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [ptxdist] [PATCH 3/4] wpewebkit: new package
  2020-04-08 19:29 [ptxdist] [PATCH 1/4] libwpe: new package Lucas Stach
@ 2020-04-08 19:30 Lucas Stach
  2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
  0 siblings, 1 reply; 11+ messages in thread
From: Lucas Stach @ 2020-04-08 19:30 UTC (permalink / raw)
  To: ptxdist

WebPlatformForEmbedded port for the WebKit cross-platform
web browser engine.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/wpewebkit.in   | 56 +++++++++++++++++++++++++++
 rules/wpewebkit.make | 90 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 146 insertions(+)
 create mode 100644 rules/wpewebkit.in
 create mode 100644 rules/wpewebkit.make

diff --git a/rules/wpewebkit.in b/rules/wpewebkit.in
new file mode 100644
index 000000000000..0de12b36e36e
--- /dev/null
+++ b/rules/wpewebkit.in
@@ -0,0 +1,56 @@
+## SECTION=multimedia_libs
+
+menuconfig WPEWEBKIT
+	tristate
+	prompt "wpewebkit                     "
+	select HOST_CMAKE
+	select HOST_NINJA
+	select HOST_SYSTEM_PERL
+	select HOST_SYSTEM_PERL_JSON
+	select GLIB
+	select LIBWPE
+	select CAIRO
+	select CAIRO_FREETYPE
+	select CAIRO_PNG
+	select FONTCONFIG
+	select FREETYPE
+	select ICU
+	select HARFBUZZ
+	select HARFBUZZ_ICU
+	select GLIB_NETWORKING if RUNTIME
+	select GNUTLS
+	select LIBJPEG
+	select LIBPCRE
+	select LIBWEBP
+	select LIBWEBP_DEMUX
+	select SQLITE
+	select ZLIB
+	select LIBPNG
+	select LIBSOUP
+	select LIBXML2
+	select LIBXSLT
+	select LIBXSLT_LIBXSLT
+	select MESALIB
+	select MESALIB_EGL
+	select MESALIB_GLES2
+	select LIBEPOXY
+	select LIBGCRYPT
+	select GSTREAMER1
+	select GST_PLUGINS_BASE1
+	select GST_PLUGINS_BASE1_APP
+	select GST_PLUGINS_BASE1_GL
+	select GST_PLUGINS_GOOD1
+	select GST_PLUGINS_BAD1
+	select WPEBACKEND_FDO
+	select QT5			if WPEWEBKIT_QT
+	select QT5_MODULE_QTDECLARATIVE	if WPEWEBKIT_QT
+	help
+	  WebPlatformForEmbedded port for the WebKit cross-platform web browser engine.
+
+if WPEWEBKIT
+
+config WPEWEBKIT_QT
+	bool
+	prompt "Qt API"
+
+endif
diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make
new file mode 100644
index 000000000000..5958508d4eec
--- /dev/null
+++ b/rules/wpewebkit.make
@@ -0,0 +1,90 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2018 by Steffen Trumtrar <s.trumtrar@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_WPEWEBKIT) += wpewebkit
+
+#
+# Paths and names
+#
+WPEWEBKIT_VERSION	:= 2.28.0
+WPEWEBKIT_MD5		:= 4298b9d38b4f05f92995422ea9979893
+WPEWEBKIT		:= wpewebkit-$(WPEWEBKIT_VERSION)
+WPEWEBKIT_SUFFIX	:= tar.xz
+WPEWEBKIT_URL		:= https://wpewebkit.org/releases/$(WPEWEBKIT).$(WPEWEBKIT_SUFFIX)
+WPEWEBKIT_SOURCE	:= $(SRCDIR)/$(WPEWEBKIT).$(WPEWEBKIT_SUFFIX)
+WPEWEBKIT_DIR		:= $(BUILDDIR)/$(WPEWEBKIT)
+WPEWEBKIT_LICENSE	:= BSD-2-Clause
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# cmake
+#
+WPEWEBKIT_CONF_TOOL	:= cmake
+WPEWEBKIT_CONF_OPT	:= \
+	$(CROSS_CMAKE_USR) \
+	-G Ninja \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DDEBUG_FISSION=OFF \
+	-DENABLE_ACCELERATED_2D_CANVAS=ON \
+	-DENABLE_ACCESSIBILITY=OFF \
+	-DENABLE_BUBBLEWRAP_SANDBOX=OFF \
+	-DENABLE_ENCRYPTED_MEDIA=OFF \
+	-DENABLE_GTKDOC=OFF\
+	-DENABLE_MEDIA_SOURCE=ON \
+	-DENABLE_SHAREABLE_RESOURCE=ON \
+	-DENABLE_VIDEO=ON \
+	-DENABLE_WEBDRIVER=ON \
+	-DENABLE_WEB_AUDIO=ON \
+	-DENABLE_WEB_CRYPTO=ON \
+	-DENABLE_WPE_QT_API=$(call ptx/onoff,PTXCONF_WPEWEBKIT_QT) \
+	-DENABLE_XSLT=ON \
+	-DPORT=WPE \
+	-DSHOULD_INSTALL_JS_SHELL=OFF \
+	-DSHOW_BINDINGS_GENERATION_PROGRESS=ON \
+	-DUSE_LD_GOLD=OFF \
+	-DUSE_OPENJPEG=OFF \
+	-DUSE_THIN_ARCHIVES=ON \
+	-DUSE_WOFF2=OFF \
+	-DWTF_CPU_ARM64_CORTEXA53=OFF
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/wpewebkit.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, wpewebkit)
+	@$(call install_fixup, wpewebkit,PRIORITY,optional)
+	@$(call install_fixup, wpewebkit,SECTION,base)
+	@$(call install_fixup, wpewebkit,AUTHOR,"Steffen Trumtrar <s.trumtrar@pengutronix.de>")
+	@$(call install_fixup, wpewebkit,DESCRIPTION,missing)
+
+	@$(call install_lib, wpewebkit, 0, 0, 0644, libWPEWebKit-1.0)
+
+	@$(call install_tree, wpewebkit, 0, 0, -, /usr/libexec/wpe-webkit-1.0)
+	@$(call install_tree, wpewebkit, 0, 0, -, /usr/lib/wpe-webkit-1.0)
+
+ifdef PTXCONF_WPEWEBKIT_QT
+	@$(call install_tree, wpewebkit, 0, 0, -, /usr/lib/qml)
+	@$(call install_link, wpewebkit, /usr/lib/qml/org/wpewebkit, /usr/lib/qt5/qml/org/wpewebkit)
+endif
+
+	@$(call install_finish, wpewebkit)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [ptxdist] [PATCH 4/4] cog: new package
  2020-04-08 19:29 [ptxdist] [PATCH 1/4] libwpe: new package Lucas Stach
@ 2020-04-08 19:30 Lucas Stach
  2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
  0 siblings, 1 reply; 11+ messages in thread
From: Lucas Stach @ 2020-04-08 19:30 UTC (permalink / raw)
  To: ptxdist

WPE launcher and webapp container.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 ...g-DWAYLAND_PROTOCOLS-on-command-line.patch | 103 ++++++++++++++++++
 patches/cog-0.6.0/series                      |   4 +
 rules/cog.in                                  |  11 ++
 rules/cog.make                                |  72 ++++++++++++
 4 files changed, 190 insertions(+)
 create mode 100644 patches/cog-0.6.0/0001-cmake-Fix-passing-DWAYLAND_PROTOCOLS-on-command-line.patch
 create mode 100644 patches/cog-0.6.0/series
 create mode 100644 rules/cog.in
 create mode 100644 rules/cog.make

diff --git a/patches/cog-0.6.0/0001-cmake-Fix-passing-DWAYLAND_PROTOCOLS-on-command-line.patch b/patches/cog-0.6.0/0001-cmake-Fix-passing-DWAYLAND_PROTOCOLS-on-command-line.patch
new file mode 100644
index 000000000000..b4686bd629d6
--- /dev/null
+++ b/patches/cog-0.6.0/0001-cmake-Fix-passing-DWAYLAND_PROTOCOLS-on-command-line.patch
@@ -0,0 +1,103 @@
+From: Joshua Watt <Joshua.Watt@garmin.com>
+Date: Mon, 30 Mar 2020 14:50:46 -0500
+Subject: [PATCH] cmake: Fix passing -DWAYLAND_PROTOCOLS= on command line
+
+The optimization to check if WAYLAND_PROTOCOLS was set on the cmake
+comamnd line was skipping the function implementations, making cmake
+fail if it was used. The simple fix is to define the functions, then
+bail of out WAYLAND_PROTOCOLS is already defined.
+
+Signed-off-by: Joshua Watt <Joshua.Watt@garmin.com>
+---
+ cmake/FindWaylandProtocols.cmake | 74 ++++++++++++++++++++--------------------
+ 1 file changed, 37 insertions(+), 37 deletions(-)
+
+diff --git a/cmake/FindWaylandProtocols.cmake b/cmake/FindWaylandProtocols.cmake
+index 49a3cd50f91b..31f429cb2732 100644
+--- a/cmake/FindWaylandProtocols.cmake
++++ b/cmake/FindWaylandProtocols.cmake
+@@ -34,43 +34,6 @@ find_package(WaylandScanner)
+ 
+ set(WAYLAND_PROTOCOLS "" CACHE FILEPATH "Path to the wayland-protocols data directory")
+ 
+-# Already detected included and directory found?
+-if (WAYLAND_PROTOCOLS AND IS_DIRECTORY "${WAYLAND_PROTOCOLS}")
+-    return ()
+-endif ()
+-
+-#
+-# Method 1: If -DWAYLAND_PROTOCOLS=... was passed in the command line,
+-#           check whether the "stable" and "unstable" subdirectories
+-#           exist.
+-#
+-if (WAYLAND_PROTOCOLS)
+-    get_filename_component(WAYLAND_PROTOCOLS "${WAYLAND_PROTOCOLS}" REALPATH)
+-    if (NOT IS_DIRECTORY "${WAYLAND_PROTOCOLS}/stable")
+-        set(WAYLAND_PROTOCOLS "")
+-    endif ()
+-    if (NOT IS_DIRECTORY "${WAYLAND_PROTOCOLS}/unstable")
+-        set(WAYLAND_PROTOCOLS "")
+-    endif ()
+-endif ()
+-
+-#
+-# Method 2: Try to find the directory using pkg-config.
+-#
+-if (NOT DEFINED WAYLAND_PROTOCOLS OR NOT WAYLAND_PROTOCOLS)
+-    find_package(PkgConfig)
+-    pkg_check_modules(WAYLAND_PROTOCOLS_PC wayland-protocols)
+-    if (WAYLAND_PROTOCOLS_PC_FOUND)
+-        pkg_get_variable(WAYLAND_PROTOCOLS_PC_DATADIR wayland-protocols pkgdatadir)
+-        if (WAYLAND_PROTOCOLS_PC_DATADIR)
+-            set(WAYLAND_PROTOCOLS "${WAYLAND_PROTOCOLS_PC_DATADIR}")
+-        endif ()
+-    endif ()
+-    unset(WAYLAND_PROTOCOLS_PC)
+-    unset(WAYLAND_PROTOCOLS_PC_DATADIR)
+-endif ()
+-
+-
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+     WAYLAND_PROTOCOLS
+@@ -206,3 +169,40 @@ function(add_wayland_protocol _target _kind _protocol)
+         target_sources(${_target} PRIVATE "${proto_server}")
+     endif ()
+ endfunction()
++
++# Already detected included and directory found?
++if (WAYLAND_PROTOCOLS AND IS_DIRECTORY "${WAYLAND_PROTOCOLS}")
++    return ()
++endif ()
++
++#
++# Method 1: If -DWAYLAND_PROTOCOLS=... was passed in the command line,
++#           check whether the "stable" and "unstable" subdirectories
++#           exist.
++#
++if (WAYLAND_PROTOCOLS)
++    get_filename_component(WAYLAND_PROTOCOLS "${WAYLAND_PROTOCOLS}" REALPATH)
++    if (NOT IS_DIRECTORY "${WAYLAND_PROTOCOLS}/stable")
++        set(WAYLAND_PROTOCOLS "")
++    endif ()
++    if (NOT IS_DIRECTORY "${WAYLAND_PROTOCOLS}/unstable")
++        set(WAYLAND_PROTOCOLS "")
++    endif ()
++endif ()
++
++#
++# Method 2: Try to find the directory using pkg-config.
++#
++if (NOT DEFINED WAYLAND_PROTOCOLS OR NOT WAYLAND_PROTOCOLS)
++    find_package(PkgConfig)
++    pkg_check_modules(WAYLAND_PROTOCOLS_PC wayland-protocols)
++    if (WAYLAND_PROTOCOLS_PC_FOUND)
++        pkg_get_variable(WAYLAND_PROTOCOLS_PC_DATADIR wayland-protocols pkgdatadir)
++        if (WAYLAND_PROTOCOLS_PC_DATADIR)
++            set(WAYLAND_PROTOCOLS "${WAYLAND_PROTOCOLS_PC_DATADIR}")
++        endif ()
++    endif ()
++    unset(WAYLAND_PROTOCOLS_PC)
++    unset(WAYLAND_PROTOCOLS_PC_DATADIR)
++endif ()
++
diff --git a/patches/cog-0.6.0/series b/patches/cog-0.6.0/series
new file mode 100644
index 000000000000..3c5f3e8d5e13
--- /dev/null
+++ b/patches/cog-0.6.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-cmake-Fix-passing-DWAYLAND_PROTOCOLS-on-command-line.patch
+# fe47d1ea6f9b17c63023088fd025091b  - git-ptx-patches magic
diff --git a/rules/cog.in b/rules/cog.in
new file mode 100644
index 000000000000..e8796399bb45
--- /dev/null
+++ b/rules/cog.in
@@ -0,0 +1,11 @@
+## SECTION=applications
+
+config COG
+	tristate
+	prompt "cog"
+	select HOST_CMAKE
+	select HOST_NINJA
+	select WPEWEBKIT
+	select WPEBACKEND_FDO
+	help
+	  Cog launcher and webapp container.
diff --git a/rules/cog.make b/rules/cog.make
new file mode 100644
index 000000000000..116fb6465c80
--- /dev/null
+++ b/rules/cog.make
@@ -0,0 +1,72 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2019 by Philippe Normand <philn@igalia.com>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_COG) += cog
+
+#
+# Paths and names
+#
+COG_VERSION		:= 0.6.0
+COG_MD5			:= a97df4f0e2d25f4da7cd9bb55294d30e
+COG			:= cog-$(COG_VERSION)
+COG_SUFFIX		:= tar.xz
+COG_URL			:= https://wpewebkit.org/releases/$(COG).$(COG_SUFFIX)
+COG_SOURCE		:= $(SRCDIR)/$(COG).$(COG_SUFFIX)
+COG_DIR			:= $(BUILDDIR)/$(COG)
+COG_LICENSE		:= MIT
+COG_LICENSE_FILES	:= file://COPYING;md5=bf1229cd7425b302d60cdb641b0ce5fb
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# cmake
+#
+COG_CONF_TOOL	:= cmake
+COG_CONF_OPT	:= \
+	$(CROSS_CMAKE_USR) \
+	-G Ninja \
+	-DCOG_APPID= \
+	-DCOG_BUILD_PROGRAMS=ON \
+	-DCOG_DBUS_OWN_USER= \
+	-DCOG_DBUS_SYSTEM_BUS=OFF \
+	-DCOG_HOME_URI=https://ptxdist.org/ \
+	-DCOG_PLATFORM_DRM=OFF \
+	-DCOG_PLATFORM_FDO=ON \
+	-DCOG_USE_WEBKITGTK=OFF \
+	-DCOG_WESTON_DIRECT_DISPLAY=OFF \
+	-DINSTALL_MAN_PAGES=OFF \
+	-DWAYLAND_PROTOCOLS=$(PTXDIST_SYSROOT_TARGET)/usr/share/wayland-protocols
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# -----------------------------------------------------------------------------
+
+$(STATEDIR)/cog.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, cog)
+	@$(call install_fixup, cog,PRIORITY,optional)
+	@$(call install_fixup, cog,SECTION,base)
+	@$(call install_fixup, cog,AUTHOR,"Philippe Normand <philn@igalia.com>")
+	@$(call install_fixup, cog,DESCRIPTION,"WPE launcher and webapp container")
+
+	@$(call install_copy, cog, 0, 0, 0755, -, /usr/bin/cog)
+	@$(call install_tree, cog, 0, 0, -, /usr/lib/)
+
+	@$(call install_finish, cog)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [ptxdist] [PATCH v2 1/2] fbgrab: remove from staging
@ 2020-04-09  9:11 Roland Hieber
  2020-04-09 16:54 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 11+ messages in thread
From: Roland Hieber @ 2020-04-09  9:11 UTC (permalink / raw)
  To: ptxdist; +Cc: Roland Hieber

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/fbgrab.in | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/rules/fbgrab.in b/rules/fbgrab.in
index dfa83fa4e477..bc8e9cf88f97 100644
--- a/rules/fbgrab.in
+++ b/rules/fbgrab.in
@@ -1,6 +1,4 @@
-## SECTION=staging
-## old section:
-### SECTION=multimedia_framebuffer
+## SECTION=multimedia_framebuffer
 
 config FBGRAB
 	select LIBPNG
@@ -11,7 +9,3 @@ config FBGRAB
 	  linux framebuffer and converting it to a png-picture.
 
 	  For details see: https://github.com/GunnarMonell/fbgrab
-
-	  STAGING: remove in ptxdist-2021.04.0
-	  Old version, broken download and obsolete. There is a new version
-	  on gitub that could be used.
-- 
2.26.0.rc2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [ptxdist] [PATCH v2 2/2] fbgrab: version bump 1.0 -> 1.3.1
  2020-04-09  9:11 [ptxdist] [PATCH v2 1/2] " Roland Hieber
@ 2020-04-09  9:11 Roland Hieber
  2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
  0 siblings, 1 reply; 11+ messages in thread
From: Roland Hieber @ 2020-04-09  9:11 UTC (permalink / raw)
  To: ptxdist; +Cc: Roland Hieber, Felicitas Jung

The old URL is broken, but the new GitHub project doesn't have the old
releases, so bump the version.

Remove patches, the respective issues have been fixed upstream.

When the rule file is evaluated, the cross pkg-config wrapper may not
exist yet, which will lead to confusing error messages during the build.
But it turns out that calling pkg-config is not actually necessary
because libpng is installed to the standard locations, and fbgrab builds
just fine using '-lpng -lz' in its Makefile.

Also set FBGRAB_CONF_TOOL for uniformity across rule files.

fbgrab.c only says "This program is free Software, see the COPYING
file". COPYING contains a GPL-2.0 license text, therefore the "-only"
part is inferred.

Reported-by: Felicitas Jung <f.jung@pengutronix.de>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 ...ake-makefile-cross-compilation-aware.patch | 37 -------------------
 .../0002-fbgrab-include-zlib.h.patch          | 24 ------------
 patches/fbgrab-1.0/series                     |  5 ---
 rules/fbgrab.make                             | 21 +++++++----
 4 files changed, 14 insertions(+), 73 deletions(-)
 delete mode 100644 patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch
 delete mode 100644 patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch
 delete mode 100644 patches/fbgrab-1.0/series

diff --git a/patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch b/patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch
deleted file mode 100644
index e783991b3289..000000000000
--- a/patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Roland Hostettler <r.hostettler@gmx.ch>
-Date: Tue, 16 Aug 2011 17:35:19 +0200
-Subject: [PATCH] make makefile cross compilation aware
-
-The upstream makefile is not usable for cross compilation.
-[wsa] Simplified 'strip' support
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
----
- Makefile |   11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 14c63cb..8ae5dc8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -4,13 +4,12 @@
- ###
- 
- fbgrab: fbgrab.c
--	splint +posixlib fbgrab.c
--	gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab
-+#	splint +posixlib fbgrab.c
-+	${CC} ${CPPFLAGS} fbgrab.c ${LDLIBS} -o fbgrab
- 
- install:
--	strip fbgrab
--	install fbgrab /usr/bin/fbgrab
--	install fbgrab.1.man /usr/man/man1/fbgrab.1
-+	install -s fbgrab ${DESTDIR}/usr/bin/fbgrab
-+	install fbgrab.1.man ${DESTDIR}/usr/man/man1/fbgrab.1
- 
- clean:
--	rm -f fbgrab *~ \#*\#
-\ No newline at end of file
-+	rm -f fbgrab *~ \#*\#
diff --git a/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch b/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch
deleted file mode 100644
index 22474f7ca4cb..000000000000
--- a/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Tue, 16 Aug 2011 17:36:49 +0200
-Subject: [PATCH] fbgrab: include zlib.h
-
-Newer libpng versions do not include zlib.h in their api any more, so if
-we use symbols from there, we should include zlib.h directly.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
----
- fbgrab.c |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/fbgrab.c b/fbgrab.c
-index fc89f5a..0c959f6 100644
---- a/fbgrab.c
-+++ b/fbgrab.c
-@@ -23,6 +23,7 @@
- #include <getopt.h>
- #include <sys/vt.h>   /* to handle vt changing */
- #include <png.h>      /* PNG lib */
-+#include <zlib.h>     /* zlib */
- #include <linux/fb.h> /* to handle framebuffer ioctls */
- 
- #define	VERSION	"1.0 beta 1"
diff --git a/patches/fbgrab-1.0/series b/patches/fbgrab-1.0/series
deleted file mode 100644
index 45420ced9d62..000000000000
--- a/patches/fbgrab-1.0/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-make-makefile-cross-compilation-aware.patch
-0002-fbgrab-include-zlib.h.patch
-# 07f6b94abfd5520604fa320ff0fa961c  - git-ptx-patches magic
diff --git a/rules/fbgrab.make b/rules/fbgrab.make
index eb05a024e4d4..ea7f07f6000a 100644
--- a/rules/fbgrab.make
+++ b/rules/fbgrab.make
@@ -15,22 +15,29 @@ PACKAGES-$(PTXCONF_FBGRAB) += fbgrab
 #
 # Paths and names
 #
-FBGRAB_VERSION	:= 1.0
-FBGRAB_MD5	:= 7af4d8774684182ed690d5da82d6d234
+FBGRAB_VERSION	:= 1.3.1
+FBGRAB_MD5	:= d2f1f9a096954c252335317216dcd501
 FBGRAB		:= fbgrab-$(FBGRAB_VERSION)
 FBGRAB_SUFFIX	:= tar.gz
-FBGRAB_URL	:= http://fbgrab.monells.se/$(FBGRAB).$(FBGRAB_SUFFIX)
+FBGRAB_URL	:= https://github.com/GunnarMonell/fbgrab/archive/$(FBGRAB_VERSION).$(FBGRAB_SUFFIX)
 FBGRAB_SOURCE	:= $(SRCDIR)/$(FBGRAB).$(FBGRAB_SUFFIX)
 FBGRAB_DIR	:= $(BUILDDIR)/$(FBGRAB)
+FBGRAB_LICENSE	:= GPL-2.0-only
+FBGRAB_LICENSE_FILES	:= \
+	file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \
+	file://fbgrab.c;startline=6;endline=6;md5=03e379b2e488fbda4e42aa556e9cec93
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+FBGRAB_CONF_TOOL := NO
 
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
-# overwrite some vars in the makefile
 
-FBGRAB_MAKE_OPT	= \
-	$(CROSS_ENV_CC) \
-	LDLIBS='`eval PATH=$(CROSS_PATH) $(CROSS_PKG_CONFIG) --libs libpng`'
+FBGRAB_MAKE_ENV := $(CROSS_ENV_CC)
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.26.0.rc2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-04-09 17:25 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-03 17:30 [ptxdist] [PATCH] dropbear: enable/disable sha1 include key exchange algorithms Bruno Thomsen
2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
2020-04-08 12:32 [ptxdist] [PATCH v3] syslogng: update to 3.25.1 Matthias Schiffer
2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
2020-04-08 12:47 [ptxdist] [PATCH] xorg-lib-x11: version bump 1.6.8 -> 1.6.9 Lucas Stach
2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
2020-04-08 19:29 [ptxdist] [PATCH 1/4] libwpe: new package Lucas Stach
2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
2020-04-08 19:30 [ptxdist] [PATCH 2/4] wpebackend-fdo: new package Lucas Stach
2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
2020-04-08 19:30 [ptxdist] [PATCH 3/4] wpewebkit: new package Lucas Stach
2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
2020-04-08 19:30 [ptxdist] [PATCH 4/4] cog: new package Lucas Stach
2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
2020-04-09 17:25   ` Michael Olbrich
2020-04-09  9:11 [ptxdist] [PATCH v2 1/2] " Roland Hieber
2020-04-09 16:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-04-09  9:11 [ptxdist] [PATCH v2 2/2] fbgrab: version bump 1.0 -> 1.3.1 Roland Hieber
2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox