From c8ee03544d0b9f2b91ff899040ee5f9b92625011 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Fri, 29 Aug 2014 16:55:22 -0700 Subject: [PATCH 1/9] gc: fix download Signed-off-by: Timothy Gu --- src/gc.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gc.mk b/src/gc.mk index aaaf8d65..d8518188 100644 --- a/src/gc.mk +++ b/src/gc.mk @@ -7,14 +7,15 @@ $(PKG)_VERSION := 7.2d $(PKG)_CHECKSUM := b43573800e27361da78f05a2e98394521cfa04fc $(PKG)_SUBDIR := $(PKG)-7.2 $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://www.hpl.hp.com/personal/Hans_Boehm/$(PKG)/$(PKG)_source/$($(PKG)_FILE) +$(PKG)_URL := http://hboehm.info/$(PKG)/$(PKG)_source/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - $(WGET) -q -O- 'http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/?C=M;O=D' | \ + $(WGET) -q -O- 'http://hboehm.info/gc/gc_source/' | \ grep ' Date: Thu, 21 Aug 2014 19:53:45 -0700 Subject: [PATCH 2/9] Add target download-only-* to ease developing Signed-off-by: Timothy Gu Conflicts: Makefile --- Makefile | 6 +++++- index.html | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5520a78f..9e719599 100644 --- a/Makefile +++ b/Makefile @@ -178,7 +178,11 @@ $(foreach TARGET,$(MXE_TARGETS),$(eval $(call TARGET_RULE,$(TARGET)))) define PKG_RULE .PHONY: download-$(1) -download-$(1):: $(addprefix download-,$($(1)_DEPS)) +download-$(1):: $(addprefix download-,$(value $(call LOOKUP_PKG_RULE,$(1),DEPS,$(3)))) \ + download-only-$(1) + +.PHONY: download-only-$(1) +download-only-$(1):: if ! $(call CHECK_PKG_ARCHIVE,$(1)); then \ $(call DOWNLOAD_PKG_ARCHIVE,$(1)); \ $(call CHECK_PKG_ARCHIVE,$(1)) || { echo 'Wrong checksum!'; exit 1; }; \ diff --git a/index.html b/index.html index 47c42abd..b0aee1f4 100644 --- a/index.html +++ b/index.html @@ -1036,6 +1036,13 @@ local-pkg-list: $(LOCAL_PKG_LIST) where up to 4 packages are downloaded in parallel +
make download-only-foo download-only-bar
+ +
+ download packages "foo", "bar", without their dependencies, + non-parallel +
+
make clean
From 810170eeb62e0252737654c367fa45a3ba5b4c75 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Fri, 29 Aug 2014 17:17:33 -0700 Subject: [PATCH 3/9] qt: Fix downloading Signed-off-by: Timothy Gu --- src/qt.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt.mk b/src/qt.mk index 13d5a485..b8d9c543 100644 --- a/src/qt.mk +++ b/src/qt.mk @@ -7,7 +7,7 @@ $(PKG)_VERSION := 4.8.5 $(PKG)_CHECKSUM := 745f9ebf091696c0d5403ce691dc28c039d77b9e $(PKG)_SUBDIR := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://download.qt-project.org/official_releases/qt/4.8/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL := http://download.qt-project.org/archive/qt/4.8/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus define $(PKG)_UPDATE From 5e16d5178723e41827f11abe42f0e786acd4686e Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Fri, 29 Aug 2014 17:28:06 -0700 Subject: [PATCH 4/9] imagemagick: fix download Signed-off-by: Timothy Gu --- src/imagemagick.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/imagemagick.mk b/src/imagemagick.mk index cc03b8e1..99accb2a 100644 --- a/src/imagemagick.mk +++ b/src/imagemagick.mk @@ -7,8 +7,8 @@ $(PKG)_VERSION := 6.8.6-3 $(PKG)_CHECKSUM := fff85a0b7fa1c8d6307908e4cc58d2576c79ff11 $(PKG)_SUBDIR := ImageMagick-$($(PKG)_VERSION) $(PKG)_FILE := ImageMagick-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := http://www.imagemagick.org/download/$($(PKG)_FILE) -$(PKG)_URL_2 := http://ftp.nluug.nl/ImageMagick/$($(PKG)_FILE) +$(PKG)_URL := http://www.imagemagick.org/download/releases/$($(PKG)_FILE) +$(PKG)_URL_2 := http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/$($(PKG)_FILE) $(PKG)_DEPS := gcc bzip2 ffmpeg fftw freetype jasper jpeg lcms liblqr-1 libpng libtool openexr pthreads tiff define $(PKG)_UPDATE From ec609013a79df9f86f7edc29014941cf6d8c9c10 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Fri, 29 Aug 2014 17:32:39 -0700 Subject: [PATCH 5/9] gd: Fix download Signed-off-by: Timothy Gu --- src/gd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gd.mk b/src/gd.mk index 28d50bdf..d5a491e9 100644 --- a/src/gd.mk +++ b/src/gd.mk @@ -8,6 +8,7 @@ $(PKG)_CHECKSUM := ccf34a610abff2dbf133a20c4d2a4aa94939018a $(PKG)_SUBDIR := gd-$($(PKG)_VERSION) $(PKG)_FILE := gd-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.libgd.org/releases/$($(PKG)_FILE) +$(PKG)_URL_2 := http://ring.u-toyama.ac.jp/archives/graphics/gd/$($(PKG)_FILE) $(PKG)_DEPS := gcc freetype libpng jpeg libxml2 pthreads define $(PKG)_UPDATE From 91c1cc2377446103b8dfb527b0fd86fbfe378a84 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Fri, 29 Aug 2014 17:34:56 -0700 Subject: [PATCH 6/9] gdal: Fix download Signed-off-by: Timothy Gu --- src/gdal.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gdal.mk b/src/gdal.mk index 1a2bfbfe..d1dbecc7 100644 --- a/src/gdal.mk +++ b/src/gdal.mk @@ -7,8 +7,8 @@ $(PKG)_VERSION := 1.10.0 $(PKG)_CHECKSUM := e522b95056905e4c41047fdb42c0ca172ef3ad25 $(PKG)_SUBDIR := gdal-$($(PKG)_VERSION) $(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://download.osgeo.org/gdal/CURRENT/$($(PKG)_FILE) -$(PKG)_URL_2 := ftp://ftp.remotesensing.org/gdal/CURRENT/$($(PKG)_FILE) +$(PKG)_URL := http://download.osgeo.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL_2 := ftp://ftp.remotesensing.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib libpng tiff libgeotiff jpeg jasper giflib expat sqlite curl geos postgresql gta hdf4 hdf5 netcdf define $(PKG)_UPDATE From 1dc24684823dfee4f148b5067b07d29786c64ae2 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Fri, 29 Aug 2014 17:38:17 -0700 Subject: [PATCH 7/9] hdf5: Fix download Signed-off-by: Timothy Gu --- src/hdf5.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hdf5.mk b/src/hdf5.mk index 2b9a5fa3..0af0b786 100644 --- a/src/hdf5.mk +++ b/src/hdf5.mk @@ -7,7 +7,7 @@ $(PKG)_VERSION := 1.8.11 $(PKG)_CHECKSUM := 87ded0894b104cf23a4b965f4ac0a567f8612e5e $(PKG)_SUBDIR := hdf5-$($(PKG)_VERSION) $(PKG)_FILE := hdf5-$($(PKG)_VERSION).tar.bz2 -$(PKG)_URL := http://www.hdfgroup.org/ftp/HDF5/current/src/$($(PKG)_FILE) +$(PKG)_URL := http://www.hdfgroup.org/ftp/HDF5/releases/$($(PKG)_SUBDIR)/src/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib pthreads define $(PKG)_UPDATE From b6f7888e76ecbbd81a8657e8a1ccc0710561be58 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Fri, 29 Aug 2014 17:42:39 -0700 Subject: [PATCH 8/9] opencv: Fix download Signed-off-by: Timothy Gu --- src/opencv.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/opencv.mk b/src/opencv.mk index 0c72cc76..1820db6d 100644 --- a/src/opencv.mk +++ b/src/opencv.mk @@ -8,6 +8,7 @@ $(PKG)_CHECKSUM := 6e518c0274a8392c0c98d18ef0ef754b9c596aca $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := OpenCV-$($(PKG)_VERSION)a.tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)library/$(PKG)-unix/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL_2 := http://distfiles.macports.org/opencv/$($(PKG)_FILE) $(PKG)_DEPS := gcc eigen ffmpeg jasper jpeg lcms1 libpng openexr tiff xz zlib define $(PKG)_UPDATE From 0e50d664f4efce912ee1a4ee62168c661d6f9199 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Fri, 29 Aug 2014 17:47:27 -0700 Subject: [PATCH 9/9] pcl: Fix download Signed-off-by: Timothy Gu --- src/pcl.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pcl.mk b/src/pcl.mk index e68b897d..b5c807f0 100644 --- a/src/pcl.mk +++ b/src/pcl.mk @@ -4,10 +4,10 @@ PKG := pcl $(PKG)_IGNORE := $(PKG)_VERSION := 1.6.0 -$(PKG)_CHECKSUM := 45a2e155d7faf5901abe609fd40d5f1659015e9e -$(PKG)_SUBDIR := PCL-$($(PKG)_VERSION)-Source -$(PKG)_FILE := PCL-$($(PKG)_VERSION)-Source.tar.bz2 -$(PKG)_URL := http://www.pointclouds.org/assets/files/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_CHECKSUM := 6e45e45dc711821236a79c6a777d045c0a2baf93 +$(PKG)_SUBDIR := pcl-pcl-$($(PKG)_VERSION) +$(PKG)_FILE := pcl-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/PointCloudLibrary/pcl/archive/$($(PKG)_FILE) $(PKG)_DEPS := gcc libgomp boost eigen flann vtk define $(PKG)_UPDATE