Contribs: Believe it or not, new version of libjpeg!

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index c9dec16cb1bd391fd6127703871b638fc865c28e..56168671dddedd4582a3dded8b8ff33d414c658b 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2079,20 +2079,20 @@ DISTCLEAN_PKG += firefox-source-$(MOZILLA_VERSION).tar.bz2
 # libjpeg
 # ***************************************************************************
 
-jpeg-$(JPEG_VERSION).tar.gz:
+jpegsrc.v$(JPEG_VERSION).tar.gz:
        $(WGET) $(JPEG_URL)
 
-jpeg: jpeg-$(JPEG_VERSION).tar.gz
+jpeg-7: jpegsrc.v$(JPEG_VERSION).tar.gz
        $(EXTRACT_GZ)
 
-.jpeg: jpeg
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(HOSTCC) && make && make install-lib)
+.jpeg: jpeg-7
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(HOSTCC) && make && make install)
        $(RANLIB) $(PREFIX)/lib/libjpeg.a
        touch $@
 
 CLEAN_FILE += .jpeg
-CLEAN_PKG += jpeg
-DISTCLEAN_PKG += jpeg-$(JPEG_VERSION).tar.gz
+CLEAN_PKG += jpeg-7
+DISTCLEAN_PKG += jpegsrc.v$(JPEG_VERSION).tar.gz
 
 # ***************************************************************************
 # tiff

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index e967f539876d987c317ba5a45d4237e13a11cbf8..aec30f03c0e5c538c3c78d032424da276d6936f6 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -163,8 +163,8 @@ TWOLAME_VERSION=0.3.12
 TWOLAME_URL=$(SF)/twolame/twolame-$(TWOLAME_VERSION).tar.gz
 X264_VERSION=20050609
 X264_URL=$(VIDEOLAN)/testing/contrib/x264-$(X264_VERSION).tar.gz
-JPEG_VERSION=6b
-JPEG_URL=$(VIDEOLAN)/contrib/jpeg-$(JPEG_VERSION).tar.gz
+JPEG_VERSION=7
+JPEG_URL=$(VIDEOLAN)/contrib/jpegsrc.v$(JPEG_VERSION).tar.gz
 TIFF_VERSION=3.8.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