From 6ce30eef5a16f62b262a86c5ca70571a2fb9bf24 Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Sun, 18 Jan 2009 10:57:23 +0000
Subject: Cleanup libgtk2, and prepare for 2.15

---
 package/libgtk2/libgtk2.mk | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'package/libgtk2')

diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index a06da31b3..9fafe241c 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/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
-- 
cgit v1.2.3