From 33ac472601eb9e4a109da35d683988928df05b82 Mon Sep 17 00:00:00 2001
From: naglis <827324+naglis@users.noreply.github.com>
Date: Sun, 17 Sep 2023 22:43:10 +0300
Subject: [PATCH 1/7] doc/plugins.rst: change command to list PipeWire targets
The `dump` command was dropped[1] in favor of other tools.
[1]: https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/50bdebe4e87c5e26acf966e7207a591332e33239
---
doc/plugins.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/plugins.rst b/doc/plugins.rst
index 7e6fe5765..a16b0cc60 100644
--- a/doc/plugins.rst
+++ b/doc/plugins.rst
@@ -1115,7 +1115,7 @@ Connect to a `PipeWire `_ server. Requires
* - **target NAME**
- Link to the given target. If not specified, let the PipeWire
manager select a target. To get a list of available targets,
- type ``pw-cli dump short Node``
+ type ``pw-cli ls Node``
* - **remote NAME**
- The name of the remote to connect to. The default is
``pipewire-0``.
From 3322b29e6a02e85f9d39b8b9d9e93f437923df3f Mon Sep 17 00:00:00 2001
From: Max Kellermann
Date: Mon, 11 Sep 2023 22:19:39 +0200
Subject: [PATCH 2/7] python/build/libs.py: update FLAC to 1.4.3
---
python/build/libs.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/python/build/libs.py b/python/build/libs.py
index 53b8316bd..55a629a27 100644
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -43,8 +43,8 @@ opus = AutotoolsProject(
)
flac = AutotoolsProject(
- 'http://downloads.xiph.org/releases/flac/flac-1.4.2.tar.xz',
- 'e322d58a1f48d23d9dd38f432672865f6f79e73a6f9cc5a5f57fcaa83eb5a8e4',
+ 'http://downloads.xiph.org/releases/flac/flac-1.4.3.tar.xz',
+ '6c58e69cd22348f441b861092b825e591d0b822e106de6eb0ee4d05d27205b70',
'lib/libFLAC.a',
[
'--disable-shared', '--enable-static',
From 6a4250f485a236a03e988772cd77f7537bde0ae0 Mon Sep 17 00:00:00 2001
From: Max Kellermann
Date: Mon, 11 Sep 2023 22:20:14 +0200
Subject: [PATCH 3/7] python/build/libs.py: update Opus to 1.4
---
python/build/libs.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/python/build/libs.py b/python/build/libs.py
index 55a629a27..dfc2942ac 100644
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -29,8 +29,8 @@ libogg = CmakeProject(
)
opus = AutotoolsProject(
- 'https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz',
- '65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d',
+ 'https://downloads.xiph.org/releases/opus/opus-1.4.tar.gz',
+ 'c9b32b4253be5ae63d1ff16eea06b94b5f0f2951b7a02aceef58e3a3ce49c51f',
'lib/libopus.a',
[
'--disable-shared', '--enable-static',
From 4f0ae2835987af29e038dbf814135f6094fce574 Mon Sep 17 00:00:00 2001
From: Max Kellermann
Date: Mon, 11 Sep 2023 22:21:59 +0200
Subject: [PATCH 4/7] python/build/libs.py: update zlib to 1.3
---
python/build/libs.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/python/build/libs.py b/python/build/libs.py
index dfc2942ac..99f54ca2a 100644
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -57,8 +57,8 @@ flac = AutotoolsProject(
)
zlib = ZlibProject(
- 'http://zlib.net/zlib-1.2.13.tar.xz',
- 'd14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98',
+ 'http://zlib.net/zlib-1.3.tar.xz',
+ '8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7',
'lib/libz.a',
)
From 0cbe3c2a93238d933f88e9707dc5492b5fa22bc9 Mon Sep 17 00:00:00 2001
From: Max Kellermann
Date: Mon, 11 Sep 2023 22:23:58 +0200
Subject: [PATCH 5/7] python/build/libs.py: update OpenSSL to 3.1.2
---
python/build/libs.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/python/build/libs.py b/python/build/libs.py
index 99f54ca2a..72ad15540 100644
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -598,8 +598,8 @@ ffmpeg = FfmpegProject(
)
openssl = OpenSSLProject(
- 'https://www.openssl.org/source/openssl-3.1.0.tar.gz',
- 'aaa925ad9828745c4cad9d9efeb273deca820f2cdcf2c3ac7d7c1212b7c497b4',
+ 'https://www.openssl.org/source/openssl-3.1.2.tar.gz',
+ 'a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539',
'include/openssl/ossl_typ.h',
)
From f38280845049c0d1c27cbf63fa2eb01b6c4fada5 Mon Sep 17 00:00:00 2001
From: Max Kellermann
Date: Mon, 11 Sep 2023 22:24:26 +0200
Subject: [PATCH 6/7] python/build/libs.py: update CURL to 8.2.1
---
python/build/libs.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/python/build/libs.py b/python/build/libs.py
index 72ad15540..85357e5dc 100644
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -604,8 +604,8 @@ openssl = OpenSSLProject(
)
curl = CmakeProject(
- 'https://curl.se/download/curl-8.0.1.tar.xz',
- '0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0',
+ 'https://curl.se/download/curl-8.2.1.tar.xz',
+ 'dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894',
'lib/libcurl.a',
[
'-DBUILD_CURL_EXE=OFF',
From 101e12cf9a4884738475ed2819103e13faddd841 Mon Sep 17 00:00:00 2001
From: Max Kellermann
Date: Mon, 11 Sep 2023 22:17:42 +0200
Subject: [PATCH 7/7] modplug: add patch to remove the deprecated `register`
keyword
---
python/build/libs.py | 1 +
src/lib/modplug/patches/no_register | 22 ++++++++++++++++++++++
src/lib/modplug/patches/series | 1 +
3 files changed, 24 insertions(+)
create mode 100644 src/lib/modplug/patches/no_register
create mode 100644 src/lib/modplug/patches/series
diff --git a/python/build/libs.py b/python/build/libs.py
index 85357e5dc..8a049045c 100644
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -111,6 +111,7 @@ libmodplug = AutotoolsProject(
[
'--disable-shared', '--enable-static',
],
+ patches='src/lib/modplug/patches',
)
libopenmpt = AutotoolsProject(
diff --git a/src/lib/modplug/patches/no_register b/src/lib/modplug/patches/no_register
new file mode 100644
index 000000000..e60ae1914
--- /dev/null
+++ b/src/lib/modplug/patches/no_register
@@ -0,0 +1,22 @@
+Index: libmodplug-0.8.9.0/src/fastmix.cpp
+===================================================================
+--- libmodplug-0.8.9.0.orig/src/fastmix.cpp
++++ libmodplug-0.8.9.0/src/fastmix.cpp
+@@ -288,7 +288,7 @@ CzWINDOWEDFIR sfir;
+ // MIXING MACROS
+ // ----------------------------------------------------------------------------
+ #define SNDMIX_BEGINSAMPLELOOP8\
+- register MODCHANNEL * const pChn = pChannel;\
++ MODCHANNEL * const pChn = pChannel;\
+ nPos = pChn->nPosLo;\
+ const signed char *p = (signed char *)(pChn->pCurrentSample+pChn->nPos);\
+ if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\
+@@ -296,7 +296,7 @@ CzWINDOWEDFIR sfir;
+ do {
+
+ #define SNDMIX_BEGINSAMPLELOOP16\
+- register MODCHANNEL * const pChn = pChannel;\
++ MODCHANNEL * const pChn = pChannel;\
+ nPos = pChn->nPosLo;\
+ const signed short *p = (signed short *)(pChn->pCurrentSample+(pChn->nPos*2));\
+ if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\
diff --git a/src/lib/modplug/patches/series b/src/lib/modplug/patches/series
new file mode 100644
index 000000000..4594bd91f
--- /dev/null
+++ b/src/lib/modplug/patches/series
@@ -0,0 +1 @@
+no_register