Skip to content

Commit b64953f

Browse files
markus-perlmarkus-perl
committed
Merge branch 'rokibhasansagar-updates'
2 parents cbb19a5 + 837c505 commit b64953f

File tree

1 file changed

+22
-23
lines changed

1 file changed

+22
-23
lines changed

‎build-ffmpeg

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ fi
293293
if command_exists "python"; then
294294

295295
if build "lv2"; then
296-
download "https://lv2plug.in/spec/lv2-1.18.0.tar.bz2" "lv2-1.18.0.tar.bz2"
296+
download "https://lv2plug.in/spec/lv2-1.18.2.tar.bz2" "lv2-1.18.2.tar.bz2"
297297
execute ./waf configure --prefix="${WORKSPACE}" --lv2-user
298298
execute ./waf
299299
execute ./waf install
@@ -302,13 +302,13 @@ if command_exists "python"; then
302302
fi
303303

304304
if build "waflib"; then
305-
download "https://gitlab.com/drobilla/autowaf/-/archive/cc37724b9bfa889baebd8cb10f38b8c7cab83e37/autowaf-cc37724b9bfa889baebd8cb10f38b8c7cab83e37.tar.gz" "autowaf.tar.gz"
305+
download "https://gitlab.com/drobilla/autowaf/-/archive/b600c928b221a001faeab7bd92786d0b25714bc8/autowaf-b600c928b221a001faeab7bd92786d0b25714bc8.tar.gz" "autowaf.tar.gz"
306306
build_done "waflib"
307307
fi
308308

