mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH 1/4] libjpeg: enable building libturbojpeg
@ 2022-02-18 16:08 Philipp Zabel
  2022-02-18 16:08 ` [ptxdist] [PATCH 2/4] aml: new package Philipp Zabel
                   ` (3 more replies)
  0 siblings, 4 replies; 10+ messages in thread
From: Philipp Zabel @ 2022-02-18 16:08 UTC (permalink / raw)
  To: ptxdist

Enable building libturbojpeg for users of the simplified API.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/libjpeg.in   | 7 +++++++
 rules/libjpeg.make | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/rules/libjpeg.in b/rules/libjpeg.in
index 53a9d9e09701..3304c6ac896f 100644
--- a/rules/libjpeg.in
+++ b/rules/libjpeg.in
@@ -19,4 +19,11 @@ config LIBJPEG_BIN
 	  cjpeg and djpeg are simple bineries to convert some basic image
 	  formats to jpeg (cjpeg) or convert them back from jpeg (djpeg)
 
+config LIBJPEG_TURBO
+	bool
+	prompt "Build and install libturbojpeg"
+	help
+	  In addition to the traditional libjpeg API, also provide the less
+	  powerful but more straightforward TurboJPEG API.
+
 endif
diff --git a/rules/libjpeg.make b/rules/libjpeg.make
index 559a6d08d504..704f810a4bd4 100644
--- a/rules/libjpeg.make
+++ b/rules/libjpeg.make
@@ -60,7 +60,7 @@ LIBJPEG_CONF_OPT := \
 	-DWITH_JPEG8=ON \
 	-DWITH_MEM_SRCDST=ON \
 	-DWITH_SIMD=$(call ptx/onoff,LIBJPEG_SIMD) \
-	-DWITH_TURBOJPEG=OFF
+	-DWITHOUT_TURBOJPEG=$(call ptx/ifdef, PTXCONF_LIBJPEG_TURBO,OFF,ON)
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -76,6 +76,9 @@ $(STATEDIR)/libjpeg.targetinstall:
 	@$(call install_fixup, libjpeg,DESCRIPTION,missing)
 
 	@$(call install_lib, libjpeg, 0, 0, 0644, libjpeg)
+ifdef PTXCONF_LIBJPEG_TURBO
+	@$(call install_lib, libjpeg, 0, 0, 0644, libturbojpeg)
+endif
 ifdef PTXCONF_LIBJPEG_BIN
 	@$(call install_copy, libjpeg, 0, 0, 0755, -, /usr/bin/cjpeg)
 	@$(call install_copy, libjpeg, 0, 0, 0755, -, /usr/bin/djpeg)
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [ptxdist] [PATCH 2/4] aml: new package
  2022-02-18 16:08 [ptxdist] [PATCH 1/4] libjpeg: enable building libturbojpeg Philipp Zabel
