Skip to content

Commit

Permalink
FFmpeg 5.0 (#43)
Browse files Browse the repository at this point in the history
* Upgrade FFmpeg from 4.4 to 5.0
  • Loading branch information
donavanbecker authored Apr 4, 2022
1 parent f638f78 commit b505a30
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 42 deletions.
17 changes: 0 additions & 17 deletions .github/stale.yml

This file was deleted.

12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
32 changes: 16 additions & 16 deletions build-ffmpeg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -264,17 +264,17 @@ 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
build_done "libogg"
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
Expand Down Expand Up @@ -320,26 +320,26 @@ 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
build_done "fdk_aac"
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
build_done "zlib"
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
Expand All @@ -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
Expand All @@ -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} \
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>",
"homepage": "https://github.com/homebridge/ffmpeg-for-homebridge#readme",
Expand Down

0 comments on commit b505a30

Please sign in to comment.