Commit c8ae502

Nick Faro committed on
Fix FFMpeg issue on windows. Remove old lazarus formula
commit c8ae502969b9f2caebeaec15d7b3db080fc6ce6f parent 77b0691
3 changed files +11−32
Deleted.github/brew/lazarus.rb +0−28
@@ -1,28 +0,0 @@
1 cask "lazarus" do
2 version "3.0"
3 sha256 "71d77f4c6491265181078adf0e410dcb6176e8237e958c3aea9217bb5499f661"
4
5 url "https://gigenet.dl.sourceforge.net/project/lazarus/Lazarus%20macOS%20x86-64/Lazarus%203.0/Lazarus-3.0-macosx-x86_64.pkg",
6 verified: "sourceforge.net/lazarus/"
7 name "Lazarus"
8 desc "IDE for rapid application development"
9 homepage "https://www.lazarus-ide.org/"
10
11 livecheck do
12 url :homepage
13 regex(%r{href=.*?macOS%20x86-64/Lazarus%20v?(\d+(?:\.\d+)+)/}i)
14 end
15
16 depends_on cask: "fpc-laz"
17 depends_on cask: "fpc-src-laz"
18
19 pkg "Lazarus-3.0-macosx-x86_64.pkg"
20
21 uninstall pkgutil: [
22 "org.freepascal.pkg.fpcsrc-320-laz",
23 "org.lazarus-ide.pkg.LazarusIDE",
24 ],
25 delete: "/Applications/Lazarus.app"
26
27 zap trash: "~/.lazarus"
28 end
Modified.github/scripts/build-ffmpeg.sh +9−2
@@ -13,12 +13,19 @@ popd
13 curl -Lo ffmpeg.tar.xz 'http://ffmpeg.org/releases/ffmpeg-4.4.tar.xz' 13 curl -Lo ffmpeg.tar.xz 'http://ffmpeg.org/releases/ffmpeg-4.4.tar.xz'
14 tar xf ffmpeg.tar.xz 14 tar xf ffmpeg.tar.xz
15 cd ffmpeg-4.4 15 cd ffmpeg-4.4
16 ./configure --pkg-config-flags=--static \ 16
17 if [ "$(uname)" = "Darwin" ]; then
18 STATIC_FLAG="--pkg-config-flags=--static"
19 else
20 STATIC_FLAG="--extra-ldflags=-static"
21 fi
22
23 ./configure $STATIC_FLAG \
17 --disable-debug --enable-lto --disable-programs --enable-ffmpeg \ 24 --disable-debug --enable-lto --disable-programs --enable-ffmpeg \
18 --disable-doc --disable-everything --enable-protocol=pipe --enable-protocol=file \ 25 --disable-doc --disable-everything --enable-protocol=pipe --enable-protocol=file \
19 --enable-filter=aresample --enable-decoder=pcm_f32le --enable-demuxer=pcm_f32le \ 26 --enable-filter=aresample --enable-decoder=pcm_f32le --enable-demuxer=pcm_f32le \
20 --enable-encoder=flac --enable-muxer=ogg --enable-muxer=flac --enable-encoder=pcm_s16le \ 27 --enable-encoder=flac --enable-muxer=ogg --enable-muxer=flac --enable-encoder=pcm_s16le \
21 --enable-muxer=wav --enable-libmp3lame --enable-encoder=libmp3lame --enable-muxer=mp3 \ 28 --enable-muxer=wav --enable-libmp3lame --enable-encoder=libmp3lame --enable-muxer=mp3 \
22 --extra-cflags="-I`realpath ../lame-install/include`" \ 29 --extra-cflags="-I`realpath ../lame-install/include`" \
23 --extra-ldflags="-L`realpath ../lame-install/lib`" || cat ffbuild/config.log 30 --extra-ldflags="-L`realpath ../lame-install/lib`"
24 make 31 make
Modified.github/workflows/build.yml +2−2
@@ -48,8 +48,8 @@ jobs:
48 - name: Install macOS dependencies 48 - name: Install macOS dependencies
49 if: matrix.name == 'Mac' 49 if: matrix.name == 'Mac'
50 run: | 50 run: |
51 brew install --cask ./hUGETracker/.github/brew/lazarus.rb 51 brew install --cask lazarus
52 brew install --verbose ./hUGETracker/.github/brew/rgbds.rb 52 brew install ./hUGETracker/.github/brew/rgbds.rb
53 brew install automake libtool shtool wget yasm 53 brew install automake libtool shtool wget yasm
54 54
55 curl -Lo 'sdl2.tgz' https://github.com/libsdl-org/SDL/archive/refs/tags/release-2.28.5.tar.gz 55 curl -Lo 'sdl2.tgz' https://github.com/libsdl-org/SDL/archive/refs/tags/release-2.28.5.tar.gz