Attachment 248984 Details for Bug 277537 – Patch for opus

[patch] Patch for opus

opus-151v4.patch (text/plain), 6.54 KB, created by Daniel Engberg on 2024-03-06 19:51:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2024-03-06 19:51:19 UTC

Size: 6.54 KB

patch

obsolete

>diff --git a/audio/opus/Makefile b/audio/opus/Makefile
>index 70abf5edd7b0..0970ca4a7388 100644
>--- a/audio/opus/Makefile
>+++ b/audio/opus/Makefile
>@@ -1,8 +1,7 @@
> PORTNAME=	opus
>-DISTVERSION=	1.4
>+DISTVERSION=	1.5.1
> CATEGORIES=	audio
>-MASTER_SITES=	https://downloads.xiph.org/releases/opus/ \
>-		https://github.com/xiph/opus/releases/download/v${DISTVERSION}/
>+MASTER_SITES=	https://downloads.xiph.org/releases/${PORTNAME}/
> 
> MAINTAINER=	naddy@FreeBSD.org
> COMMENT=	IETF audio codec
>@@ -11,14 +10,28 @@ WWW=		https://opus-codec.org/
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		cpe gmake libtool pathfix
>+USES=		cpe meson python:env shebangfix
> CPE_VENDOR=	opus-codec
>+SHEBANG_FILES=	meson/*.py
> USE_LDCONFIG=	yes
> 
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--enable-custom-modes \
>-		--disable-doc   # requires doxygen
>-INSTALL_TARGET=	install-strip
>-TEST_TARGET=	check
>+MESON_ARGS=	-Ddefault_library=both \
>+		-Dcustom-modes=true \
>+		-Ddocs=disabled
>+
>+OPTIONS_DEFINE_armv6=	NEON
>+OPTIONS_DEFINE_armv7=	NEON
>+
>+.include <bsd.port.options.mk>
>+
>+NEON_MESON_enabled=	intrinsics
>+
>+.if ${ARCH} != "aarch64" && ${ARCH} != "amd64" && ${ARCH} != "arm"
>+MESON_ARGS+=	-Drtc=disabled
>+.endif
>+
>+.if ${ARCH} != "arm"
>+MESON_ARGS+=	-Dasm=disabled
>+.endif
> 
> .include <bsd.port.mk>
>diff --git a/audio/opus/distinfo b/audio/opus/distinfo
>index 99676246378c..fde09a028392 100644
>--- a/audio/opus/distinfo
>+++ b/audio/opus/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1682429725
>-SHA256 (opus-1.4.tar.gz) = c9b32b4253be5ae63d1ff16eea06b94b5f0f2951b7a02aceef58e3a3ce49c51f
>-SIZE (opus-1.4.tar.gz) = 1063408
>+TIMESTAMP = 1709587372
>+SHA256 (opus-1.5.1.tar.gz) = b84610959b8d417b611aa12a22565e0a3732097c6389d19098d844543e340f85
>+SIZE (opus-1.5.1.tar.gz) = 7834540
>diff --git a/audio/opus/files/patch-celt_arm_armcpu.c b/audio/opus/files/patch-celt_arm_armcpu.c
>new file mode 100644
>index 000000000000..f31009ce2641
>--- /dev/null
>+++ b/audio/opus/files/patch-celt_arm_armcpu.c
>@@ -0,0 +1,57 @@
>+--- celt/arm/armcpu.c.orig	2024-03-06 18:21:25 UTC
>++++ celt/arm/armcpu.c
>+@@ -191,6 +191,54 @@ opus_uint32 opus_cpu_capabilities(void)
>+   return flags;
>+ }
>+ 
>++#elif defined(__FreeBSD__)
>++#include <sys/auxv.h>
>++
>++opus_uint32 opus_cpu_capabilities(void)
>++{
>++  long hwcap = 0;
>++  opus_uint32 flags = 0;
>++
>++# if defined(OPUS_ARM_MAY_HAVE_MEDIA) \
>++ || defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
>++  /* FreeBSD required armv6+, always supported media instructions */
>++  flags |= OPUS_CPU_ARM_MEDIA_FLAG;
>++# endif
>++
>++  elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap);
>++
>++# if defined(OPUS_ARM_MAY_HAVE_EDSP) || defined(OPUS_ARM_MAY_HAVE_MEDIA) \
>++ || defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
>++#  ifdef HWCAP_EDSP
>++  if (hwcap & HWCAP_EDSP)
>++    flags |= OPUS_CPU_ARM_EDSP_FLAG;
>++#  endif
>++
>++#  if defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
>++#   ifdef HWCAP_NEON
>++  if (hwcap & HWCAP_NEON)
>++    flags |= OPUS_CPU_ARM_NEON_FLAG;
>++#   elif defined(HWCAP_ASIMD)
>++  if (hwcap & HWCAP_ASIMD)
>++    flags |= OPUS_CPU_ARM_NEON_FLAG | OPUS_CPU_ARM_MEDIA_FLAG | OPUS_CPU_ARM_EDSP_FLAG;
>++#   endif
>++#  endif
>++#  if defined(OPUS_ARM_MAY_HAVE_DOTPROD) && defined(HWCAP_ASIMDDP)
>++  if (hwcap & HWCAP_ASIMDDP)
>++    flags |= OPUS_CPU_ARM_DOTPROD_FLAG;
>++#  endif
>++# endif
>++
>++#if defined(OPUS_ARM_PRESUME_AARCH64_NEON_INTR)
>++    flags |= OPUS_CPU_ARM_EDSP_FLAG | OPUS_CPU_ARM_MEDIA_FLAG | OPUS_CPU_ARM_NEON_FLAG;
>++# if defined(OPUS_ARM_PRESUME_DOTPROD)
>++    flags |= OPUS_CPU_ARM_DOTPROD_FLAG;
>++# endif
>++#endif
>++
>++  return (flags);
>++}
>++
>+ #else
>+ /* The feature registers which can tell us what the processor supports are
>+  * accessible in priveleged modes only, so we can't have a general user-space
>diff --git a/audio/opus/files/patch-configure b/audio/opus/files/patch-configure
>deleted file mode 100644
>index 867efc968d0a..000000000000
>--- a/audio/opus/files/patch-configure
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- configure.orig	2016-01-12 18:17:49 UTC
>-+++ configure
>-@@ -13251,7 +13251,7 @@ $as_echo "$as_me: WARNING: Compiler does
>- 
>- fi
>-     ;; #(
>--  i?86|x86_64) :
>-+  i?86|x86_64|amd64) :
>- 
>- 
>-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports SSE intrinsics" >&5
>diff --git a/audio/opus/files/patch-dnn_vec__neon.h b/audio/opus/files/patch-dnn_vec__neon.h
>new file mode 100644
>index 000000000000..4c87275f2273
>--- /dev/null
>+++ b/audio/opus/files/patch-dnn_vec__neon.h
>@@ -0,0 +1,11 @@
>+--- dnn/vec_neon.h.orig	2024-03-06 18:49:19 UTC
>++++ dnn/vec_neon.h
>+@@ -34,7 +34,7 @@
>+ #include <arm_neon.h>
>+ #include "os_support.h"
>+ 
>+-#if defined(__arm__) && !defined(__aarch64__)
>++#if __ARM_ARCH < 8
>+ /* Emulate vcvtnq_s32_f32() for ARMv7 Neon. */
>+ static OPUS_INLINE int32x4_t vcvtnq_s32_f32(float32x4_t x) {
>+   return vrshrq_n_s32(vcvtq_n_s32_f32(x, 8), 8);
>diff --git a/audio/opus/files/patch-meson.build b/audio/opus/files/patch-meson.build
>new file mode 100644
>index 000000000000..8bb437a27b48
>--- /dev/null
>+++ b/audio/opus/files/patch-meson.build
>@@ -0,0 +1,37 @@
>+--- meson.build.orig	2024-02-29 20:57:13 UTC
>++++ meson.build
>+@@ -650,29 +650,11 @@ endif
>+   subdir('tests')
>+ endif
>+ 
>+-# pkg-config files (not using pkg module so we can use the existing .pc.in file)
>+-pkgconf = configuration_data()
>+-
>+-pkgconf.set('prefix', join_paths(get_option('prefix')))
>+-pkgconf.set('exec_prefix', '${prefix}')
>+-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
>+-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
>+-pkgconf.set('VERSION', opus_version)
>+-pkgconf.set('PC_BUILD', pc_build)
>+-pkgconf.set('LIBM', libm.found() ? '-lm' : '')
>+-
>+-pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir'))
>+-
>+-configure_file(input : 'opus.pc.in',
>+-  output : 'opus.pc',
>+-  configuration : pkgconf,
>+-  install_dir : pkg_install_dir)
>+-
>+-# The uninstalled one has hardcoded libtool + static lib stuff, skip it for now
>+-#configure_file(input : 'opus-uninstalled.pc.in',
>+-#  output : 'opus-uninstalled.pc',
>+-#  configuration : pkgconf,
>+-#  install : false)
>++pkg = import('pkgconfig')
>++pkg.generate(opus_lib,
>++  description: 'Opus IETF audio codec',
>++  subdirs: 'opus',
>++)
>+ 
>+ doxygen = find_program('doxygen', required: get_option('docs'))
>+ if doxygen.found()
>diff --git a/audio/opus/pkg-plist b/audio/opus/pkg-plist
>index 3807ee6ea18e..ad087a73b415 100644
>--- a/audio/opus/pkg-plist
>+++ b/audio/opus/pkg-plist
>@@ -7,6 +7,5 @@ include/opus/opus_types.h
> lib/libopus.a
> lib/libopus.so
> lib/libopus.so.0
>-lib/libopus.so.0.9.0
>+lib/libopus.so.0.10.0
> libdata/pkgconfig/opus.pc
>-share/aclocal/opus.m4

Actions: View | Diff

Attachments on bug 277537: 248984 | 248985 | 249040