@ 2022-02-18 16:08 ` Philipp Zabel
  2022-02-28 12:09   ` [ptxdist] [APPLIED] " Michael Olbrich
  2022-02-18 16:08 ` [ptxdist] [PATCH 3/4] neatvnc: " Philipp Zabel
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 10+ messages in thread
From: Philipp Zabel @ 2022-02-18 16:08 UTC (permalink / raw)
  To: ptxdist

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/aml.in   |  8 +++++++
 rules/aml.make | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 rules/aml.in
 create mode 100644 rules/aml.make

diff --git a/rules/aml.in b/rules/aml.in
new file mode 100644
index 000000000000..897028c61f72
--- /dev/null
+++ b/rules/aml.in
@@ -0,0 +1,8 @@
+## SECTION=system_libraries
+
+config AML
+	tristate
+	select HOST_MESON
+	prompt "aml"
+	help
+	  Andri's Main Loop
diff --git a/rules/aml.make b/rules/aml.make
new file mode 100644
index 000000000000..f083fe29a5c3
--- /dev/null
+++ b/rules/aml.make
@@ -0,0 +1,57 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Marian Cichy <m.cichy@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_AML) += aml
+
+#
+# Paths and names
+#
+AML_VERSION	:= 0.2.1
+AML_MD5		:= 8416dc2bdcd4c8c56d5e246468a30c2d
+AML		:= aml-$(AML_VERSION)
+AML_SUFFIX	:= tar.gz
+AML_URL		:= https://github.com/any1/aml/archive/refs/tags/v$(AML_VERSION).$(AML_SUFFIX)
+AML_SOURCE	:= $(SRCDIR)/$(AML).$(AML_SUFFIX)
+AML_DIR		:= $(BUILDDIR)/$(AML)
+AML_LICENSE	:= ISC
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# meson
+#
+AML_CONF_TOOL	:= meson
+AML_CONF_OPT	:=  \
+	$(CROSS_MESON_USR) \
+	-Dexamples=false
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/aml.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, aml)
+	@$(call install_fixup, aml,PRIORITY,optional)
+	@$(call install_fixup, aml,SECTION,base)
+	@$(call install_fixup, aml,AUTHOR,"Marian Cichy <m.cichy@pengutronix.de>")
+	@$(call install_fixup, aml,DESCRIPTION,missing)
+
+	@$(call install_lib, aml, 0, 0, 0644, libaml)
+
+	@$(call install_finish, aml)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [ptxdist] [PATCH 3/4] neatvnc: new package
  2022-02-18 16:08 [ptxdist] [PATCH 1/4] libjpeg: enable building libturbojpeg Philipp Zabel
  2022-02-18 16:08 ` [ptxdist] [PATCH 2/4] aml: new package Philipp Zabel
@ 2022-02-18 16:08 ` Philipp Zabel
  2022-02-28 12:09   ` [ptxdist] [APPLIED] " Michael Olbrich
  2022-02-18 16:08 ` [ptxdist] [PATCH 4/4] wayvnc: " Philipp Zabel
  2022-02-18 16:27 ` [ptxdist] [PATCH 1/4] libjpeg: enable building libturbojpeg Christian Melki
  3 siblings, 1 reply; 10+ messages in thread
From: Philipp Zabel @ 2022-02-18 16:08 UTC (permalink / raw)
  To: ptxdist

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/neatvnc.in   | 22 +++++++++++++++++
 rules/neatvnc.make | 61 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 rules/neatvnc.in
 create mode 100644 rules/neatvnc.make

diff --git a/rules/neatvnc.in b/rules/neatvnc.in
new file mode 100644
index 000000000000..9871a645dee8
--- /dev/null
+++ b/rules/neatvnc.in
@@ -0,0 +1,22 @@
+## SECTION=system_libraries
+
+menuconfig NEATVNC
+	tristate
+	select HOST_MESON
+	select PIXMAN
+	select ZLIB
+	select AML
+	select LIBJPEG		if NEATVNC_JPEG
+	select LIBJPEG_TURBO	if NEATVNC_JPEG
+	select LIBDRM		if BUILDTIME
+	prompt "neatvnc"
+	help
+	  VNC Server library
+
+if NEATVNC
+
+config NEATVNC_JPEG
+	bool
+	prompt "enable jpeg compression"
+
+endif
diff --git a/rules/neatvnc.make b/rules/neatvnc.make
new file mode 100644
index 000000000000..e5bb4c96e89b
--- /dev/null
+++ b/rules/neatvnc.make
@@ -0,0 +1,61 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Marian Cichy <m.cichy@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_NEATVNC) += neatvnc
+
+#
+# Paths and names
+#
+NEATVNC_VERSION	:= 0.4.0
+NEATVNC_MD5	:= c645abf2233a3a3ad294ca1ef9399d23
+NEATVNC		:= neatvnc-$(NEATVNC_VERSION)
+NEATVNC_SUFFIX	:= tar.gz
+NEATVNC_URL	:= https://github.com/any1/neatvnc/archive/refs/tags/v$(NEATVNC_VERSION).$(NEATVNC_SUFFIX)
+NEATVNC_SOURCE	:= $(SRCDIR)/$(NEATVNC).$(NEATVNC_SUFFIX)
+NEATVNC_DIR	:= $(BUILDDIR)/$(NEATVNC)
+NEATVNC_LICENSE	:= ISC
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# meson
+#
+NEATVNC_CONF_TOOL	:= meson
+NEATVNC_CONF_OPT	:=  \
+	$(CROSS_MESON_USR) \
+	-Dbenchmarks=false \
+	-Dexamples=false \
+	-Djpeg=$(call ptx/endis,PTXCONF_NEATVNC_JPEG)d \
+	-Dtls=disabled \
+	-Dsystemtap=false
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/neatvnc.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, neatvnc)
+	@$(call install_fixup, neatvnc,PRIORITY,optional)
+	@$(call install_fixup, neatvnc,SECTION,base)
+	@$(call install_fixup, neatvnc,AUTHOR,"Marian Cichy <m.cichy@pengutronix.de>")
+	@$(call install_fixup, neatvnc,DESCRIPTION,missing)
+
+	@$(call install_lib, neatvnc, 0, 0, 0644, libneatvnc)
+
+	@$(call install_finish, neatvnc)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [ptxdist] [PATCH 4/4] wayvnc: new package
  2022-02-18 16:08 [ptxdist] [PATCH 1/4] libjpeg: enable building libturbojpeg Philipp Zabel
  2022-02-18 16:08 ` [ptxdist] [PATCH 2/4] aml: new package Philipp Zabel
  2022-02-18 16:08 ` [ptxdist] [PATCH 3/4] neatvnc: " Philipp Zabel
