From 1b9546a93e9907b7794cc510d3c8615dafa3a7ba Mon Sep 17 00:00:00 2001 From: Richard van Dijk Date: Thu, 6 Apr 2017 21:57:59 +0200 Subject: [PATCH 1/4] add patch for libxslt (fixes Illuminux/arm-cross-sysroot#8) Remove icucore dependency. --- formula/libxslt.sh | 5 +++++ patches/libxslt.patch | 7 +++++++ 2 files changed, 12 insertions(+) create mode 100644 patches/libxslt.patch diff --git a/formula/libxslt.sh b/formula/libxslt.sh index 9386414..2adca8a 100755 --- a/formula/libxslt.sh +++ b/formula/libxslt.sh @@ -27,6 +27,11 @@ if [ $? == 1 ]; then FU_file_get_download FU_file_extract_tar + echo -n "Patch ${GV_name}... " + patch "${GV_source_dir}/${GV_dir_name}/configure" \ + < "${GV_base_dir}/patches/libxslt.patch" >$GV_log_file 2>&1 + FU_tools_is_error "patch" + FU_build_configure FU_build_make FU_build_install "install-strip" diff --git a/patches/libxslt.patch b/patches/libxslt.patch new file mode 100644 index 0000000..8f3686a --- /dev/null +++ b/patches/libxslt.patch @@ -0,0 +1,7 @@ +--- ../src/libxslt-1.1.27/configure 2012-09-12 08:33:52.000000000 +0200 ++++ ../src/libxslt-1.1.27/configure 2017-04-06 14:21:19.000000000 +0200 +@@ -16297,3 +16297,4 @@ if test -n "$ac_unrecognized_opts" && te + $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + fi + ++find . -exec sed -i -e 's/-licucore//g' \{\} \; From fc5d7a4496ed6c9386514d8d9d240c78ca5a1a01 Mon Sep 17 00:00:00 2001 From: Richard van Dijk Date: Thu, 6 Apr 2017 22:07:12 +0200 Subject: [PATCH 2/4] use GV_sha1 config for git formulas This enables cloning a specific git commit by its SHA1 hash. --- include/files.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/files.sh b/include/files.sh index 061f699..0670d2e 100755 --- a/include/files.sh +++ b/include/files.sh @@ -55,6 +55,11 @@ FU_file_git_clone(){ echo -n "Download ${GV_name}... " if ! [ -d "${UV_download_dir}/${GV_dir_name}" ]; then git clone $GV_url 2>&1 + if ! [ -z $GV_sha1 ]; then + do_cd ${GV_dir_name} + echo "git reset --hard $GV_sha1" + git reset --hard $GV_sha1 + fi FU_tools_is_error "clone" else echo "alredy loaded" From 5f4fc8b4002911f5ed531e4f5b7b6f89cbd5a17b Mon Sep 17 00:00:00 2001 From: Richard van Dijk Date: Thu, 6 Apr 2017 22:09:53 +0200 Subject: [PATCH 3/4] use latest compatible version of wiringPi (fixes Illuminux/arm-cross-sysroot#9) --- formula/wiringpi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/formula/wiringpi.sh b/formula/wiringpi.sh index de4349e..73b0eb4 100755 --- a/formula/wiringpi.sh +++ b/formula/wiringpi.sh @@ -5,7 +5,7 @@ if ! [ "${UV_board}" == "raspi" ]; then fi GV_url="git://git.drogon.net/wiringPi" -GV_sha1="" +GV_sha1="95a292824ff9188f013fc230f432acf1a8b1092f" GV_depend=() From 7e085f7ca518f6f8ec89aa3a675103421611a23d Mon Sep 17 00:00:00 2001 From: Richard van Dijk Date: Thu, 6 Apr 2017 22:11:39 +0200 Subject: [PATCH 4/4] adjust download paths for several formulas --- formula/alsa-lib.sh | 2 +- formula/i2c-tools.sh | 2 +- formula/lame.sh | 2 +- formula/lcms2.sh | 2 +- formula/libgpg-error.sh | 2 +- formula/opencv.sh | 2 +- formula/orc.sh | 2 +- formula/readline.sh | 2 +- formula/taglib.sh | 2 +- formula/zlib.sh | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/formula/alsa-lib.sh b/formula/alsa-lib.sh index 667d899..80de10b 100755 --- a/formula/alsa-lib.sh +++ b/formula/alsa-lib.sh @@ -1,6 +1,6 @@ #!/bin/bash -GV_url="http://alsa.cybermirror.org/lib/alsa-lib-1.0.27.tar.bz2" +GV_url="ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.27.tar.bz2" GV_sha1="a110aa9230fc93c4bef776d255df2fac9ffd9e7a" GV_depend=() diff --git a/formula/i2c-tools.sh b/formula/i2c-tools.sh index 2f92854..2965049 100755 --- a/formula/i2c-tools.sh +++ b/formula/i2c-tools.sh @@ -1,6 +1,6 @@ #!/bin/bash -GV_url="http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-3.1.1.tar.bz2" +GV_url="http://jdelvare.nerim.net/mirror/i2c-tools/i2c-tools-3.1.1.tar.bz2" GV_sha1="05e4e3b34ebc921812e14527936c0fae65729204" GV_depend=() diff --git a/formula/lame.sh b/formula/lame.sh index cb099e3..9a2615d 100755 --- a/formula/lame.sh +++ b/formula/lame.sh @@ -1,6 +1,6 @@ #!/bin/bash -GV_url="http://garr.dl.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz" +GV_url="http://iweb.dl.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz" GV_sha1="03a0bfa85713adcc6b3383c12e2cc68a9cfbf4c4" GV_depend=() diff --git a/formula/lcms2.sh b/formula/lcms2.sh index 4c48310..70a97f6 100755 --- a/formula/lcms2.sh +++ b/formula/lcms2.sh @@ -1,6 +1,6 @@ #!/bin/bash -GV_url="http://optimate.dl.sourceforge.net/project/lcms/lcms/2.2/lcms2-2.2.tar.gz" +GV_url="http://iweb.dl.sourceforge.net/project/lcms/lcms/2.2/lcms2-2.2.tar.gz" GV_sha1="55ae4884a92c7fbd491c118aa3b356814b1014df" GV_depend=() diff --git a/formula/libgpg-error.sh b/formula/libgpg-error.sh index 9a56def..b8c36bf 100755 --- a/formula/libgpg-error.sh +++ b/formula/libgpg-error.sh @@ -1,6 +1,6 @@ #!/bin/bash -GV_url="ftp://ftp.gnupg.org/GnuPG/libgpg-error//libgpg-error-1.10.tar.bz2" +GV_url="ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.bz2" GV_sha1="95b324359627fbcb762487ab6091afbe59823b29" GV_depend=() diff --git a/formula/opencv.sh b/formula/opencv.sh index 765380d..5c0b7c5 100755 --- a/formula/opencv.sh +++ b/formula/opencv.sh @@ -1,6 +1,6 @@ #!/bin/bash -GV_url="http://garr.dl.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.10/opencv-2.4.10.zip" +GV_url="http://iweb.dl.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.10/opencv-2.4.10.zip" GV_sha1="0b185f5e332d5feef91722a6ed68c36a6d33909e" GV_depend=( diff --git a/formula/orc.sh b/formula/orc.sh index 4644afa..2dffdf4 100755 --- a/formula/orc.sh +++ b/formula/orc.sh @@ -1,6 +1,6 @@ #!/bin/bash -GV_url="http://code.entropywave.com/download/orc/orc-0.4.16.tar.gz" +GV_url="https://gstreamer.freedesktop.org/src/orc/orc-0.4.16.tar.gz" GV_sha1="b67131881e7834b0c820bfba468f668100fb2e91" GV_depend=() diff --git a/formula/readline.sh b/formula/readline.sh index 4d00126..f4a5dc1 100755 --- a/formula/readline.sh +++ b/formula/readline.sh @@ -1,6 +1,6 @@ #!/bin/bash -GV_url="ftp.gnu.org:/pub/gnu/readline/readline-6.0.tar.gz" +GV_url="ftp://ftp.gnu.org:/pub/gnu/readline/readline-6.0.tar.gz" GV_sha1="1e511b091514ef631c539552316787c75ace5262" GV_depend=() diff --git a/formula/taglib.sh b/formula/taglib.sh index 0828584..b94cad8 100755 --- a/formula/taglib.sh +++ b/formula/taglib.sh @@ -1,6 +1,6 @@ #!/bin/bash -GV_url="http://ktown.kde.org/~wheeler/files/src/taglib-1.7.2.tar.gz" +GV_url="http://ftp.osuosl.org/pub/blfs/conglomeration/taglib/taglib-1.7.2.tar.gz" GV_sha1="e657384ccf3284db2daba32dccece74534286012" GV_depend=() diff --git a/formula/zlib.sh b/formula/zlib.sh index 0a6ee40..dd475b5 100755 --- a/formula/zlib.sh +++ b/formula/zlib.sh @@ -1,6 +1,6 @@ #!/bin/bash -GV_url="http://zlib.net/zlib-1.2.8.tar.gz" +GV_url="http://zlib.net/fossils/zlib-1.2.8.tar.gz" GV_sha1="a4d316c404ff54ca545ea71a27af7dbc29817088" GV_depend=()