freetype, libfuse, libpng, x11vnc, zlib: get rid of BR2_SOURCEFORGE_MIRROR

PATCH New Stefan Froberg 2 participants 4 messages Aug 22, 2012 – Aug 25, 2012

Share & tools

Stefan Froberg

author

2012-08-22 22:11 UTC #0 lore raw

PATCH 1/1 freetype, libfuse, libpng, x11vnc, zlib: get rid of BR2_SOURCEFORGE_MIRROR

Starting point of kicking that useless BR2_SOURCEFORGE_MIRROR variable out and using sourceforges mirror autoselection.

This will ensure that there will be always some mirror available and maybe fast one too (Hurrah! 3G modem users shout ;) )

If someone *still* want's to have sourceforge mirror forcing then that could probably be possible with the hacking of package/pkg-download.mk and adding special handling of BR2_SOURCEFORGE_MIRROR variable in DOWNLOAD_INNER.

Regards:
Stefan Froberg

Stefan Froberg

author

2012-08-22 22:11 UTC #1 lore raw

PATCH 1/1 freetype, libfuse, libpng, x11vnc, zlib: get rid of BR2_SOURCEFORGE_MIRROR

Signed-off-by Stefan Froberg <[email protected]>

---
 package/freetype/freetype.mk |    2 +-
 package/libfuse/libfuse.mk   |    2 +-
 package/libpng/libpng.mk     |    2 +-
 package/x11vnc/x11vnc.mk     |    2 +-
 package/zlib/zlib.mk         |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

package/freetype/freetype.mk +1 -1

index 448efe0..2116cee 100644
@@ -5,8 +5,8 @@
 #############################################################
 
 FREETYPE_VERSION = 2.4.10
-FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
+FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/${FREETYPE_VERSION}
 FREETYPE_INSTALL_STAGING = YES
 FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
 FREETYPE_DEPENDENCIES = host-pkg-config \

package/libfuse/libfuse.mk +1 -1

index 5f748b4..246697f 100644
@@ -6,7 +6,7 @@
 
 LIBFUSE_VERSION = 2.9.0
 LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
-LIBFUSE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/fuse/fuse-2.X/$(LIBFUSE_VERSION)
+LIBFUSE_SITE = http://downloads.sourceforge.net/project/fuse/fuse-2.X/$(LIBFUSE_VERSION)
 
 LIBFUSE_INSTALL_STAGING = YES
 LIBFUSE_CONF_OPT= --disable-nls \

package/libpng/libpng.mk +1 -1

index 6edabc4..171b616 100644
@@ -6,8 +6,8 @@
 
 LIBPNG_VERSION = 1.4.12
 LIBPNG_SERIES = 14
-LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION)
 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2
+LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/${LIBPNG_VERSION}
 LIBPNG_INSTALL_STAGING = YES
 LIBPNG_DEPENDENCIES = host-pkg-config zlib

package/x11vnc/x11vnc.mk +1 -1

index 06d3f0d..e96b665 100644
@@ -5,7 +5,7 @@
 #############################################################
 X11VNC_VERSION = 0.9.3
 X11VNC_SOURCE = x11vnc-$(X11VNC_VERSION).tar.gz
-X11VNC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libvncserver
+X11VNC_SITE = http://downloads.sourceforge.net/project/libvncserver/x11vnc/$(X11VNC_VERSION)
 X11VNC_CONF_OPT = \
 	--without-avahi

package/zlib/zlib.mk +1 -1

index a9d4a8f..54915ad 100644
@@ -6,7 +6,7 @@
 
 ZLIB_VERSION = 1.2.7
 ZLIB_SOURCE =zlib-$(ZLIB_VERSION).tar.bz2
-ZLIB_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
+ZLIB_SITE = http://downloads.sourceforge.net/project/libpng/zlib/$(ZLIB_VERSION)
 ZLIB_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)

Signature · 1 line

1.7.7.6

Thomas Petazzoni

Applied

2012-08-24 21:34 UTC #2 lore raw

PATCH 1/1 freetype, libfuse, libpng, x11vnc, zlib: get rid of BR2_SOURCEFORGE_MIRROR

Le Thu, 23 Aug 2012 01:11:55 +0300,
Stefan Froberg <[email protected]> a ?crit :

Quoted 8 lines

Signed-off-by Stefan Froberg <[email protected]>

---
 package/freetype/freetype.mk |    2 +-
 package/libfuse/libfuse.mk   |    2 +-
 package/libpng/libpng.mk     |    2 +-
 package/x11vnc/x11vnc.mk     |    2 +-
 package/zlib/zlib.mk         |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

Applied, thanks.

I have done one small change: use $() everywhere instead of the ${} that you introduced. We use $() everywhere in Buildroot to reference make variables.

Could you look at the other packages that reference the BR2_SOURCEFORGE_MIRROR variable?

Thanks!

Thomas

Signature · 4 lines

Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

Stefan Fröberg

author

2012-08-25 00:20 UTC #3 lore raw

PATCH 1/1 freetype, libfuse, libpng, x11vnc, zlib: get rid of BR2_SOURCEFORGE_MIRROR

Hi Thomas!

25.8.2012 0:34, Thomas Petazzoni kirjoitti:

Quoted 11 lines

Le Thu, 23 Aug 2012 01:11:55 +0300,
Stefan Froberg <[email protected]> a ?crit :
Quoted 8 lines
Signed-off-by Stefan Froberg <[email protected]>
---
 package/freetype/freetype.mk |    2 +-
 package/libfuse/libfuse.mk   |    2 +-
 package/libpng/libpng.mk     |    2 +-
 package/x11vnc/x11vnc.mk     |    2 +-
 package/zlib/zlib.mk         |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

Quoted 8 lines

Applied, thanks.
I have done one small change: use $() everywhere instead of the ${} that you introduced. We use $() everywhere in Buildroot to reference make variables.
Could you look at the other packages that reference the BR2_SOURCEFORGE_MIRROR variable?

Sure, no problem.
I will make one megapatch that takes care of all the rest of the sourceforge packages.

Actually I think I do just that before submitting my cleaned up firefox patch + it's required changes
to other packages as you requested.
http://lists.busybox.net/pipermail/buildroot/2012-August/057858.html

Stefan

Quoted 3 lines

Thanks!
Thomas