@ 2022-02-18 16:08 ` Philipp Zabel
  2022-02-28 12:09   ` [ptxdist] [APPLIED] " Michael Olbrich
  2022-02-18 16:27 ` [ptxdist] [PATCH 1/4] libjpeg: enable building libturbojpeg Christian Melki
  3 siblings, 1 reply; 10+ messages in thread
From: Philipp Zabel @ 2022-02-18 16:08 UTC (permalink / raw)
  To: ptxdist

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/wayvnc.in   | 24 +++++++++++++++++++
 rules/wayvnc.make | 60 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 rules/wayvnc.in
 create mode 100644 rules/wayvnc.make

diff --git a/rules/wayvnc.in b/rules/wayvnc.in
new file mode 100644
index 000000000000..d92b3880c736
--- /dev/null
+++ b/rules/wayvnc.in
@@ -0,0 +1,24 @@
+## SECTION=multimedia_wayland
+
+menuconfig WAYVNC
+	tristate
+	select HOST_MESON
+	select AML
+	select LIBDRM
+	select LIBXKBCOMMON
+	select NEATVNC
+	select PIXMAN
+	select WAYLAND
+	select MESALIB		if WAYVNC_SCREENCOPY_DMABUF
+	select MESALIB_GBM	if WAYVNC_SCREENCOPY_DMABUF
+	prompt "wayvnc"
+	help
+	  A VNC server for wlroots based Wayland compositors.
+
+if WAYVNC
+
+config WAYVNC_SCREENCOPY_DMABUF
+	bool
+	prompt "Enable GPU-side screencopy (experimental)"
+
+endif
diff --git a/rules/wayvnc.make b/rules/wayvnc.make
new file mode 100644
index 000000000000..77f3f076dbd2
--- /dev/null
+++ b/rules/wayvnc.make
@@ -0,0 +1,60 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Philipp Zabel <p.zabel@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_WAYVNC) += wayvnc
+
+#
+# Paths and names
+#
+WAYVNC_VERSION	:= 0.4.1
+WAYVNC_MD5	:= edbc130394fcba052090eaf1ef9fda2c
+WAYVNC		:= wayvnc-$(WAYVNC_VERSION)
+WAYVNC_SUFFIX	:= tar.gz
+WAYVNC_URL	:= https://github.com/any1/wayvnc/archive/refs/tags/v$(WAYVNC_VERSION).$(WAYVNC_SUFFIX)
+WAYVNC_SOURCE	:= $(SRCDIR)/$(WAYVNC).$(WAYVNC_SUFFIX)
+WAYVNC_DIR	:= $(BUILDDIR)/$(WAYVNC)
+WAYVNC_LICENSE	:= ISC
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# meson
+#
+WAYVNC_CONF_TOOL	:= meson
+WAYVNC_CONF_OPT	:=  \
+	$(CROSS_MESON_USR) \
+	-Dscreencopy-dmabuf=$(call ptx/endis,PTXCONF_WAYVNC_SCREENCOPY_DMABUF)d \
+	-Dpam=disabled \
+	-Dman-pages=disabled \
+	-Dsystemtap=false
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/wayvnc.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, wayvnc)
+	@$(call install_fixup, wayvnc,PRIORITY,optional)
+	@$(call install_fixup, wayvnc,SECTION,base)
+	@$(call install_fixup, wayvnc,AUTHOR,"Philipp Zabel <p.zabel@pengutronix.de>")
+	@$(call install_fixup, wayvnc,DESCRIPTION,missing)
+
+	@$(call install_copy, wayvnc, 0, 0, 0755, -, /usr/bin/wayvnc)
+
+	@$(call install_finish, wayvnc)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [PATCH 1/4] libjpeg: enable building libturbojpeg
  2022-02-18 16:08 [ptxdist] [PATCH 1/4] libjpeg: enable building libturbojpeg Philipp Zabel
                   ` (2 preceding siblings ...)
  2022-02-18 16:08 ` [ptxdist] [PATCH 4/4] wayvnc: " Philipp Zabel
@ 2022-02-18 16:27 ` Christian Melki
  2022-02-22  7:35   ` Michael Olbrich
  2022-02-22 12:03   ` Philipp Zabel
  3 siblings, 2 replies; 10+ messages in thread
