Disable fribidi's primary download site because it is down. Used v.o one.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index a598eb59d7415ceb05231fbf10b6d8168ff39f14..519500757aa5e3f8efacec0228e179b3eb6c12ef 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -453,15 +453,19 @@ DISTCLEAN_PKG += freetype-$(FREETYPE2_VERSION).tar.gz
 # fribidi
 # ***************************************************************************
 
-fribidi-$(FRIBIDI_VERSION).tar.gz:
+fribidi-$(FRIBIDI_VERSION).tar.bz2:
        $(WGET) $(FRIBIDI_URL)
 
-fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz
-       $(EXTRACT_GZ)
+fribidi: fribidi-$(FRIBIDI_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
        patch -p0 < Patches/fribidi.patch.real
 ifdef HAVE_WIN32
        patch -p0 <Patches/fribidi-win32.patch
 endif
+ifdef HAVE_UCLIBC
+       patch -p0 < Patches/fribidi-uclibc.patch
+endif
+
 .fribidi: fribidi .iconv
        (cd $<; rm -f configure; ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)  && make && make install)
        $(INSTALL_NAME)
@@ -469,7 +473,7 @@ endif
 
 CLEAN_FILE += .fribidi
 CLEAN_PKG += fribidi
-DISTCLEAN_PKG += fribidi-$(FRIBIDI_VERSION).tar.gz
+DISTCLEAN_PKG += fribidi-$(FRIBIDI_VERSION).tar.bz2
 
 # ***************************************************************************
 # liba52

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index b5bef3f3a30f07b1d268e251204596d8907cae5b..7edf803d32f60953e77044f53c932db26602f0b4 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -45,7 +45,8 @@ GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
 FREETYPE2_VERSION=2.3.4
 FREETYPE2_URL=$(SF)/freetype/freetype-$(FREETYPE2_VERSION).tar.gz
 FRIBIDI_VERSION=0.10.4
-FRIBIDI_URL=http://fribidi.org/download/fribidi-$(FRIBIDI_VERSION).tar.gz
+#FRIBIDI_URL=http://fribidi.org/download/fribidi-$(FRIBIDI_VERSION).tar.gz
+FRIBIDI_URL=ftp://ftp.videolan.org/pub/testing/contrib/fribidi-$(FRIBIDI_VERSION).tar.bz2
 A52DEC_VERSION=0.7.4
 A52DEC_URL=$(VIDEOLAN)/testing/contrib/a52dec-$(A52DEC_VERSION).tar.gz
 MPEG2DEC_VERSION=0.4.1