From 70129e0cd109f03cd7b888b20edddd0d85442b56 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 15 Dec 2012 17:53:57 +0000 Subject: libsdl-image: update to upstream version 1.2.12 Now uses zlib license. Works with libpng15. Signed-off-by: Marko Lindqvist Signed-off-by: Martin Jansa --- .../libsdl-image/libsdl-image_1.2.10.bb | 34 ---------------------- .../libsdl-image/libsdl-image_1.2.12.bb | 33 +++++++++++++++++++++ 2 files changed, 33 insertions(+), 34 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.10.bb create mode 100644 meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb diff --git a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.10.bb b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.10.bb deleted file mode 100644 index 12a3abd8a2..0000000000 --- a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.10.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "Simple DirectMedia Layer image library." -SECTION = "libs" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" - -PR = "r3" - -DEPENDS = "tiff zlib libpng jpeg virtual/libsdl" - -SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz" -SRC_URI[md5sum] = "6c06584b31559e2b59f2b982d0d1f628" -SRC_URI[sha256sum] = "75e05d1e95f6277b44797157d9e25a908ba8d08a393216ffb019b0d74de11876" - -S = "${WORKDIR}/SDL_image-${PV}" - -inherit autotools - -export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" - -# Disable the run-time loading of the libs and bring back the soname dependencies. -EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared" - -do_configure_prepend() { - # Removing this file fixes a libtool version mismatch. - rm -f acinclude/libtool.m4 - rm -f acinclude/sdl.m4 - rm -f acinclude/pkg.m4 - rm -f acinclude/lt~obsolete.m4 - rm -f acinclude/ltoptions.m4 - rm -f acinclude/ltsugar.m4 - rm -f acinclude/ltversion.m4 -} - diff --git a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb new file mode 100644 index 0000000000..ccc3d40030 --- /dev/null +++ b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Simple DirectMedia Layer image library." +SECTION = "libs" + +LICENSE = "zlib" +LIC_FILES_CHKSUM = "file://COPYING;md5=613734b7586e1580ef944961c6d62227" + +PR = "r0" + +DEPENDS = "tiff zlib libpng jpeg virtual/libsdl" + +SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz" +SRC_URI[md5sum] = "a0f9098ebe5400f0bdc9b62e60797ecb" +SRC_URI[sha256sum] = "0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699" + +S = "${WORKDIR}/SDL_image-${PV}" + +inherit autotools + +export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" + +# Disable the run-time loading of the libs and bring back the soname dependencies. +EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared" + +do_configure_prepend() { + # Removing this file fixes a libtool version mismatch. + rm -f acinclude/libtool.m4 + rm -f acinclude/sdl.m4 + rm -f acinclude/pkg.m4 + rm -f acinclude/lt~obsolete.m4 + rm -f acinclude/ltoptions.m4 + rm -f acinclude/ltsugar.m4 + rm -f acinclude/ltversion.m4 +} -- cgit 1.2.3-korg