From: Christian Melki @ 2022-02-18 16:27 UTC (permalink / raw)
  To: p.zabel; +Cc: ptxdist

On 2/18/22 17:08, Philipp Zabel wrote:
> Enable building libturbojpeg for users of the simplified API.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
>  rules/libjpeg.in   | 7 +++++++
>  rules/libjpeg.make | 5 ++++-
>  2 files changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/libjpeg.in b/rules/libjpeg.in
> index 53a9d9e09701..3304c6ac896f 100644
> --- a/rules/libjpeg.in
> +++ b/rules/libjpeg.in
> @@ -19,4 +19,11 @@ config LIBJPEG_BIN
>  	  cjpeg and djpeg are simple bineries to convert some basic image
>  	  formats to jpeg (cjpeg) or convert them back from jpeg (djpeg)
>  
> +config LIBJPEG_TURBO
> +	bool
> +	prompt "Build and install libturbojpeg"
> +	help
> +	  In addition to the traditional libjpeg API, also provide the less
> +	  powerful but more straightforward TurboJPEG API.
> +
>  endif
> diff --git a/rules/libjpeg.make b/rules/libjpeg.make
> index 559a6d08d504..704f810a4bd4 100644
> --- a/rules/libjpeg.make
> +++ b/rules/libjpeg.make
> @@ -60,7 +60,7 @@ LIBJPEG_CONF_OPT := \
>  	-DWITH_JPEG8=ON \
>  	-DWITH_MEM_SRCDST=ON \
>  	-DWITH_SIMD=$(call ptx/onoff,LIBJPEG_SIMD) \
> -	-DWITH_TURBOJPEG=OFF
> +	-DWITHOUT_TURBOJPEG=$(call ptx/ifdef, PTXCONF_LIBJPEG_TURBO,OFF,ON)

