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 ca73294

Browse filesBrowse files
markus-perlmarkus-perl
authored
Merge pull request markus-perl#188 from mrienstra/patch-1
Fix indenting
2 parents 5ee28a2 + e9f4425 commit ca73294
Copy full SHA for ca73294

File tree

Expand file treeCollapse file tree

1 file changed

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

1 file changed

+72
-72
lines changed

‎build-ffmpeg

Copy file name to clipboardExpand all lines: build-ffmpeg
+72-72Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ library_exists() {
169169
}
170170

171171
build_done() {
172-
echo "$2" > "$PACKAGES/$1.done"
172+
echo "$2" >"$PACKAGES/$1.done"
173173
}
174174

175175
verify_binary_type() {
@@ -311,10 +311,10 @@ fi
311311

312312
if build "giflib" "5.2.1"; then
313313
download "https://netcologne.dl.sourceforge.net/project/giflib/giflib-5.2.1.tar.gz"
314-
if [[ "$OSTYPE" == "darwin"* ]]; then
315-
download "https://sourceforge.net/p/giflib/bugs/_discuss/thread/4e811ad29b/c323/attachment/Makefile.patch"
316-
execute patch -p0 --forward "${PACKAGES}/giflib-5.2.1/Makefile" "${PACKAGES}/Makefile.patch" || true
317-
fi
314+
if [[ "$OSTYPE" == "darwin"* ]]; then
315+
download "https://sourceforge.net/p/giflib/bugs/_discuss/thread/4e811ad29b/c323/attachment/Makefile.patch"
316+
execute patch -p0 --forward "${PACKAGES}/giflib-5.2.1/Makefile" "${PACKAGES}/Makefile.patch" || true
317+
fi
318318
cd "${PACKAGES}"/giflib-5.2.1 || exit
319319
#multicore build disabled for this library
320320
execute make
@@ -417,16 +417,16 @@ else
417417
build_done "nettle" "3.8.1"
418418
fi
419419

420-
if [[ ! $ARCH == 'arm64' ]]; then
421-
if build "gnutls" "3.7.9"; then
422-
download "https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.9.tar.xz"
423-
execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static --disable-doc --disable-tools --disable-cxx --disable-tests --disable-gtk-doc-html --disable-libdane --disable-nls --enable-local-libopts --disable-guile --with-included-libtasn1 --with-included-unistring --without-p11-kit CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
424-
execute make -j $MJOBS
425-
execute make install
426-
build_done "gnutls" "3.7.9"
420+
if [[ ! $ARCH == 'arm64' ]]; then
421+
if build "gnutls" "3.7.9"; then
422+
download "https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.9.tar.xz"
423+
execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static --disable-doc --disable-tools --disable-cxx --disable-tests --disable-gtk-doc-html --disable-libdane --disable-nls --enable-local-libopts --disable-guile --with-included-libtasn1 --with-included-unistring --without-p11-kit CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
424+
execute make -j $MJOBS
425+
execute make install
426+
build_done "gnutls" "3.7.9"
427+
fi
428+
# CONFIGURE_OPTIONS+=("--enable-gmp" "--enable-gnutls")
427429
fi
428-
# CONFIGURE_OPTIONS+=("--enable-gmp" "--enable-gnutls")
429-
fi
430430
fi
431431

432432
if build "cmake" "3.25.1"; then
@@ -450,27 +450,27 @@ if command_exists "python3"; then
450450
if ! command_exists ${r}; then
451451
execute pip3 install ${r} --quiet --upgrade --no-cache-dir --disable-pip-version-check
452452
fi
453-
export PATH=$PATH:~/Library/Python/3.9/bin
453+
export PATH=$PATH:~/Library/Python/3.9/bin
454454
done
455455
fi
456456
if command_exists "meson"; then
457457
if build "dav1d" "1.1.0"; then
458458
download "https://code.videolan.org/videolan/dav1d/-/archive/1.1.0/dav1d-1.1.0.tar.gz"
459459
make_dir build
460-
460+
461461
CFLAGSBACKUP=$CFLAGS
462462
if $MACOS_M1; then
463463
export CFLAGS="-arch arm64"
464464
fi
465-
465+
466466
execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib
467467
execute ninja -C build
468468
execute ninja -C build install
469-
469+
470470
if $MACOS_M1; then
471471
export CFLAGS=$CFLAGSBACKUP
472472
fi
473-
473+
474474
build_done "dav1d" "1.1.0"
475475
fi
476476
CONFIGURE_OPTIONS+=("--enable-libdav1d")
@@ -487,7 +487,7 @@ if ! $MACOS_M1; then
487487
execute make install
488488
execute cp SvtAv1Enc.pc "${WORKSPACE}/lib/pkgconfig/"
489489
execute cp SvtAv1Dec.pc "${WORKSPACE}/lib/pkgconfig/"
490-
build_done "svtav1" "1.4.1";
490+
build_done "svtav1" "1.4.1"
491491
fi
492492
CONFIGURE_OPTIONS+=("--enable-libsvtav1")
493493
fi
@@ -658,59 +658,59 @@ CONFIGURE_OPTIONS+=("--enable-libzimg")
658658

659659
if command_exists "python3"; then
660660

661-
if command_exists "meson"; then
661+
if command_exists "meson"; then
662662

663-
if build "lv2" "1.18.10"; then
664-
download "https://lv2plug.in/spec/lv2-1.18.10.tar.xz" "lv2-1.18.10.tar.xz"
665-
execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib
666-
execute ninja -C build
667-
execute ninja -C build install
668-
build_done "lv2" "1.18.10"
669-
fi
670-
if build "waflib" "b600c92"; then
671-
download "https://gitlab.com/drobilla/autowaf/-/archive/b600c928b221a001faeab7bd92786d0b25714bc8/autowaf-b600c928b221a001faeab7bd92786d0b25714bc8.tar.gz" "autowaf.tar.gz"
672-
build_done "waflib" "b600c92"
673-
fi
674-
if build "serd" "0.30.16"; then
675-
download "https://gitlab.com/drobilla/serd/-/archive/v0.30.16/serd-v0.30.16.tar.gz" "serd-v0.30.16.tar.gz"
676-
execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib
677-
execute ninja -C build
678-
execute ninja -C build install
679-
build_done "serd" "0.30.16"
680-
fi
681-
if build "pcre" "8.45"; then
682-
download "https://altushost-swe.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.gz" "pcre-8.45.tar.gz"
683-
execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static
684-
execute make -j $MJOBS
685-
execute make install
686-
build_done "pcre" "8.45"
687-
fi
688-
if build "sord" "0.16.14"; then
689-
download "https://gitlab.com/drobilla/sord/-/archive/v0.16.14/sord-v0.16.14.tar.gz" "sord-v0.16.14.tar.gz"
690-
execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib
691-
execute ninja -C build
692-
execute ninja -C build install
693-
build_done "sord" "0.16.14"
694-
fi
695-
if build "sratom" "0.6.14"; then
696-
download "https://gitlab.com/lv2/sratom/-/archive/v0.6.14/sratom-v0.6.14.tar.gz" "sratom-v0.6.14.tar.gz"
697-
execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib
698-
execute ninja -C build
699-
execute ninja -C build install
700-
build_done "sratom" "0.6.14"
701-
fi
702-
if build "lilv" "0.24.20"; then
703-
download "https://gitlab.com/lv2/lilv/-/archive/v0.24.20/lilv-v0.24.20.tar.gz" "lilv-v0.24.20.tar.gz"
704-
execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib
705-
execute ninja -C build
706-
execute ninja -C build install
707-
build_done "lilv" "0.24.20"
708-
fi
709-
CFLAGS+=" -I$WORKSPACE/include/lilv-0"
663+
if build "lv2" "1.18.10"; then
664+
download "https://lv2plug.in/spec/lv2-1.18.10.tar.xz" "lv2-1.18.10.tar.xz"
665+
execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib
666+
execute ninja -C build
667+
execute ninja -C build install
668+
build_done "lv2" "1.18.10"
669+
fi
670+
if build "waflib" "b600c92"; then
671+
download "https://gitlab.com/drobilla/autowaf/-/archive/b600c928b221a001faeab7bd92786d0b25714bc8/autowaf-b600c928b221a001faeab7bd92786d0b25714bc8.tar.gz" "autowaf.tar.gz"
672+
build_done "waflib" "b600c92"
673+
fi
674+
if build "serd" "0.30.16"; then
675+
download "https://gitlab.com/drobilla/serd/-/archive/v0.30.16/serd-v0.30.16.tar.gz" "serd-v0.30.16.tar.gz"
676+
execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib
677+
execute ninja -C build
678+
execute ninja -C build install
679+
build_done "serd" "0.30.16"
680+
fi
681+
if build "pcre" "8.45"; then
682+
download "https://altushost-swe.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.gz" "pcre-8.45.tar.gz"
683+
execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static
684+
execute make -j $MJOBS
685+
execute make install
686+
build_done "pcre" "8.45"
687+
fi
688+
if build "sord" "0.16.14"; then
689+
download "https://gitlab.com/drobilla/sord/-/archive/v0.16.14/sord-v0.16.14.tar.gz" "sord-v0.16.14.tar.gz"
690+
execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib
691+
execute ninja -C build
692+
execute ninja -C build install
693+
build_done "sord" "0.16.14"
694+
fi
695+
if build "sratom" "0.6.14"; then
696+
download "https://gitlab.com/lv2/sratom/-/archive/v0.6.14/sratom-v0.6.14.tar.gz" "sratom-v0.6.14.tar.gz"
697+
execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib
698+
execute ninja -C build
699+
execute ninja -C build install
700+
build_done "sratom" "0.6.14"
701+
fi
702+
if build "lilv" "0.24.20"; then
703+
download "https://gitlab.com/lv2/lilv/-/archive/v0.24.20/lilv-v0.24.20.tar.gz" "lilv-v0.24.20.tar.gz"
704+
execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib
705+
execute ninja -C build
706+
execute ninja -C build install
707+
build_done "lilv" "0.24.20"
708+
fi
709+
CFLAGS+=" -I$WORKSPACE/include/lilv-0"
710710

711-
CONFIGURE_OPTIONS+=("--enable-lv2")
711+
CONFIGURE_OPTIONS+=("--enable-lv2")
712712

713-
fi
713+
fi
714714
fi
715715

716716
if build "opencore" "0.1.6"; then
@@ -766,15 +766,15 @@ if build "libtheora" "1.1.1"; then
766766
sed "s/-fforce-addr//g" configure >configure.patched
767767
chmod +x configure.patched
768768
mv configure.patched configure
769-
769+
770770
if ! $MACOS_M1; then
771771
##BEGIN CONFIG.GUESS PATCH -- Updating config.guess file. Which allowed me to compile on aarch64 (ARMv8) [linux kernel 4.9 Ubuntu 20.04]
772772
rm config.guess
773773
curl -L --silent -o "config.guess" "https://raw.githubusercontent.com/gcc-mirror/gcc/master/config.guess"
774774
chmod +x config.guess
775775
##END OF CONFIG.GUESS PATCH
776776
fi
777-
777+
778778
execute ./configure --prefix="${WORKSPACE}" --with-ogg-libraries="${WORKSPACE}"/lib --with-ogg-includes="${WORKSPACE}"/include/ --with-vorbis-libraries="${WORKSPACE}"/lib --with-vorbis-includes="${WORKSPACE}"/include/ --enable-static --disable-shared --disable-oggtest --disable-vorbistest --disable-examples --disable-asm --disable-spec
779779
execute make -j $MJOBS
780780
execute make install

0 commit comments

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