309309
if build "serd"; then
310-
download "https://gitlab.com/drobilla/serd/-/archive/v0.30.6/serd-v0.30.6.tar.gz" "serd-v0.30.6.tar.gz"
311-
execute cp -r "${PACKAGES}"/autowaf/* "${PACKAGES}/serd-v0.30.6/waflib/"
310+
download "https://gitlab.com/drobilla/serd/-/archive/v0.30.10/serd-v0.30.10.tar.gz" "serd-v0.30.10.tar.gz"
311+
execute cp -r "${PACKAGES}"/autowaf/* "${PACKAGES}/serd-v0.30.10/waflib/"
312312
execute ./waf configure --prefix="${WORKSPACE}" --static --no-shared --no-posix
313313
execute ./waf
314314
execute ./waf install
@@ -325,8 +325,8 @@ if command_exists "python"; then
325325
fi
326326

327327
if build "sord"; then
328-
download "https://gitlab.com/drobilla/sord/-/archive/v0.16.6/sord-v0.16.6.tar.gz" "sord-v0.16.6.tar.gz"
329-
execute cp -r "${PACKAGES}"/autowaf/* "${PACKAGES}/sord-v0.16.6/waflib/"
328+
download "https://gitlab.com/drobilla/sord/-/archive/v0.16.8/sord-v0.16.8.tar.gz" "sord-v0.16.8.tar.gz"
329+
execute cp -r "${PACKAGES}"/autowaf/* "${PACKAGES}/sord-v0.16.8/waflib/"
330330
execute ./waf configure --prefix="${WORKSPACE}" CFLAGS="${CFLAGS}" --static --no-shared --no-utils
331331
execute ./waf CFLAGS="${CFLAGS}"
332332
execute ./waf install
@@ -335,8 +335,8 @@ if command_exists "python"; then
335335
fi
336336

337337
if build "sratom"; then
338-
download "https://gitlab.com/lv2/sratom/-/archive/v0.6.6/sratom-v0.6.6.tar.gz" "sratom-v0.6.6.tar.gz"
339-
execute cp -r "${PACKAGES}"/autowaf/* "${PACKAGES}/sratom-v0.6.6/waflib/"
338+
download "https://gitlab.com/lv2/sratom/-/archive/v0.6.8/sratom-v0.6.8.tar.gz" "sratom-v0.6.8.tar.gz"
339+
execute cp -r "${PACKAGES}"/autowaf/* "${PACKAGES}/sratom-v0.6.8/waflib/"
340340
execute ./waf configure --prefix="${WORKSPACE}" --static --no-shared
341341
execute ./waf
342342
execute ./waf install
@@ -345,8 +345,8 @@ if command_exists "python"; then
345345
fi
346346

347347
if build "lilv"; then
348-
download "https://gitlab.com/lv2/lilv/-/archive/v0.24.10/lilv-v0.24.10.tar.gz" "lilv-v0.24.10.tar.gz"
349-
execute cp -r "${PACKAGES}"/autowaf/* "${PACKAGES}/lilv-v0.24.10/waflib/"
348+
download "https://gitlab.com/lv2/lilv/-/archive/v0.24.12/lilv-v0.24.12.tar.gz" "lilv-v0.24.12.tar.gz"
349+
execute cp -r "${PACKAGES}"/autowaf/* "${PACKAGES}/lilv-v0.24.12/waflib/"
350350
execute ./waf configure --prefix="${WORKSPACE}" --static --no-shared --no-utils
351351
execute ./waf
352352
execute ./waf install
@@ -383,7 +383,7 @@ fi
383383

384384
if $NONFREE_AND_GPL; then
385385
if build "openssl"; then
386-
download "https://www.openssl.org/source/openssl-1.1.1i.tar.gz"
386+
download "https://www.openssl.org/source/openssl-1.1.1k.tar.gz"
387387
if $MACOS_M1; then
388388
sed -n 's/\(##### GNU Hurd\)/"darwin64-arm64-cc" => { \n inherit_from => [ "darwin-common", asm("aarch64_asm") ],\n CFLAGS => add("-Wall"),\n cflags => add("-arch arm64 "),\n lib_cppflags => add("-DL_ENDIAN"),\n bn_ops => "SIXTY_FOUR_BIT_LONG", \n perlasm_scheme => "macosx", \n}, \n\1/g' Configurations/10-main.conf
389389
execute ./configure --prefix="${WORKSPACE}" no-shared no-asm darwin64-arm64-cc
@@ -398,9 +398,8 @@ CONFIGURE_OPTIONS+=("--enable-openssl")
398398
fi
399399

400400
if build "cmake"; then
401-
download "https://cmake.org/files/v3.18/cmake-3.18.4.tar.gz"
402-
execute ./bootstrap -- -DCMAKE_USE_OPENSSL=OFF
403-
execute ./configure --prefix="${WORKSPACE}"
401+
download "https://cmake.org/files/LatestRelease/cmake-3.20.2.tar.gz"
402+
execute ./configure --prefix="${WORKSPACE}" --parallel="${MJOBS}" -- -DCMAKE_USE_OPENSSL=OFF
404403
execute make -j $MJOBS
405404
execute make install
406405
build_done "cmake"
@@ -422,8 +421,8 @@ fi
422421

423422
if $NONFREE_AND_GPL; then
424423
if build "x264"; then
425-
download "https://code.videolan.org/videolan/x264/-/archive/0d754ec36013fee82978496cd56fbd48824910b3/x264-0d754ec36013fee82978496cd56fbd48824910b3.tar.gz" "x264-0d754ec.tar.gz"
426-
cd "${PACKAGES}"/x264-0d754ec || exit
424+
download "https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.gz" "x264-stable.tar.gz"
425+
cd "${PACKAGES}"/x264-stable || exit
427426

428427
if [[ "$OSTYPE" == "linux-gnu" ]]; then
429428
execute ./configure --prefix="${WORKSPACE}" --enable-static --enable-pic CXXFLAGS="-fPIC"
@@ -459,7 +458,7 @@ CONFIGURE_OPTIONS+=("--enable-libx265")
459458
fi
460459

461460
if build "libvpx"; then
462-
download "https://github.com/webmproject/libvpx/archive/v1.9.0.tar.gz" "libvpx-1.9.0.tar.gz"
461+
download "https://github.com/webmproject/libvpx/archive/refs/tags/v1.10.0.tar.gz" "libvpx-1.10.0.tar.gz"
463462

464463
if [[ "$OSTYPE" == "darwin"* ]]; then
465464
echo "Applying Darwin patch"
@@ -515,7 +514,7 @@ CONFIGURE_OPTIONS+=("--enable-libvidstab")
515514
fi
516515

517516
if build "av1"; then
518-
download "https://aomedia.googlesource.com/aom/+archive/b52ee6d44adaef8a08f6984390de050d64df9faa.tar.gz" "av1.tar.gz" "av1"
517+
download "https://aomedia.googlesource.com/aom/+archive/c0f14141bd71414b004dccd66d48b27570299fa3.tar.gz" "av1.tar.gz" "av1"
519518
make_dir "$PACKAGES"/aom_build
520519
cd "$PACKAGES"/aom_build || exit
521520
if $MACOS_M1; then
@@ -597,8 +596,8 @@ CONFIGURE_OPTIONS+=("--enable-libtheora")
597596

598597
if $NONFREE_AND_GPL; then
599598
if build "fdk_aac"; then
600-
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"
601-
execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static
599+
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"
600+
execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static --enable-pic
602601
execute make -j $MJOBS
603602
execute make install
604603

@@ -612,7 +611,7 @@ fi
612611
##
613612

614613
if build "libwebp"; then
615-
download "https://github.com/webmproject/libwebp/archive/v1.1.0.tar.gz" "libwebp-1.1.0.tar.gz"
614+
download "https://github.com/webmproject/libwebp/archive/v1.2.0.tar.gz" "libwebp-1.2.0.tar.gz"
616615
make_dir build
617616
cd build || exit
618617
execute cmake -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_BINDIR=bin -DCMAKE_INSTALL_INCLUDEDIR=include -DENABLE_SHARED=OFF -DENABLE_STATIC=ON ../
@@ -638,7 +637,7 @@ fi
638637

639638
if $NONFREE_AND_GPL; then
640639
if build "srt"; then
641-
download "https://github.com/Haivision/srt/archive/v1.4.1.tar.gz" "srt-1.4.1.tar.gz"
640+
download "https://github.com/Haivision/srt/archive/v1.4.3.tar.gz" "srt-1.4.3.tar.gz"
642641
export OPENSSL_ROOT_DIR="${WORKSPACE}"
643642
export OPENSSL_LIB_DIR="${WORKSPACE}"/lib
644643
export OPENSSL_INCLUDE_DIR="${WORKSPACE}"/include/
@@ -661,7 +660,7 @@ fi
661660
if [[ "$OSTYPE" == "linux-gnu" ]]; then
662661
if command_exists "nvcc"; then
663662
if build "nv-codec"; then
664-
download "https://github.com/FFmpeg/nv-codec-headers/releases/download/n11.0.10.0/nv-codec-headers-11.0.10.0.tar.gz"
663+
download "https://github.com/FFmpeg/nv-codec-headers/releases/download/n11.0.10.1/nv-codec-headers-11.0.10.1.tar.gz"
665664
execute make PREFIX="${WORKSPACE}"
666665
execute make install PREFIX="${WORKSPACE}"
667666
build_done "nv-codec"

0 commit comments

Comments
 (0)