Looks weird. Didn't -DWITH work?
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> @@ -76,6 +76,9 @@ $(STATEDIR)/libjpeg.targetinstall:
>  	@$(call install_fixup, libjpeg,DESCRIPTION,missing)
>  
>  	@$(call install_lib, libjpeg, 0, 0, 0644, libjpeg)
> +ifdef PTXCONF_LIBJPEG_TURBO
> +	@$(call install_lib, libjpeg, 0, 0, 0644, libturbojpeg)
> +endif
>  ifdef PTXCONF_LIBJPEG_BIN
>  	@$(call install_copy, libjpeg, 0, 0, 0755, -, /usr/bin/cjpeg)
>  	@$(call install_copy, libjpeg, 0, 0, 0755, -, /usr/bin/djpeg)


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [PATCH 1/4] libjpeg: enable building libturbojpeg
  2022-02-18 16:27 ` [ptxdist] [PATCH 1/4] libjpeg: enable building libturbojpeg Christian Melki
@ 2022-02-22  7:35   ` Michael Olbrich
  2022-02-22 12:03   ` Philipp Zabel
  1 sibling, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2022-02-22  7:35 UTC (permalink / raw)
  To: Christian Melki; +Cc: ptxdist, p.zabel

On Fri, Feb 18, 2022 at 05:27:50PM +0100, Christian Melki wrote:
> On 2/18/22 17:08, Philipp Zabel wrote:
> > Enable building libturbojpeg for users of the simplified API.
> > 
> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> > ---
> >  rules/libjpeg.in   | 7 +++++++
> >  rules/libjpeg.make | 5 ++++-
> >  2 files changed, 11 insertions(+), 1 deletion(-)
> > 
> > diff --git a/rules/libjpeg.in b/rules/libjpeg.in
> > index 53a9d9e09701..3304c6ac896f 100644
> > --- a/rules/libjpeg.in
> > +++ b/rules/libjpeg.in
> > @@ -19,4 +19,11 @@ config LIBJPEG_BIN
> >  	  cjpeg and djpeg are simple bineries to convert some basic image
> >  	  formats to jpeg (cjpeg) or convert them back from jpeg (djpeg)
> >  
> > +config LIBJPEG_TURBO
> > +	bool
> > +	prompt "Build and install libturbojpeg"
> > +	help
> > +	  In addition to the traditional libjpeg API, also provide the less
> > +	  powerful but more straightforward TurboJPEG API.
> > +
> >  endif
> > diff --git a/rules/libjpeg.make b/rules/libjpeg.make
> > index 559a6d08d504..704f810a4bd4 100644
> > --- a/rules/libjpeg.make
> > +++ b/rules/libjpeg.make
> > @@ -60,7 +60,7 @@ LIBJPEG_CONF_OPT := \
> >  	-DWITH_JPEG8=ON \
> >  	-DWITH_MEM_SRCDST=ON \
> >  	-DWITH_SIMD=$(call ptx/onoff,LIBJPEG_SIMD) \
> > -	-DWITH_TURBOJPEG=OFF
> > +	-DWITHOUT_TURBOJPEG=$(call ptx/ifdef, PTXCONF_LIBJPEG_TURBO,OFF,ON)
> 
> Looks weird. Didn't -DWITH work?

Weird indeed. Philipp, what's going on here?

Michael

> >  
> >  # ----------------------------------------------------------------------------
> >  # Target-Install
> > @@ -76,6 +76,9 @@ $(STATEDIR)/libjpeg.targetinstall:
> >  	@$(call install_fixup, libjpeg,DESCRIPTION,missing)
> >  
> >  	@$(call install_lib, libjpeg, 0, 0, 0644, libjpeg)
> > +ifdef PTXCONF_LIBJPEG_TURBO
> > +	@$(call install_lib, libjpeg, 0, 0, 0644, libturbojpeg)
> > +endif
> >  ifdef PTXCONF_LIBJPEG_BIN
> >  	@$(call install_copy, libjpeg, 0, 0, 0755, -, /usr/bin/cjpeg)
> >  	@$(call install_copy, libjpeg, 0, 0, 0755, -, /usr/bin/djpeg)
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@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
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [PATCH 1/4] libjpeg: enable building libturbojpeg
  2022-02-18 16:27 ` [ptxdist] [PATCH 1/4] libjpeg: enable building libturbojpeg Christian Melki
  2022-02-22  7:35   ` Michael Olbrich
@ 2022-02-22 12:03   ` Philipp Zabel
  1 sibling, 0 replies; 10+ messages in thread
From: Philipp Zabel @ 2022-02-22 12:03 UTC (permalink / raw)
  To: christian.melki; +Cc: ptxdist

Hi Christian,

