* [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
2020-04-08 19:30 ` [ptxdist] [PATCH 3/4] wpewebkit: new package Lucas Stach
` (3 subsequent siblings)
4 siblings, 1 reply; 10+ 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] 10+ messages in thread* Re: [ptxdist] [APPLIED] fbgrab: remove from staging
2020-04-08 19:30 ` [ptxdist] [PATCH 2/4] wpebackend-fdo: " Lucas Stach
@ 2020-04-09 16:54 ` Michael Olbrich
0 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2020-04-09 16:54 UTC (permalink / raw)
To: ptxdist; +Cc: Lucas Stach
Thanks, applied as 2a55a625e4a904bd57a1c86c7884c9d92b6465e9.
Michael
[sent from post-receive hook]
On Thu, 09 Apr 2020 18:54:24 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> WPE backend based on freedesktop.org stack.
>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20200408193002.18077-2-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/wpebackend-fdo.in b/rules/wpebackend-fdo.in
> new file mode 100644
> index 000000000000..4efb763a54d3
> --- /dev/null
> +++ b/rules/wpebackend-fdo.in
> @@ -0,0 +1,16 @@
> +## 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 MESALIB_EGL_WAYLAND
> + 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..90db6b5b3934
> --- /dev/null
> +++ b/rules/wpebackend-fdo.make
> @@ -0,0 +1,70 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2018 by Steffen Trumtrar <s.trumtrar@pengutronix.de>
> +#
> +# 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
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 10+ 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 ` [ptxdist] [PATCH 2/4] wpebackend-fdo: " Lucas Stach
@ 2020-04-08 19:30 ` 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
` (2 subsequent siblings)
4 siblings, 1 reply; 10+ 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] 10+ messages in thread* Re: [ptxdist] [APPLIED] fbgrab: remove from staging
2020-04-08 19:30 ` [ptxdist] [PATCH 3/4] wpewebkit: new package Lucas Stach
@ 2020-04-09 16:54 ` Michael Olbrich
0 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2020-04-09 16:54 UTC (permalink / raw)
To: ptxdist; +Cc: Lucas Stach
Thanks, applied as 42b59d2a062c5a96dd885cc9275941963651fda6.
Michael
[sent from post-receive hook]
On Thu, 09 Apr 2020 18:54:24 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> WebPlatformForEmbedded port for the WebKit cross-platform
> web browser engine.
>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20200408193002.18077-3-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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..075e5cd6c706
> --- /dev/null
> +++ b/rules/wpewebkit.make
> @@ -0,0 +1,91 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2018 by Steffen Trumtrar <s.trumtrar@pengutronix.de>
> +#
> +# 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
> +
> +# private options
> +WPEWEBKIT_CONF_OPT += \
> + -DENABLE_REMOTE_INSPECTOR=ON
> +
> +# ----------------------------------------------------------------------------
> +# 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/qt5/qml/org/wpewebkit)
> +endif
> +
> + @$(call install_finish, wpewebkit)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 10+ 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 ` [ptxdist] [PATCH 2/4] wpebackend-fdo: " Lucas Stach
2020-04-08 19:30 ` [ptxdist] [PATCH 3/4] wpewebkit: new package Lucas Stach
@ 2020-04-08 19:30 ` Lucas Stach
2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
2020-04-09 12:55 ` [ptxdist] [PATCH 1/4] libwpe: new package Roland Hieber
2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
4 siblings, 1 reply; 10+ 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] 10+ messages in thread* Re: [ptxdist] [APPLIED] fbgrab: remove from staging
2020-04-08 19:30 ` [ptxdist] [PATCH 4/4] cog: new package Lucas Stach
@ 2020-04-09 16:54 ` Michael Olbrich
2020-04-09 17:25 ` Michael Olbrich
0 siblings, 1 reply; 10+ messages in thread
From: Michael Olbrich @ 2020-04-09 16:54 UTC (permalink / raw)
To: ptxdist; +Cc: Lucas Stach
Thanks, applied as 998885ca0aebcca14a8e2dcdce4e3663aa46df3a.
Michael
[sent from post-receive hook]
On Thu, 09 Apr 2020 18:54:25 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> WPE launcher and webapp container.
>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20200408193002.18077-4-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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..23b9de3cd931
> --- /dev/null
> +++ b/rules/cog.in
> @@ -0,0 +1,12 @@
> +## SECTION=applications
> +
> +config COG
> + tristate
> + prompt "cog"
> + select HOST_CMAKE
> + select HOST_NINJA
> + select WAYLAND_PROTOCOLS
> + 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..19a70b941d6f
> --- /dev/null
> +++ b/rules/cog.make
> @@ -0,0 +1,71 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2019 by Philippe Normand <philn@igalia.com>
> +#
> +# 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_lib, cog, 0, 0, 644, libcogplatform-fdo)
> + @$(call install_lib, cog, 0, 0, 644, libcogcore)
> +
> + @$(call install_finish, cog)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [ptxdist] [APPLIED] fbgrab: remove from staging
2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
@ 2020-04-09 17:25 ` Michael Olbrich
0 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2020-04-09 17:25 UTC (permalink / raw)
To: ptxdist
Right, my tooling need more work. The subject should be correct in the
future. I tried to change it from the subject of the original mail to the
actual subject of the commit, but used the wrong commit-ish...
Michael
On Thu, Apr 09, 2020 at 06:54:25PM +0200, Michael Olbrich wrote:
> Thanks, applied as 998885ca0aebcca14a8e2dcdce4e3663aa46df3a.
>
> Michael
>
> [sent from post-receive hook]
>
> On Thu, 09 Apr 2020 18:54:25 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> > WPE launcher and webapp container.
> >
> > Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> > Message-Id: <20200408193002.18077-4-l.stach@pengutronix.de>
> > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> >
> > 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..23b9de3cd931
> > --- /dev/null
> > +++ b/rules/cog.in
> > @@ -0,0 +1,12 @@
> > +## SECTION=applications
> > +
> > +config COG
> > + tristate
> > + prompt "cog"
> > + select HOST_CMAKE
> > + select HOST_NINJA
> > + select WAYLAND_PROTOCOLS
> > + 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..19a70b941d6f
> > --- /dev/null
> > +++ b/rules/cog.make
> > @@ -0,0 +1,71 @@
> > +# -*-makefile-*-
> > +#
> > +# Copyright (C) 2019 by Philippe Normand <philn@igalia.com>
> > +#
> > +# 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_lib, cog, 0, 0, 644, libcogplatform-fdo)
> > + @$(call install_lib, cog, 0, 0, 644, libcogcore)
> > +
> > + @$(call install_finish, cog)
> > +
> > + @$(call touch)
> > +
> > +# vim: syntax=make
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ptxdist] [PATCH 1/4] libwpe: new package
2020-04-08 19:29 [ptxdist] [PATCH 1/4] libwpe: new package Lucas Stach
` (2 preceding siblings ...)
2020-04-08 19:30 ` [ptxdist] [PATCH 4/4] cog: new package Lucas Stach
@ 2020-04-09 12:55 ` Roland Hieber
2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
4 siblings, 0 replies; 10+ messages in thread
From: Roland Hieber @ 2020-04-09 12:55 UTC (permalink / raw)
To: Lucas Stach; +Cc: ptxdist
On Wed, Apr 08, 2020 at 09:29:59PM +0200, Lucas Stach wrote:
> 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.
Please remove, as always.
- Roland
> +#
> +# 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
>
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [ptxdist] [APPLIED] fbgrab: remove from staging
2020-04-08 19:29 [ptxdist] [PATCH 1/4] libwpe: new package Lucas Stach
` (3 preceding siblings ...)
2020-04-09 12:55 ` [ptxdist] [PATCH 1/4] libwpe: new package Roland Hieber
@ 2020-04-09 16:54 ` Michael Olbrich
4 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2020-04-09 16:54 UTC (permalink / raw)
To: ptxdist; +Cc: Lucas Stach
Thanks, applied as 8ed25566dda8c722a3ff320224364bdf950e0116.
Michael
[sent from post-receive hook]
On Thu, 09 Apr 2020 18:54:23 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> General-purpose library for the WebPlatformForEmbedded-flavored port of WebKit.
>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20200408193002.18077-1-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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..552a55dc9fcc
> --- /dev/null
> +++ b/rules/libwpe.make
> @@ -0,0 +1,61 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2018 by Steffen Trumtrar <s.trumtrar@pengutronix.de>
> +#
> +# 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
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 10+ messages in thread