Commit 7582d0ce authored by Amir MOHAMMADI's avatar Amir MOHAMMADI

Merge branch 'openh264' into 'master'

Fix openh264 and ffmpeg recipes

See merge request bob/bob.conda!335
parents 1d13a9a5 600f2c0c
Pipeline #16571 passed with stage
in 10 minutes and 37 seconds
...@@ -23,11 +23,4 @@ unset SUBDIR ...@@ -23,11 +23,4 @@ unset SUBDIR
--enable-libopus --enable-libopus
make -j${CPU_COUNT} make -j${CPU_COUNT}
# For some reason it looks in /usr/local/lib for openh264
if [ "$(uname -s)" == "Darwin" ]; then
install_name_tool -change \
/usr/local/lib/libopenh264.4.dylib \
@rpath/libopenh264.4.dylib \
libavcodec/libavcodec.57.dylib
fi
make install make install
...@@ -9,7 +9,7 @@ source: ...@@ -9,7 +9,7 @@ source:
sha256: 6ed03b00404a3923e3c2f560248a9c9ad79fbaaee26d723f74aae6b31fe2bae6 sha256: 6ed03b00404a3923e3c2f560248a9c9ad79fbaaee26d723f74aae6b31fe2bae6
build: build:
number: 0 number: 1
# The windows build is repacking binaries rather than building from source # The windows build is repacking binaries rather than building from source
skip: True # [win] skip: True # [win]
run_exports: run_exports:
......
#!/bin/bash #!/bin/bash
make -j${CPU_COUNT} make PREFIX=$PREFIX -j${CPU_COUNT}
make PREFIX=$PREFIX install make PREFIX=$PREFIX install
mkdir -p -m755 -v "$PREFIX"/bin mkdir -p -m755 -v "$PREFIX"/bin
......
...@@ -13,7 +13,7 @@ source: ...@@ -13,7 +13,7 @@ source:
'{{ hash_type }}': '{{ hash_value }}' '{{ hash_type }}': '{{ hash_value }}'
build: build:
number: 0 number: 1
run_exports: run_exports:
# https://abi-laboratory.pro/tracker/timeline/openh264 # https://abi-laboratory.pro/tracker/timeline/openh264
- {{ pin_subpackage(name, max_pin='x.x') }} - {{ pin_subpackage(name, max_pin='x.x') }}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment