* [ptxdist] [PATCH] util-linux-ng: Version bump 2.37.2 -> 2.37.3
2022-02-05 23:07 [ptxdist] [PATCH] zstd: Version bump. 1.5.1 -> 1.5.2 Christian Melki
@ 2022-02-05 23:07 ` Christian Melki
2022-02-14 12:43 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-02-05 23:07 ` [ptxdist] [PATCH] screen: Version bump. 4.8.0 -> 4.9.0 Christian Melki
` (3 subsequent siblings)
4 siblings, 1 reply; 15+ messages in thread
From: Christian Melki @ 2022-02-05 23:07 UTC (permalink / raw)
To: ptxdist
* Minor bump. Bugfix release.
* Notable inclusion in the release is the lsfd program. lsfd is
intended as a replacement to lsof with more support for Linux
specific features such as namespaces. Needs a bit more work to mature.
Perhaps make an introduction of lsfd in the next major util-linux release.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
rules/util-linux-ng.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 25e4c8768..4ad8757ff 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng
#
# Paths and names
#
-UTIL_LINUX_NG_VERSION := 2.37.2
-UTIL_LINUX_NG_MD5 := d659bf7cd417d93dc609872f6334b019
+UTIL_LINUX_NG_VERSION := 2.37.3
+UTIL_LINUX_NG_MD5 := 36fe209806ede050ce124e4a2e6e66d4
UTIL_LINUX_NG := util-linux-$(UTIL_LINUX_NG_VERSION)
UTIL_LINUX_NG_SUFFIX := tar.xz
UTIL_LINUX_NG_BASENAME := v$(if $(filter 2,$(basename $(UTIL_LINUX_NG_VERSION))),$(UTIL_LINUX_NG_VERSION),$(basename $(UTIL_LINUX_NG_VERSION)))
--
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] 15+ messages in thread
* Re: [ptxdist] [APPLIED] util-linux-ng: Version bump 2.37.2 -> 2.37.3
2022-02-05 23:07 ` [ptxdist] [PATCH] util-linux-ng: Version bump 2.37.2 -> 2.37.3 Christian Melki
@ 2022-02-14 12:43 ` Michael Olbrich
0 siblings, 0 replies; 15+ messages in thread
From: Michael Olbrich @ 2022-02-14 12:43 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as e156af9aa92b7ee7adee290f37409b8312f88ddd.
Michael
[sent from post-receive hook]
On Mon, 14 Feb 2022 13:43:35 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> * Minor bump. Bugfix release.
>
> * Notable inclusion in the release is the lsfd program. lsfd is
> intended as a replacement to lsof with more support for Linux
> specific features such as namespaces. Needs a bit more work to mature.
> Perhaps make an introduction of lsfd in the next major util-linux release.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220205230718.2518022-2-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
> index 25e4c8768566..4ad8757ff9b9 100644
> --- a/rules/util-linux-ng.make
> +++ b/rules/util-linux-ng.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng
> #
> # Paths and names
> #
> -UTIL_LINUX_NG_VERSION := 2.37.2
> -UTIL_LINUX_NG_MD5 := d659bf7cd417d93dc609872f6334b019
> +UTIL_LINUX_NG_VERSION := 2.37.3
> +UTIL_LINUX_NG_MD5 := 36fe209806ede050ce124e4a2e6e66d4
> UTIL_LINUX_NG := util-linux-$(UTIL_LINUX_NG_VERSION)
> UTIL_LINUX_NG_SUFFIX := tar.xz
> UTIL_LINUX_NG_BASENAME := v$(if $(filter 2,$(basename $(UTIL_LINUX_NG_VERSION))),$(UTIL_LINUX_NG_VERSION),$(basename $(UTIL_LINUX_NG_VERSION)))
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 15+ messages in thread
* [ptxdist] [PATCH] screen: Version bump. 4.8.0 -> 4.9.0
2022-02-05 23:07 [ptxdist] [PATCH] zstd: Version bump. 1.5.1 -> 1.5.2 Christian Melki
2022-02-05 23:07 ` [ptxdist] [PATCH] util-linux-ng: Version bump 2.37.2 -> 2.37.3 Christian Melki
@ 2022-02-05 23:07 ` Christian Melki
2022-02-14 12:43 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-02-05 23:07 ` [ptxdist] [PATCH] qemu: Version bump. 6.1.0 -> 6.2.0 Christian Melki
` (2 subsequent siblings)
4 siblings, 1 reply; 15+ messages in thread
From: Christian Melki @ 2022-02-05 23:07 UTC (permalink / raw)
To: ptxdist
New screen version just released after the last bump.
Mostly bugfixes over 1,5 year. Nothing exceptional.
https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00000.html
* CVE-2021-26937 fixed.
* Drop other patches that looks incorporated.
* Drop unused patches.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
.../0101-fix_screen_utf8_nfd.patch | 37 ----------
...d-d_xtermosc-array-in-struct-display.patch | 37 ----------
...-is-used-in-place-of-TERMCAP_BUFSIZE.patch | 24 -------
.../screen-4.8.0/0104-CVE-2021-26937.patch | 69 -------------------
patches/screen-4.8.0/autogen.sh | 9 ---
patches/screen-4.8.0/series | 12 ----
.../0001-comm.h-now-depends-on-term.h.patch | 0
...-needed-for-list_-display-generic-.o.patch | 0
.../0003-suppress_remap.patch} | 2 +-
patches/screen-4.9.0/autogen.sh | 1 +
patches/screen-4.9.0/series | 6 ++
rules/screen.make | 4 +-
12 files changed, 10 insertions(+), 191 deletions(-)
delete mode 100644 patches/screen-4.8.0/0101-fix_screen_utf8_nfd.patch
delete mode 100644 patches/screen-4.8.0/0102-Expand-d_xtermosc-array-in-struct-display.patch
delete mode 100644 patches/screen-4.8.0/0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch
delete mode 100644 patches/screen-4.8.0/0104-CVE-2021-26937.patch
delete mode 100755 patches/screen-4.8.0/autogen.sh
delete mode 100644 patches/screen-4.8.0/series
rename patches/{screen-4.8.0 => screen-4.9.0}/0001-comm.h-now-depends-on-term.h.patch (100%)
rename patches/{screen-4.8.0 => screen-4.9.0}/0002-comm.h-needed-for-list_-display-generic-.o.patch (100%)
rename patches/{screen-4.8.0/0100-suppress_remap.patch => screen-4.9.0/0003-suppress_remap.patch} (92%)
create mode 120000 patches/screen-4.9.0/autogen.sh
create mode 100644 patches/screen-4.9.0/series
diff --git a/patches/screen-4.8.0/0101-fix_screen_utf8_nfd.patch b/patches/screen-4.8.0/0101-fix_screen_utf8_nfd.patch
deleted file mode 100644
index 54cc81f0d..000000000
--- a/patches/screen-4.8.0/0101-fix_screen_utf8_nfd.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 7 Jan 2022 12:53:57 +0100
-Subject: [PATCH] fix_screen_utf8_nfd
-
-Imported from screen_4.8.0-7.debian.tar.xz
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- ansi.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/ansi.c b/ansi.c
-index 2a52eddd32d4..83b266d6f777 100644
---- a/ansi.c
-+++ b/ansi.c
-@@ -692,10 +692,6 @@ register int len;
- }
- curr->w_rend.font = 0;
- }
--# ifdef DW_CHARS
-- if (curr->w_encoding == UTF8 && utf8_isdouble(c))
-- curr->w_mbcs = 0xff;
--# endif
- if (curr->w_encoding == UTF8 && c >= 0x0300 && utf8_iscomb(c))
- {
- int ox, oy;
-@@ -730,6 +726,10 @@ register int len;
- }
- break;
- }
-+# ifdef DW_CHARS
-+ if (curr->w_encoding == UTF8 && utf8_isdouble(c))
-+ curr->w_mbcs = 0xff;
-+# endif
- font = curr->w_rend.font;
- # endif
- # ifdef DW_CHARS
diff --git a/patches/screen-4.8.0/0102-Expand-d_xtermosc-array-in-struct-display.patch b/patches/screen-4.8.0/0102-Expand-d_xtermosc-array-in-struct-display.patch
deleted file mode 100644
index 8cbfc6d2f..000000000
--- a/patches/screen-4.8.0/0102-Expand-d_xtermosc-array-in-struct-display.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: =?UTF-8?q?V=C3=A1clav=20Dole=C5=BEal?= <vdolezal@redhat.com>
-Date: Fri, 21 Feb 2020 14:02:51 +0100
-Subject: [PATCH] Expand-d_xtermosc-array-in-struct-display
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit c5db181 expands index range of "typ2" by one without expanding
-affected arrays. d_xtermosc in struct display is one of these.
-
-Related: c5db181b6e017cfccb8d7842ce140e59294d9f62
- (ansi: add support for xterm OSC 11)
-Related: 68386dfb1fa33471372a8cd2e74686758a2f527b
- (Fix out of bounds access when setting w_xtermosc after OSC 49)
-
-Signed-off-by: Václav Doležal <vdolezal@redhat.com>
-
-Imported from screen_4.8.0-7.debian.tar.xz
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- display.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/display.h b/display.h
-index 459cc5dc1543..4fc206189b4b 100644
---- a/display.h
-+++ b/display.h
-@@ -112,7 +112,7 @@ struct display
- int d_mousetrack; /* set when user wants to use mouse even when the window
- does not */
- #ifdef RXVT_OSC
-- int d_xtermosc[4]; /* osc used */
-+ int d_xtermosc[5]; /* osc used */
- #endif
- struct mchar d_lpchar; /* missing char */
- struct timeval d_status_time; /* time of status display */
diff --git a/patches/screen-4.8.0/0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch b/patches/screen-4.8.0/0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch
deleted file mode 100644
index 1152cb522..000000000
--- a/patches/screen-4.8.0/0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Mon, 27 Apr 2020 18:12:56 +0200
-Subject: [PATCH] TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE
-
-Imported from screen_4.8.0-7.debian.tar.xz
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- termcap.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/termcap.c b/termcap.c
-index ed9e838c4c9d..29684cf974f7 100644
---- a/termcap.c
-+++ b/termcap.c
-@@ -1066,7 +1066,7 @@ int aflag;
- {
- if (i >= T_KEYPAD) /* don't put keypad codes in TERMCAP */
- continue; /* - makes it too big */
--#if (TERMCAP_BUF < 1024)
-+#if (TERMCAP_BUFSIZE < 1024)
- if (i >= T_FEXTRA && i < T_BACKTAB) /* also skip extra vt220 keys */
- continue;
- if (i > T_BACKTAB && i < T_NAVIGATE) /* more vt220 keys */
diff --git a/patches/screen-4.8.0/0104-CVE-2021-26937.patch b/patches/screen-4.8.0/0104-CVE-2021-26937.patch
deleted file mode 100644
index 9f4e879af..000000000
--- a/patches/screen-4.8.0/0104-CVE-2021-26937.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 7 Jan 2022 12:53:57 +0100
-Subject: [PATCH] CVE-2021-26937
-
-Imported from screen_4.8.0-7.debian.tar.xz
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- encoding.c | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/encoding.c b/encoding.c
-index e5db3e708126..79f5d14024c4 100644
---- a/encoding.c
-+++ b/encoding.c
-@@ -43,7 +43,7 @@ static int encmatch __P((char *, char *));
- # ifdef UTF8
- static int recode_char __P((int, int, int));
- static int recode_char_to_encoding __P((int, int));
--static void comb_tofront __P((int, int));
-+static void comb_tofront __P((int));
- # ifdef DW_CHARS
- static int recode_char_dw __P((int, int *, int, int));
- static int recode_char_dw_to_encoding __P((int, int *, int));
-@@ -1263,6 +1263,8 @@ int c;
- {0x30000, 0x3FFFD},
- };
-
-+ if (c >= 0xdf00 && c <= 0xdfff)
-+ return 1; /* dw combining sequence */
- return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) ||
- (cjkwidth &&
- bisearch(c, ambiguous,
-@@ -1330,11 +1332,12 @@ int c;
- }
-
- static void
--comb_tofront(root, i)
--int root, i;
-+comb_tofront(i)
-+int i;
- {
- for (;;)
- {
-+ int root = i >= 0x700 ? 0x801 : 0x800;
- debug1("bring to front: %x\n", i);
- combchars[combchars[i]->prev]->next = combchars[i]->next;
- combchars[combchars[i]->next]->prev = combchars[i]->prev;
-@@ -1396,9 +1399,9 @@ struct mchar *mc;
- {
- /* full, recycle old entry */
- if (c1 >= 0xd800 && c1 < 0xe000)
-- comb_tofront(root, c1 - 0xd800);
-+ comb_tofront(c1 - 0xd800);
- i = combchars[root]->prev;
-- if (c1 == i + 0xd800)
-+ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800)
- {
- /* completely full, can't recycle */
- debug("utf8_handle_comp: completely full!\n");
-@@ -1422,7 +1425,7 @@ struct mchar *mc;
- mc->font = (i >> 8) + 0xd8;
- mc->fontx = 0;
- debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800);
-- comb_tofront(root, i);
-+ comb_tofront(i);
- }
-
- #else /* !UTF8 */
diff --git a/patches/screen-4.8.0/autogen.sh b/patches/screen-4.8.0/autogen.sh
deleted file mode 100755
index 9e73c8d20..000000000
--- a/patches/screen-4.8.0/autogen.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-autoconf \
- --force \
- --warnings=cross \
- --warnings=syntax \
- --warnings=obsolete \
- --warnings=unsupported
-
diff --git a/patches/screen-4.8.0/series b/patches/screen-4.8.0/series
deleted file mode 100644
index c9b8d7197..000000000
--- a/patches/screen-4.8.0/series
+++ /dev/null
@@ -1,12 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-#tag:buildroot --start-number 1
-0001-comm.h-now-depends-on-term.h.patch
-0002-comm.h-needed-for-list_-display-generic-.o.patch
-#tag:debian --start-number 100
-0100-suppress_remap.patch
-0101-fix_screen_utf8_nfd.patch
-0102-Expand-d_xtermosc-array-in-struct-display.patch
-0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch
-0104-CVE-2021-26937.patch
-# d92ac31ab347a013a74ca7f4001696ec - git-ptx-patches magic
diff --git a/patches/screen-4.8.0/0001-comm.h-now-depends-on-term.h.patch b/patches/screen-4.9.0/0001-comm.h-now-depends-on-term.h.patch
similarity index 100%
rename from patches/screen-4.8.0/0001-comm.h-now-depends-on-term.h.patch
rename to patches/screen-4.9.0/0001-comm.h-now-depends-on-term.h.patch
diff --git a/patches/screen-4.8.0/0002-comm.h-needed-for-list_-display-generic-.o.patch b/patches/screen-4.9.0/0002-comm.h-needed-for-list_-display-generic-.o.patch
similarity index 100%
rename from patches/screen-4.8.0/0002-comm.h-needed-for-list_-display-generic-.o.patch
rename to patches/screen-4.9.0/0002-comm.h-needed-for-list_-display-generic-.o.patch
diff --git a/patches/screen-4.8.0/0100-suppress_remap.patch b/patches/screen-4.9.0/0003-suppress_remap.patch
similarity index 92%
rename from patches/screen-4.8.0/0100-suppress_remap.patch
rename to patches/screen-4.9.0/0003-suppress_remap.patch
index 7da242564..fda63e90c 100644
--- a/patches/screen-4.8.0/0100-suppress_remap.patch
+++ b/patches/screen-4.9.0/0003-suppress_remap.patch
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 2 deletions(-)
diff --git a/termcap.c b/termcap.c
-index 26cba62fd7c1..ed9e838c4c9d 100644
+index 26c8f5a96589..29684cf974f7 100644
--- a/termcap.c
+++ b/termcap.c
@@ -553,8 +553,6 @@ int map;
diff --git a/patches/screen-4.9.0/autogen.sh b/patches/screen-4.9.0/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/screen-4.9.0/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/screen-4.9.0/series b/patches/screen-4.9.0/series
new file mode 100644
index 000000000..bf7060df3
--- /dev/null
+++ b/patches/screen-4.9.0/series
@@ -0,0 +1,6 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-comm.h-now-depends-on-term.h.patch
+0002-comm.h-needed-for-list_-display-generic-.o.patch
+0003-suppress_remap.patch
+# 086ac9b43abed5bb61eef564f1ac00d9 - git-ptx-patches magic
diff --git a/rules/screen.make b/rules/screen.make
index 1087dfc9d..4f1994660 100644
--- a/rules/screen.make
+++ b/rules/screen.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SCREEN) += screen
#
# Paths and names
#
-SCREEN_VERSION := 4.8.0
-SCREEN_MD5 := d276213d3acd10339cd37848b8c4ab1e
+SCREEN_VERSION := 4.9.0
+SCREEN_MD5 := b1ef8ed89134d335e614016634982b6d
SCREEN := screen-$(SCREEN_VERSION)
SCREEN_SUFFIX := tar.gz
SCREEN_URL := $(call ptx/mirror, GNU, screen/$(SCREEN).$(SCREEN_SUFFIX))
--
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] 15+ messages in thread
* Re: [ptxdist] [APPLIED] screen: Version bump. 4.8.0 -> 4.9.0
2022-02-05 23:07 ` [ptxdist] [PATCH] screen: Version bump. 4.8.0 -> 4.9.0 Christian Melki
@ 2022-02-14 12:43 ` Michael Olbrich
0 siblings, 0 replies; 15+ messages in thread
From: Michael Olbrich @ 2022-02-14 12:43 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 8385e3146289cc0c0dac6921f7a5dd1a4b1c6e07.
Michael
[sent from post-receive hook]
On Mon, 14 Feb 2022 13:43:36 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> New screen version just released after the last bump.
> Mostly bugfixes over 1,5 year. Nothing exceptional.
> https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00000.html
>
> * CVE-2021-26937 fixed.
> * Drop other patches that looks incorporated.
> * Drop unused patches.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220205230718.2518022-3-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/screen-4.8.0/0101-fix_screen_utf8_nfd.patch b/patches/screen-4.8.0/0101-fix_screen_utf8_nfd.patch
> deleted file mode 100644
> index 54cc81f0d7a1..000000000000
> --- a/patches/screen-4.8.0/0101-fix_screen_utf8_nfd.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -From: Michael Olbrich <m.olbrich@pengutronix.de>
> -Date: Fri, 7 Jan 2022 12:53:57 +0100
> -Subject: [PATCH] fix_screen_utf8_nfd
> -
> -Imported from screen_4.8.0-7.debian.tar.xz
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ----
> - ansi.c | 8 ++++----
> - 1 file changed, 4 insertions(+), 4 deletions(-)
> -
> -diff --git a/ansi.c b/ansi.c
> -index 2a52eddd32d4..83b266d6f777 100644
> ---- a/ansi.c
> -+++ b/ansi.c
> -@@ -692,10 +692,6 @@ register int len;
> - }
> - curr->w_rend.font = 0;
> - }
> --# ifdef DW_CHARS
> -- if (curr->w_encoding == UTF8 && utf8_isdouble(c))
> -- curr->w_mbcs = 0xff;
> --# endif
> - if (curr->w_encoding == UTF8 && c >= 0x0300 && utf8_iscomb(c))
> - {
> - int ox, oy;
> -@@ -730,6 +726,10 @@ register int len;
> - }
> - break;
> - }
> -+# ifdef DW_CHARS
> -+ if (curr->w_encoding == UTF8 && utf8_isdouble(c))
> -+ curr->w_mbcs = 0xff;
> -+# endif
> - font = curr->w_rend.font;
> - # endif
> - # ifdef DW_CHARS
> diff --git a/patches/screen-4.8.0/0102-Expand-d_xtermosc-array-in-struct-display.patch b/patches/screen-4.8.0/0102-Expand-d_xtermosc-array-in-struct-display.patch
> deleted file mode 100644
> index 8cbfc6d2fe9f..000000000000
> --- a/patches/screen-4.8.0/0102-Expand-d_xtermosc-array-in-struct-display.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -From: =?UTF-8?q?V=C3=A1clav=20Dole=C5=BEal?= <vdolezal@redhat.com>
> -Date: Fri, 21 Feb 2020 14:02:51 +0100
> -Subject: [PATCH] Expand-d_xtermosc-array-in-struct-display
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Commit c5db181 expands index range of "typ2" by one without expanding
> -affected arrays. d_xtermosc in struct display is one of these.
> -
> -Related: c5db181b6e017cfccb8d7842ce140e59294d9f62
> - (ansi: add support for xterm OSC 11)
> -Related: 68386dfb1fa33471372a8cd2e74686758a2f527b
> - (Fix out of bounds access when setting w_xtermosc after OSC 49)
> -
> -Signed-off-by: Václav Doležal <vdolezal@redhat.com>
> -
> -Imported from screen_4.8.0-7.debian.tar.xz
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ----
> - display.h | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/display.h b/display.h
> -index 459cc5dc1543..4fc206189b4b 100644
> ---- a/display.h
> -+++ b/display.h
> -@@ -112,7 +112,7 @@ struct display
> - int d_mousetrack; /* set when user wants to use mouse even when the window
> - does not */
> - #ifdef RXVT_OSC
> -- int d_xtermosc[4]; /* osc used */
> -+ int d_xtermosc[5]; /* osc used */
> - #endif
> - struct mchar d_lpchar; /* missing char */
> - struct timeval d_status_time; /* time of status display */
> diff --git a/patches/screen-4.8.0/0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch b/patches/screen-4.8.0/0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch
> deleted file mode 100644
> index 1152cb522b95..000000000000
> --- a/patches/screen-4.8.0/0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -From: Michael Olbrich <m.olbrich@pengutronix.de>
> -Date: Mon, 27 Apr 2020 18:12:56 +0200
> -Subject: [PATCH] TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE
> -
> -Imported from screen_4.8.0-7.debian.tar.xz
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ----
> - termcap.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/termcap.c b/termcap.c
> -index ed9e838c4c9d..29684cf974f7 100644
> ---- a/termcap.c
> -+++ b/termcap.c
> -@@ -1066,7 +1066,7 @@ int aflag;
> - {
> - if (i >= T_KEYPAD) /* don't put keypad codes in TERMCAP */
> - continue; /* - makes it too big */
> --#if (TERMCAP_BUF < 1024)
> -+#if (TERMCAP_BUFSIZE < 1024)
> - if (i >= T_FEXTRA && i < T_BACKTAB) /* also skip extra vt220 keys */
> - continue;
> - if (i > T_BACKTAB && i < T_NAVIGATE) /* more vt220 keys */
> diff --git a/patches/screen-4.8.0/0104-CVE-2021-26937.patch b/patches/screen-4.8.0/0104-CVE-2021-26937.patch
> deleted file mode 100644
> index 9f4e879afd24..000000000000
> --- a/patches/screen-4.8.0/0104-CVE-2021-26937.patch
> +++ /dev/null
> @@ -1,69 +0,0 @@
> -From: Michael Olbrich <m.olbrich@pengutronix.de>
> -Date: Fri, 7 Jan 2022 12:53:57 +0100
> -Subject: [PATCH] CVE-2021-26937
> -
> -Imported from screen_4.8.0-7.debian.tar.xz
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ----
> - encoding.c | 15 +++++++++------
> - 1 file changed, 9 insertions(+), 6 deletions(-)
> -
> -diff --git a/encoding.c b/encoding.c
> -index e5db3e708126..79f5d14024c4 100644
> ---- a/encoding.c
> -+++ b/encoding.c
> -@@ -43,7 +43,7 @@ static int encmatch __P((char *, char *));
> - # ifdef UTF8
> - static int recode_char __P((int, int, int));
> - static int recode_char_to_encoding __P((int, int));
> --static void comb_tofront __P((int, int));
> -+static void comb_tofront __P((int));
> - # ifdef DW_CHARS
> - static int recode_char_dw __P((int, int *, int, int));
> - static int recode_char_dw_to_encoding __P((int, int *, int));
> -@@ -1263,6 +1263,8 @@ int c;
> - {0x30000, 0x3FFFD},
> - };
> -
> -+ if (c >= 0xdf00 && c <= 0xdfff)
> -+ return 1; /* dw combining sequence */
> - return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) ||
> - (cjkwidth &&
> - bisearch(c, ambiguous,
> -@@ -1330,11 +1332,12 @@ int c;
> - }
> -
> - static void
> --comb_tofront(root, i)
> --int root, i;
> -+comb_tofront(i)
> -+int i;
> - {
> - for (;;)
> - {
> -+ int root = i >= 0x700 ? 0x801 : 0x800;
> - debug1("bring to front: %x\n", i);
> - combchars[combchars[i]->prev]->next = combchars[i]->next;
> - combchars[combchars[i]->next]->prev = combchars[i]->prev;
> -@@ -1396,9 +1399,9 @@ struct mchar *mc;
> - {
> - /* full, recycle old entry */
> - if (c1 >= 0xd800 && c1 < 0xe000)
> -- comb_tofront(root, c1 - 0xd800);
> -+ comb_tofront(c1 - 0xd800);
> - i = combchars[root]->prev;
> -- if (c1 == i + 0xd800)
> -+ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800)
> - {
> - /* completely full, can't recycle */
> - debug("utf8_handle_comp: completely full!\n");
> -@@ -1422,7 +1425,7 @@ struct mchar *mc;
> - mc->font = (i >> 8) + 0xd8;
> - mc->fontx = 0;
> - debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800);
> -- comb_tofront(root, i);
> -+ comb_tofront(i);
> - }
> -
> - #else /* !UTF8 */
> diff --git a/patches/screen-4.8.0/autogen.sh b/patches/screen-4.8.0/autogen.sh
> deleted file mode 100755
> index 9e73c8d2079c..000000000000
> --- a/patches/screen-4.8.0/autogen.sh
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -#!/bin/bash
> -
> -autoconf \
> - --force \
> - --warnings=cross \
> - --warnings=syntax \
> - --warnings=obsolete \
> - --warnings=unsupported
> -
> diff --git a/patches/screen-4.8.0/series b/patches/screen-4.8.0/series
> deleted file mode 100644
> index c9b8d7197669..000000000000
> --- a/patches/screen-4.8.0/series
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -#tag:buildroot --start-number 1
> -0001-comm.h-now-depends-on-term.h.patch
> -0002-comm.h-needed-for-list_-display-generic-.o.patch
> -#tag:debian --start-number 100
> -0100-suppress_remap.patch
> -0101-fix_screen_utf8_nfd.patch
> -0102-Expand-d_xtermosc-array-in-struct-display.patch
> -0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch
> -0104-CVE-2021-26937.patch
> -# d92ac31ab347a013a74ca7f4001696ec - git-ptx-patches magic
> diff --git a/patches/screen-4.8.0/0001-comm.h-now-depends-on-term.h.patch b/patches/screen-4.9.0/0001-comm.h-now-depends-on-term.h.patch
> similarity index 100%
> rename from patches/screen-4.8.0/0001-comm.h-now-depends-on-term.h.patch
> rename to patches/screen-4.9.0/0001-comm.h-now-depends-on-term.h.patch
> diff --git a/patches/screen-4.8.0/0002-comm.h-needed-for-list_-display-generic-.o.patch b/patches/screen-4.9.0/0002-comm.h-needed-for-list_-display-generic-.o.patch
> similarity index 100%
> rename from patches/screen-4.8.0/0002-comm.h-needed-for-list_-display-generic-.o.patch
> rename to patches/screen-4.9.0/0002-comm.h-needed-for-list_-display-generic-.o.patch
> diff --git a/patches/screen-4.8.0/0100-suppress_remap.patch b/patches/screen-4.9.0/0003-suppress_remap.patch
> similarity index 92%
> rename from patches/screen-4.8.0/0100-suppress_remap.patch
> rename to patches/screen-4.9.0/0003-suppress_remap.patch
> index 7da242564975..fda63e90c7e7 100644
> --- a/patches/screen-4.8.0/0100-suppress_remap.patch
> +++ b/patches/screen-4.9.0/0003-suppress_remap.patch
> @@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 1 file changed, 2 deletions(-)
>
> diff --git a/termcap.c b/termcap.c
> -index 26cba62fd7c1..ed9e838c4c9d 100644
> +index 26c8f5a96589..29684cf974f7 100644
> --- a/termcap.c
> +++ b/termcap.c
> @@ -553,8 +553,6 @@ int map;
> diff --git a/patches/screen-4.9.0/autogen.sh b/patches/screen-4.9.0/autogen.sh
> new file mode 120000
> index 000000000000..9f8a4cb7ddcb
> --- /dev/null
> +++ b/patches/screen-4.9.0/autogen.sh
> @@ -0,0 +1 @@
> +../autogen.sh
> \ No newline at end of file
> diff --git a/patches/screen-4.9.0/series b/patches/screen-4.9.0/series
> new file mode 100644
> index 000000000000..bf7060df3881
> --- /dev/null
> +++ b/patches/screen-4.9.0/series
> @@ -0,0 +1,6 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-comm.h-now-depends-on-term.h.patch
> +0002-comm.h-needed-for-list_-display-generic-.o.patch
> +0003-suppress_remap.patch
> +# 086ac9b43abed5bb61eef564f1ac00d9 - git-ptx-patches magic
> diff --git a/rules/screen.make b/rules/screen.make
> index 1087dfc9d8fd..4f19946605e8 100644
> --- a/rules/screen.make
> +++ b/rules/screen.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SCREEN) += screen
> #
> # Paths and names
> #
> -SCREEN_VERSION := 4.8.0
> -SCREEN_MD5 := d276213d3acd10339cd37848b8c4ab1e
> +SCREEN_VERSION := 4.9.0
> +SCREEN_MD5 := b1ef8ed89134d335e614016634982b6d
> SCREEN := screen-$(SCREEN_VERSION)
> SCREEN_SUFFIX := tar.gz
> SCREEN_URL := $(call ptx/mirror, GNU, screen/$(SCREEN).$(SCREEN_SUFFIX))
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 15+ messages in thread
* [ptxdist] [PATCH] qemu: Version bump. 6.1.0 -> 6.2.0
2022-02-05 23:07 [ptxdist] [PATCH] zstd: Version bump. 1.5.1 -> 1.5.2 Christian Melki
2022-02-05 23:07 ` [ptxdist] [PATCH] util-linux-ng: Version bump 2.37.2 -> 2.37.3 Christian Melki
2022-02-05 23:07 ` [ptxdist] [PATCH] screen: Version bump. 4.8.0 -> 4.9.0 Christian Melki
@ 2022-02-05 23:07 ` Christian Melki
2022-02-05 23:07 ` [ptxdist] [PATCH] pulseaudio: Version bump. 13.0 -> 1.5.0 Christian Melki
2022-02-14 12:43 ` [ptxdist] [APPLIED] zstd: Version bump. 1.5.1 -> 1.5.2 Michael Olbrich
4 siblings, 0 replies; 15+ messages in thread
From: Christian Melki @ 2022-02-05 23:07 UTC (permalink / raw)
To: ptxdist
https://wiki.qemu.org/ChangeLog/6.2
* Add options to enable/disable audio support for alsa/pa.
* Move patchset, applies.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
...symlinks-for-security_model-mapped-f.patch | 0
.../0002-let-ninja-use-the-jobserver.patch | 4 ++--
patches/{qemu-6.1.0 => qemu-6.2.0}/series | 0
rules/qemu.in | 22 +++++++++++++++----
rules/qemu.make | 9 ++++----
5 files changed, 24 insertions(+), 11 deletions(-)
rename patches/{qemu-6.1.0 => qemu-6.2.0}/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch (100%)
rename patches/{qemu-6.1.0 => qemu-6.2.0}/0002-let-ninja-use-the-jobserver.patch (89%)
rename patches/{qemu-6.1.0 => qemu-6.2.0}/series (100%)
diff --git a/patches/qemu-6.1.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch b/patches/qemu-6.2.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
similarity index 100%
rename from patches/qemu-6.1.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
rename to patches/qemu-6.2.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
diff --git a/patches/qemu-6.1.0/0002-let-ninja-use-the-jobserver.patch b/patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch
similarity index 89%
rename from patches/qemu-6.1.0/0002-let-ninja-use-the-jobserver.patch
rename to patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch
index 0de2e99f3..5df864c39 100644
--- a/patches/qemu-6.1.0/0002-let-ninja-use-the-jobserver.patch
+++ b/patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch
@@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 401c623a65f8..36a0557d2aa8 100644
+index 74c5b46d38b5..4b3e390e8947 100644
--- a/Makefile
+++ b/Makefile
-@@ -136,7 +136,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS))))
+@@ -142,7 +142,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS))))
MAKE.q = $(findstring q,$(firstword $(filter-out --%,$(MAKEFLAGS))))
MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq)
NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \
diff --git a/patches/qemu-6.1.0/series b/patches/qemu-6.2.0/series
similarity index 100%
rename from patches/qemu-6.1.0/series
rename to patches/qemu-6.2.0/series
diff --git a/rules/qemu.in b/rules/qemu.in
index b14dd53d4..eb689a188 100644
--- a/rules/qemu.in
+++ b/rules/qemu.in
@@ -10,10 +10,12 @@ menuconfig QEMU
select GLIB
select LIBCAP_NG
select ZLIB
- select SDL2 if QEMU_SDL
- select GTK if QEMU_GTK
- select LIBUSB if QEMU_SYS
- select PIXMAN if QEMU_SYS
+ select SDL2 if QEMU_SDL
+ select GTK if QEMU_GTK
+ select LIBUSB if QEMU_SYS
+ select PIXMAN if QEMU_SYS
+ select PULSEAUDIO if QEMU_PULSEAUDIO
+ select ALSA_LIB if QEMU_ALSA
help
QEMU is a generic and open source machine emulator and
virtualizer.
@@ -41,6 +43,18 @@ config QEMU_GTK
help
Say y to build with GTK support.
+config QEMU_PULSEAUDIO
+ bool
+ prompt "Enable pulseaudio output support."
+ help
+ Say y to build with pa support.
+
+config QEMU_ALSA
+ bool
+ prompt "Enable alsa audio output support."
+ help
+ Say y to build with alsa support.
+
config QEMU_TOOLS
bool
prompt "Enable tools"
diff --git a/rules/qemu.make b/rules/qemu.make
index 756633a0b..6d117b44d 100644
--- a/rules/qemu.make
+++ b/rules/qemu.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu
#
# Paths and names
#
-QEMU_VERSION := 6.1.0
-QEMU_MD5 := 47f776c276a24f42108ba512a2aa3013
+QEMU_VERSION := 6.2.0
+QEMU_MD5 := a077669ce58b6ee07ec355e54aad25be
QEMU := qemu-$(QEMU_VERSION)
QEMU_SUFFIX := tar.xz
QEMU_URL := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX)
@@ -52,7 +52,8 @@ QEMU_CONF_OPT := \
--disable-strip \
--disable-werror \
--enable-stack-protector \
- --audio-drv-list= \
+ --$(call ptx/endis, PTXCONF_QEMU_ALSA)-alsa \
+ --$(call ptx/endis, PTXCONF_QEMU_PULSEAUDIO)-pa \
--block-drv-rw-whitelist= \
--block-drv-ro-whitelist= \
--enable-trace-backends=nop \
@@ -143,8 +144,6 @@ QEMU_CONF_OPT := \
--disable-libssh \
--disable-numa \
--disable-libxml2 \
- --disable-tcmalloc \
- --disable-jemalloc \
--enable-replication \
--disable-opengl \
--disable-virglrenderer \
--
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] 15+ messages in thread
* [ptxdist] [PATCH] pulseaudio: Version bump. 13.0 -> 1.5.0
2022-02-05 23:07 [ptxdist] [PATCH] zstd: Version bump. 1.5.1 -> 1.5.2 Christian Melki
` (2 preceding siblings ...)
2022-02-05 23:07 ` [ptxdist] [PATCH] qemu: Version bump. 6.1.0 -> 6.2.0 Christian Melki
@ 2022-02-05 23:07 ` Christian Melki
2022-02-07 5:56 ` Bruno Thomsen
2022-02-07 7:54 ` Michael Olbrich
2022-02-14 12:43 ` [ptxdist] [APPLIED] zstd: Version bump. 1.5.1 -> 1.5.2 Michael Olbrich
4 siblings, 2 replies; 15+ messages in thread
From: Christian Melki @ 2022-02-05 23:07 UTC (permalink / raw)
To: ptxdist
https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/14.0/
https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/
* Add GLIB as a dependency.
* Remove old patches
* Correct configuration flag for the new version.
* Disable doxygen usage.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
...ld-sys-meson-Add-missing-include-dir.patch | 30 -------------------
patches/pulseaudio-13.0/series | 4 ---
rules/pulseaudio.in | 1 +
rules/pulseaudio.make | 11 +++----
4 files changed, 7 insertions(+), 39 deletions(-)
delete mode 100644 patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
delete mode 100644 patches/pulseaudio-13.0/series
diff --git a/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch b/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
deleted file mode 100644
index f88efd824..000000000
--- a/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Wed, 12 May 2021 21:10:54 +0200
-Subject: [PATCH] build-sys: meson: Add missing include dir
-
-Otherwise building module-echo-cancel fails here:
-
- FAILED: src/modules/module-echo-cancel.so.p/echo-cancel_adrian-aec.c.o
- cc -Isrc/modules/module-echo-cancel.so.p -I. -I../pulseaudio -Isrc -I../pulseaudio/src -I/usr/include/orc-0.4 -flto=auto -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=gnu11 -march=x86-64 -mtune=generic -O2 -p>
- ../pulseaudio/src/modules/echo-cancel/adrian-aec.c:30:10: fatal error: adrian-aec-orc-gen.h: No such file or directory
- 30 | #include "adrian-aec-orc-gen.h"
- | ^~~~~~~~~~~~~~~~~~~~~~
-
-Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/552>
----
- src/modules/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/meson.build b/src/modules/meson.build
-index 92d5871f9966..83cb11a63ed1 100644
---- a/src/modules/meson.build
-+++ b/src/modules/meson.build
-@@ -279,7 +279,7 @@ foreach m : all_modules
- mod = shared_module(name,
- sources,
- headers,
-- include_directories : [configinc, topinc],
-+ include_directories : [configinc, topinc, include_directories('.')],
- c_args : [pa_c_args, server_c_args, '-DPA_MODULE_NAME=' + name.underscorify()] + extra_flags,
- install : true,
- install_rpath : rpath_dirs,
diff --git a/patches/pulseaudio-13.0/series b/patches/pulseaudio-13.0/series
deleted file mode 100644
index ff45a6029..000000000
--- a/patches/pulseaudio-13.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-build-sys-meson-Add-missing-include-dir.patch
-# d9287d7937841a165c1263a5c38c0ed7 - git-ptx-patches magic
diff --git a/rules/pulseaudio.in b/rules/pulseaudio.in
index 3c925f70f..e4dfff115 100644
--- a/rules/pulseaudio.in
+++ b/rules/pulseaudio.in
@@ -7,6 +7,7 @@ menuconfig PULSEAUDIO
select LIBC_M
select LIBC_RT
select LIBC_PTHREAD
+ select GLIB
select ALSA_LIB
select ALSA_LIB_MIXER
select ALSA_LIB_UCM
diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make
index 59a9fdda0..23d9a1a3b 100644
--- a/rules/pulseaudio.make
+++ b/rules/pulseaudio.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PULSEAUDIO) += pulseaudio
#
# Paths and names
#
-PULSEAUDIO_VERSION := 13.0
-PULSEAUDIO_MD5 := e41d606f90254ed45c90520faf83d95c
+PULSEAUDIO_VERSION := 15.0
+PULSEAUDIO_MD5 := bb888e7747b778c1c487c63b582ddf40
PULSEAUDIO := pulseaudio-$(PULSEAUDIO_VERSION)
PULSEAUDIO_SUFFIX := tar.xz
PULSEAUDIO_URL := http://freedesktop.org/software/pulseaudio/releases/$(PULSEAUDIO).$(PULSEAUDIO_SUFFIX)
@@ -50,14 +50,14 @@ PULSEAUDIO_CONF_OPT := \
-Datomic-arm-linux-helpers=true \
-Datomic-arm-memory-barrier=true \
-Davahi=disabled \
- -Dbluez5=$(call ptx/truefalse, PTXCONF_PULSEAUDIO_BLUETOOTH) \
+ -Dbluez5=$(call ptx/endis, PTXCONF_PULSEAUDIO_BLUETOOTH)d \
-Dbluez5-native-headset=$(call ptx/truefalse, PTXCONF_PULSEAUDIO_BLUETOOTH) \
-Dbluez5-ofono-headset=false \
-Ddatabase=simple \
-Ddbus=$(call ptx/endis, PTXCONF_PULSEAUDIO_BLUETOOTH)d \
-Dfftw=disabled \
-Dgcov=false \
- -Dglib=disabled \
+ -Dglib=enabled \
-Dgsettings=disabled \
-Dgtk=disabled \
-Dhal-compat=false \
@@ -84,7 +84,8 @@ PULSEAUDIO_CONF_OPT := \
-Dudevrulesdir=/lib/udev/rules.d \
-Dwebrtc-aec=$(call ptx/endis, PTXCONF_PULSEAUDIO_WEBRTC_AEC)d \
-Dx11=disabled \
- -Dzshcompletiondir=
+ -Dzshcompletiondir= \
+ -Ddoxygen=false
PULSEAUDIO_LDFLAGS := -Wl,-rpath,/usr/lib/pulseaudio:/usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules
--
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] 15+ messages in thread
* Re: [ptxdist] [PATCH] pulseaudio: Version bump. 13.0 -> 1.5.0
2022-02-05 23:07 ` [ptxdist] [PATCH] pulseaudio: Version bump. 13.0 -> 1.5.0 Christian Melki
@ 2022-02-07 5:56 ` Bruno Thomsen
2022-02-07 7:54 ` Michael Olbrich
1 sibling, 0 replies; 15+ messages in thread
From: Bruno Thomsen @ 2022-02-07 5:56 UTC (permalink / raw)
To: ptxdist
Hi
Patch title shows wrong new version.
1.5.0 vs 15.0
/Bruno
Den søn. 6. feb. 2022 kl. 00.09 skrev Christian Melki
<christian.melki@t2data.com>:
>
> https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/14.0/
> https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/
>
> * Add GLIB as a dependency.
> * Remove old patches
> * Correct configuration flag for the new version.
> * Disable doxygen usage.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
> ...ld-sys-meson-Add-missing-include-dir.patch | 30 -------------------
> patches/pulseaudio-13.0/series | 4 ---
> rules/pulseaudio.in | 1 +
> rules/pulseaudio.make | 11 +++----
> 4 files changed, 7 insertions(+), 39 deletions(-)
> delete mode 100644 patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
> delete mode 100644 patches/pulseaudio-13.0/series
>
> diff --git a/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch b/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
> deleted file mode 100644
> index f88efd824..000000000
> --- a/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
> -Date: Wed, 12 May 2021 21:10:54 +0200
> -Subject: [PATCH] build-sys: meson: Add missing include dir
> -
> -Otherwise building module-echo-cancel fails here:
> -
> - FAILED: src/modules/module-echo-cancel.so.p/echo-cancel_adrian-aec.c.o
> - cc -Isrc/modules/module-echo-cancel.so.p -I. -I../pulseaudio -Isrc -I../pulseaudio/src -I/usr/include/orc-0.4 -flto=auto -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=gnu11 -march=x86-64 -mtune=generic -O2 -p>
> - ../pulseaudio/src/modules/echo-cancel/adrian-aec.c:30:10: fatal error: adrian-aec-orc-gen.h: No such file or directory
> - 30 | #include "adrian-aec-orc-gen.h"
> - | ^~~~~~~~~~~~~~~~~~~~~~
> -
> -Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/552>
> ----
> - src/modules/meson.build | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/src/modules/meson.build b/src/modules/meson.build
> -index 92d5871f9966..83cb11a63ed1 100644
> ---- a/src/modules/meson.build
> -+++ b/src/modules/meson.build
> -@@ -279,7 +279,7 @@ foreach m : all_modules
> - mod = shared_module(name,
> - sources,
> - headers,
> -- include_directories : [configinc, topinc],
> -+ include_directories : [configinc, topinc, include_directories('.')],
> - c_args : [pa_c_args, server_c_args, '-DPA_MODULE_NAME=' + name.underscorify()] + extra_flags,
> - install : true,
> - install_rpath : rpath_dirs,
> diff --git a/patches/pulseaudio-13.0/series b/patches/pulseaudio-13.0/series
> deleted file mode 100644
> index ff45a6029..000000000
> --- a/patches/pulseaudio-13.0/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-build-sys-meson-Add-missing-include-dir.patch
> -# d9287d7937841a165c1263a5c38c0ed7 - git-ptx-patches magic
> diff --git a/rules/pulseaudio.in b/rules/pulseaudio.in
> index 3c925f70f..e4dfff115 100644
> --- a/rules/pulseaudio.in
> +++ b/rules/pulseaudio.in
> @@ -7,6 +7,7 @@ menuconfig PULSEAUDIO
> select LIBC_M
> select LIBC_RT
> select LIBC_PTHREAD
> + select GLIB
> select ALSA_LIB
> select ALSA_LIB_MIXER
> select ALSA_LIB_UCM
> diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make
> index 59a9fdda0..23d9a1a3b 100644
> --- a/rules/pulseaudio.make
> +++ b/rules/pulseaudio.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PULSEAUDIO) += pulseaudio
> #
> # Paths and names
> #
> -PULSEAUDIO_VERSION := 13.0
> -PULSEAUDIO_MD5 := e41d606f90254ed45c90520faf83d95c
> +PULSEAUDIO_VERSION := 15.0
> +PULSEAUDIO_MD5 := bb888e7747b778c1c487c63b582ddf40
> PULSEAUDIO := pulseaudio-$(PULSEAUDIO_VERSION)
> PULSEAUDIO_SUFFIX := tar.xz
> PULSEAUDIO_URL := http://freedesktop.org/software/pulseaudio/releases/$(PULSEAUDIO).$(PULSEAUDIO_SUFFIX)
> @@ -50,14 +50,14 @@ PULSEAUDIO_CONF_OPT := \
> -Datomic-arm-linux-helpers=true \
> -Datomic-arm-memory-barrier=true \
> -Davahi=disabled \
> - -Dbluez5=$(call ptx/truefalse, PTXCONF_PULSEAUDIO_BLUETOOTH) \
> + -Dbluez5=$(call ptx/endis, PTXCONF_PULSEAUDIO_BLUETOOTH)d \
> -Dbluez5-native-headset=$(call ptx/truefalse, PTXCONF_PULSEAUDIO_BLUETOOTH) \
> -Dbluez5-ofono-headset=false \
> -Ddatabase=simple \
> -Ddbus=$(call ptx/endis, PTXCONF_PULSEAUDIO_BLUETOOTH)d \
> -Dfftw=disabled \
> -Dgcov=false \
> - -Dglib=disabled \
> + -Dglib=enabled \
> -Dgsettings=disabled \
> -Dgtk=disabled \
> -Dhal-compat=false \
> @@ -84,7 +84,8 @@ PULSEAUDIO_CONF_OPT := \
> -Dudevrulesdir=/lib/udev/rules.d \
> -Dwebrtc-aec=$(call ptx/endis, PTXCONF_PULSEAUDIO_WEBRTC_AEC)d \
> -Dx11=disabled \
> - -Dzshcompletiondir=
> + -Dzshcompletiondir= \
> + -Ddoxygen=false
>
> PULSEAUDIO_LDFLAGS := -Wl,-rpath,/usr/lib/pulseaudio:/usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules
>
> --
> 2.30.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [ptxdist] [PATCH] pulseaudio: Version bump. 13.0 -> 1.5.0
2022-02-05 23:07 ` [ptxdist] [PATCH] pulseaudio: Version bump. 13.0 -> 1.5.0 Christian Melki
2022-02-07 5:56 ` Bruno Thomsen
@ 2022-02-07 7:54 ` Michael Olbrich
2022-02-07 8:05 ` Christian Melki
1 sibling, 1 reply; 15+ messages in thread
From: Michael Olbrich @ 2022-02-07 7:54 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
On Sun, Feb 06, 2022 at 12:07:18AM +0100, Christian Melki wrote:
> https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/14.0/
> https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/
>
> * Add GLIB as a dependency.
Why is this necessary?
Michael
> * Remove old patches
> * Correct configuration flag for the new version.
> * Disable doxygen usage.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
> ...ld-sys-meson-Add-missing-include-dir.patch | 30 -------------------
> patches/pulseaudio-13.0/series | 4 ---
> rules/pulseaudio.in | 1 +
> rules/pulseaudio.make | 11 +++----
> 4 files changed, 7 insertions(+), 39 deletions(-)
> delete mode 100644 patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
> delete mode 100644 patches/pulseaudio-13.0/series
>
> diff --git a/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch b/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
> deleted file mode 100644
> index f88efd824..000000000
> --- a/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
> -Date: Wed, 12 May 2021 21:10:54 +0200
> -Subject: [PATCH] build-sys: meson: Add missing include dir
> -
> -Otherwise building module-echo-cancel fails here:
> -
> - FAILED: src/modules/module-echo-cancel.so.p/echo-cancel_adrian-aec.c.o
> - cc -Isrc/modules/module-echo-cancel.so.p -I. -I../pulseaudio -Isrc -I../pulseaudio/src -I/usr/include/orc-0.4 -flto=auto -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=gnu11 -march=x86-64 -mtune=generic -O2 -p>
> - ../pulseaudio/src/modules/echo-cancel/adrian-aec.c:30:10: fatal error: adrian-aec-orc-gen.h: No such file or directory
> - 30 | #include "adrian-aec-orc-gen.h"
> - | ^~~~~~~~~~~~~~~~~~~~~~
> -
> -Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/552>
> ----
> - src/modules/meson.build | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/src/modules/meson.build b/src/modules/meson.build
> -index 92d5871f9966..83cb11a63ed1 100644
> ---- a/src/modules/meson.build
> -+++ b/src/modules/meson.build
> -@@ -279,7 +279,7 @@ foreach m : all_modules
> - mod = shared_module(name,
> - sources,
> - headers,
> -- include_directories : [configinc, topinc],
> -+ include_directories : [configinc, topinc, include_directories('.')],
> - c_args : [pa_c_args, server_c_args, '-DPA_MODULE_NAME=' + name.underscorify()] + extra_flags,
> - install : true,
> - install_rpath : rpath_dirs,
> diff --git a/patches/pulseaudio-13.0/series b/patches/pulseaudio-13.0/series
> deleted file mode 100644
> index ff45a6029..000000000
> --- a/patches/pulseaudio-13.0/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-build-sys-meson-Add-missing-include-dir.patch
> -# d9287d7937841a165c1263a5c38c0ed7 - git-ptx-patches magic
> diff --git a/rules/pulseaudio.in b/rules/pulseaudio.in
> index 3c925f70f..e4dfff115 100644
> --- a/rules/pulseaudio.in
> +++ b/rules/pulseaudio.in
> @@ -7,6 +7,7 @@ menuconfig PULSEAUDIO
> select LIBC_M
> select LIBC_RT
> select LIBC_PTHREAD
> + select GLIB
> select ALSA_LIB
> select ALSA_LIB_MIXER
> select ALSA_LIB_UCM
> diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make
> index 59a9fdda0..23d9a1a3b 100644
> --- a/rules/pulseaudio.make
> +++ b/rules/pulseaudio.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PULSEAUDIO) += pulseaudio
> #
> # Paths and names
> #
> -PULSEAUDIO_VERSION := 13.0
> -PULSEAUDIO_MD5 := e41d606f90254ed45c90520faf83d95c
> +PULSEAUDIO_VERSION := 15.0
> +PULSEAUDIO_MD5 := bb888e7747b778c1c487c63b582ddf40
> PULSEAUDIO := pulseaudio-$(PULSEAUDIO_VERSION)
> PULSEAUDIO_SUFFIX := tar.xz
> PULSEAUDIO_URL := http://freedesktop.org/software/pulseaudio/releases/$(PULSEAUDIO).$(PULSEAUDIO_SUFFIX)
> @@ -50,14 +50,14 @@ PULSEAUDIO_CONF_OPT := \
> -Datomic-arm-linux-helpers=true \
> -Datomic-arm-memory-barrier=true \
> -Davahi=disabled \
> - -Dbluez5=$(call ptx/truefalse, PTXCONF_PULSEAUDIO_BLUETOOTH) \
> + -Dbluez5=$(call ptx/endis, PTXCONF_PULSEAUDIO_BLUETOOTH)d \
> -Dbluez5-native-headset=$(call ptx/truefalse, PTXCONF_PULSEAUDIO_BLUETOOTH) \
> -Dbluez5-ofono-headset=false \
> -Ddatabase=simple \
> -Ddbus=$(call ptx/endis, PTXCONF_PULSEAUDIO_BLUETOOTH)d \
> -Dfftw=disabled \
> -Dgcov=false \
> - -Dglib=disabled \
> + -Dglib=enabled \
> -Dgsettings=disabled \
> -Dgtk=disabled \
> -Dhal-compat=false \
> @@ -84,7 +84,8 @@ PULSEAUDIO_CONF_OPT := \
> -Dudevrulesdir=/lib/udev/rules.d \
> -Dwebrtc-aec=$(call ptx/endis, PTXCONF_PULSEAUDIO_WEBRTC_AEC)d \
> -Dx11=disabled \
> - -Dzshcompletiondir=
> + -Dzshcompletiondir= \
> + -Ddoxygen=false
>
> PULSEAUDIO_LDFLAGS := -Wl,-rpath,/usr/lib/pulseaudio:/usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules
>
> --
> 2.30.2
>
>
> _______________________________________________
> 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] 15+ messages in thread
* Re: [ptxdist] [PATCH] pulseaudio: Version bump. 13.0 -> 1.5.0
2022-02-07 7:54 ` Michael Olbrich
@ 2022-02-07 8:05 ` Christian Melki
2022-02-07 10:30 ` Christian Melki
0 siblings, 1 reply; 15+ messages in thread
From: Christian Melki @ 2022-02-07 8:05 UTC (permalink / raw)
To: m.olbrich; +Cc: ptxdist
On 2/7/22 8:54 AM, Michael Olbrich wrote:
> On Sun, Feb 06, 2022 at 12:07:18AM +0100, Christian Melki wrote:
>> https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/14.0/
>> https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/
>>
>> * Add GLIB as a dependency.
>
> Why is this necessary?
>
> Michael
>
Hmm. Maybe I misread it. I interpreted configuration whine as GLIB
dependency. But when checking closer, I really can't see a strict one.
I can disable it again.
>> * Remove old patches
>> * Correct configuration flag for the new version.
>> * Disable doxygen usage.
>>
>> Signed-off-by: Christian Melki <christian.melki@t2data.com>
>> ---
>> ...ld-sys-meson-Add-missing-include-dir.patch | 30 -------------------
>> patches/pulseaudio-13.0/series | 4 ---
>> rules/pulseaudio.in | 1 +
>> rules/pulseaudio.make | 11 +++----
>> 4 files changed, 7 insertions(+), 39 deletions(-)
>> delete mode 100644 patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
>> delete mode 100644 patches/pulseaudio-13.0/series
>>
>> diff --git a/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch b/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
>> deleted file mode 100644
>> index f88efd824..000000000
>> --- a/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
>> +++ /dev/null
>> @@ -1,30 +0,0 @@
>> -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
>> -Date: Wed, 12 May 2021 21:10:54 +0200
>> -Subject: [PATCH] build-sys: meson: Add missing include dir
>> -
>> -Otherwise building module-echo-cancel fails here:
>> -
>> - FAILED: src/modules/module-echo-cancel.so.p/echo-cancel_adrian-aec.c.o
>> - cc -Isrc/modules/module-echo-cancel.so.p -I. -I../pulseaudio -Isrc -I../pulseaudio/src -I/usr/include/orc-0.4 -flto=auto -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=gnu11 -march=x86-64 -mtune=generic -O2 -p>
>> - ../pulseaudio/src/modules/echo-cancel/adrian-aec.c:30:10: fatal error: adrian-aec-orc-gen.h: No such file or directory
>> - 30 | #include "adrian-aec-orc-gen.h"
>> - | ^~~~~~~~~~~~~~~~~~~~~~
>> -
>> -Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/552>
>> ----
>> - src/modules/meson.build | 2 +-
>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>> -
>> -diff --git a/src/modules/meson.build b/src/modules/meson.build
>> -index 92d5871f9966..83cb11a63ed1 100644
>> ---- a/src/modules/meson.build
>> -+++ b/src/modules/meson.build
>> -@@ -279,7 +279,7 @@ foreach m : all_modules
>> - mod = shared_module(name,
>> - sources,
>> - headers,
>> -- include_directories : [configinc, topinc],
>> -+ include_directories : [configinc, topinc, include_directories('.')],
>> - c_args : [pa_c_args, server_c_args, '-DPA_MODULE_NAME=' + name.underscorify()] + extra_flags,
>> - install : true,
>> - install_rpath : rpath_dirs,
>> diff --git a/patches/pulseaudio-13.0/series b/patches/pulseaudio-13.0/series
>> deleted file mode 100644
>> index ff45a6029..000000000
>> --- a/patches/pulseaudio-13.0/series
>> +++ /dev/null
>> @@ -1,4 +0,0 @@
>> -# generated by git-ptx-patches
>> -#tag:base --start-number 1
>> -0001-build-sys-meson-Add-missing-include-dir.patch
>> -# d9287d7937841a165c1263a5c38c0ed7 - git-ptx-patches magic
>> diff --git a/rules/pulseaudio.in b/rules/pulseaudio.in
>> index 3c925f70f..e4dfff115 100644
>> --- a/rules/pulseaudio.in
>> +++ b/rules/pulseaudio.in
>> @@ -7,6 +7,7 @@ menuconfig PULSEAUDIO
>> select LIBC_M
>> select LIBC_RT
>> select LIBC_PTHREAD
>> + select GLIB
>> select ALSA_LIB
>> select ALSA_LIB_MIXER
>> select ALSA_LIB_UCM
>> diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make
>> index 59a9fdda0..23d9a1a3b 100644
>> --- a/rules/pulseaudio.make
>> +++ b/rules/pulseaudio.make
>> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PULSEAUDIO) += pulseaudio
>> #
>> # Paths and names
>> #
>> -PULSEAUDIO_VERSION := 13.0
>> -PULSEAUDIO_MD5 := e41d606f90254ed45c90520faf83d95c
>> +PULSEAUDIO_VERSION := 15.0
>> +PULSEAUDIO_MD5 := bb888e7747b778c1c487c63b582ddf40
>> PULSEAUDIO := pulseaudio-$(PULSEAUDIO_VERSION)
>> PULSEAUDIO_SUFFIX := tar.xz
>> PULSEAUDIO_URL := http://freedesktop.org/software/pulseaudio/releases/$(PULSEAUDIO).$(PULSEAUDIO_SUFFIX)
>> @@ -50,14 +50,14 @@ PULSEAUDIO_CONF_OPT := \
>> -Datomic-arm-linux-helpers=true \
>> -Datomic-arm-memory-barrier=true \
>> -Davahi=disabled \
>> - -Dbluez5=$(call ptx/truefalse, PTXCONF_PULSEAUDIO_BLUETOOTH) \
>> + -Dbluez5=$(call ptx/endis, PTXCONF_PULSEAUDIO_BLUETOOTH)d \
>> -Dbluez5-native-headset=$(call ptx/truefalse, PTXCONF_PULSEAUDIO_BLUETOOTH) \
>> -Dbluez5-ofono-headset=false \
>> -Ddatabase=simple \
>> -Ddbus=$(call ptx/endis, PTXCONF_PULSEAUDIO_BLUETOOTH)d \
>> -Dfftw=disabled \
>> -Dgcov=false \
>> - -Dglib=disabled \
>> + -Dglib=enabled \
>> -Dgsettings=disabled \
>> -Dgtk=disabled \
>> -Dhal-compat=false \
>> @@ -84,7 +84,8 @@ PULSEAUDIO_CONF_OPT := \
>> -Dudevrulesdir=/lib/udev/rules.d \
>> -Dwebrtc-aec=$(call ptx/endis, PTXCONF_PULSEAUDIO_WEBRTC_AEC)d \
>> -Dx11=disabled \
>> - -Dzshcompletiondir=
>> + -Dzshcompletiondir= \
>> + -Ddoxygen=false
>>
>> PULSEAUDIO_LDFLAGS := -Wl,-rpath,/usr/lib/pulseaudio:/usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules
>>
>> --
>> 2.30.2
>>
>>
>> _______________________________________________
>> ptxdist mailing list
>> ptxdist@pengutronix.de
>> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>>
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [ptxdist] [PATCH] pulseaudio: Version bump. 13.0 -> 1.5.0
2022-02-07 8:05 ` Christian Melki
@ 2022-02-07 10:30 ` Christian Melki
2022-02-07 12:02 ` Michael Olbrich
0 siblings, 1 reply; 15+ messages in thread
From: Christian Melki @ 2022-02-07 10:30 UTC (permalink / raw)
To: m.olbrich; +Cc: ptxdist
On 2/7/22 9:05 AM, Christian Melki wrote:
>
>
> On 2/7/22 8:54 AM, Michael Olbrich wrote:
>> On Sun, Feb 06, 2022 at 12:07:18AM +0100, Christian Melki wrote:
>>> https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/14.0/
>>> https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/
>>>
>>> * Add GLIB as a dependency.
>>
>> Why is this necessary?
>>
>> Michael
>>
>
> Hmm. Maybe I misread it. I interpreted configuration whine as GLIB
> dependency. But when checking closer, I really can't see a strict one.
> I can disable it again.
>
Well. It became rather obvious soon after alright.
Sorry about my goldfish style memory.. :)
...
Run-time dependency gio-2.0 found: NO (tried pkgconfig)
../pulseaudio-15.0/meson.build:617:0: ERROR: Dependency "gio-2.0" not
found, tried pkgconfig
...
Which was discussed in mr-654.
https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/654
I don't know if the suggested fix made it back, but I applied the diff
and could disable glib properly.
Regards,
Christian
>>> * Remove old patches
>>> * Correct configuration flag for the new version.
>>> * Disable doxygen usage.
>>>
>>> Signed-off-by: Christian Melki <christian.melki@t2data.com>
>>> ---
>>> ...ld-sys-meson-Add-missing-include-dir.patch | 30 -------------------
>>> patches/pulseaudio-13.0/series | 4 ---
>>> rules/pulseaudio.in | 1 +
>>> rules/pulseaudio.make | 11 +++----
>>> 4 files changed, 7 insertions(+), 39 deletions(-)
>>> delete mode 100644
>>> patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
>>>
>>> delete mode 100644 patches/pulseaudio-13.0/series
>>>
>>> diff --git
>>> a/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
>>> b/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
>>>
>>> deleted file mode 100644
>>> index f88efd824..000000000
>>> ---
>>> a/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
>>>
>>> +++ /dev/null
>>> @@ -1,30 +0,0 @@
>>> -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
>>> -Date: Wed, 12 May 2021 21:10:54 +0200
>>> -Subject: [PATCH] build-sys: meson: Add missing include dir
>>> -
>>> -Otherwise building module-echo-cancel fails here:
>>> -
>>> - FAILED:
>>> src/modules/module-echo-cancel.so.p/echo-cancel_adrian-aec.c.o
>>> - cc -Isrc/modules/module-echo-cancel.so.p -I. -I../pulseaudio
>>> -Isrc -I../pulseaudio/src -I/usr/include/orc-0.4 -flto=auto
>>> -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch
>>> -std=gnu11 -march=x86-64 -mtune=generic -O2 -p>
>>> - ../pulseaudio/src/modules/echo-cancel/adrian-aec.c:30:10: fatal
>>> error: adrian-aec-orc-gen.h: No such file or directory
>>> - 30 | #include "adrian-aec-orc-gen.h"
>>> - | ^~~~~~~~~~~~~~~~~~~~~~
>>> -
>>> -Part-of:
>>> <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/552>
>>>
>>> ----
>>> - src/modules/meson.build | 2 +-
>>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>>> -
>>> -diff --git a/src/modules/meson.build b/src/modules/meson.build
>>> -index 92d5871f9966..83cb11a63ed1 100644
>>> ---- a/src/modules/meson.build
>>> -+++ b/src/modules/meson.build
>>> -@@ -279,7 +279,7 @@ foreach m : all_modules
>>> - mod = shared_module(name,
>>> - sources,
>>> - headers,
>>> -- include_directories : [configinc, topinc],
>>> -+ include_directories : [configinc, topinc,
>>> include_directories('.')],
>>> - c_args : [pa_c_args, server_c_args, '-DPA_MODULE_NAME=' +
>>> name.underscorify()] + extra_flags,
>>> - install : true,
>>> - install_rpath : rpath_dirs,
>>> diff --git a/patches/pulseaudio-13.0/series
>>> b/patches/pulseaudio-13.0/series
>>> deleted file mode 100644
>>> index ff45a6029..000000000
>>> --- a/patches/pulseaudio-13.0/series
>>> +++ /dev/null
>>> @@ -1,4 +0,0 @@
>>> -# generated by git-ptx-patches
>>> -#tag:base --start-number 1
>>> -0001-build-sys-meson-Add-missing-include-dir.patch
>>> -# d9287d7937841a165c1263a5c38c0ed7 - git-ptx-patches magic
>>> diff --git a/rules/pulseaudio.in b/rules/pulseaudio.in
>>> index 3c925f70f..e4dfff115 100644
>>> --- a/rules/pulseaudio.in
>>> +++ b/rules/pulseaudio.in
>>> @@ -7,6 +7,7 @@ menuconfig PULSEAUDIO
>>> select LIBC_M
>>> select LIBC_RT
>>> select LIBC_PTHREAD
>>> + select GLIB
>>> select ALSA_LIB
>>> select ALSA_LIB_MIXER
>>> select ALSA_LIB_UCM
>>> diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make
>>> index 59a9fdda0..23d9a1a3b 100644
>>> --- a/rules/pulseaudio.make
>>> +++ b/rules/pulseaudio.make
>>> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PULSEAUDIO) += pulseaudio
>>> #
>>> # Paths and names
>>> #
>>> -PULSEAUDIO_VERSION := 13.0
>>> -PULSEAUDIO_MD5 := e41d606f90254ed45c90520faf83d95c
>>> +PULSEAUDIO_VERSION := 15.0
>>> +PULSEAUDIO_MD5 := bb888e7747b778c1c487c63b582ddf40
>>> PULSEAUDIO := pulseaudio-$(PULSEAUDIO_VERSION)
>>> PULSEAUDIO_SUFFIX := tar.xz
>>> PULSEAUDIO_URL :=
>>> http://freedesktop.org/software/pulseaudio/releases/$(PULSEAUDIO).$(PULSEAUDIO_SUFFIX)
>>>
>>> @@ -50,14 +50,14 @@ PULSEAUDIO_CONF_OPT := \
>>> -Datomic-arm-linux-helpers=true \
>>> -Datomic-arm-memory-barrier=true \
>>> -Davahi=disabled \
>>> - -Dbluez5=$(call ptx/truefalse, PTXCONF_PULSEAUDIO_BLUETOOTH) \
>>> + -Dbluez5=$(call ptx/endis, PTXCONF_PULSEAUDIO_BLUETOOTH)d \
>>> -Dbluez5-native-headset=$(call ptx/truefalse,
>>> PTXCONF_PULSEAUDIO_BLUETOOTH) \
>>> -Dbluez5-ofono-headset=false \
>>> -Ddatabase=simple \
>>> -Ddbus=$(call ptx/endis, PTXCONF_PULSEAUDIO_BLUETOOTH)d \
>>> -Dfftw=disabled \
>>> -Dgcov=false \
>>> - -Dglib=disabled \
>>> + -Dglib=enabled \
>>> -Dgsettings=disabled \
>>> -Dgtk=disabled \
>>> -Dhal-compat=false \
>>> @@ -84,7 +84,8 @@ PULSEAUDIO_CONF_OPT := \
>>> -Dudevrulesdir=/lib/udev/rules.d \
>>> -Dwebrtc-aec=$(call ptx/endis, PTXCONF_PULSEAUDIO_WEBRTC_AEC)d \
>>> -Dx11=disabled \
>>> - -Dzshcompletiondir=
>>> + -Dzshcompletiondir= \
>>> + -Ddoxygen=false
>>> PULSEAUDIO_LDFLAGS :=
>>> -Wl,-rpath,/usr/lib/pulseaudio:/usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules
>>>
>>> --
>>> 2.30.2
>>>
>>>
>>> _______________________________________________
>>> ptxdist mailing list
>>> ptxdist@pengutronix.de
>>> To unsubscribe, send a mail with subject "unsubscribe" to
>>> ptxdist-request@pengutronix.de
>>>
>>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to
> ptxdist-request@pengutronix.de
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [ptxdist] [PATCH] pulseaudio: Version bump. 13.0 -> 1.5.0
2022-02-07 10:30 ` Christian Melki
@ 2022-02-07 12:02 ` Michael Olbrich
0 siblings, 0 replies; 15+ messages in thread
From: Michael Olbrich @ 2022-02-07 12:02 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
On Mon, Feb 07, 2022 at 11:30:51AM +0100, Christian Melki wrote:
>
>
> On 2/7/22 9:05 AM, Christian Melki wrote:
> >
> >
> > On 2/7/22 8:54 AM, Michael Olbrich wrote:
> > > On Sun, Feb 06, 2022 at 12:07:18AM +0100, Christian Melki wrote:
> > > > https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/14.0/
> > > > https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/
> > > >
> > > > * Add GLIB as a dependency.
> > >
> > > Why is this necessary?
> > >
> > > Michael
> > >
> >
> > Hmm. Maybe I misread it. I interpreted configuration whine as GLIB
> > dependency. But when checking closer, I really can't see a strict one.
> > I can disable it again.
> >
>
> Well. It became rather obvious soon after alright.
> Sorry about my goldfish style memory.. :)
:-)
> ...
> Run-time dependency gio-2.0 found: NO (tried pkgconfig)
>
> ../pulseaudio-15.0/meson.build:617:0: ERROR: Dependency "gio-2.0" not found,
> tried pkgconfig
> ...
>
> Which was discussed in mr-654.
> https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/654
>
> I don't know if the suggested fix made it back, but I applied the diff and
> could disable glib properly.
"required : false" is correct as the commenter noted. Please use that.
Michael
> Regards,
> Christian
>
> > > > * Remove old patches
> > > > * Correct configuration flag for the new version.
> > > > * Disable doxygen usage.
> > > >
> > > > Signed-off-by: Christian Melki <christian.melki@t2data.com>
> > > > ---
> > > > ...ld-sys-meson-Add-missing-include-dir.patch | 30 -------------------
> > > > patches/pulseaudio-13.0/series | 4 ---
> > > > rules/pulseaudio.in | 1 +
> > > > rules/pulseaudio.make | 11 +++----
> > > > 4 files changed, 7 insertions(+), 39 deletions(-)
> > > > delete mode 100644 patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
> > > >
> > > > delete mode 100644 patches/pulseaudio-13.0/series
> > > >
> > > > diff --git a/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch b/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
> > > >
> > > > deleted file mode 100644
> > > > index f88efd824..000000000
> > > > --- a/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
> > > >
> > > > +++ /dev/null
> > > > @@ -1,30 +0,0 @@
> > > > -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
> > > > -Date: Wed, 12 May 2021 21:10:54 +0200
> > > > -Subject: [PATCH] build-sys: meson: Add missing include dir
> > > > -
> > > > -Otherwise building module-echo-cancel fails here:
> > > > -
> > > > - FAILED:
> > > > src/modules/module-echo-cancel.so.p/echo-cancel_adrian-aec.c.o
> > > > - cc -Isrc/modules/module-echo-cancel.so.p -I.
> > > > -I../pulseaudio -Isrc -I../pulseaudio/src -I/usr/include/orc-0.4
> > > > -flto=auto -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64
> > > > -Wall -Winvalid-pch -std=gnu11 -march=x86-64 -mtune=generic -O2
> > > > -p>
> > > > - ../pulseaudio/src/modules/echo-cancel/adrian-aec.c:30:10:
> > > > fatal error: adrian-aec-orc-gen.h: No such file or directory
> > > > - 30 | #include "adrian-aec-orc-gen.h"
> > > > - | ^~~~~~~~~~~~~~~~~~~~~~
> > > > -
> > > > -Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/552>
> > > >
> > > > ----
> > > > - src/modules/meson.build | 2 +-
> > > > - 1 file changed, 1 insertion(+), 1 deletion(-)
> > > > -
> > > > -diff --git a/src/modules/meson.build b/src/modules/meson.build
> > > > -index 92d5871f9966..83cb11a63ed1 100644
> > > > ---- a/src/modules/meson.build
> > > > -+++ b/src/modules/meson.build
> > > > -@@ -279,7 +279,7 @@ foreach m : all_modules
> > > > - mod = shared_module(name,
> > > > - sources,
> > > > - headers,
> > > > -- include_directories : [configinc, topinc],
> > > > -+ include_directories : [configinc, topinc,
> > > > include_directories('.')],
> > > > - c_args : [pa_c_args, server_c_args, '-DPA_MODULE_NAME=' +
> > > > name.underscorify()] + extra_flags,
> > > > - install : true,
> > > > - install_rpath : rpath_dirs,
> > > > diff --git a/patches/pulseaudio-13.0/series
> > > > b/patches/pulseaudio-13.0/series
> > > > deleted file mode 100644
> > > > index ff45a6029..000000000
> > > > --- a/patches/pulseaudio-13.0/series
> > > > +++ /dev/null
> > > > @@ -1,4 +0,0 @@
> > > > -# generated by git-ptx-patches
> > > > -#tag:base --start-number 1
> > > > -0001-build-sys-meson-Add-missing-include-dir.patch
> > > > -# d9287d7937841a165c1263a5c38c0ed7 - git-ptx-patches magic
> > > > diff --git a/rules/pulseaudio.in b/rules/pulseaudio.in
> > > > index 3c925f70f..e4dfff115 100644
> > > > --- a/rules/pulseaudio.in
> > > > +++ b/rules/pulseaudio.in
> > > > @@ -7,6 +7,7 @@ menuconfig PULSEAUDIO
> > > > select LIBC_M
> > > > select LIBC_RT
> > > > select LIBC_PTHREAD
> > > > + select GLIB
> > > > select ALSA_LIB
> > > > select ALSA_LIB_MIXER
> > > > select ALSA_LIB_UCM
> > > > diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make
> > > > index 59a9fdda0..23d9a1a3b 100644
> > > > --- a/rules/pulseaudio.make
> > > > +++ b/rules/pulseaudio.make
> > > > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PULSEAUDIO) += pulseaudio
> > > > #
> > > > # Paths and names
> > > > #
> > > > -PULSEAUDIO_VERSION := 13.0
> > > > -PULSEAUDIO_MD5 := e41d606f90254ed45c90520faf83d95c
> > > > +PULSEAUDIO_VERSION := 15.0
> > > > +PULSEAUDIO_MD5 := bb888e7747b778c1c487c63b582ddf40
> > > > PULSEAUDIO := pulseaudio-$(PULSEAUDIO_VERSION)
> > > > PULSEAUDIO_SUFFIX := tar.xz
> > > > PULSEAUDIO_URL := http://freedesktop.org/software/pulseaudio/releases/$(PULSEAUDIO).$(PULSEAUDIO_SUFFIX)
> > > >
> > > > @@ -50,14 +50,14 @@ PULSEAUDIO_CONF_OPT := \
> > > > -Datomic-arm-linux-helpers=true \
> > > > -Datomic-arm-memory-barrier=true \
> > > > -Davahi=disabled \
> > > > - -Dbluez5=$(call ptx/truefalse, PTXCONF_PULSEAUDIO_BLUETOOTH) \
> > > > + -Dbluez5=$(call ptx/endis, PTXCONF_PULSEAUDIO_BLUETOOTH)d \
> > > > -Dbluez5-native-headset=$(call ptx/truefalse,
> > > > PTXCONF_PULSEAUDIO_BLUETOOTH) \
> > > > -Dbluez5-ofono-headset=false \
> > > > -Ddatabase=simple \
> > > > -Ddbus=$(call ptx/endis, PTXCONF_PULSEAUDIO_BLUETOOTH)d \
> > > > -Dfftw=disabled \
> > > > -Dgcov=false \
> > > > - -Dglib=disabled \
> > > > + -Dglib=enabled \
> > > > -Dgsettings=disabled \
> > > > -Dgtk=disabled \
> > > > -Dhal-compat=false \
> > > > @@ -84,7 +84,8 @@ PULSEAUDIO_CONF_OPT := \
> > > > -Dudevrulesdir=/lib/udev/rules.d \
> > > > -Dwebrtc-aec=$(call ptx/endis, PTXCONF_PULSEAUDIO_WEBRTC_AEC)d \
> > > > -Dx11=disabled \
> > > > - -Dzshcompletiondir=
> > > > + -Dzshcompletiondir= \
> > > > + -Ddoxygen=false
> > > > PULSEAUDIO_LDFLAGS := -Wl,-rpath,/usr/lib/pulseaudio:/usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules
> > > >
> > > > --
> > > > 2.30.2
> > > >
> > > >
> > > > _______________________________________________
> > > > ptxdist mailing list
> > > > ptxdist@pengutronix.de
> > > > To unsubscribe, send a mail with subject "unsubscribe" to
> > > > ptxdist-request@pengutronix.de
> > > >
> > >
> >
> > _______________________________________________
> > 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] 15+ messages in thread
* Re: [ptxdist] [APPLIED] zstd: Version bump. 1.5.1 -> 1.5.2
2022-02-05 23:07 [ptxdist] [PATCH] zstd: Version bump. 1.5.1 -> 1.5.2 Christian Melki
` (3 preceding siblings ...)
2022-02-05 23:07 ` [ptxdist] [PATCH] pulseaudio: Version bump. 13.0 -> 1.5.0 Christian Melki
@ 2022-02-14 12:43 ` Michael Olbrich
4 siblings, 0 replies; 15+ messages in thread
From: Michael Olbrich @ 2022-02-14 12:43 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as d27181cb59920a0e96d3954ae356946bd28821a9.
Michael
[sent from post-receive hook]
On Mon, 14 Feb 2022 13:43:33 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Mostly a bugfix release.
> https://github.com/facebook/zstd/releases/tag/v1.5.2
> * Drop patches for noexecstack. Fixed in 1.5.2
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220205230718.2518022-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/zstd-1.5.1/0001-Mark-Huffman-Decoder-Assembly-noexecstack-on-All-Arc.patch b/patches/zstd-1.5.1/0001-Mark-Huffman-Decoder-Assembly-noexecstack-on-All-Arc.patch
> deleted file mode 100644
> index d28baf8d3117..000000000000
> --- a/patches/zstd-1.5.1/0001-Mark-Huffman-Decoder-Assembly-noexecstack-on-All-Arc.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -From: "W. Felix Handte" <w@felixhandte.com>
> -Date: Wed, 29 Dec 2021 17:47:12 -0800
> -Subject: [PATCH] Mark Huffman Decoder Assembly `noexecstack` on All
> - Architectures
> -
> -Apparently, even when the assembly file is empty (because
> -`ZSTD_ENABLE_ASM_X86_64_BMI2` is false), it still is marked as possibly
> -needing an executable stack and so the whole library is marked as such. This
> -commit applies a simple patch for this problem by moving the noexecstack
> -indication outside the macro guard.
> -
> -This commit builds on #2857.
> -
> -This commit addresses #2963.
> ----
> - lib/decompress/huf_decompress_amd64.S | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/lib/decompress/huf_decompress_amd64.S b/lib/decompress/huf_decompress_amd64.S
> -index 98173cce863d..706786bb0db0 100644
> ---- a/lib/decompress/huf_decompress_amd64.S
> -+++ b/lib/decompress/huf_decompress_amd64.S
> -@@ -1,7 +1,5 @@
> - #include "../common/portability_macros.h"
> -
> --#if ZSTD_ENABLE_ASM_X86_64_BMI2
> --
> - /* Stack marking
> - * ref: https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart
> - */
> -@@ -9,6 +7,8 @@
> - .section .note.GNU-stack,"",%progbits
> - #endif
> -
> -+#if ZSTD_ENABLE_ASM_X86_64_BMI2
> -+
> - /* Calling convention:
> - *
> - * %rdi contains the first argument: HUF_DecompressAsmArgs*.
> diff --git a/patches/zstd-1.5.1/0002-Makefiles-Add-noexecstack-Options-to-Compilation-and.patch b/patches/zstd-1.5.1/0002-Makefiles-Add-noexecstack-Options-to-Compilation-and.patch
> deleted file mode 100644
> index 81afe8442ca1..000000000000
> --- a/patches/zstd-1.5.1/0002-Makefiles-Add-noexecstack-Options-to-Compilation-and.patch
> +++ /dev/null
> @@ -1,71 +0,0 @@
> -From: "W. Felix Handte" <w@felixhandte.com>
> -Date: Wed, 5 Jan 2022 14:53:22 -0500
> -Subject: [PATCH] Makefiles: Add `noexecstack` Options to Compilation and
> - Linking
> -
> -Hopefully this marks the binary artifacts `noexecstack` even on platforms
> -where binaries default to true.
> ----
> - lib/libzstd.mk | 28 ++++++++++++++++++++++++++++
> - programs/Makefile | 2 --
> - 2 files changed, 28 insertions(+), 2 deletions(-)
> -
> -diff --git a/lib/libzstd.mk b/lib/libzstd.mk
> -index af12daffe128..5432198ed481 100644
> ---- a/lib/libzstd.mk
> -+++ b/lib/libzstd.mk
> -@@ -34,6 +34,8 @@ ZSTD_NO_ASM ?= 0
> - # libzstd helpers
> - ##################################################################
> -
> -+VOID ?= /dev/null
> -+
> - # Make 4.3 doesn't support '\#' anymore (https://lwn.net/Articles/810071/)
> - NUM_SYMBOL := \#
> -
> -@@ -96,6 +98,32 @@ CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS)
> - LDFLAGS += $(MOREFLAGS)
> - FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
> -
> -+ifndef ALREADY_APPENDED_NOEXECSTACK
> -+export ALREADY_APPENDED_NOEXECSTACK := 1
> -+ifeq ($(shell echo "int main(int argc, char* argv[]) { (void)argc; (void)argv; return 0; }" | $(CC) $(FLAGS) -z noexecstack -x c -Werror - -o $(VOID) 2>$(VOID) && echo 1 || echo 0),1)
> -+$(info Supports noexecstack linker flag!)
> -+$(info $(LDFLAGS))
> -+LDFLAGS += -z noexecstack
> -+$(info $(LDFLAGS))
> -+else
> -+$(info Doesn't support noexecstack linker flag!)
> -+endif
> -+ifeq ($(shell echo | $(CC) $(FLAGS) -Wa,--noexecstack -x assembler -Werror -c - -o $(VOID) 2>$(VOID) && echo 1 || echo 0),1)
> -+$(info Supports noexecstack assembler flag!)
> -+$(info $(CFLAGS))
> -+CFLAGS += -Wa,--noexecstack
> -+$(info $(CFLAGS))
> -+else ifeq ($(shell echo | $(CC) $(FLAGS) -Qunused-arguments -Wa,--noexecstack -x assembler -Werror -c - -o $(VOID) 2>$(VOID) && echo 1 || echo 0),1)
> -+# See e.g.: https://github.com/android/ndk/issues/171
> -+$(info Supports noexecstack assembler flag with unused arg suppression!)
> -+$(info $(CFLAGS))
> -+CFLAGS += -Qunused-arguments -Wa,--noexecstack
> -+$(info $(CFLAGS))
> -+else
> -+$(info Doesn't support noexecstack assembler flag!)
> -+endif
> -+endif
> -+
> - HAVE_COLORNEVER = $(shell echo a | grep --color=never a > /dev/null 2> /dev/null && echo 1 || echo 0)
> - GREP_OPTIONS ?=
> - ifeq ($HAVE_COLORNEVER, 1)
> -diff --git a/programs/Makefile b/programs/Makefile
> -index a54900cc1e9d..da848eb66bc0 100644
> ---- a/programs/Makefile
> -+++ b/programs/Makefile
> -@@ -62,8 +62,6 @@ else
> - EXT =
> - endif
> -
> --VOID = /dev/null
> --
> - # thread detection
> - NO_THREAD_MSG := ==> no threads, building without multithreading support
> - HAVE_PTHREAD := $(shell printf '$(NUM_SYMBOL)include <pthread.h>\nint main(void) { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o have_pthread$(EXT) have_pthread.c -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0; rm have_pthread.c)
> diff --git a/patches/zstd-1.5.1/series b/patches/zstd-1.5.1/series
> deleted file mode 100644
> index 29b488d4b2fd..000000000000
> --- a/patches/zstd-1.5.1/series
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Mark-Huffman-Decoder-Assembly-noexecstack-on-All-Arc.patch
> -0002-Makefiles-Add-noexecstack-Options-to-Compilation-and.patch
> -# f2f3753627f3109aedeb7a6d245daf7a - git-ptx-patches magic
> diff --git a/rules/zstd.make b/rules/zstd.make
> index da2cf75a381e..7198117c3720 100644
> --- a/rules/zstd.make
> +++ b/rules/zstd.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_ZSTD) += zstd
> #
> # Paths and names
> #
> -ZSTD_VERSION := 1.5.1
> -ZSTD_MD5 := 120d77140ad538e8bd3a7dae6a38c4c9
> +ZSTD_VERSION := 1.5.2
> +ZSTD_MD5 := 6dc24b78e32e7c99f80c9441e40ff8bc
> ZSTD := zstd-$(ZSTD_VERSION)
> ZSTD_SUFFIX := tar.gz
> ZSTD_URL := https://github.com/facebook/zstd/archive/v$(ZSTD_VERSION).$(ZSTD_SUFFIX)
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 15+ messages in thread