From 5339e22d26e9323094047a6c9c3fa4ec396dd1ac Mon Sep 17 00:00:00 2001 From: BtbN Date: Tue, 12 Jul 2022 20:28:45 +0200 Subject: [PATCH] Migrate more scripts to git --- scripts.d/20-libiconv.sh | 13 +++++++------ scripts.d/20-zlib.sh | 10 +++------- scripts.d/25-freetype.sh | 14 ++++++-------- scripts.d/25-xz.sh | 10 ++++------ scripts.d/35-fontconfig.sh | 10 ++++------ scripts.d/50-libmp3lame.sh | 12 ++++++------ scripts.d/50-opencore-amr.sh | 9 +++------ scripts.d/50-soxr.sh | 1 - scripts.d/50-twolame.sh | 12 ++++++------ scripts.d/50-vulkan/50-shaderc.sh | 2 +- scripts.d/50-xvid.sh | 9 +++------ 11 files changed, 43 insertions(+), 59 deletions(-) diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh index 467cb8a..6e3a15d 100755 --- a/scripts.d/20-libiconv.sh +++ b/scripts.d/20-libiconv.sh @@ -1,17 +1,18 @@ #!/bin/bash -# https://ftp.gnu.org/gnu/libiconv/ -ICONV_SRC="https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.17.tar.gz" +SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git" +SCRIPT_COMMIT="4b9c27bec873392533dd3ef309cd62962a644e18" ffbuild_enabled() { return 0 } ffbuild_dockerbuild() { - wget -O iconv.tar.gz "$ICONV_SRC" - tar xaf iconv.tar.gz - rm iconv.tar.gz - cd libiconv* + git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" iconv + cd iconv + + ./gitsub.sh pull + ./autogen.sh local myconf=( --prefix="$FFBUILD_PREFIX" diff --git a/scripts.d/20-zlib.sh b/scripts.d/20-zlib.sh index 816d666..4f3da7b 100755 --- a/scripts.d/20-zlib.sh +++ b/scripts.d/20-zlib.sh @@ -1,20 +1,16 @@ #!/bin/bash -ZLIB_SRC="https://zlib.net/zlib-1.2.12.tar.gz" +SCRIPT_REPO="https://github.com/madler/zlib.git" +SCRIPT_COMMIT="21767c654d31d2dccdde4330529775c6c5fd5389" ffbuild_enabled() { return 0 } ffbuild_dockerbuild() { - mkdir zlib + git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" zlib cd zlib - wget "$ZLIB_SRC" -O zlib.tar.gz - tar xaf zlib.tar.gz - rm zlib.tar.gz - cd zlib* - local myconf=( --prefix="$FFBUILD_PREFIX" --static diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh index 76822e4..36b7a16 100755 --- a/scripts.d/25-freetype.sh +++ b/scripts.d/25-freetype.sh @@ -1,19 +1,17 @@ #!/bin/bash -# https://sourceforge.net/projects/freetype/files/freetype2/ -FREETYPE_SRC="https://sourceforge.net/projects/freetype/files/freetype2/2.12.1/freetype-2.12.1.tar.xz/download" +SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git" +SCRIPT_COMMIT="275b116b40c9d183d42242099ea9ff276985855b" ffbuild_enabled() { return 0 } ffbuild_dockerbuild() { - mkdir ft - cd ft - wget -O ft.tar.gz "$FREETYPE_SRC" - tar xaf ft.tar.gz - rm ft.tar.gz - cd freetype* + git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" freetype + cd freetype + + ./autogen.sh local myconf=( --prefix="$FFBUILD_PREFIX" diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh index 62c13f2..0576bac 100755 --- a/scripts.d/25-xz.sh +++ b/scripts.d/25-xz.sh @@ -1,19 +1,17 @@ #!/bin/bash -XZ_SRC="https://sourceforge.net/projects/lzmautils/files/xz-5.2.5.tar.xz/download" +SCRIPT_REPO="https://github.com/xz-mirror/xz.git" +SCRIPT_COMMIT="4773608554d1b684a05ff9c1d879cf5c42266d33" ffbuild_enabled() { return 0 } ffbuild_dockerbuild() { - mkdir xz + git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xz cd xz - wget "$XZ_SRC" -O xz.tar.xz - tar xaf xz.tar.xz - rm xz.tar.xz - cd xz* + ./autogen.sh --no-po4a local myconf=( --prefix="$FFBUILD_PREFIX" diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh index 483a757..20144cd 100755 --- a/scripts.d/35-fontconfig.sh +++ b/scripts.d/35-fontconfig.sh @@ -1,19 +1,17 @@ #!/bin/bash -FONTCONFIG_SRC="https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.0.tar.xz" +SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git" +SCRIPT_COMMIT="fd0753af88f746fd3d729bf6e1df08eefeeaa3ac" ffbuild_enabled() { return 0 } ffbuild_dockerbuild() { - mkdir fc + git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fc cd fc - wget "$FONTCONFIG_SRC" -O fc.tar.gz - tar xaf fc.tar.gz - rm fc.tar.gz - cd fontconfig* + ./autogen.sh --noconf local myconf=( --prefix="$FFBUILD_PREFIX" diff --git a/scripts.d/50-libmp3lame.sh b/scripts.d/50-libmp3lame.sh index eb6a4b7..2daf818 100755 --- a/scripts.d/50-libmp3lame.sh +++ b/scripts.d/50-libmp3lame.sh @@ -1,18 +1,17 @@ #!/bin/bash -LAME_SRC="https://sourceforge.net/projects/lame/files/lame/3.100/lame-3.100.tar.gz/download" +SCRIPT_REPO="https://svn.code.sf.net/p/lame/svn/trunk/lame" +SCRIPT_REV="6507" ffbuild_enabled() { return 0 } ffbuild_dockerbuild() { - mkdir lame + svn checkout "${SCRIPT_REPO}@${SCRIPT_REV}" lame cd lame - wget -O lame.tar.gz "$LAME_SRC" - tar xaf lame.tar.gz - rm lame.tar.gz - cd lame* + + autoreconf -i local myconf=( --prefix="$FFBUILD_PREFIX" @@ -22,6 +21,7 @@ ffbuild_dockerbuild() { --disable-gtktest --disable-cpml --disable-frontend + --disable-decoder ) if [[ $TARGET == win* || $TARGET == linux* ]]; then diff --git a/scripts.d/50-opencore-amr.sh b/scripts.d/50-opencore-amr.sh index b55bd22..da698f1 100755 --- a/scripts.d/50-opencore-amr.sh +++ b/scripts.d/50-opencore-amr.sh @@ -1,18 +1,15 @@ #!/bin/bash -OAMR_SRC="https://sourceforge.net/projects/opencore-amr/files/opencore-amr/opencore-amr-0.1.5.tar.gz/download" +SCRIPT_REPO="https://git.code.sf.net/p/opencore-amr/code" +SCRIPT_COMMIT="7ba9df63d310355f86cb594018fba999965c1388" ffbuild_enabled() { return 0 } ffbuild_dockerbuild() { - mkdir opencore + git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" opencore cd opencore - wget -O opencore.tar.gz "$OAMR_SRC" - tar xaf opencore.tar.gz - rm opencore.tar.gz - cd opencore* autoreconf -i diff --git a/scripts.d/50-soxr.sh b/scripts.d/50-soxr.sh index 1fb2cac..f351fa6 100755 --- a/scripts.d/50-soxr.sh +++ b/scripts.d/50-soxr.sh @@ -1,6 +1,5 @@ #!/bin/bash -# https://sourceforge.net/p/soxr/code/ci/master/tree/ SCRIPT_REPO="https://git.code.sf.net/p/soxr/code" SCRIPT_COMMIT="945b592b70470e29f917f4de89b4281fbbd540c0" diff --git a/scripts.d/50-twolame.sh b/scripts.d/50-twolame.sh index 6464678..2dac91d 100755 --- a/scripts.d/50-twolame.sh +++ b/scripts.d/50-twolame.sh @@ -1,18 +1,18 @@ #!/bin/bash -TWOLAME_SRC="https://sourceforge.net/projects/twolame/files/twolame/0.4.0/twolame-0.4.0.tar.gz/download" +SCRIPT_REPO="https://github.com/njh/twolame.git" +SCRIPT_COMMIT="90b694b6125dbe23a346bd5607a7fb63ad2785dc" ffbuild_enabled() { return 0 } ffbuild_dockerbuild() { - mkdir twolame + git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" twolame cd twolame - wget -O twolame.tar.gz "$TWOLAME_SRC" - tar xaf twolame.tar.gz - rm twolame.tar.gz - cd twolame* + + NOCONFIGURE=1 ./autogen.sh + touch doc/twolame.1 local myconf=( --prefix="$FFBUILD_PREFIX" diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh index 4e7001e..225889f 100755 --- a/scripts.d/50-vulkan/50-shaderc.sh +++ b/scripts.d/50-vulkan/50-shaderc.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/google/shaderc.git" -SCRIPT_COMMIT="7e2cfcf2b75c245fa3ceaf2e276180cbf8f107ea" +SCRIPT_COMMIT="a0a247d09229669d19b268eb8051eeda880449c1" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-xvid.sh b/scripts.d/50-xvid.sh index f6ec11a..73f74a0 100755 --- a/scripts.d/50-xvid.sh +++ b/scripts.d/50-xvid.sh @@ -1,6 +1,7 @@ #!/bin/bash -XVID_SRC="https://downloads.xvid.com/downloads/xvidcore-1.3.7.tar.gz" +SCRIPT_REPO="http://svn.xvid.org/trunk/xvidcore" +SCRIPT_REV="2197" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 @@ -8,12 +9,8 @@ ffbuild_enabled() { } ffbuild_dockerbuild() { - mkdir xvid + svn checkout --username "anonymous" --password "" "${SCRIPT_REPO}@${SCRIPT_REV}" xvid cd xvid - wget -O xvid.tar.gz "$XVID_SRC" - tar xaf xvid.tar.gz - rm xvid.tar.gz - cd xvid* cd build/generic