Bug#987874: [pre-approval] unblock: osspd/1.3.2-12
Hi Simon, On Thu, 10 Jun 2021 at 17:27:48 +0200, Paul Gevers wrote: If you really think another upload is too much hassle, you could convince us to unblock regardless if you build twice and show with diffoscope that the compat bump doesn't impact the (binary) packages at all. I'm not the maintainer, but I'd like to see osspd get into bullseye: it's good to have around for the benefit of old binary-only games, some of which are supported by game-data-packager. Unfortunately the compat bump from 9 to 13 does make a difference to the built binaries (mostly due to the addition of dh_dwz and the switch from dh_installinit to dh_systemd for systemd units, I think). Ralf, would you accept an NMU with the compat level bump reverted? Sure. I don't know what the process is for this, but if you want to fix osspd in bullseye, feel free to do whatever is necessary, and then please let me know what I have to do to get the compat-level-13 version back into unstable after the bullseye release. :) Kind regards, Ralf
Bug#987874: [pre-approval] unblock: osspd/1.3.2-12
On Thu, 10 Jun 2021 at 17:27:48 +0200, Paul Gevers wrote: > If you really think another upload is too much hassle, you could > convince us to unblock regardless if you build twice and show with > diffoscope that the compat bump doesn't impact the (binary) packages at all. I'm not the maintainer, but I'd like to see osspd get into bullseye: it's good to have around for the benefit of old binary-only games, some of which are supported by game-data-packager. Unfortunately the compat bump from 9 to 13 does make a difference to the built binaries (mostly due to the addition of dh_dwz and the switch from dh_installinit to dh_systemd for systemd units, I think). Ralf, would you accept an NMU with the compat level bump reverted? smcv
Bug#987874: [pre-approval] unblock: osspd/1.3.2-12
Hi Ralf, On 03-06-2021 13:00, Ralf Jung wrote: >> Changing compat levels is no longer acceptable for bullseye. Please >> revert. > > Ah, that's a bummer. I was not aware of this policy, sorry for that. > Doing a revert upload sounds like a lot of hassle though that this > package is probably not worth -- so in this case it likely makes more > sense to simply remove the package from testing, and let it re-migrate > after the release. The current testing version (1.3.2-11) is broken with > current PulseAudio, so shipping it as-is makes no sense. If you really think another upload is too much hassle, you could convince us to unblock regardless if you build twice and show with diffoscope that the compat bump doesn't impact the (binary) packages at all. Paul OpenPGP_signature Description: OpenPGP digital signature
Bug#987874: [pre-approval] unblock: osspd/1.3.2-12
Dear release team,
osspd maintainer here. Version 1.3.2-12 has hit unstable now that my new key is
finally in the keyring.
> diff --git a/debian/changelog b/debian/changelog
> index c412732..9481d07 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,17 @@
> +osspd (1.3.2-12) unstable; urgency=low
> +
> + [ Sébastien Noel ]
> + * cherrypick 2 commits from upstream GIT:
> ++ d/p/GIT-fix-adsp_se.patch
> ++ d/p/GIT-fix-compiler-warnings.patch
> + * Add workaround for pulseaudio >= 13
> +d/p/Hack-to-work-with-modern-PulseAudio.patch (Closes: #986662)
> +
> + [ Ralf Jung ]
> + * Switch to debhelper compat level 13.
Changing compat levels is no longer acceptable for bullseye. Please
revert.
Ah, that's a bummer. I was not aware of this policy, sorry for that.
Doing a revert upload sounds like a lot of hassle though that this package is
probably not worth -- so in this case it likely makes more sense to simply
remove the package from testing, and let it re-migrate after the release. The
current testing version (1.3.2-11) is broken with current PulseAudio, so
shipping it as-is makes no sense.
+Pre-Depends: ${misc:Pre-Depends}
Why?
Because lintian told me a pre-depends on "init-system-helpers" was missing, and
this was the easiest way to get that dependency.
Kind regards,
Ralf
Bug#987874: [pre-approval] unblock: osspd/1.3.2-12
Control: tags -1 moreinfo
On 2021-05-01 11:03:07 +0300, Sergei Golovan wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian@packages.debian.org
> Usertags: unblock
>
> Hi release team!
>
> I'm writing on behalf of the maintainer of the osspd package (I intend
> to sponsor the potential upload).
>
> We'd like to upload the osspd package to fix #986662 (see [1] for
> details). The bug is serious as the currently osspd doesn't work at all.
>
> The diff is attached. It includes two other fixes, which are much less
> serious, so if you decide that changes are too big for the freeze
> time then we'll drop them.
>
> [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=986662
>
> unblock osspd/1.3.2-12
>
> -- System Information:
> Debian Release: 10.9
> APT prefers stable-debug
> APT policy: (500, 'stable-debug'), (500, 'proposed-updates'), (500,
> 'stable'), (500, 'oldstable'), (1, 'experimental'), (1, 'unstable')
> Architecture: amd64 (x86_64)
> Foreign Architectures: i386
>
> Kernel: Linux 4.19.0-16-amd64 (SMP w/12 CPU cores)
> Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
> LANGUAGE=en_US:en (charmap=UTF-8)
> Shell: /bin/sh linked to /bin/dash
> Init: systemd (via /run/systemd/system)
> diff --git a/debian/changelog b/debian/changelog
> index c412732..9481d07 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,17 @@
> +osspd (1.3.2-12) unstable; urgency=low
> +
> + [ Sébastien Noel ]
> + * cherrypick 2 commits from upstream GIT:
> ++ d/p/GIT-fix-adsp_se.patch
> ++ d/p/GIT-fix-compiler-warnings.patch
> + * Add workaround for pulseaudio >= 13
> +d/p/Hack-to-work-with-modern-PulseAudio.patch (Closes: #986662)
> +
> + [ Ralf Jung ]
> + * Switch to debhelper compat level 13.
Changing compat levels is no longer acceptable for bullseye. Please
revert.
> +
> + -- Ralf Jung Sat, 17 Apr 2021 14:28:09 +0200
> +
> osspd (1.3.2-11) unstable; urgency=medium
>
>* Update Standards-Version to 4.3.0. No changes needed.
> diff --git a/debian/compat b/debian/compat
> deleted file mode 100644
> index ec63514..000
> --- a/debian/compat
> +++ /dev/null
> @@ -1 +0,0 @@
> -9
> diff --git a/debian/control b/debian/control
> index c3cd2da..ee044ca 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -2,7 +2,8 @@ Source: osspd
> Section: sound
> Priority: optional
> Maintainer: Ralf Jung
> -Build-Depends: debhelper (>= 9.20160709),
> +Uploaders: Sébastien Noel
> +Build-Depends: debhelper-compat (= 13),
> libasound2-dev,
> libfuse-dev,
> libpulse-dev
> @@ -14,6 +15,7 @@ Vcs-Git: git://ralfj.de/osspd.git
> Package: osspd
> Architecture: linux-any
> Multi-Arch: foreign
> +Pre-Depends: ${misc:Pre-Depends}
Why?
Cheers
> Depends: lsb-base (>= 3.2-14),
> osspd-pulseaudio | osspd-backend,
> ${misc:Depends},
> diff --git a/debian/patches/GIT-fix-adsp_se.patch
> b/debian/patches/GIT-fix-adsp_se.patch
> new file mode 100644
> index 000..7316f9c
> --- /dev/null
> +++ b/debian/patches/GIT-fix-adsp_se.patch
> @@ -0,0 +1,24 @@
> +From 4c6161d951daa98f6463904f76b3fa2ce7216194 Mon Sep 17 00:00:00 2001
> +From: Tejun Heo
> +Date: Mon, 21 Feb 2011 11:54:06 +0100
> +Subject: [PATCH] adsp_se was incorrectly created with dsp_ops. Create it
> with
> + adsp_ops.
> +
> +Reported-by: Aaron
> +---
> + osspd.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/osspd.c b/osspd.c
> +index 37c9b35..df1cfc4 100644
> +--- a/osspd.c
> b/osspd.c
> +@@ -2253,7 +2253,7 @@ int main(int argc, char **argv)
> +param.mixer_major, param.mixer_minor,
> +args.argc, args.argv);
> + if (strlen(param.adsp_name))
> +-adsp_se = setup_ossp_cuse(_ops, param.adsp_name,
> ++adsp_se = setup_ossp_cuse(_ops, param.adsp_name,
> + param.adsp_major, param.adsp_minor,
> + args.argc, args.argv);
> +
> diff --git a/debian/patches/GIT-fix-compiler-warnings.patch
> b/debian/patches/GIT-fix-compiler-warnings.patch
> new file mode 100644
> index 000..1424b2b
> --- /dev/null
> +++ b/debian/patches/GIT-fix-compiler-warnings.patch
> @@ -0,0 +1,251 @@
> +From 37eb730a452f0ded2ed1c174feb438e3df041581 Mon Sep 17 00:00:00 2001
> +From: Miklos Szeredi
> +Date: Fri, 11 Nov 2011 14:19:32 +0100
> +Subject: [PATCH] fix compiler warnings
> +
> +---
> + ossp-padsp.c | 3 ---
> + osspd.c | 75 ++--
> + 2 files changed, 44 insertions(+), 34 deletions(-)
> +
> +diff --git a/ossp-padsp.c b/ossp-padsp.c
> +index 1871f5b..3143960 100644
> +--- a/ossp-padsp.c
> b/ossp-padsp.c
> +@@ -972,16 +972,13 @@ static void do_mmap_read(size_t bytes)
> +
> + static void stream_rw_callback(pa_stream *s, size_t length, void *userdata)
> + {
> +-int
Bug#987874: [pre-approval] unblock: osspd/1.3.2-12
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
Hi release team!
I'm writing on behalf of the maintainer of the osspd package (I intend
to sponsor the potential upload).
We'd like to upload the osspd package to fix #986662 (see [1] for
details). The bug is serious as the currently osspd doesn't work at all.
The diff is attached. It includes two other fixes, which are much less
serious, so if you decide that changes are too big for the freeze
time then we'll drop them.
[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=986662
unblock osspd/1.3.2-12
-- System Information:
Debian Release: 10.9
APT prefers stable-debug
APT policy: (500, 'stable-debug'), (500, 'proposed-updates'), (500,
'stable'), (500, 'oldstable'), (1, 'experimental'), (1, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.19.0-16-amd64 (SMP w/12 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff --git a/debian/changelog b/debian/changelog
index c412732..9481d07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+osspd (1.3.2-12) unstable; urgency=low
+
+ [ Sébastien Noel ]
+ * cherrypick 2 commits from upstream GIT:
++ d/p/GIT-fix-adsp_se.patch
++ d/p/GIT-fix-compiler-warnings.patch
+ * Add workaround for pulseaudio >= 13
+d/p/Hack-to-work-with-modern-PulseAudio.patch (Closes: #986662)
+
+ [ Ralf Jung ]
+ * Switch to debhelper compat level 13.
+
+ -- Ralf Jung Sat, 17 Apr 2021 14:28:09 +0200
+
osspd (1.3.2-11) unstable; urgency=medium
* Update Standards-Version to 4.3.0. No changes needed.
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index c3cd2da..ee044ca 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: osspd
Section: sound
Priority: optional
Maintainer: Ralf Jung
-Build-Depends: debhelper (>= 9.20160709),
+Uploaders: Sébastien Noel
+Build-Depends: debhelper-compat (= 13),
libasound2-dev,
libfuse-dev,
libpulse-dev
@@ -14,6 +15,7 @@ Vcs-Git: git://ralfj.de/osspd.git
Package: osspd
Architecture: linux-any
Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
Depends: lsb-base (>= 3.2-14),
osspd-pulseaudio | osspd-backend,
${misc:Depends},
diff --git a/debian/patches/GIT-fix-adsp_se.patch
b/debian/patches/GIT-fix-adsp_se.patch
new file mode 100644
index 000..7316f9c
--- /dev/null
+++ b/debian/patches/GIT-fix-adsp_se.patch
@@ -0,0 +1,24 @@
+From 4c6161d951daa98f6463904f76b3fa2ce7216194 Mon Sep 17 00:00:00 2001
+From: Tejun Heo
+Date: Mon, 21 Feb 2011 11:54:06 +0100
+Subject: [PATCH] adsp_se was incorrectly created with dsp_ops. Create it with
+ adsp_ops.
+
+Reported-by: Aaron
+---
+ osspd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/osspd.c b/osspd.c
+index 37c9b35..df1cfc4 100644
+--- a/osspd.c
b/osspd.c
+@@ -2253,7 +2253,7 @@ int main(int argc, char **argv)
+ param.mixer_major, param.mixer_minor,
+ args.argc, args.argv);
+ if (strlen(param.adsp_name))
+- adsp_se = setup_ossp_cuse(_ops, param.adsp_name,
++ adsp_se = setup_ossp_cuse(_ops, param.adsp_name,
+ param.adsp_major, param.adsp_minor,
+ args.argc, args.argv);
+
diff --git a/debian/patches/GIT-fix-compiler-warnings.patch
b/debian/patches/GIT-fix-compiler-warnings.patch
new file mode 100644
index 000..1424b2b
--- /dev/null
+++ b/debian/patches/GIT-fix-compiler-warnings.patch
@@ -0,0 +1,251 @@
+From 37eb730a452f0ded2ed1c174feb438e3df041581 Mon Sep 17 00:00:00 2001
+From: Miklos Szeredi
+Date: Fri, 11 Nov 2011 14:19:32 +0100
+Subject: [PATCH] fix compiler warnings
+
+---
+ ossp-padsp.c | 3 ---
+ osspd.c | 75 ++--
+ 2 files changed, 44 insertions(+), 34 deletions(-)
+
+diff --git a/ossp-padsp.c b/ossp-padsp.c
+index 1871f5b..3143960 100644
+--- a/ossp-padsp.c
b/ossp-padsp.c
+@@ -972,16 +972,13 @@ static void do_mmap_read(size_t bytes)
+
+ static void stream_rw_callback(pa_stream *s, size_t length, void *userdata)
+ {
+- int dir;
+ size_t size;
+
+ if (s == stream[PLAY]) {
+- dir = PLAY;
+ size = pa_stream_writable_size(s);
+ if (mmap_map[PLAY])
+ do_mmap_write(size);
+ } else if (s == stream[REC]) {
+- dir = REC;
+ size = pa_stream_readable_size(s);
+ if (mmap_map[REC])
+ do_mmap_read(size);
+diff --git a/osspd.c
