Thanks, applied as a161776dc33f679485da3942746721c9e0ce46e4. Michael
[sent from post-receive hook] On Fri, 23 Jan 2026 16:02:25 +0100, Philipp Zabel <[email protected]> wrote: > https://opus-codec.org/release/stable/2025/12/15/libopus-1_6.html > > Signed-off-by: Philipp Zabel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/patches/opus-1.5.2/0001-add-missing-celt-arm-meson.build.patch > b/patches/opus-1.5.2/0001-add-missing-celt-arm-meson.build.patch > deleted file mode 100644 > index bb6501b87b42..000000000000 > --- a/patches/opus-1.5.2/0001-add-missing-celt-arm-meson.build.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From: Michael Olbrich <[email protected]> > -Date: Fri, 12 Jul 2024 10:26:47 +0200 > -Subject: [PATCH] add missing celt/arm/meson.build > - > -It is missing in the release tarball because it is not listed in > -EXTRA_DIST. See: https://github.com/xiph/opus/pull/358 > - > -Signed-off-by: Michael Olbrich <[email protected]> > ---- > - celt/arm/meson.build | 12 ++++++++++++ > - 1 file changed, 12 insertions(+) > - create mode 100644 celt/arm/meson.build > - > -diff --git a/celt/arm/meson.build b/celt/arm/meson.build > -new file mode 100644 > -index 000000000000..b4dec564fcbe > ---- /dev/null > -+++ b/celt/arm/meson.build > -@@ -0,0 +1,12 @@ > -+arm2gnu = [find_program('arm2gnu.pl')] + arm2gnu_args > -+celt_sources_arm_asm = configure_file(input: 'celt_pitch_xcorr_arm.s', > -+ output: '@[email protected]', > -+ command: arm2gnu + ['@INPUT@'], > -+ capture: true) > -+celt_arm_armopts_s_in = configure_file(input: 'armopts.s.in', > -+ output: 'armopts.s', > -+ configuration: opus_conf) > -+celt_arm_armopts_s = configure_file(input: [celt_arm_armopts_s_in], > -+ output: '@[email protected]', > -+ command: arm2gnu + ['@INPUT@'], > -+ capture: true) > diff --git > a/patches/opus-1.5.2/0100-ptxdist-get-version.py-don-t-detect-extract-git-as-g.patch > > b/patches/opus-1.5.2/0100-ptxdist-get-version.py-don-t-detect-extract-git-as-g.patch > deleted file mode 100644 > index 0fce16913780..000000000000 > --- > a/patches/opus-1.5.2/0100-ptxdist-get-version.py-don-t-detect-extract-git-as-g.patch > +++ /dev/null > @@ -1,25 +0,0 @@ > -From: Michael Olbrich <[email protected]> > -Date: Sun, 24 Mar 2024 15:59:29 +0100 > -Subject: [PATCH] ptxdist: get-version.py: don't detect 'extract --git' as git > - checkout > - > -Otherwise building fails because the relevant tags are missing. > - > -Signed-off-by: Michael Olbrich <[email protected]> > ---- > - meson/get-version.py | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/meson/get-version.py b/meson/get-version.py > -index d3835f134c81..96a275f15af8 100755 > ---- a/meson/get-version.py > -+++ b/meson/get-version.py > -@@ -31,7 +31,7 @@ if __name__ == '__main__': > - > - # check if git checkout > - git_dir = os.path.join(srcroot, '.git') > -- is_git = os.path.isdir(git_dir) or os.path.isfile(git_dir) > -+ is_git = (os.path.isdir(git_dir) or os.path.isfile(git_dir)) and > not os.path.isdir(os.path.join(srcroot, '.ptxdist/git-patches')) > - have_git = shutil.which('git') is not None > - > - if is_git and have_git: > diff --git a/patches/opus-1.5.2/series b/patches/opus-1.5.2/series > deleted file mode 100644 > index c196896829b7..000000000000 > --- a/patches/opus-1.5.2/series > +++ /dev/null > @@ -1,6 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-add-missing-celt-arm-meson.build.patch > -#tag:ptxdist --start-number 100 > -0100-ptxdist-get-version.py-don-t-detect-extract-git-as-g.patch > -# 51ddc9f65eb10fe64c831272191e3ea9 - git-ptx-patches magic > diff --git a/rules/opus.make b/rules/opus.make > index 8698ee69d386..3004c8ec0fc9 100644 > --- a/rules/opus.make > +++ b/rules/opus.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_OPUS) += opus > # > # Paths and names > # > -OPUS_VERSION := 1.5.2 > -OPUS_MD5 := c40b3a1fbdbb9a7aa178600b88200c76 > +OPUS_VERSION := 1.6 > +OPUS_MD5 := 6ddaa5851e354621b735806007fa4651 > OPUS := opus-$(OPUS_VERSION) > OPUS_SUFFIX := tar.gz > OPUS_URL := > http://downloads.xiph.org/releases/opus/$(OPUS).$(OPUS_SUFFIX)
