From 5abd4fd0c32284ea562921a2d6460b5e406004c2 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Sun, 23 Mar 2014 09:58:28 +0100 Subject: [PATCH] recipes: replace libjpeg with libjpeg-turbo --- recipes/gdk-pixbuf.recipe | 2 +- recipes/gst-plugins-good-1.0-static.recipe | 2 +- recipes/gst-plugins-good-1.0.recipe | 2 +- recipes/gst-plugins-good-static.recipe | 2 +- recipes/gst-plugins-good.recipe | 2 +- recipes/jasper.recipe | 2 +- recipes/jpeg.recipe | 11 ----------- recipes/libjpeg-turbo.recipe | 16 ++++++++++++++++ 8 files changed, 22 insertions(+), 17 deletions(-) delete mode 100644 recipes/jpeg.recipe create mode 100644 recipes/libjpeg-turbo.recipe diff --git a/recipes/gdk-pixbuf.recipe b/recipes/gdk-pixbuf.recipe index c24c80c..a3e24cf 100644 --- a/recipes/gdk-pixbuf.recipe +++ b/recipes/gdk-pixbuf.recipe @@ -7,7 +7,7 @@ class Recipe(recipe.Recipe): version = '2.26.2' licenses = [License.LGPLv2Plus] configure_options = '--with-included-loaders --enable-static ' - deps = ['jpeg', 'glib', 'libpng', 'tiff', 'zlib' ] + deps = ['libjpeg-turbo', 'glib', 'libpng', 'tiff', 'zlib' ] autoreconf = True files_libs = ['libgdk_pixbuf-2.0'] diff --git a/recipes/gst-plugins-good-1.0-static.recipe b/recipes/gst-plugins-good-1.0-static.recipe index 2ba0d11..8044a02 100644 --- a/recipes/gst-plugins-good-1.0-static.recipe +++ b/recipes/gst-plugins-good-1.0-static.recipe @@ -8,7 +8,7 @@ class Recipe(custom.GStreamerStatic): licenses = [License.LGPLv2Plus] extra_configure_options = '--enable-static --disable-oss4 --disable-oss --disable-dv1394 --disable-aalib --disable-libcaca --disable-jack --disable-shout2' commit = 'upstream/1.0' - deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'jpeg', 'libpng', + deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'libjpeg-turbo', 'libpng', 'speex', 'gdk-pixbuf', 'libsoup', 'orc', 'wavpack', 'flac', 'taglib', 'bzip2', 'zlib', 'libvpx', 'libdv', 'cairo'] diff --git a/recipes/gst-plugins-good-1.0.recipe b/recipes/gst-plugins-good-1.0.recipe index c4821c8..7c2eb54 100644 --- a/recipes/gst-plugins-good-1.0.recipe +++ b/recipes/gst-plugins-good-1.0.recipe @@ -8,7 +8,7 @@ class Recipe(recipe.Recipe): config_sh = 'sh ./autogen.sh --noconfigure && ./configure' configure_options = '--disable-introspection --disable-examples --disable-oss4 --disable-oss --disable-dv1394 --disable-aalib --disable-libcaca --disable-jack --disable-shout2 --with-package-origin="http://www.gstreamer.com" --with-package-name=\'GStreamer Good Plugins (GStreamer SDK)\' ' commit = 'upstream/1.0' - deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'jpeg', 'libpng', + deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'libjpeg-turbo', 'libpng', 'speex', 'gdk-pixbuf', 'libsoup', 'orc', 'wavpack', 'flac', 'taglib', 'bzip2', 'zlib', 'libvpx', 'libdv', 'cairo'] diff --git a/recipes/gst-plugins-good-static.recipe b/recipes/gst-plugins-good-static.recipe index a1eb804..5699d64 100644 --- a/recipes/gst-plugins-good-static.recipe +++ b/recipes/gst-plugins-good-static.recipe @@ -7,7 +7,7 @@ class Recipe(custom.GStreamerStatic): gstreamer_version = '0.10' licenses = [License.LGPLv2Plus] extra_configure_options = ' --disable-oss4 --disable-oss --disable-dv1394 --disable-aalib --disable-libcaca --disable-esd --disable-gconf --disable-hal --disable-jack --disable-shout2' - deps = ['gstreamer', 'gst-plugins-base', 'jpeg', 'libpng', + deps = ['gstreamer', 'gst-plugins-base', 'libjpeg-turbo', 'libpng', 'speex', 'gdk-pixbuf', 'libsoup', 'cairo', 'orc', 'wavpack', 'flac', 'taglib', 'bzip2', 'zlib', 'libdv' ] diff --git a/recipes/gst-plugins-good.recipe b/recipes/gst-plugins-good.recipe index e7c318e..0eeb96c 100644 --- a/recipes/gst-plugins-good.recipe +++ b/recipes/gst-plugins-good.recipe @@ -8,7 +8,7 @@ class Recipe(recipe.Recipe): config_sh = 'sh ./autogen.sh --noconfigure && ./configure' configure_options = '--disable-introspection --disable-examples --disable-oss4 --disable-oss --disable-dv1394 --disable-aalib --disable-libcaca --disable-esd --disable-gconf --disable-hal --disable-jack --disable-shout2 --with-package-origin="http://www.gstreamer.com" --with-package-name=\'GStreamer Good Plugins (GStreamer SDK)\' ' remotes = {'upstream': 'git://anongit.freedesktop.org/gstreamer/gst-plugins-good'} - deps = ['gstreamer', 'gst-plugins-base', 'jpeg', 'libpng', + deps = ['gstreamer', 'gst-plugins-base', 'libjpeg-turbo', 'libpng', 'speex', 'gdk-pixbuf', 'libsoup','taglib', 'orc', 'wavpack', 'flac', 'bzip2', 'zlib', 'cairo', 'libdv'] diff --git a/recipes/jasper.recipe b/recipes/jasper.recipe index 08e076a..9e285bc 100644 --- a/recipes/jasper.recipe +++ b/recipes/jasper.recipe @@ -6,7 +6,7 @@ class Recipe(recipe.Recipe): licenses = [License.Jasperv2] config_sh = 'sh configure' configure_options = '--enable-shared ' - deps = ['jpeg'] + deps = ['libjpeg-turbo'] files_libs = ['libjasper'] files_bins = ['jasper'] diff --git a/recipes/jpeg.recipe b/recipes/jpeg.recipe deleted file mode 100644 index 556656d..0000000 --- a/recipes/jpeg.recipe +++ /dev/null @@ -1,11 +0,0 @@ -# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python - - -class Recipe(recipe.Recipe): - name = 'jpeg' - version = '8d' - licenses = [License.JPEG] - - files_libs = ['libjpeg'] - files_devel = ['include/jpeglib.h', 'include/jerror.h', 'include/jconfig.h', - 'include/jmorecfg.h'] diff --git a/recipes/libjpeg-turbo.recipe b/recipes/libjpeg-turbo.recipe new file mode 100644 index 0000000..8633889 --- /dev/null +++ b/recipes/libjpeg-turbo.recipe @@ -0,0 +1,16 @@ +# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python + + +class Recipe(recipe.Recipe): + name = 'libjpeg-turbo' + version = '1.3.1' + licenses = [License.BSD_like] + stype = SourceType.TARBALL + configure_tpl = "%(config-sh)s --prefix=%(prefix)s "\ + "--libdir=%(libdir)s %(options)s" + configure_options = " --with-jpeg8" + url = 'http://downloads.sourceforge.net/project/libjpeg-turbo/1.3.1/libjpeg-turbo-1.3.1.tar.gz' + + files_libs = ['libjpeg','libturbojpeg'] + files_devel = ['include/jpeglib.h', 'include/jerror.h', 'include/jconfig.h', + 'include/jmorecfg.h','turbojpeg.h'] -- 1.9.1