Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 404a0c3

Browse filesBrowse files
markus-perlmarkus-perl
authored
Merge pull request markus-perl#140 from SmoochySix4/master
updated packages, added python3 to waf, fixed typo
2 parents 4d1de44 + 2679152 commit 404a0c3
Copy full SHA for 404a0c3

File tree

Expand file treeCollapse file tree

1 file changed

+22
-22
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+22
-22
lines changed

‎build-ffmpeg

Copy file name to clipboardExpand all lines: build-ffmpeg
+22-22Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ if $NONFREE_AND_GPL; then
391391
download "https://www.openssl.org/source/openssl-1.1.1m.tar.gz"
392392
if $MACOS_M1; then
393393
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
394-
execute ./configure --prefix="${WORKSPACE}" no-shared no-asm darwin64-arm64-cc
394+
execute ./Configure --prefix="${WORKSPACE}" no-shared no-asm darwin64-arm64-cc
395395
else
396396
execute ./config --prefix="${WORKSPACE}" --openssldir="${WORKSPACE}" --with-zlib-include="${WORKSPACE}"/include/ --with-zlib-lib="${WORKSPACE}"/lib no-shared zlib
397397
fi
@@ -402,12 +402,12 @@ if $NONFREE_AND_GPL; then
402402
CONFIGURE_OPTIONS+=("--enable-openssl")
403403
fi
404404

405-
if build "cmake" "3.22.1"; then
406-
download "https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1.tar.gz"
405+
if build "cmake" "3.23.1"; then
406+
download "https://github.com/Kitware/CMake/releases/download/v3.23.1/cmake-3.23.1.tar.gz"
407407
execute ./configure --prefix="${WORKSPACE}" --parallel="${MJOBS}" -- -DCMAKE_USE_OPENSSL=OFF
408408
execute make -j $MJOBS
409409
execute make install
410-
build_done "cmake" "3.22.1"
410+
build_done "cmake" "3.23.1"
411411
fi
412412

413413
##
@@ -632,9 +632,9 @@ if command_exists "python3"; then
632632

633633
if build "lv2" "1.18.2"; then
634634
download "https://lv2plug.in/spec/lv2-1.18.2.tar.bz2" "lv2-1.18.2.tar.bz2"
635-
execute ./waf configure --prefix="${WORKSPACE}" --lv2-user
636-
execute ./waf
637-
execute ./waf install
635+
execute python3 ./waf configure --prefix="${WORKSPACE}" --lv2-user
636+
execute python3 ./waf
637+
execute python3 ./waf install
638638

639639
build_done "lv2" "1.18.2"
640640
fi
@@ -645,9 +645,9 @@ if command_exists "python3"; then
645645
if build "serd" "0.30.10"; then
646646
download "https://gitlab.com/drobilla/serd/-/archive/v0.30.10/serd-v0.30.10.tar.gz" "serd-v0.30.10.tar.gz"
647647
execute cp -r "${PACKAGES}"/autowaf/* "${PACKAGES}/serd-v0.30.10/waflib/"
648-
execute ./waf configure --prefix="${WORKSPACE}" --static --no-shared --no-posix
649-
execute ./waf
650-
execute ./waf install
648+
execute python3 ./waf configure --prefix="${WORKSPACE}" --static --no-shared --no-posix
649+
execute python3 ./waf
650+
execute python3 ./waf install
651651
build_done "serd" "0.30.10"
652652
fi
653653
if build "pcre" "8.45"; then
@@ -661,27 +661,27 @@ if command_exists "python3"; then
661661
if build "sord" "0.16.8"; then
662662
download "https://gitlab.com/drobilla/sord/-/archive/v0.16.8/sord-v0.16.8.tar.gz" "sord-v0.16.8.tar.gz"
663663
execute cp -r "${PACKAGES}"/autowaf/* "${PACKAGES}/sord-v0.16.8/waflib/"
664-
execute ./waf configure --prefix="${WORKSPACE}" CFLAGS="${CFLAGS}" --static --no-shared --no-utils
665-
execute ./waf CFLAGS="${CFLAGS}"
666-
execute ./waf install
664+
execute python3 ./waf configure --prefix="${WORKSPACE}" CFLAGS="${CFLAGS}" --static --no-shared --no-utils
665+
execute python3 ./waf CFLAGS="${CFLAGS}"
666+
execute python3 ./waf install
667667

668668
build_done "sord" "0.16.8"
669669
fi
670670
if build "sratom" "0.6.8"; then
671671
download "https://gitlab.com/lv2/sratom/-/archive/v0.6.8/sratom-v0.6.8.tar.gz" "sratom-v0.6.8.tar.gz"
672672
execute cp -r "${PACKAGES}"/autowaf/* "${PACKAGES}/sratom-v0.6.8/waflib/"
673-
execute ./waf configure --prefix="${WORKSPACE}" --static --no-shared
674-
execute ./waf
675-
execute ./waf install
673+
execute python3 ./waf configure --prefix="${WORKSPACE}" --static --no-shared
674+
execute python3 ./waf
675+
execute python3 ./waf install
676676

677677
build_done "sratom" "0.6.8"
678678
fi
679679
if build "lilv" "0.24.12"; then
680680
download "https://gitlab.com/lv2/lilv/-/archive/v0.24.12/lilv-v0.24.12.tar.gz" "lilv-v0.24.12.tar.gz"
681681
execute cp -r "${PACKAGES}"/autowaf/* "${PACKAGES}/lilv-v0.24.12/waflib/"
682-
execute ./waf configure --prefix="${WORKSPACE}" --static --no-shared --no-utils
683-
execute ./waf
684-
execute ./waf install
682+
execute python3 ./waf configure --prefix="${WORKSPACE}" --static --no-shared --no-utils
683+
execute python3 ./waf
684+
execute python3 ./waf install
685685
build_done "lilv" "0.24.12"
686686
fi
687687
CFLAGS+=" -I$WORKSPACE/include/lilv-0"
@@ -810,13 +810,13 @@ fi
810810
## other library
811811
##
812812

813-
if build "libsdl" "2.0.14"; then
814-
download "https://www.libsdl.org/release/SDL2-2.0.14.tar.gz"
813+
if build "libsdl" "2.0.20"; then
814+
download "https://www.libsdl.org/release/SDL2-2.0.20.tar.gz"
815815
execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static
816816
execute make -j $MJOBS
817817
execute make install
818818

819-
build_done "libsdl" "2.0.14"
819+
build_done "libsdl" "2.0.20"
820820
fi
821821

822822
if $NONFREE_AND_GPL; then

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.