delete jpeg, use libjpeg-turbo

15 files changed, 22 insertions, 64 deletions

diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile
index 41da96f05..67d3e5003 100644
--- a/package/DirectFB/Makefile
+++ b/package/DirectFB/Makefile
@@ -10,8 +10,8 @@ PKG_EXTRAVER:=		1.6-0
 PKG_MD5SUM:=		641e8e999c017770da647f9b5b890906
 PKG_DESCR:=		Thin graphic library for the Linux framebuffer devices
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libpng libjpeg libfreetype
-PKG_BUILDDEP:=		libpng jpeg freetype
+PKG_DEPENDS:=		libpng libjpeg-turbo libfreetype
+PKG_BUILDDEP:=		libpng libjpeg-turbo freetype
 PKG_URL:=		http://www.directfb.org/
 PKG_SITES:=		http://directfb.org/downloads/Core/DirectFB-1.6/
 PKG_LIBNAME:=		directfb
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile
index 5f03351c2..dc42ebe55 100644
--- a/package/ImageMagick/Makefile
+++ b/package/ImageMagick/Makefile
@@ -10,7 +10,7 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		8134257e3fbb43cc06fb32a6d725d3d0
 PKG_DESCR:=		image processing and converting utility
 PKG_SECTION:=		multimedia
-PKG_BUILDDEP:=		libpng jpeg libtiff fontconfig libiconv-tiny libtool e2fsprogs
+PKG_BUILDDEP:=		libpng libjpeg-turbo libtiff fontconfig libiconv-tiny libtool e2fsprogs
 PKG_BUILDDEP+=		pango
 PKG_URL:=		http://www.imagemagick.org/
 PKG_SITES:=		http://image_magick.veidrodis.com/image_magick/
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index 6f427d357..56077e946 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -9,9 +9,9 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		726cd0b7a18c5e25f4d80ebeffe7607e
 PKG_DESCR:=		small graphical web browser
 PKG_SECTION:=		x11/apps
-PKG_DEPENDS:=		libfltk libxi libpng zlib libjpeg
+PKG_DEPENDS:=		libfltk libxi libpng zlib libjpeg-turbo
 PKG_DEPENDS+=		libstdcxx libpthread libgcc libopenssl
-PKG_BUILDDEP:=		fltk libXi libiconv-tiny jpeg libpng zlib openssl
+PKG_BUILDDEP:=		fltk libXi libiconv-tiny libjpeg-turbo libpng zlib openssl
 PKG_URL:=		http://www.dillo.org/
 PKG_SITES:=		http://www.dillo.org/download/
 PKG_NEED_CXX:=		1
diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile
deleted file mode 100644
index cd7763c5e..000000000
--- a/package/jpeg/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME:=		jpeg
-PKG_VERSION:=		8d
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		52654eb3b2e60c35731ea8fc87f1bd29
-PKG_DESCR:=		The Independent JPEG Groups JPEG runtime library
-PKG_SECTION:=		libs
-PKG_URL:=		http://www.ijg.org/
-PKG_SITES:=		http://www.ijg.org/files/
-PKG_LIBNAME:=		libjpeg
-PKG_OPTS:=		dev
-
-DISTFILES:=		${PKG_NAME}src.v${PKG_VERSION}.tar.gz
-
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+=		libonly
-endif
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-
-libjpeg-install:
-	${INSTALL_DIR} ${IDIR_LIBJPEG}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libjpeg.so* ${IDIR_LIBJPEG}/usr/lib/
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/jpeg/patches/patch-ltmain_sh b/package/jpeg/patches/patch-ltmain_sh
deleted file mode 100644
index 234778820..000000000
--- a/package/jpeg/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- jpeg-8d.orig/ltmain.sh	2011-12-22 14:48:30.000000000 +0100
-+++ jpeg-8d/ltmain.sh	2012-10-15 10:59:49.000000000 +0200
-@@ -5853,7 +5853,7 @@ func_mode_link ()
-       # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/libgd/Makefile b/package/libgd/Makefile
index e4d913beb..608c7ed8a 100644
--- a/package/libgd/Makefile
+++ b/package/libgd/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		03588159bf4faab9079849c8d709acc6
 PKG_DESCR:=		A library for the dynamic creation of images
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libjpeg libpng
-PKG_BUILDDEP:=		libpng jpeg
+PKG_DEPENDS:=		libjpeg-turbo libpng
+PKG_BUILDDEP:=		libpng libjpeg-turbo
 PKG_URL:=		http://www.libgd.org/
 PKG_SITES:=		https://bitbucket.org/libgd/gd-libgd/downloads/
 PKG_LIBNAME:=		libgd
