From b505a3015eb899eed071e6ba67eb7f351ee13f57 Mon Sep 17 00:00:00 2001 From: Donavan Becker Date: Mon, 4 Apr 2022 09:28:27 -0500 Subject: [PATCH] FFmpeg 5.0 (#43) * Upgrade FFmpeg from 4.4 to 5.0 --- .github/stale.yml | 17 ----------------- .github/workflows/main.yml | 12 ++++++------ build-ffmpeg | 32 ++++++++++++++++---------------- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 25 insertions(+), 42 deletions(-) delete mode 100644 .github/stale.yml diff --git a/.github/stale.yml b/.github/stale.yml deleted file mode 100644 index 30a0b0b..0000000 --- a/.github/stale.yml +++ /dev/null @@ -1,17 +0,0 @@ -# Number of days of inactivity before an issue becomes stale -daysUntilStale: 30 -# Number of days of inactivity before a stale issue is closed -daysUntilClose: 5 -# Issues with these labels will never be considered stale -exemptLabels: - - pinned - - security -# Label to use when marking an issue as stale -staleLabel: stale -# Comment to post when marking an issue as stale. Set to `false` to disable -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -# Comment to post when closing a stale issue. Set to `false` to disable -closeComment: false \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4f5cf39..4606fa1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,10 +61,10 @@ jobs: os: macOS-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache Workspace id: cache - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: build key: ${{ matrix.name }}-cache @@ -104,15 +104,15 @@ jobs: tar -C package -zcvf ffmpeg-${{ matrix.name }}.tar.gz . - name: Upload Asset - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 with: name: ffmpeg-${{ matrix.name }} path: ffmpeg-${{ matrix.name }}.tar.gz - + publish: - needs: build_and_test + needs: build - if: ${{ github.repository == 'homebridge/homebridge' }} + if: ${{ github.repository == 'homebridge/ffmpeg-for-homebridge' && github.branches == 'master' && github.event_name == 'release' && startsWith(github.ref, 'refs/tags/v')}} uses: homebridge/.github/.github/workflows/npm-publish.yml@main secrets: diff --git a/build-ffmpeg b/build-ffmpeg index 6cbf249..c4b24a2 100755 --- a/build-ffmpeg +++ b/build-ffmpeg @@ -181,8 +181,8 @@ if build "yasm"; then fi if build "nasm"; then - download "https://www.nasm.us/pub/nasm/releasebuilds/2.14.02/nasm-2.14.02.tar.gz" "nasm.tar.gz" - cd $PACKAGES/nasm-2.14.02 || exit + download "https://www.nasm.us/pub/nasm/releasebuilds/2.15/nasm-2.15.tar.gz" "nasm.tar.gz" + cd $PACKAGES/nasm-2.15 || exit execute ./configure --prefix=${WORKSPACE} --disable-shared --enable-static execute make -j $MJOBS execute make install @@ -264,8 +264,8 @@ if build "x264"; then fi if build "libogg"; then - download "https://ftp.osuosl.org/pub/xiph/releases/ogg/libogg-1.3.3.tar.gz" "libogg-1.3.3.tar.gz" - cd $PACKAGES/libogg-1.3.3 || exit + download "https://ftp.osuosl.org/pub/xiph/releases/ogg/libogg-1.3.5.tar.gz" "libogg-1.3.5.tar.gz" + cd $PACKAGES/libogg-1.3.5 || exit execute ./configure --prefix=${WORKSPACE} --disable-shared --enable-static execute make -j $MJOBS execute make install @@ -273,8 +273,8 @@ if build "libogg"; then fi if build "libvorbis"; then - download "https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-1.3.6.tar.gz" "libvorbis-1.3.6.tar.gz" - cd $PACKAGES/libvorbis-1.3.6 || exit + download "https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-1.3.7.tar.gz" "libvorbis-1.3.7.tar.gz" + cd $PACKAGES/libvorbis-1.3.7 || exit execute ./configure --prefix=${WORKSPACE} --with-ogg-libraries=${WORKSPACE}/lib --with-ogg-includes=${WORKSPACE}/include/ --enable-static --disable-shared --disable-oggtest execute make -j $MJOBS execute make install @@ -320,8 +320,8 @@ fi # fi if build "fdk_aac"; then - download "https://sourceforge.net/projects/opencore-amr/files/fdk-aac/fdk-aac-2.0.1.tar.gz/download?use_mirror=gigenet" "fdk-aac-2.0.1.tar.gz" - cd $PACKAGES/fdk-aac-2.0.1 || exit + download "https://sourceforge.net/projects/opencore-amr/files/fdk-aac/fdk-aac-2.0.2.tar.gz/download?use_mirror=gigenet" "fdk-aac-2.0.2.tar.gz" + cd $PACKAGES/fdk-aac-2.0.2 || exit execute ./configure --prefix=${WORKSPACE} --disable-shared --enable-static execute make -j $MJOBS execute make install @@ -329,8 +329,8 @@ if build "fdk_aac"; then fi if build "zlib"; then - download "https://www.zlib.net/zlib-1.2.11.tar.gz" "zlib-1.2.11.tar.gz" - cd $PACKAGES/zlib-1.2.11 || exit + download "https://www.zlib.net/zlib-1.2.12.tar.gz" "zlib-1.2.12.tar.gz" + cd $PACKAGES/zlib-1.2.12 || exit execute ./configure --prefix=${WORKSPACE} execute make -j $MJOBS execute make install @@ -338,8 +338,8 @@ if build "zlib"; then fi if build "openssl"; then - download "https://www.openssl.org/source/openssl-1.1.1l.tar.gz" "openssl-1.1.1l.tar.gz" - cd $PACKAGES/openssl-1.1.1l || exit + download "https://www.openssl.org/source/openssl-1.1.1m.tar.gz" "openssl-1.1.1m.tar.gz" + cd $PACKAGES/openssl-1.1.1m || exit execute ./config --prefix=${WORKSPACE} --openssldir=${WORKSPACE} --with-zlib-include=${WORKSPACE}/include/ --with-zlib-lib=${WORKSPACE}/lib no-shared zlib execute make -j $MJOBS execute make install @@ -361,8 +361,8 @@ fi if [ "$(uname)" = "Linux" ]; then if build "alsa"; then - download "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.2.2.tar.bz2" "alsa-lib-1.2.2.tar.bz2" - cd $PACKAGES/alsa-lib-1.2.2 || exit + download "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.2.6.1.tar.bz2" "alsa-lib-1.2.6.1.tar.bz2" + cd $PACKAGES/alsa-lib-1.2.6.1 || exit execute ./configure --prefix=${WORKSPACE} --with-configdir=/usr/share/alsa --enable-static --disable-shared execute make -j $MJOBS execute make install @@ -374,8 +374,8 @@ fi build "ffmpeg" -download "https://ffmpeg.org/releases/ffmpeg-4.4.tar.bz2" "ffmpeg-4.4.tar.bz2" -cd $PACKAGES/ffmpeg-4.4/ || exit +download "https://ffmpeg.org/releases/ffmpeg-5.0.tar.bz2" "ffmpeg-5.0.tar.bz2" +cd $PACKAGES/ffmpeg-5.0/ || exit ./configure $ADDITIONAL_CONFIGURE_OPTIONS \ --pkgconfigdir="$WORKSPACE/lib/pkgconfig" \ --prefix=${WORKSPACE} \ diff --git a/package-lock.json b/package-lock.json index 7d8ffa8..9f4fca0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ffmpeg-for-homebridge", - "version": "0.0.10", + "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ffmpeg-for-homebridge", - "version": "0.0.10", + "version": "1.0.0", "hasInstallScript": true, "dependencies": { "detect-libc": "^2.0.1", diff --git a/package.json b/package.json index 39eca56..68d1f3c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ffmpeg-for-homebridge", - "version": "0.0.11", + "version": "0.1.0", "description": "Static ffmpeg binaries for Homebridge with support for audio (libfdk-aac) and hardware decoding (h264_omx).", "author": "oznu ", "homepage": "https://github.com/homebridge/ffmpeg-for-homebridge#readme",