On Fr, 2022-02-18 at 17:27 +0100, Christian Melki wrote:
> On 2/18/22 17:08, Philipp Zabel wrote:
> > Enable building libturbojpeg for users of the simplified API.
> > 
> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> > ---
> >  rules/libjpeg.in   | 7 +++++++
> >  rules/libjpeg.make | 5 ++++-
> >  2 files changed, 11 insertions(+), 1 deletion(-)
> > 
> > diff --git a/rules/libjpeg.in b/rules/libjpeg.in
> > index 53a9d9e09701..3304c6ac896f 100644
> > --- a/rules/libjpeg.in
> > +++ b/rules/libjpeg.in
> > @@ -19,4 +19,11 @@ config LIBJPEG_BIN
> >           cjpeg and djpeg are simple bineries to convert some basic
> > image
> >           formats to jpeg (cjpeg) or convert them back from jpeg
> > (djpeg)
> >  
> > +config LIBJPEG_TURBO
> > +       bool
> > +       prompt "Build and install libturbojpeg"
> > +       help
> > +         In addition to the traditional libjpeg API, also provide
> > the less
> > +         powerful but more straightforward TurboJPEG API.
> > +
> >  endif
> > diff --git a/rules/libjpeg.make b/rules/libjpeg.make
> > index 559a6d08d504..704f810a4bd4 100644
> > --- a/rules/libjpeg.make
> > +++ b/rules/libjpeg.make
> > @@ -60,7 +60,7 @@ LIBJPEG_CONF_OPT := \
> >         -DWITH_JPEG8=ON \
> >         -DWITH_MEM_SRCDST=ON \
> >         -DWITH_SIMD=$(call ptx/onoff,LIBJPEG_SIMD) \
> > -       -DWITH_TURBOJPEG=OFF
> > +       -DWITHOUT_TURBOJPEG=$(call ptx/ifdef,
> > PTXCONF_LIBJPEG_TURBO,OFF,ON)
> 
> Looks weird. Didn't -DWITH work?

Thank you, that's just an artifact of parallel history. I initially
wrote this when the libjpeg rule still had -DWITHOUT_TURBOJPEG=ON and
didn't notice this was changed with the 2.0.5 -> 2.1.0 version bump.

Using -DWITH_TURBOJPEG=$(call ptx/onoff,PTXCONF_LIBJPEG_TURBO) works
just fine. Will fix and resend this patch.

regards
Philipp

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [APPLIED] aml: new package
  2022-02-18 16:08 ` [ptxdist] [PATCH 2/4] aml: new package Philipp Zabel
@ 2022-02-28 12:09   ` Michael Olbrich
  0 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2022-02-28 12:09 UTC (permalink / raw)
  To: ptxdist; +Cc: Philipp Zabel

Thanks, applied as a4880605adc45cc0d8c1c8659ffd2640f0c94cf9.

Michael

[sent from post-receive hook]

On Mon, 28 Feb 2022 13:09:16 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20220218160838.759601-2-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/aml.in b/rules/aml.in
> new file mode 100644
> index 000000000000..897028c61f72
> --- /dev/null
> +++ b/rules/aml.in
> @@ -0,0 +1,8 @@
> +## SECTION=system_libraries
> +
> +config AML
> +	tristate
> +	select HOST_MESON
> +	prompt "aml"
> +	help
> +	  Andri's Main Loop
> diff --git a/rules/aml.make b/rules/aml.make
> new file mode 100644
> index 000000000000..f083fe29a5c3
> --- /dev/null
> +++ b/rules/aml.make
> @@ -0,0 +1,57 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2020 by Marian Cichy <m.cichy@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_AML) += aml
> +
> +#
> +# Paths and names
> +#
> +AML_VERSION	:= 0.2.1
> +AML_MD5		:= 8416dc2bdcd4c8c56d5e246468a30c2d
> +AML		:= aml-$(AML_VERSION)
> +AML_SUFFIX	:= tar.gz
> +AML_URL		:= https://github.com/any1/aml/archive/refs/tags/v$(AML_VERSION).$(AML_SUFFIX)
> +AML_SOURCE	:= $(SRCDIR)/$(AML).$(AML_SUFFIX)
> +AML_DIR		:= $(BUILDDIR)/$(AML)
> +AML_LICENSE	:= ISC
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# meson
> +#
> +AML_CONF_TOOL	:= meson
> +AML_CONF_OPT	:=  \
> +	$(CROSS_MESON_USR) \
> +	-Dexamples=false
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/aml.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, aml)
> +	@$(call install_fixup, aml,PRIORITY,optional)
> +	@$(call install_fixup, aml,SECTION,base)
> +	@$(call install_fixup, aml,AUTHOR,"Marian Cichy <m.cichy@pengutronix.de>")
> +	@$(call install_fixup, aml,DESCRIPTION,missing)
> +
> +	@$(call install_lib, aml, 0, 0, 0644, libaml)
> +
> +	@$(call install_finish, aml)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [APPLIED] neatvnc: new package
  2022-02-18 16:08 ` [ptxdist] [PATCH 3/4] neatvnc: " Philipp Zabel
@ 2022-02-28 12:09   ` Michael Olbrich
  0 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2022-02-28 12:09 UTC (permalink / raw)
  To: ptxdist; +Cc: Philipp Zabel

