From: Sergey Matveev <stargrave@stargrave.org>
Date: Fri, 26 Dec 2025 08:36:59 +0000 (+0300)
Subject: Update libopusenc
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=650d7428210d802a2589ef34a1f95af7c5e0e5354f925368e763bec92c1c160f;p=bass.git

Update libopusenc

Because previous version used macroses which were deleted in Opus 1.6.
---

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index f434359..69e5827 100644
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -134,7 +134,8 @@
 /libmad-0.16.3.tar.gz
 /libmatroska-1.7.1.tar.xz
 /libogg-1.3.5.tar.xz
-/libopusenc-0.2.1.tar.gz
+/libopusenc-v0.3.tar.zst
+/libopusenc.git/
 /libotr-4.1.1.tar.gz
 /libplacebo-v6.338.0-117-g5c1e6da2.tar.zst
 /libplacebo/
diff --git a/build/distfiles/libopusenc-0.2.1.tar.gz.meta4 b/build/distfiles/libopusenc-0.2.1.tar.gz.meta4
deleted file mode 100644
index a2072da..0000000
--- a/build/distfiles/libopusenc-0.2.1.tar.gz.meta4
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metalink xmlns="urn:ietf:params:xml:ns:metalink">
-  <file name="libopusenc-0.2.1.tar.gz">
-    <hash type="blake3-256">91cc6901f7a9570ed3379deb0f44476b810601bb2689255255747d05eaf83270</hash>
-    <hash type="blake2b-512">de3a69aeb6bb955352e097e41b12cf0c627ce5278687124d00996f52ccf5e8e39277e7c345bb26e75dd7d29b6a70f50396fa5a157913e0906a18acd007b1621b</hash>
-    <hash type="blake2b-256">3b1b073ba97d9b828659dea792d19a49cc287b622f76f414522167d73f941ca6</hash>
-    <hash type="skein-512">fb8b40c0cb705de1649c13d4bcf0e0e6b6147d32bfb37300418a07e7b06ea1d37eda3aeda158e91b2db5e31a73e166648203beafb2788ab90bce49b9ba2ae0d9</hash>
-    <hash type="shake128">62aa49d5d99564ad8b8bce93b6fb4c231cd382694211535b6dbcc7c7bde8662d</hash>
-    <hash type="shake256">156d9795b94c27f8080550e6a00431d9d6c3e041d05f0bbd532e1bb929b8f7ec36999786f4e506b5be57332a2f5446b02e2441f8e80ac67689473f10bf746fbb</hash>
-    <hash type="sha-512">adf30cacea9ac2e5889a40147f53943a1bec5279c5ff3a9b09de8ca52727a6cbaeecd338417fc5856e337ae183c85b0d366d14ec4ec329de12d50709a6f6507a</hash>
-    <hash type="sha-256">8298db61a8d3d63e41c1a80705baa8ce9ff3f50452ea7ec1c19a564fe106cbb9</hash>
-    <hash type="streebog-512">c9b59cda62963606012abe2eac16d3e427c51b0e8c258f1be10380c0e892ffc444801e442d87ff78b7dca3ee85fda41832da7399e4fca90a18cafad495b94bdc</hash>
-    <hash type="streebog-256">5e560b7b397c732dd6242a1f74e87fffc4ec8e5473f2d8b74caffe1a95161242</hash>
-    <hash type="xxh3-128">7555dd13069ae2db640f268ec1614ae9</hash>
-    <size>388071</size>
-    <url>https://archive.mozilla.org/pub/opus/libopusenc-0.2.1.tar.gz</url>
-  </file>
-</metalink>
diff --git a/build/distfiles/libopusenc-v0.3.tar.zst.do b/build/distfiles/libopusenc-v0.3.tar.zst.do
new file mode 100644
index 0000000..31f1716
--- /dev/null
+++ b/build/distfiles/libopusenc-v0.3.tar.zst.do
@@ -0,0 +1,7 @@
+[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../..
+sname=$1.do . "$BASS_ROOT"/lib/rc
+[ -d libopusenc.git ] || git clone --depth 1 --bare https://github.com/xiph/libopusenc.git >&2
+cd libopusenc.git
+commit=0dba1bea736ab8bb811409dce80c994a00a2ced9
+git fetch origin $commit >&2
+git archive --prefix=${1%.tar.zst}/ $commit | $COMPRESSOR
diff --git a/build/skel/audio/libopusenc-0.2.1.do b/build/skel/audio/libopusenc-v0.3.do
similarity index 67%
rename from build/skel/audio/libopusenc-0.2.1.do
rename to build/skel/audio/libopusenc-v0.3.do
index d4f2c00..4747fb3 100644
--- a/build/skel/audio/libopusenc-0.2.1.do
+++ b/build/skel/audio/libopusenc-v0.3.do
@@ -2,17 +2,22 @@
 sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
-bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1"
+bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1 devel/autotools"
 rdeps=audio/opus-1.6
-redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz $rdeps
+redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst $rdeps
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
 "$BASS_ROOT"/build/bin/pkg-inst $bdeps $rdeps
 . ./rc
-$TAR xf "$DISTFILES"/$NAME.tar.gz
+$TAR xf "$DISTFILES"/$NAME.tar.zst
 "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
 
 cd $NAME
+cat >package_version <<EOF
+AUTO_UPDATE=yes
+PACKAGE_VERSION="0.3"
+EOF
+ACLOCAL="aclocal -I$_localpath/share/aclocal" ./autogen.sh >&2
 ./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh --disable-doc >&2
 make -j$MAKE_JOBS >&2
 make install >&2
diff --git a/build/skel/audio/opus-tools-0.2.do b/build/skel/audio/opus-tools-0.2.do
index ebf6cd5..882fa81 100644
--- a/build/skel/audio/opus-tools-0.2.do
+++ b/build/skel/audio/opus-tools-0.2.do
@@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
 bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1"
-rdeps="audio/flac-1.4.3 audio/libopusenc-0.2.1 audio/opusfile-0.12"
+rdeps="audio/flac-1.4.3 audio/libopusenc-v0.3 audio/opusfile-0.12"
 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz $rdeps
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc