Skip to content

Commit 5328bd8

Browse files
SineVector241SineVector241
authored
Merge pull request #41 from AvionBlock/dev
v1.6.2 update.
2 parents b78904a + 94d2357 commit 5328bd8

31 files changed

Lines changed: 185 additions & 164 deletions

File tree

‎.github/workflows/OpusCompile.yml‎

Lines changed: 103 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128

129129
- name: Rename file
130130
working-directory: ./build
131-
run: mv libopus.so.0.11.0 opus.so
131+
run: mv libopus.so.*.*.* opus.so
132132

133133
- name: Upload Artifact
134134
uses: actions/upload-artifact@v4
@@ -225,7 +225,7 @@ jobs:
225225

226226
- name: Rename file
227227
working-directory: ./build
228-
run: mv libopus.0.11.0.dylib opus.dylib
228+
run: mv libopus.*.*.*.dylib opus.dylib
229229

230230
- name: Upload Artifact
231231
uses: actions/upload-artifact@v4
@@ -442,3 +442,104 @@ jobs:
442442
with:
443443
name: wasm-libopus.a
444444
path: ./build/libopus.a
445+
446+
Create-Runtimes:
447+
runs-on: ubuntu-latest
448+
needs: [Android, iOS-universal, MacOS, Linux, Windows, Wasm]
449+
steps:
450+
- uses: actions/checkout@v4
451+
452+
# Android
453+
- name: Download android-arm32-libopus.so
454+
uses: actions/download-artifact@v4
455+
with:
456+
name: android-arm32-libopus.so
457+
path: runtimes/android-arm/native
458+
459+
- name: Download android-arm64-libopus.so
460+
uses: actions/download-artifact@v4
461+
with:
462+
name: android-arm64-libopus.so
463+
path: runtimes/android-arm64/native
464+
465+
- name: Download android-x64-libopus.so
466+
uses: actions/download-artifact@v4
467+
with:
468+
name: android-x64-libopus.so
469+
path: runtimes/android-x64/native
470+
471+
- name: Download android-x86-libopus.so
472+
uses: actions/download-artifact@v4
473+
with:
474+
name: android-x86-libopus.so
475+
path: runtimes/android-x86/native
476+
477+
# iOS
478+
- name: Download ios-universal-libopus
479+
uses: actions/download-artifact@v4
480+
with:
481+
name: ios-universal-libopus
482+
path: runtimes/ios/native
483+
484+
# Linux
485+
- name: Download linux-arm32-opus.so
486+
uses: actions/download-artifact@v4
487+
with:
488+
name: linux-arm32-opus.so
489+
path: runtimes/linux-arm/native
490+
491+
- name: Download linux-arm64-opus.so
492+
uses: actions/download-artifact@v4
493+
with:
494+
name: linux-arm64-opus.so
495+
path: runtimes/linux-arm64/native
496+
497+
- name: Download linux-x64-opus.so
498+
uses: actions/download-artifact@v4
499+
with:
500+
name: linux-x64-opus.so
501+
path: runtimes/linux-x64/native
502+
503+
- name: Download linux-x86-opus.so
504+
uses: actions/download-artifact@v4
505+
with:
506+
name: linux-x86-opus.so
507+
path: runtimes/linux-x86/native
508+
509+
# MacOS
510+
- name: Download macos-arm64-opus.dylib
511+
uses: actions/download-artifact@v4
512+
with:
513+
name: macos-arm64-opus.dylib
514+
path: runtimes/osx-arm64/native
515+
516+
- name: Download macos-x64-opus.dylib
517+
uses: actions/download-artifact@v4
518+
with:
519+
name: macos-x64-opus.dylib
520+
path: runtimes/osx-x64/native
521+
522+
# Windows
523+
- name: Download win-arm64-opus.dll
524+
uses: actions/download-artifact@v4
525+
with:
526+
name: win-arm64-opus.dll
527+
path: runtimes/win-arm64/native
528+
529+
- name: Download win-x64-opus.dll
530+
uses: actions/download-artifact@v4
531+
with:
532+
name: win-x64-opus.dll
533+
path: runtimes/win-x64/native
534+
535+
- name: Download win-x86-opus.dll
536+
uses: actions/download-artifact@v4
537+
with:
538+
name: win-x86-opus.dll
539+
path: runtimes/win-x86/native
540+
541+
- name: Upload Artifact
542+
uses: actions/upload-artifact@v4
543+
with:
544+
name: All-Runtimes
545+
path: ./runtimes

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: CI
22

33
on:
44
push:
5-
branches: [ "main" ]
5+
branches: [ "master" ]
66
pull_request:
7-
branches: [ "main" ]
7+
branches: [ "master" ]
88

99
jobs:
1010
test-core:

‎Directory.Build.props‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<Project>
22
<PropertyGroup>
3-
<OpusSharpVersion>1.6.0.2</OpusSharpVersion>
3+
<OpusSharpVersion>1.6.2</OpusSharpVersion>
4+
<OpusSharpCoreVersion>1.6.0.2</OpusSharpCoreVersion>
5+
<OpusSharpNativesVersion>1.6.0.2</OpusSharpNativesVersion>
6+
<PackageProjectUrl>https://avionblock.github.io/OpusSharp/index.html</PackageProjectUrl>
47
<RepositoryUrl>https://github.com/AvionBlock/OpusSharp</RepositoryUrl>
58
</PropertyGroup>
69
</Project>

