浏览代码

sdl_image: bump to version 1.2.12

Also added:
- WEBP file format support
- License information

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
gilles.talis@gmail.com 12 年之前
父节点
当前提交
42aba9658d
共有 2 个文件被更改,包括 10 次插入2 次删除
  1. 4 0
      package/sdl_image/Config.in
  2. 6 2
      package/sdl_image/sdl_image.mk

+ 4 - 0
package/sdl_image/Config.in

@@ -42,6 +42,10 @@ config BR2_PACKAGE_SDL_IMAGE_TIFF
 	bool "enable TIFF file format support"
 	select BR2_PACKAGE_TIFF
 
+config BR2_PACKAGE_SDL_IMAGE_WEBP
+	bool "enable WEBP file format support"
+	select BR2_PACKAGE_WEBP
+
 config BR2_PACKAGE_SDL_IMAGE_XCF
 	bool "enable XCF file format support"
 

+ 6 - 2
package/sdl_image/sdl_image.mk

@@ -4,10 +4,12 @@
 #
 ################################################################################
 
-SDL_IMAGE_VERSION = 1.2.6
+SDL_IMAGE_VERSION = 1.2.12
 SDL_IMAGE_SOURCE = SDL_image-$(SDL_IMAGE_VERSION).tar.gz
 SDL_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release
 SDL_IMAGE_INSTALL_STAGING = YES
+SDL_IMAGE_LICENSE = zlib
+SDL_IMAGE_LICENSE_FILES = COPYING
 
 SDL_IMAGE_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
 		--with-sdl-exec-prefix=$(STAGING_DIR)/usr \
@@ -25,6 +27,7 @@ SDL_IMAGE_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
 		--enable-pnm=$(if $(BR2_PACKAGE_SDL_IMAGE_PNM),yes,no) \
 		--enable-tga=$(if $(BR2_PACKAGE_SDL_IMAGE_TARGA),yes,no) \
 		--enable-tif=$(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),yes,no) \
+		--enable-webp=$(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),yes,no) \
 		--enable-xcf=$(if $(BR2_PACKAGE_SDL_IMAGE_XCF),yes,no) \
 		--enable-xpm=$(if $(BR2_PACKAGE_SDL_IMAGE_XPM),yes,no) \
 		--enable-xv=$(if $(BR2_PACKAGE_SDL_IMAGE_XV),yes,no) \
@@ -32,6 +35,7 @@ SDL_IMAGE_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
 SDL_IMAGE_DEPENDENCIES = sdl \
 	$(if $(BR2_PACKAGE_SDL_IMAGE_JPEG),jpeg) \
 	$(if $(BR2_PACKAGE_SDL_IMAGE_PNG),libpng) \
-	$(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),tiff)
+	$(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),tiff) \
+	$(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),webp)
 
 $(eval $(autotools-package))