From 5b5cf3bf3630352e8c24f9185d7795ec0f503cb4 Mon Sep 17 00:00:00 2001 From: John Voltz Date: Thu, 6 Mar 2008 18:15:42 +0000 Subject: updated libgtk2 --- package/libgtk2/libgtk2.mk | 222 +++++++++++++-------------------------------- 1 file changed, 64 insertions(+), 158 deletions(-) (limited to 'package/libgtk2/libgtk2.mk') diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 785088aea..4fc46d3e3 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -3,171 +3,77 @@ # libgtk2.0 # ############################################################# -LIBGTK2_VERSION:=2.10.9 -LIBGTK2_SOURCE:=gtk+-$(LIBGTK2_VERSION).tar.bz2 -LIBGTK2_SITE:=ftp://ftp.gtk.org/pub/gtk/v2.10 -LIBGTK2_CAT:=$(BZCAT) -LIBGTK2_DIR:=$(BUILD_DIR)/gtk+-$(LIBGTK2_VERSION) -LIBGTK2_BINARY:=libgtk-x11-2.0.a +LIBGTK2_VERSION = 2.12.6 +LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.bz2 +LIBGTK2_SITE = ftp://ftp.gtk.org/pub/gtk/2.12 +LIBGTK2_AUTORECONF = NO +LIBGTK2_INSTALL_STAGING = YES +LIBGTK2_INSTALL_TARGET = YES +LIBGTK2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install +LIBGTK2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install -LIBGTK2_BUILD_ENV= \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ac_cv_func_posix_getpwuid_r=yes \ - glib_cv_stack_grows=no \ - glib_cv_uscore=no \ - ac_cv_func_strtod=yes \ - ac_fsusage_space=yes \ - fu_cv_sys_stat_statfs2_bsize=yes \ - ac_cv_func_closedir_void=no \ - ac_cv_func_getloadavg=no \ - ac_cv_lib_util_getloadavg=no \ - ac_cv_lib_getloadavg_getloadavg=no \ - ac_cv_func_getgroups=yes \ - ac_cv_func_getgroups_works=yes \ - ac_cv_func_chown_works=yes \ - ac_cv_have_decl_euidaccess=no \ - ac_cv_func_euidaccess=no \ - ac_cv_have_decl_strnlen=yes \ - ac_cv_func_strnlen_working=yes \ - ac_cv_func_lstat_dereferences_slashed_symlink=yes \ - ac_cv_func_lstat_empty_string_bug=no \ - ac_cv_func_stat_empty_string_bug=no \ - vb_cv_func_rename_trailing_slash_bug=no \ - ac_cv_have_decl_nanosleep=yes \ - jm_cv_func_nanosleep_works=yes \ - gl_cv_func_working_utimes=yes \ - ac_cv_func_utime_null=yes \ - ac_cv_have_decl_strerror_r=yes \ - ac_cv_func_strerror_r_char_p=no \ - jm_cv_func_svid_putenv=yes \ - ac_cv_func_getcwd_null=yes \ - ac_cv_func_getdelim=yes \ - ac_cv_func_mkstemp=yes \ - utils_cv_func_mkstemp_limitations=no \ - utils_cv_func_mkdir_trailing_slash_bug=no \ - ac_cv_func_memcmp_working=yes \ - ac_cv_have_decl_malloc=yes \ - gl_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_calloc_0_nonnull=yes \ - ac_cv_func_realloc_0_nonnull=yes \ - jm_cv_func_gettimeofday_clobber=no \ - gl_cv_func_working_readdir=yes \ - jm_ac_cv_func_link_follows_symlink=no \ - utils_cv_localtime_cache=no \ - ac_cv_struct_st_mtim_nsec=no \ - gl_cv_func_tzset_clobber=no \ - gl_cv_func_getcwd_null=yes \ - gl_cv_func_getcwd_path_max=yes \ - ac_cv_func_fnmatch_gnu=yes \ - am_getline_needs_run_time_check=no \ - am_cv_func_working_getline=yes \ - gl_cv_func_mkdir_trailing_slash_bug=no \ - gl_cv_func_mkstemp_limitations=no \ - ac_cv_func_working_mktime=yes \ - jm_cv_func_working_re_compile_pattern=yes \ - ac_use_included_regex=no \ - gl_cv_c_restrict=no \ +LIBGTK2_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ + glib_cv_uscore=no ac_cv_func_strtod=yes \ + ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \ + ac_cv_func_closedir_void=no ac_cv_func_getloadavg=no \ + ac_cv_lib_util_getloadavg=no ac_cv_lib_getloadavg_getloadavg=no \ + ac_cv_func_getgroups=yes ac_cv_func_getgroups_works=yes \ + ac_cv_func_chown_works=yes ac_cv_have_decl_euidaccess=no \ + ac_cv_func_euidaccess=no ac_cv_have_decl_strnlen=yes \ + ac_cv_func_strnlen_working=yes ac_cv_func_lstat_dereferences_slashed_symlink=yes \ + ac_cv_func_lstat_empty_string_bug=no ac_cv_func_stat_empty_string_bug=no \ + vb_cv_func_rename_trailing_slash_bug=no ac_cv_have_decl_nanosleep=yes \ + jm_cv_func_nanosleep_works=yes gl_cv_func_working_utimes=yes \ + ac_cv_func_utime_null=yes ac_cv_have_decl_strerror_r=yes \ + ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \ + ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \ + ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \ + utils_cv_func_mkdir_trailing_slash_bug=no ac_cv_func_memcmp_working=yes \ + ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes \ + ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes \ + ac_cv_func_realloc_0_nonnull=yes jm_cv_func_gettimeofday_clobber=no \ + gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \ + utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \ + gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \ + gl_cv_func_getcwd_path_max=yes ac_cv_func_fnmatch_gnu=yes \ + am_getline_needs_run_time_check=no am_cv_func_working_getline=yes \ + gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=no \ + ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \ + ac_use_included_regex=no gl_cv_c_restrict=no \ ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \ - ac_cv_prog_F77=no \ - ac_cv_prog_CXX=no \ - ac_cv_path_CUPS_CONFIG=no + ac_cv_path_GTK_UPDATE_ICON_CACHE=/usr/bin/gtk-update-icon-cache \ + ac_cv_path_GDK_PIXBUF_CSOURCE=/usr/bin/gdk-pixbuf-csource \ + ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no +LIBGTK2_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) --prefix=/usr \ + --exec-prefix=/usr --bindir=/usr/bin \ + --sbindir=/usr/sbin --libdir=/usr/lib \ + --libexecdir=/usr/lib --sysconfdir=/etc \ + --datadir=/usr/share --localstatedir=/var \ + --includedir=/usr/include --mandir=/usr/man \ + --infodir=/usr/info --enable-shared \ + --enable-static \ + --disable-glibtest --enable-explicit-deps=no \ + --disable-debug PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ + $(LIBGTK2_CONF_OPT_X) $(LIBGTK2_CONF_OPT_DFB) -$(DL_DIR)/$(LIBGTK2_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBGTK2_SITE)/$(LIBGTK2_SOURCE) - -libgtk2-source: $(DL_DIR)/$(LIBGTK2_SOURCE) -$(LIBGTK2_DIR)/.unpacked: $(DL_DIR)/$(LIBGTK2_SOURCE) - $(LIBGTK2_CAT) $(DL_DIR)/$(LIBGTK2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(LIBGTK2_DIR) package/libgtk2/ \*.patch* - $(CONFIG_UPDATE) $(LIBGTK2_DIR) - touch $(LIBGTK2_DIR)/.unpacked +ifeq ($(BR2_PACKAGE_DIRECTFB),y) + LIBGTK2_CONF_OPT += --with-gdktarget=directfb + LIBGTK2_DEPENDENCIES_EXTRA = directfb +endif -$(LIBGTK2_DIR)/.configured: $(LIBGTK2_DIR)/.unpacked - # The following is an truely evil hack! - # I dont yet understand why configure is not doing this right - # TODO: also remove 'odd-include-problem.patch' when this is fixed - $(SED) "s,^GDK_DEP_CFLAGS=.*,GDK_DEP_CFLAGS=\'-pthread -I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/lib/glib-2.0/include -I$(STAGING_DIR)/usr/include/pango-1.0 -I$(STAGING_DIR)/usr/include/cairo\',g" $(LIBGTK2_DIR)/configure - $(SED) "s,^GDK_DEP_LIBS=.*,GDK_DEP_LIBS=\'-L$(STAGING_DIR)/lib -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lfontconfig -lXext -lXrender -lX11 -lXinerama -lXrandr -lXcursor -lXfixes -lXft -lm\',g" $(LIBGTK2_DIR)/configure - (cd $(LIBGTK2_DIR); rm -rf config.cache; \ - $(LIBGTK2_BUILD_ENV) \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libdir=/lib \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --localstatedir=/var \ - --includedir=/usr/include \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --enable-shared \ - --enable-static \ - --with-x \ +ifneq ($(BR2_PACKAGE_XSERVER_none),y) + LIBGTK2_CONF_OPT += --with-x \ --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib \ - --disable-glibtest \ - --enable-explicit-deps=no \ - --disable-debug \ - ) - touch $(LIBGTK2_DIR)/.configured - -$(LIBGTK2_DIR)/gtk/.libs/$(LIBGTK2_BINARY): $(LIBGTK2_DIR)/.configured - $(LIBGTK2_BUILD_ENV) $(MAKE) CC=$(TARGET_CC) -C $(LIBGTK2_DIR) - touch -c $(LIBGTK2_DIR)/gtk/.libs/$(LIBGTK2_BINARY) - -$(STAGING_DIR)/lib/$(LIBGTK2_BINARY): $(LIBGTK2_DIR)/gtk/.libs/$(LIBGTK2_BINARY) - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBGTK2_DIR) install - touch -c $(STAGING_DIR)/lib/$(LIBGTK2_BINARY) - -$(TARGET_DIR)/lib/libgtk-x11-2.0.so.0: $(STAGING_DIR)/lib/$(LIBGTK2_BINARY) - cp -a $(STAGING_DIR)/lib/libgtk-x11-2.0.so $(TARGET_DIR)/lib/ - cp -a $(STAGING_DIR)/lib/libgtk-x11-2.0.so.0* $(TARGET_DIR)/lib/ - cp -a $(STAGING_DIR)/lib/libgdk*-2.0.so $(TARGET_DIR)/lib/ - cp -a $(STAGING_DIR)/lib/libgdk*-2.0.so.0* $(TARGET_DIR)/lib/ - $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0* - $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgdk*-2.0.so.0* - mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines - cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/engines/*.so \ - $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines/ - mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/printbackends - cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/printbackends/*.so \ - $(TARGET_DIR)/lib/gtk-2.0/2.10.0/printbackends/ - mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/immodules - cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/immodules/*.so \ - $(TARGET_DIR)/lib/gtk-2.0/2.10.0/immodules/ - mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/loaders - cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/loaders/*.so \ - $(TARGET_DIR)/lib/gtk-2.0/2.10.0/loaders/ - mkdir -p $(TARGET_DIR)/etc/gtk-2.0 - cp package/libgtk2/gdk-pixbuf.loaders $(TARGET_DIR)/etc/gtk-2.0 - cp package/libgtk2/gtk.immodules $(TARGET_DIR)/etc/gtk-2.0 - touch -c $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0 - -libgtk2: uclibc png jpeg tiff $(XSERVER) libglib2 \ - cairo pango atk $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0 - -libgtk2-clean: - rm -f $(TARGET_DIR)/lib/libgtk* $(TARGET_DIR)/lib/libgdk* - -$(MAKE) -C $(LIBGTK2_DIR) clean + --with-gdktarget=x11 + LIBGTK2_DEPENDENCIES_EXTRA = xlib_libXcomposite $(XSERVER) +else + LIBGTK2_CONF_OPT += --without-x +endif -libgtk2-dirclean: - rm -rf $(LIBGTK2_DIR) +LIBGTK2_DEPENDENCIES = uclibc png jpeg tiff $(LIBGTK2_DEPENDENCIES_EXTRA) libglib2 cups cairo pango atk -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBGTK2)),y) -TARGETS+=libgtk2 -endif +$(eval $(call AUTOTARGETS,package,libgtk2)) -- cgit v1.2.3