‎LICENSE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2025 AvionBlock
3+
Copyright (c) 2026 AvionBlock
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎OpusSharp.Core/OpusSharp.Core.csproj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<AssemblyName>OpusSharp.Core</AssemblyName>
4+
<IsPackable>true</IsPackable>
45
<Nullable>enable</Nullable>
56
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
67
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;</TargetFrameworks>
78
<GenerateDocumentationFile>True</GenerateDocumentationFile>
89
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
10+
911
<PackageId>OpusSharp.Core</PackageId>
10-
<Version>$(OpusSharpVersion)</Version>
11-
<Authors>SineVector241</Authors>
1212
<Description>Standard library for OpusSharp.</Description>
13+
<Version>$(OpusSharpCoreVersion)</Version>
1314
<PackageReadmeFile>README.md</PackageReadmeFile>
1415
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
15-
<PackageProjectUrl>https://avionblock.github.io/OpusSharp/index.html</PackageProjectUrl>
16+
<Copyright>MIT</Copyright>
17+
<Authors>SineVector241</Authors>
18+
19+
<PackageProjectUrl>$(PackageProjectUrl)</PackageProjectUrl>
1620
<RepositoryUrl>$(RepositoryUrl)</RepositoryUrl>
1721
<RepositoryType>git</RepositoryType>
1822
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

‎OpusSharp.Core/OpusSharp.Core.nuspec‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎OpusSharp.Core/StaticNativeOpus.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ namespace OpusSharp.Core
1212
/// </summary>
1313
public static partial class StaticNativeOpus
1414
{
15-
private const string DllName = "__Internal";
15+
#if COMPILE_STATIC
16+
private const string DllName = "__Internal";
17+
#else
18+
private const string DllName = "opus";
19+
#endif
1620

1721
//Encoder
1822
/// <summary>

‎OpusSharp.Natives/LICENSE.txt‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
Copyright 2001-2023 Xiph.Org, Skype Limited, Octasic,
2+
Jean-Marc Valin, Timothy B. Terriberry,
3+
CSIRO, Gregory Maxwell, Mark Borgerding,
4+
Erik de Castro Lopo, Mozilla, Amazon
5+
6+
Redistribution and use in source and binary forms, with or without
7+
modification, are permitted provided that the following conditions
8+
are met:
9+
10+
- Redistributions of source code must retain the above copyright
11+
notice, this list of conditions and the following disclaimer.
12+
13+
- Redistributions in binary form must reproduce the above copyright
14+
notice, this list of conditions and the following disclaimer in the
15+
documentation and/or other materials provided with the distribution.
16+
17+
- Neither the name of Internet Society, IETF or IETF Trust, nor the
18+
names of specific contributors, may be used to endorse or promote
19+
products derived from this software without specific prior written
20+
permission.
21+
22+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
23+
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
24+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
25+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
26+
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
27+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
28+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
29+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
30+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
31+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
32+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33+
34+
Opus is subject to the royalty-free patent licenses which are
35+
specified at:
36+
37+
Xiph.Org Foundation:
38+
https://datatracker.ietf.org/ipr/1524/
39+
40+
Microsoft Corporation:
41+
https://datatracker.ietf.org/ipr/1914/
42+
43+
Broadcom Corporation:
44+
https://datatracker.ietf.org/ipr/1526/

‎OpusSharp.Natives/OpusSharp.Natives.csproj‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>netstandard2.0</TargetFramework>
4+
<NoWarn>$(NoWarn);NU5128</NoWarn>
5+
<IsPackable>true</IsPackable>
6+
47
<PackageId>OpusSharp.Natives</PackageId>
5-
<Version>$(OpusSharpVersion)</Version>
6-
<Authors>The Opus Authors.</Authors>
78
<Description>Contains native binaries for OpusSharp.</Description>
9+
<Version>$(OpusSharpNativesVersion)</Version>
810
<PackageReadmeFile>README.md</PackageReadmeFile>
9-
<PackageProjectUrl>https://avionblock.github.io/OpusSharp/index.html</PackageProjectUrl>
11+
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
12+
<Authors>The Opus Authors.</Authors>
13+
14+
<PackageProjectUrl>$(PackageProjectUrl)</PackageProjectUrl>
1015
<RepositoryUrl>$(RepositoryUrl)</RepositoryUrl>
1116
<RepositoryType>git</RepositoryType>
1217
<IncludeBuildOutput>false</IncludeBuildOutput>
13-
<IsPackable>true</IsPackable>
1418
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
15-
<NoWarn>$(NoWarn);NU5128</NoWarn>
1619
</PropertyGroup>
1720

1821
<ItemGroup>
1922
<None Include="README.md" Pack="true" PackagePath="\" Link="README.md" />
23+
<None Include="LICENSE.txt" Pack="true" PackagePath="\" Link="LICENSE.txt" />
2024
<None Include="runtimes\**\*" Pack="true" PackagePath="runtimes" />
2125
<None Include="buildTransitive\OpusSharp.Natives.targets" Pack="true" PackagePath="buildTransitive" />
2226
</ItemGroup>

‎OpusSharp.Natives/OpusSharp.Natives.nuspec‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)