Thanks, applied as 121709c0fafe05ba9f3bce88bd7b00948dd8a95c.

Michael

[sent from post-receive hook]

On Mon, 28 Feb 2022 13:09:17 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20220218160838.759601-3-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/neatvnc.in b/rules/neatvnc.in
> new file mode 100644
> index 000000000000..9871a645dee8
> --- /dev/null
> +++ b/rules/neatvnc.in
> @@ -0,0 +1,22 @@
> +## SECTION=system_libraries
> +
> +menuconfig NEATVNC
> +	tristate
> +	select HOST_MESON
> +	select PIXMAN
> +	select ZLIB
> +	select AML
> +	select LIBJPEG		if NEATVNC_JPEG
> +	select LIBJPEG_TURBO	if NEATVNC_JPEG
> +	select LIBDRM		if BUILDTIME
> +	prompt "neatvnc"
> +	help
> +	  VNC Server library
> +
> +if NEATVNC
> +
> +config NEATVNC_JPEG
> +	bool
> +	prompt "enable jpeg compression"
> +
> +endif
> diff --git a/rules/neatvnc.make b/rules/neatvnc.make
> new file mode 100644
> index 000000000000..e5bb4c96e89b
> --- /dev/null
> +++ b/rules/neatvnc.make
> @@ -0,0 +1,61 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2020 by Marian Cichy <m.cichy@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_NEATVNC) += neatvnc
> +
> +#
> +# Paths and names
> +#
> +NEATVNC_VERSION	:= 0.4.0
> +NEATVNC_MD5	:= c645abf2233a3a3ad294ca1ef9399d23
> +NEATVNC		:= neatvnc-$(NEATVNC_VERSION)
> +NEATVNC_SUFFIX	:= tar.gz
> +NEATVNC_URL	:= https://github.com/any1/neatvnc/archive/refs/tags/v$(NEATVNC_VERSION).$(NEATVNC_SUFFIX)
> +NEATVNC_SOURCE	:= $(SRCDIR)/$(NEATVNC).$(NEATVNC_SUFFIX)
> +NEATVNC_DIR	:= $(BUILDDIR)/$(NEATVNC)
> +NEATVNC_LICENSE	:= ISC
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# meson
> +#
> +NEATVNC_CONF_TOOL	:= meson
> +NEATVNC_CONF_OPT	:=  \
> +	$(CROSS_MESON_USR) \
> +	-Dbenchmarks=false \
> +	-Dexamples=false \
> +	-Djpeg=$(call ptx/endis,PTXCONF_NEATVNC_JPEG)d \
> +	-Dtls=disabled \
> +	-Dsystemtap=false
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/neatvnc.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, neatvnc)
> +	@$(call install_fixup, neatvnc,PRIORITY,optional)
> +	@$(call install_fixup, neatvnc,SECTION,base)
> +	@$(call install_fixup, neatvnc,AUTHOR,"Marian Cichy <m.cichy@pengutronix.de>")
> +	@$(call install_fixup, neatvnc,DESCRIPTION,missing)
> +
> +	@$(call install_lib, neatvnc, 0, 0, 0644, libneatvnc)
> +
> +	@$(call install_finish, neatvnc)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [APPLIED] wayvnc: new package
  2022-02-18 16:08 ` [ptxdist] [PATCH 4/4] wayvnc: " Philipp Zabel
@ 2022-02-28 12:09   ` Michael Olbrich
  0 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2022-02-28 12:09 UTC (permalink / raw)
  To: ptxdist; +Cc: Philipp Zabel

Thanks, applied as 4c756a1abfbd054cbff37e834a63b5a7e3f96965.

Michael

[sent from post-receive hook]

