Contrib: jpeg update to v8a

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index e584a9b378511e96da42e4b7ba4d6c1905e86898..6eca294ba300ba293e2fd6fcb94262ffd568865e 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2011,10 +2011,10 @@ DISTCLEAN_PKG += firefox-source-$(MOZILLA_VERSION).tar.bz2
 jpegsrc.v$(JPEG_VERSION).tar.gz:
        $(WGET) $(JPEG_URL)
 
-jpeg-7: jpegsrc.v$(JPEG_VERSION).tar.gz
+jpeg-$(JPEG_VERSION): jpegsrc.v$(JPEG_VERSION).tar.gz
        $(EXTRACT_GZ)
 
-.jpeg: jpeg-7
+.jpeg: jpeg-$(JPEG_VERSION)
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(HOSTCC) && make && make install)
        $(RANLIB) $(PREFIX)/lib/libjpeg.a
        touch $@

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index bf1e18857e644103407895cab813d69fadb6fcae..f04aca57972803de7a2fedd96cfff7418cee9a78 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -167,8 +167,8 @@ TWOLAME_VERSION=0.3.12
 TWOLAME_URL=$(SF)/twolame/twolame-$(TWOLAME_VERSION).tar.gz
 X264_VERSION=20050609
 X264_URL=$(CONTRIB_VIDEOLAN)/x264-$(X264_VERSION).tar.gz
-JPEG_VERSION=7
-JPEG_URL=$(VIDEOLAN)/contrib/jpegsrc.v$(JPEG_VERSION).tar.gz
+JPEG_VERSION=8a
+JPEG_URL=http://www.ijg.org/files/jpegsrc.v$(JPEG_VERSION).tar.gz
 TIFF_VERSION=3.9.2
 TIFF_URL=ftp://ftp.remotesensing.org/libtiff/tiff-$(TIFF_VERSION).tar.gz
 #TIFF_URL=http://dl.maptools.org/dl/libtiff/tiff-$(TIFF_VERSION).tar.gz