Skip to content

Commit

Permalink
add srt
Browse files Browse the repository at this point in the history
  • Loading branch information
joepers committed Nov 13, 2024
1 parent ef6da67 commit 19ebf93
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 15 deletions.
33 changes: 19 additions & 14 deletions .github/workflows/build-ffmpeg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@ jobs:
fail-fast: false
matrix:
include:
- os: macos-14
arch: arm64
shell: bash
- os: macos-13
arch: x86_64
shell: bash
- os: ubuntu-latest
arch: i686
shell: bash
# - os: macos-14
# arch: arm64
# shell: bash
# - os: macos-13
# arch: x86_64
# shell: bash
# - os: ubuntu-latest
# arch: i686
# shell: bash
- os: ubuntu-latest
arch: x86_64
shell: bash
- os: windows-latest
arch: AMD64
shell: 'msys2 {0}'
# - os: windows-latest
# arch: AMD64
# shell: 'msys2 {0}'
defaults:
run:
shell: ${{ matrix.shell }}
Expand All @@ -46,12 +46,17 @@ jobs:
- name: Set deployment target
if: matrix.os == 'macos-13' || matrix.os == 'macos-14'
run: echo "MACOSX_DEPLOYMENT_TARGET=10.13" >> $GITHUB_ENV
- name: Install packages
- name: Install packages for macos
if: matrix.os == 'macos-13' || matrix.os == 'macos-14'
run: |
brew update
brew install pkg-config
brew install pkg-config [email protected]
brew unlink gettext libidn2 libpng libtiff libunistring libx11 libxau libxcb libxdmcp little-cms2 unbound
- name: Install packages for linux
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install pkg-config 'libgnutls.*-dev' libsrt-gnutls-dev gnutls-bin autoconf automake build-essential cmake libtool nasm
- uses: msys2/setup-msys2@v2
if: matrix.os == 'windows-latest'
with:
Expand Down
1 change: 1 addition & 0 deletions scripts/build-ffmpeg.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ def main():
"--enable-libopencore-amrwb",
"--enable-libopus",
"--enable-libspeex",
"--enable-libsrt",
"--enable-libtwolame",
"--enable-libvorbis",
"--enable-libvpx",
Expand Down
15 changes: 14 additions & 1 deletion scripts/cibuildpkg.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,23 @@ def run(cmd, env=None):
try:
subprocess.run(cmd, check=True, env=env, stderr=subprocess.PIPE, text=True)
except subprocess.CalledProcessError as e:
print(f"stderr: {e.stderr}")
print(f"1111111stderr: {e.stderr}")
find_file("ffbuild/config.log")
raise e


def find_file(target_path):
target_dir, target_file = os.path.split(target_path)
for root, dirs, files in os.walk("/"):
if target_dir in dirs:
potential_dir = os.path.join(root, target_dir)
if target_file in os.listdir(potential_dir):
full_path = os.path.join(potential_dir, target_file)
print(f"2222222Found: {full_path}")




@dataclass
class Package:
name: str
Expand Down

0 comments on commit 19ebf93

Please sign in to comment.