diff --git a/package/links/Makefile b/package/links/Makefile
index f2cdf6b12..ab1f7e592 100644
--- a/package/links/Makefile
+++ b/package/links/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		6b5ca02e180aed2f78ca2712f85e3ba5
 PKG_DESCR:=		web browser with graphic support
 PKG_SECTION:=		browser
-PKG_DEPENDS:=		libpng libjpeg libtiff gpm libopenssl
-PKG_BUILDDEP:=		openssl libpng jpeg gpm
+PKG_DEPENDS:=		libpng libjpeg-turbo libtiff gpm libopenssl
+PKG_BUILDDEP:=		openssl libpng libjpeg-turbo gpm
 PKG_URL:=		http://links.twibright.com/
 PKG_SITES:=		http://links.twibright.com/download/
 
diff --git a/package/motion/Makefile b/package/motion/Makefile
index e2974e1fc..69f96ea05 100644
--- a/package/motion/Makefile
+++ b/package/motion/Makefile
@@ -10,8 +10,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		6b8730c875e0f550c1abdb647027d8e1
 PKG_DESCR:=		Webcam motion sensing and logging
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		libjpeg libpthread libsdl
-PKG_BUILDDEP:=		jpeg sdl
+PKG_DEPENDS:=		libjpeg-turbo libpthread libsdl
+PKG_BUILDDEP:=		libjpeg-turbo sdl
 PKG_URL:=		http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=motion/}
 
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 2a6b2533f..a6851f3fa 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -9,12 +9,12 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		39dd55f30eb5403f219a606e79a6648a
 PKG_DESCR:=		popular video player
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		alsa-lib libjpeg libfaad2 libmad libncurses
+PKG_DEPENDS:=		alsa-lib libjpeg-turbo libfaad2 libmad libncurses
 PKG_DEPENDS+=		libogg libpng libpthread libvorbis giflib
 PKG_DEPENDS+=		libx11 libxau libxdmcp libxext libxv zlib
 PKG_DEPENDS+=		libxscrnsaver libtheora libxvid libvpx
 PKG_BUILDDEP:=		alsa-lib libmad libvorbis faad2 ncurses zlib
-PKG_BUILDDEP+=		libX11 libXv libpng libXext jpeg libtheora
+PKG_BUILDDEP+=		libX11 libXv libpng libXext libjpeg-turbo libtheora
 PKG_BUILDDEP+=		xvidcore libvpx gettext-tiny
 PKG_URL:=		http://www.mplayerhq.hu/
 PKG_SITES:=		http://www.mplayerhq.hu/MPlayer/releases/
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index d51a80d8b..2787168bf 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		e96e5e578d442d3ae56cd332e8dbc6b6
 PKG_DESCR:=		OpenJDK 7 Java VM
 PKG_SECTION:=		lang
 PKG_BUILDDEP:=		gettext-tiny-host glib-host flex-host bison-host qemu-host
-PKG_BUILDDEP+=		alsa-lib xproto jpeg zlib giflib libpng freetype cups
+PKG_BUILDDEP+=		alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups
 PKG_BUILDDEP+=		libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny
 PKG_DEPENDS:=		zlib libstdcxx libffi libpthread libxtst libxi libgcc
 PKG_URL:=		http://openjdk.org/
diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile
index 3f5e2b06d..14fa39434 100644
--- a/package/sdl-image/Makefile
+++ b/package/sdl-image/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		6c06584b31559e2b59f2b982d0d1f628
 PKG_DESCR:=		Simple DirectMedia Layer
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libpng libtiff libjpeg libsdl
-PKG_BUILDDEP:=		sdl-image-host libpng libtiff jpeg sdl
+PKG_DEPENDS:=		libpng libtiff libjpeg-turbo libsdl
+PKG_BUILDDEP:=		sdl-image-host libpng libtiff libjpeg-turbo sdl
 PKG_URL:=		http://www.libsdl.org/
 PKG_SITES:=		http://www.libsdl.org/projects/SDL_image/release/
 PKG_NEED_CXX:=		1
diff --git a/package/v4l-utils/Makefile b/package/v4l-utils/Makefile
index 70bcc28d6..f4879acdd 100644
--- a/package/v4l-utils/Makefile
+++ b/package/v4l-utils/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		2127f2d06be9162b0d346f7037a9e852
 PKG_DESCR:=		Video4Linux2 utilities
 PKG_SECTION:=		multimedia
-PKG_BUILDDEP:=		jpeg
+PKG_BUILDDEP:=		libjpeg-turbo
 PKG_SITES:=		http://linuxtv.org/downloads/v4l-utils/
 PKG_LIBNAME:=		libv4l
 PKG_OPTS:=		dev
diff --git a/package/vnc-reflector/Makefile b/package/vnc-reflector/Makefile
index 3be33a3a7..d6c36d88f 100644
--- a/package/vnc-reflector/Makefile
+++ b/package/vnc-reflector/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		c3f88bc62f228b335c25c07f9744ab0c
 PKG_DESCR:=		specialized VNC server which acts as a proxy
 PKG_SECTION:=		proxy
-PKG_DEPENDS:=		libjpeg zlib
-PKG_BUILDDEP:=		jpeg zlib
+PKG_DEPENDS:=		libjpeg-turbo zlib
+PKG_BUILDDEP:=		libjpeg-turbo zlib
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=vnc-reflector/}
 
 DISTFILES:=		vnc_reflector-${PKG_VERSION}.tar.gz
diff --git a/package/x11vnc/Makefile b/package/x11vnc/Makefile
index ef5a2d428..e98d28416 100644
--- a/package/x11vnc/Makefile
+++ b/package/x11vnc/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		1498a68d02aa7b6c97bf746c073c8d00
 PKG_DESCR:=		VNC server for X11 displays
 PKG_SECTION:=		x11/apps
-PKG_BUILDDEP:=		libX11 libXtst jpeg
+PKG_BUILDDEP:=		libX11 libXtst libjpeg-turbo
 PKG_URL:=		http://www.karlrunge.com/x11vnc/
 PKG_SITES:=		http://openadk.org/distfiles/
 
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index aa971d872..236cd78b6 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		software media player
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		boost libffmpeg python2 libstdcxx bcm2835-vc
 PKG_DEPENDS+=		libglew mesalib libass libmpeg2 libmad dbus
-PKG_DEPENDS+=		libjpeg libogg libvorbis libmodplug libcurl
+PKG_DEPENDS+=		libjpeg-turbo libogg libvorbis libmodplug libcurl
 PKG_DEPENDS+=		libflac libopenssl libbz2 libtiff liblzo
 PKG_DEPENDS+=		yajl tinyxml libsqlite libpcrecpp libpng
 PKG_DEPENDS+=		libpcre libcdio libfreetype libsamplerate
@@ -19,7 +19,7 @@ PKG_DEPENDS+=		taglib libjasper libmp3lame libmicrohttpd
 PKG_DEPENDS+=		omxplayer libusb-compat libbluray libgpg-error
 PKG_DEPENDS+=		libssh libcec libnfs librtmp
 PKG_BUILDDEP:=		autotool boost ffmpeg python2 MesaLib libglew libass
-PKG_BUILDDEP+=		libmpeg2 libmad jpeg libogg libvorbis libmodplug
+PKG_BUILDDEP+=		libmpeg2 libmad libjpeg-turbo libogg libvorbis libmodplug
 PKG_BUILDDEP+=		curl flac openssl bzip2 libtiff liblzo yajl
 PKG_BUILDDEP+=		tinyxml sqlite pcre libpng libcdio freetype 
 PKG_BUILDDEP+=		libsamplerate taglib libjasper lame libmicrohttpd