mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-01 21:23:51 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/libopusenc: bump version to 0.3

Browse Source 
https://opus-codec.org/release/dev/2026/01/03/libopusenc-0_3.html

Removed patch which is included in this release.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Bernd Kuhls
2026-01-21 19:07:18 +01:00
committed by Julien Olivain
parent 18de297a5a
commit 72e4853bc7
3 changed files with 4 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
package/libopusenc/0001-opusenc.h-Avoid-__opus_check_-macros.patch
View File

@@ -1,85 +0,0 @@
From a0010e4602b40efc1413b3069122eb73efb688d3 Mon Sep 17 00:00:00 2001
From: Mark Harris <mark.hsj@gmail.com>
Date: Mon, 24 Nov 2025 11:52:29 -0800
Subject: [PATCH] opusenc.h: Avoid __opus_check_* macros
The __opus_check_* macros are undocumented macros internal to opus, and
have changed in opus commit 7817df7908318fb3a0af2a01e4da1e25643967d0
because identifiers beginning with a double underscore are reserved by
ISO C. Define our own macros, not using reserved identifiers.
Reported by Bertaz on GitHub and benedikt-grl on gitlab.xiph.org.
Resolves: https://github.com/xiph/libopusenc/pull/36
Resolves: https://gitlab.xiph.org/xiph/opus-tools/-/issues/2323
Upstream: https://gitlab.xiph.org/xiph/libopusenc/-/commit/04c6172ffbbd5c7f7f2e170cf843872113f33b05
[Julien: rebase on v0.2.1]
Signed-off-by: Julien Olivain <ju.o@free.fr>
---
include/opusenc.h | 35 ++++++++++++++++++++---------------
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/include/opusenc.h b/include/opusenc.h
index 50ba8b5..6a893c7 100644
--- a/include/opusenc.h
+++ b/include/opusenc.h
@@ -104,7 +104,6 @@ extern "C" {
/*@}*/
/*@}*/
-
/* These are the "raw" request values -- they should usually not be used. */
#define OPE_SET_DECISION_DELAY_REQUEST 14000
#define OPE_GET_DECISION_DELAY_REQUEST 14001
@@ -121,6 +120,13 @@ extern "C" {
#define OPE_GET_NB_STREAMS_REQUEST 14013
#define OPE_GET_NB_COUPLED_STREAMS_REQUEST 14015
+/* Macros to trigger compilation errors when the wrong types are provided to a CTL. */
+/* These macros are not part of the API and are only for use within the macros below. */
+#define ope_check_int(x) (((void)((x) == (opus_int32)0)), (opus_int32)(x))
+#define ope_check_int_ptr(ptr) ((ptr) + ((ptr) - (opus_int32*)(ptr)))
+#define ope_check_packet_func(x) ((void)((void (*)(void *, const unsigned char *, opus_int32, opus_uint32))0 == (x)), (x))
+#define ope_check_void_ptr(x) ((void)((void *)0 == (x)), (x))
+
/**\defgroup encoder_ctl Encoding Options*/
/*@{*/
@@ -129,21 +135,20 @@ extern "C" {
Macros for setting encoder options.*/
/*@{*/
-#define OPE_SET_DECISION_DELAY(x) OPE_SET_DECISION_DELAY_REQUEST, __opus_check_int(x)
-#define OPE_GET_DECISION_DELAY(x) OPE_GET_DECISION_DELAY_REQUEST, __opus_check_int_ptr(x)
-#define OPE_SET_MUXING_DELAY(x) OPE_SET_MUXING_DELAY_REQUEST, __opus_check_int(x)
-#define OPE_GET_MUXING_DELAY(x) OPE_GET_MUXING_DELAY_REQUEST, __opus_check_int_ptr(x)
-#define OPE_SET_COMMENT_PADDING(x) OPE_SET_COMMENT_PADDING_REQUEST, __opus_check_int(x)
-#define OPE_GET_COMMENT_PADDING(x) OPE_GET_COMMENT_PADDING_REQUEST, __opus_check_int_ptr(x)
-#define OPE_SET_SERIALNO(x) OPE_SET_SERIALNO_REQUEST, __opus_check_int(x)
-#define OPE_GET_SERIALNO(x) OPE_GET_SERIALNO_REQUEST, __opus_check_int_ptr(x)
-/* FIXME: Add type-checking macros to these. */
-#define OPE_SET_PACKET_CALLBACK(x,u) OPE_SET_PACKET_CALLBACK_REQUEST, (x), (u)
+#define OPE_SET_DECISION_DELAY(x) OPE_SET_DECISION_DELAY_REQUEST, ope_check_int(x)
+#define OPE_GET_DECISION_DELAY(x) OPE_GET_DECISION_DELAY_REQUEST, ope_check_int_ptr(x)
+#define OPE_SET_MUXING_DELAY(x) OPE_SET_MUXING_DELAY_REQUEST, ope_check_int(x)
+#define OPE_GET_MUXING_DELAY(x) OPE_GET_MUXING_DELAY_REQUEST, ope_check_int_ptr(x)
+#define OPE_SET_COMMENT_PADDING(x) OPE_SET_COMMENT_PADDING_REQUEST, ope_check_int(x)
+#define OPE_GET_COMMENT_PADDING(x) OPE_GET_COMMENT_PADDING_REQUEST, ope_check_int_ptr(x)
+#define OPE_SET_SERIALNO(x) OPE_SET_SERIALNO_REQUEST, ope_check_int(x)
+#define OPE_GET_SERIALNO(x) OPE_GET_SERIALNO_REQUEST, ope_check_int_ptr(x)
+#define OPE_SET_PACKET_CALLBACK(x,u) OPE_SET_PACKET_CALLBACK_REQUEST, ope_check_packet_func(x), ope_check_void_ptr(u)
/*#define OPE_GET_PACKET_CALLBACK(x,u) OPE_GET_PACKET_CALLBACK_REQUEST, (x), (u)*/
-#define OPE_SET_HEADER_GAIN(x) OPE_SET_HEADER_GAIN_REQUEST, __opus_check_int(x)
-#define OPE_GET_HEADER_GAIN(x) OPE_GET_HEADER_GAIN_REQUEST, __opus_check_int_ptr(x)
-#define OPE_GET_NB_STREAMS(x) OPE_GET_NB_STREAMS_REQUEST, __opus_check_int_ptr(x)
-#define OPE_GET_NB_COUPLED_STREAMS(x) OPE_GET_NB_COUPLED_STREAMS_REQUEST, __opus_check_int_ptr(x)
+#define OPE_SET_HEADER_GAIN(x) OPE_SET_HEADER_GAIN_REQUEST, ope_check_int(x)
+#define OPE_GET_HEADER_GAIN(x) OPE_GET_HEADER_GAIN_REQUEST, ope_check_int_ptr(x)
+#define OPE_GET_NB_STREAMS(x) OPE_GET_NB_STREAMS_REQUEST, ope_check_int_ptr(x)
+#define OPE_GET_NB_COUPLED_STREAMS(x) OPE_GET_NB_COUPLED_STREAMS_REQUEST, ope_check_int_ptr(x)
/*@}*/
/*@}*/
--
2.52.0

5
package/libopusenc/libopusenc.hash
View File

@@ -1,3 +1,4 @@
# From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt
sha256 8298db61a8d3d63e41c1a80705baa8ce9ff3f50452ea7ec1c19a564fe106cbb9 libopusenc-0.2.1.tar.gz
# From https://opus-codec.org/release/dev/2026/01/03/libopusenc-0_3.html
sha256 f616d3aff9b2034547894ccb8ab56c36cf1a4acb0d922c5d7119f97bbe58642c libopusenc-0.3.tar.gz
# Locally computed
sha256 93b17ab56b8230127fea532be0dcb4e6d71e66ab5e8ce5d6ae8785d7288b164f COPYING

2
package/libopusenc/libopusenc.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
LIBOPUSENC_VERSION = 0.2.1
LIBOPUSENC_VERSION = 0.3
LIBOPUSENC_SITE = https://downloads.xiph.org/releases/opus
LIBOPUSENC_LICENSE = BSD-3-Clause
LIBOPUSENC_LICENSE_FILES = COPYING