Merge pull request #23 from moffatman/main

encodersgpl flavor
media-kit · Sep 24, 2023 · 4286f55 · 4286f55
2 parents 1a0757c + 5896a83
commit 4286f55
Show file tree

Hide file tree

Showing 32 changed files with 770 additions and 241 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install requirements
-        run: brew install go meson ninja
+        run: brew install go meson ninja nasm
 
       - name: Print tool versions
         run: make tool-versions
@@ -41,40 +41,58 @@ jobs:
           VERSION=${{ steps.version.outputs.version }}
           make build/output/libmpv-libs_${VERSION}_ios-arm64-audio-default.tar.gz
           make build/output/libmpv-libs_${VERSION}_ios-arm64-audio-full.tar.gz
+          make build/output/libmpv-libs_${VERSION}_ios-arm64-audio-encodersgpl.tar.gz
           make build/output/libmpv-libs_${VERSION}_ios-arm64-video-default.tar.gz
           make build/output/libmpv-libs_${VERSION}_ios-arm64-video-full.tar.gz
+          make build/output/libmpv-libs_${VERSION}_ios-arm64-video-encodersgpl.tar.gz
           make build/output/libmpv-libs_${VERSION}_iossimulator-amd64-audio-default.tar.gz
           make build/output/libmpv-libs_${VERSION}_iossimulator-amd64-audio-full.tar.gz
+          make build/output/libmpv-libs_${VERSION}_iossimulator-amd64-audio-encodersgpl.tar.gz
           make build/output/libmpv-libs_${VERSION}_iossimulator-amd64-video-default.tar.gz
           make build/output/libmpv-libs_${VERSION}_iossimulator-amd64-video-full.tar.gz
+          make build/output/libmpv-libs_${VERSION}_iossimulator-amd64-video-encodersgpl.tar.gz
           make build/output/libmpv-libs_${VERSION}_iossimulator-arm64-audio-default.tar.gz
           make build/output/libmpv-libs_${VERSION}_iossimulator-arm64-audio-full.tar.gz
+          make build/output/libmpv-libs_${VERSION}_iossimulator-arm64-audio-encodersgpl.tar.gz
           make build/output/libmpv-libs_${VERSION}_iossimulator-arm64-video-default.tar.gz
           make build/output/libmpv-libs_${VERSION}_iossimulator-arm64-video-full.tar.gz
+          make build/output/libmpv-libs_${VERSION}_iossimulator-arm64-video-encodersgpl.tar.gz
           make build/output/libmpv-libs_${VERSION}_iossimulator-universal-audio-default.tar.gz
           make build/output/libmpv-libs_${VERSION}_iossimulator-universal-audio-full.tar.gz
+          make build/output/libmpv-libs_${VERSION}_iossimulator-universal-audio-encodersgpl.tar.gz
           make build/output/libmpv-libs_${VERSION}_iossimulator-universal-video-default.tar.gz
           make build/output/libmpv-libs_${VERSION}_iossimulator-universal-video-full.tar.gz
+          make build/output/libmpv-libs_${VERSION}_iossimulator-universal-video-encodersgpl.tar.gz
           make build/output/libmpv-libs_${VERSION}_macos-amd64-audio-default.tar.gz
           make build/output/libmpv-libs_${VERSION}_macos-amd64-audio-full.tar.gz
+          make build/output/libmpv-libs_${VERSION}_macos-amd64-audio-encodersgpl.tar.gz
           make build/output/libmpv-libs_${VERSION}_macos-amd64-video-default.tar.gz
           make build/output/libmpv-libs_${VERSION}_macos-amd64-video-full.tar.gz
+          make build/output/libmpv-libs_${VERSION}_macos-amd64-video-encodersgpl.tar.gz
           make build/output/libmpv-libs_${VERSION}_macos-arm64-audio-default.tar.gz
           make build/output/libmpv-libs_${VERSION}_macos-arm64-audio-full.tar.gz
+          make build/output/libmpv-libs_${VERSION}_macos-arm64-audio-encodersgpl.tar.gz
           make build/output/libmpv-libs_${VERSION}_macos-arm64-video-default.tar.gz
           make build/output/libmpv-libs_${VERSION}_macos-arm64-video-full.tar.gz
+          make build/output/libmpv-libs_${VERSION}_macos-arm64-video-encodersgpl.tar.gz
           make build/output/libmpv-libs_${VERSION}_macos-universal-audio-default.tar.gz
           make build/output/libmpv-libs_${VERSION}_macos-universal-audio-full.tar.gz
+          make build/output/libmpv-libs_${VERSION}_macos-universal-audio-encodersgpl.tar.gz
           make build/output/libmpv-libs_${VERSION}_macos-universal-video-default.tar.gz
           make build/output/libmpv-libs_${VERSION}_macos-universal-video-full.tar.gz
+          make build/output/libmpv-libs_${VERSION}_macos-universal-video-encodersgpl.tar.gz
           make build/output/libmpv-xcframeworks_${VERSION}_ios-universal-audio-default.tar.gz
           make build/output/libmpv-xcframeworks_${VERSION}_ios-universal-audio-full.tar.gz
+          make build/output/libmpv-xcframeworks_${VERSION}_ios-universal-audio-encodersgpl.tar.gz
           make build/output/libmpv-xcframeworks_${VERSION}_ios-universal-video-default.tar.gz
           make build/output/libmpv-xcframeworks_${VERSION}_ios-universal-video-full.tar.gz
+          make build/output/libmpv-xcframeworks_${VERSION}_ios-universal-video-encodersgpl.tar.gz
           make build/output/libmpv-xcframeworks_${VERSION}_macos-universal-audio-default.tar.gz
           make build/output/libmpv-xcframeworks_${VERSION}_macos-universal-audio-full.tar.gz
+          make build/output/libmpv-xcframeworks_${VERSION}_macos-universal-audio-encodersgpl.tar.gz
           make build/output/libmpv-xcframeworks_${VERSION}_macos-universal-video-default.tar.gz
           make build/output/libmpv-xcframeworks_${VERSION}_macos-universal-video-full.tar.gz
+          make build/output/libmpv-xcframeworks_${VERSION}_macos-universal-video-encodersgpl.tar.gz
           make build/output/debug.zip
 
       - name: Upload artifacts

diff --git a/.tool-versions b/.tool-versions
@@ -1,8 +1,10 @@
 clang 14.0.3
-cmake 3.27.4
+cmake 3.27.5
 golang 1.21.0
-macos 13.5.1
+macos 13.5.2
 make 3.81
 meson 1.2.1
+nasm 2.16.01
 ninja 1.11.1
+python3 3.11.5
 xcode 14.3.1
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,3 +1,5 @@
+For the "default" and "full" flavors, the following license applies:
+
 MIT License
 
 Copyright (c) 2023 birros
@@ -19,3 +21,20 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+For the "encodersgpl" flavor, the following license applies:
+
+Copyright (C) 2023 moffatman
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.