On Mon, 28 Feb 2022 13:09:19 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20220218160838.759601-4-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/wayvnc.in b/rules/wayvnc.in
> new file mode 100644
> index 000000000000..d92b3880c736
> --- /dev/null
> +++ b/rules/wayvnc.in
> @@ -0,0 +1,24 @@
> +## SECTION=multimedia_wayland
> +
> +menuconfig WAYVNC
> +	tristate
> +	select HOST_MESON
> +	select AML
> +	select LIBDRM
> +	select LIBXKBCOMMON
> +	select NEATVNC
> +	select PIXMAN
> +	select WAYLAND
> +	select MESALIB		if WAYVNC_SCREENCOPY_DMABUF
> +	select MESALIB_GBM	if WAYVNC_SCREENCOPY_DMABUF
> +	prompt "wayvnc"
> +	help
> +	  A VNC server for wlroots based Wayland compositors.
> +
> +if WAYVNC
> +
> +config WAYVNC_SCREENCOPY_DMABUF
> +	bool
> +	prompt "Enable GPU-side screencopy (experimental)"
> +
> +endif
> diff --git a/rules/wayvnc.make b/rules/wayvnc.make
> new file mode 100644
> index 000000000000..77f3f076dbd2
> --- /dev/null
> +++ b/rules/wayvnc.make
> @@ -0,0 +1,60 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2020 by Philipp Zabel <p.zabel@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_WAYVNC) += wayvnc
> +
> +#
> +# Paths and names
> +#
> +WAYVNC_VERSION	:= 0.4.1
> +WAYVNC_MD5	:= edbc130394fcba052090eaf1ef9fda2c
> +WAYVNC		:= wayvnc-$(WAYVNC_VERSION)
> +WAYVNC_SUFFIX	:= tar.gz
> +WAYVNC_URL	:= https://github.com/any1/wayvnc/archive/refs/tags/v$(WAYVNC_VERSION).$(WAYVNC_SUFFIX)
> +WAYVNC_SOURCE	:= $(SRCDIR)/$(WAYVNC).$(WAYVNC_SUFFIX)
> +WAYVNC_DIR	:= $(BUILDDIR)/$(WAYVNC)
> +WAYVNC_LICENSE	:= ISC
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# meson
> +#
> +WAYVNC_CONF_TOOL	:= meson
> +WAYVNC_CONF_OPT	:=  \
> +	$(CROSS_MESON_USR) \
> +	-Dscreencopy-dmabuf=$(call ptx/endis,PTXCONF_WAYVNC_SCREENCOPY_DMABUF)d \
> +	-Dpam=disabled \
> +	-Dman-pages=disabled \
> +	-Dsystemtap=false
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/wayvnc.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, wayvnc)
> +	@$(call install_fixup, wayvnc,PRIORITY,optional)
> +	@$(call install_fixup, wayvnc,SECTION,base)
> +	@$(call install_fixup, wayvnc,AUTHOR,"Philipp Zabel <p.zabel@pengutronix.de>")
> +	@$(call install_fixup, wayvnc,DESCRIPTION,missing)
> +
> +	@$(call install_copy, wayvnc, 0, 0, 0755, -, /usr/bin/wayvnc)
> +
> +	@$(call install_finish, wayvnc)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2022-02-28 12:10 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-18 16:08 [ptxdist] [PATCH 1/4] libjpeg: enable building libturbojpeg Philipp Zabel
2022-02-18 16:08 ` [ptxdist] [PATCH 2/4] aml: new package Philipp Zabel
2022-02-28 12:09   ` [ptxdist] [APPLIED] " Michael Olbrich
2022-02-18 16:08 ` [ptxdist] [PATCH 3/4] neatvnc: " Philipp Zabel
2022-02-28 12:09   ` [ptxdist] [APPLIED] " Michael Olbrich
2022-02-18 16:08 ` [ptxdist] [PATCH 4/4] wayvnc: " Philipp Zabel
2022-02-28 12:09   ` [ptxdist] [APPLIED] " Michael Olbrich
2022-02-18 16:27 ` [ptxdist] [PATCH 1/4] libjpeg: enable building libturbojpeg Christian Melki
2022-02-22  7:35   ` Michael Olbrich
2022-02-22 12:03   ` Philipp Zabel

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