瀏覽代碼

Cleanup libgtk2, and prepare for 2.15

Ulf Samuelsson 16 年之前
父節點
當前提交
6ce30eef5a
共有 1 個文件被更改,包括 10 次插入2 次删除
  1. 10 2
      package/libgtk2/libgtk2.mk

+ 10 - 2
package/libgtk2/libgtk2.mk

@@ -3,9 +3,13 @@
 # libgtk2.0
 #
 #############################################################
-LIBGTK2_VERSION = 2.12.12
+#LIBGTK2_VERSION = 2.15.0
+LIBGTK2_VERSION_MAJOR:=2.12
+LIBGTK2_VERSION_MINOR:=12
+LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).$(LIBGTK2_VERSION_MINOR)
+
 LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.bz2
-LIBGTK2_SITE = ftp://ftp.gtk.org/pub/gtk/2.12
+LIBGTK2_SITE = ftp://ftp.gtk.org/pub/gtk/$(LIBGTK2_VERSION_MAJOR)
 LIBGTK2_AUTORECONF = NO
 LIBGTK2_INSTALL_STAGING = YES
 LIBGTK2_INSTALL_TARGET = YES
@@ -96,6 +100,10 @@ else
 	LIBGTK2_CONF_OPT += --without-x
 endif
 
+# Buildroot does not support JPEG2000 library
+ifeq ($(LIBGTK2_VERSION_MAJOR),2.15)
+LIBGTK2_CONF_OPT += --without-libjasper
+endif
 
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
 LIBGTK2_DEPENDENCIES += libpng