gdk_pixbuf2 0.90.5 → 0.90.6

data/ChangeLog

@@ -1,3 +1,15 @@
+2011-01-30  Kouhei Sutou  <kou@cozmixng.org>
+
+	* Rakefile, ext/gdk_pixbuf2/extconf.rb: share depended packages
+	vendor/local/.
+
+	* lib/gdk_pixbuf2.rb, ext/gdk_pixbuf2/extconf.rb: remove cairo
+	dependency.
+
+2011-01-22  Masaaki Aoyagi
+
+	* Rakefile: change to use gnome2-raketask.rb.
+
 2010-10-23  Kouhei Sutou  <kou@cozmixng.org>
 
 	* ext/gdk_pixbuf2/depend: ruby-gdkpixbuf2 -> ruby-gdk-pixbuf2.

data/Rakefile

@@ -1,77 +1,12 @@
 # -*- ruby -*-
 
-require 'pathname'
-require 'find'
-require 'rubygems'
-require 'rake/extensiontask'
+require './../glib2/lib/gnome2-raketask'
 
-@top_dir = Pathname(__FILE__).dirname.parent.expand_path
-@rb_glib2_dir = @top_dir + "glib2"
-
-task :default => :build
-
-def version
-  @version ||= ENV["VERSION"] || guess_version
-end
-
-def guess_version
-  versions = {}
-  rbglib_h_path = @rb_glib2_dir + "ext" + "glib2" + "rbglib.h"
-  rbglib_h_path.open do |rbglib_h|
-    rbglib_h.each_line do |line|
-      if /#define\s+RBGLIB_([A-Z]+)_VERSION\s+(\d+)/ =~ line
-        versions[$1.downcase] = $2.to_i
-      end
-    end
-  end
-  ["major", "minor", "micro"].collect {|type| versions[type]}.compact.join(".")
-end
-
-package_name = "gdk_pixbuf2"
-
-spec = Gem::Specification.new do |s|
-  s.name = package_name
-  s.summary = "Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf-2.x."
-  s.description = "Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf-2.x."
-  s.author = "The Ruby-GNOME2 Proejct Team"
-  s.email = "ruby-gnome2-devel-en@lists.sourceforge.net"
-  s.homepage = "http://ruby-gnome2.sourceforge.jp/"
-  s.version = version
-  s.platform = Gem::Platform::RUBY
-  compatible_version = version.split(/\./)[0, 3].join(".")
-  s.add_dependency("glib2", ">= #{compatible_version}")
-  s.extensions = FileList["ext/#{package_name}/extconf.rb"]
-  s.require_paths = ["lib"]
-  s.files = FileList["ChangeLog", "README", "Rakefile", "extconf.rb",
-                     "lib/**/*.rb", "{ext,sample,test}/**/*"]
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-end
-
-Rake::ExtensionTask.new(package_name, spec) do |ext|
-  ext.cross_compile = true
-  ext.cross_compiling do |spec|
-    if /mingw|mswin/ =~ spec.platform.to_s
-      win32_dir = File.join("vendor", "local")
-      win32_files = []
-      Find.find(win32_dir) do |file|
-        next if /\.zip\z/ =~ file
-        win32_files << file
-      end
-      spec.files += win32_files
-    end
-  end
-end
-
-namespace :win32 do
-  desc "download Windows binaries"
-  task :download do
-    $LOAD_PATH.unshift((@rb_glib2_dir + "lib").to_s)
-    require 'gnome2-win32-binary-downloader'
-    packages = ["glib", "gdk-pixbuf"]
-    dependencies = ["gettext-runtime", "zlib", "libpng"]
-    GNOME2Win32BinaryDownloader.download(:packages => packages,
-                                         :dependencies => dependencies)
-  end
+package = GNOME2Package.new do |_package|
+  _package.summary = "Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf-2.x."
+  _package.description = "Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf-2.x."
+  _package.dependency.gem.runtime = ["glib2"]
+  _package.win32.packages = ["gdk-pixbuf"]
+  _package.win32.dependencies = ["zlib", "libpng"]
 end
+package.define_tasks

data/ext/gdk_pixbuf2/Makefile

@@ -0,0 +1,162 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = /home/kou/work/ruby/ruby-gnome2/gdk_pixbuf2/ext/gdk_pixbuf2
+topdir = /usr/lib/ruby/1.8/x86_64-linux
+hdrdir = $(topdir)
+VPATH = $(srcdir):$(topdir):$(hdrdir)
+exec_prefix = $(prefix)
+prefix = $(DESTDIR)/usr
+sharedstatedir = $(prefix)/com
+mandir = $(prefix)/share/man
+psdir = $(docdir)
+oldincludedir = $(DESTDIR)/usr/include
+localedir = $(datarootdir)/locale
+bindir = $(exec_prefix)/bin
+libexecdir = $(prefix)/lib/ruby1.8
+sitedir = $(DESTDIR)/usr/local/lib/site_ruby
+htmldir = $(docdir)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
+includedir = $(prefix)/include
+infodir = $(prefix)/share/info
+vendorlibdir = $(vendordir)/$(ruby_version)
+sysconfdir = $(DESTDIR)/etc
+libdir = $(exec_prefix)/lib
+sbindir = $(exec_prefix)/sbin
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+vendordir = $(libdir)/ruby/vendor_ruby
+datarootdir = $(prefix)/share
+pdfdir = $(docdir)
+archdir = $(rubylibdir)/$(arch)
+sitearchdir = $(sitelibdir)/$(sitearch)
+datadir = $(datarootdir)
+localstatedir = $(DESTDIR)/var
+sitelibdir = $(sitedir)/$(ruby_version)
+
+CC = gcc
+LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+
+RUBY_EXTCONF_H = 
+CFLAGS   =  -fPIC -fno-strict-aliasing -g -g -O2  -fPIC $(cflags) -Wall -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -pthread -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/home/kou/work/ruby/rcairo/ext/cairo 
+INCFLAGS = -I. -I/home/kou/work/ruby/ruby-gnome2/glib2/ext/glib2 -I/home/kou/work/ruby/ruby-gnome2/glib2/ext/glib2 -I/home/kou/work/ruby/ruby-gnome2/glib2/ext/glib2 -I. -I/usr/lib/ruby/1.8/x86_64-linux -I/home/kou/work/ruby/ruby-gnome2/gdk_pixbuf2/ext/gdk_pixbuf2
+DEFS     = 
+CPPFLAGS = -DHAVE_RB_DEFINE_ALLOC_FUNC -DHAVE_RB_BLOCK_PROC -DHAVE_OBJECT_ALLOCATE -DHAVE_NODE_ATTRASGN -DHAVE_GDK_PIXBUF_SET_OPTION -DHAVE_GDK_PIXBUF_GDK_PIXBUF_IO_H -DHAVE_RB_CAIRO_H   
+CXXFLAGS = $(CFLAGS) 
+ldflags  = -L.  -rdynamic -Wl,-export-dynamic -pthread -pthread 
+dldflags = 
+archflag = 
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
+LDSHARED = $(CC) -shared
+AR = ar
+EXEEXT = 
+
+RUBY_INSTALL_NAME = ruby1.8
+RUBY_SO_NAME = ruby1.8
+arch = x86_64-linux
+sitearch = x86_64-linux
+ruby_version = 1.8
+ruby = /usr/bin/ruby1.8
+RUBY = $(ruby)
+RM = rm -f
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = . $(libdir)
+LIBPATH =  -L. -L$(libdir)
+DEFFILE = 
+
+CLEANFILES = mkmf.log
+DISTCLEANFILES = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED)  -lgdk_pixbuf-2.0 -lm -lgobject-2.0 -lglib-2.0 -lgthread-2.0 -lrt -lgmodule-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lm -lgobject-2.0 -lglib-2.0 -lgthread-2.0 -lrt -lgmodule-2.0 -lpango-1.0 -lpangocairo-1.0 -lcairo -lgio-2.0 -lcairo -lpthread -lrt -ldl -lcrypt -lm   -lc
+SRCS = rbgdk-pixbufsimpleanim.c rbgdk-pixbuf-loader.c rbgdk-pixbufanimation.c rbgdk-pixbuf-format.c rbgdk-pixdata.c rbgdk-pixbuf.c
+OBJS = rbgdk-pixbufsimpleanim.o rbgdk-pixbuf-loader.o rbgdk-pixbufanimation.o rbgdk-pixbuf-format.o rbgdk-pixdata.o rbgdk-pixbuf.o
+TARGET = gdk_pixbuf2
+DLLIB = $(TARGET).so
+EXTSTATIC = 
+STATIC_LIB = 
+
+BINDIR        = $(bindir)
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
+
+all:		$(DLLIB)
+static:		$(STATIC_LIB)
+
+clean:
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean:	clean
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+
+realclean:	distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+$(RUBYARCHDIR):
+	$(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .cxx .cpp .C .o
+
+.cc.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cxx.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cpp.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.C.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.c.o:
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+
+$(DLLIB): $(OBJS) Makefile
+	@-$(RM) $@
+	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+###
+install:
+	if test -n "$(pkgconfigdir)"; then			\
+	  $(MAKEDIRS) $(pkgconfigdir);				\
+	  $(INSTALL_DATA) ruby-gdk-pixbuf2.pc $(pkgconfigdir);	\
+	fi

data/ext/gdk_pixbuf2/extconf.rb

@@ -24,6 +24,15 @@ package_id = "gdk-pixbuf-2.0"
 
 require 'mkmf-gnome2'
 
+["glib2"].each do |package|
+  directory = "#{package}#{version_suffix}"
+  build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
+  add_depend_package(package, "#{directory}/ext/#{package}",
+                     top_dir.to_s,
+                     :top_build_dir => top_build_dir.to_s,
+                     :target_build_dir => build_dir)
+end
+
 setup_win32(module_name, base_dir)
 
 PKGConfig.have_package(package_id) or exit 1
@@ -33,30 +42,6 @@ have_func("gdk_pixbuf_set_option", "gdk-pixbuf/gdk-pixbuf.h") do |src|
 end
 have_header("gdk-pixbuf/gdk-pixbuf-io.h")
 
-if PKGConfig.have_package('gdk-2.0')
-  options = {}
-  rcairo_source_dir_names = ["rcairo"]
-  if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM
-    rcairo_source_dir_names.unshift("rcairo.win32")
-  end
-  rcairo_source_dir_names.each do |rcairo_source_dir_name|
-    rcairo_source_dir = top_dir.parent.expand_path + rcairo_source_dir_name
-    if rcairo_source_dir.exist?
-      options[:rcairo_source_dir] = rcairo_source_dir.to_s
-      break
-    end
-  end
-  check_cairo(options)
-end
-
-["glib2"].each do |package|
-  directory = "#{package}#{version_suffix}"
-  build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
-  add_depend_package(package, "#{directory}/ext/#{package}",
-                     top_dir.to_s,
-                     :top_build_dir => top_build_dir.to_s,
-                     :target_build_dir => build_dir)
-end
 create_pkg_config_file("Ruby/GdkPixbuf2", package_id, nil, "ruby-gdk-pixbuf2.pc")
 create_makefile(module_name)
 

data/ext/gdk_pixbuf2/ruby-gdk-pixbuf2.pc

@@ -0,0 +1,3 @@
+Name: Ruby/GdkPixbuf2
+Description: Ruby bindings for Image loading and scaling
+Version: 0.90.6

data/lib/gdk_pixbuf2.rb

@@ -1,13 +1,4 @@
 require 'glib2'
-begin
-  begin
-    require 'cairo'
-  rescue LoadError
-    require 'rubygems'
-    require 'cairo'
-  end
-rescue LoadError
-end
 
 base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path
 vendor_dir = base_dir + "vendor" + "local"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gdk_pixbuf2
 version: !ruby/object:Gem::Version 
-  hash: 381
+  hash: 379
   prerelease: false
   segments: 
   - 0
   - 90
-  - 5
-  version: 0.90.5
+  - 6
+  version: 0.90.6
 platform: ruby
 authors: 
 - The Ruby-GNOME2 Proejct Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 +09:00
+date: 2011-01-30 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 381
+        hash: 379
         segments: 
         - 0
         - 90
-        - 5
-        version: 0.90.5
+        - 6
+        version: 0.90.6
   type: :runtime
   version_requirements: *id001
 description: Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf-2.x.
@@ -48,31 +48,40 @@ files:
 - Rakefile
 - extconf.rb
 - lib/gdk_pixbuf2.rb
+- ext/gdk_pixbuf2/gdk_pixbuf2.def
+- ext/gdk_pixbuf2/rbgdk-pixbuf-format.o
+- ext/gdk_pixbuf2/rbgdk-pixbuf.o
+- ext/gdk_pixbuf2/rbgdk-pixbufsimpleanim.o
+- ext/gdk_pixbuf2/Makefile
+- ext/gdk_pixbuf2/rbgdk-pixbuf-loader.o
+- ext/gdk_pixbuf2/extconf.rb
 - ext/gdk_pixbuf2/rbgdk-pixbufsimpleanim.c
 - ext/gdk_pixbuf2/rbgdk-pixbuf.h
-- ext/gdk_pixbuf2/extconf.rb
+- ext/gdk_pixbuf2/rbgdk-pixbuf-loader.c
+- ext/gdk_pixbuf2/ruby-gdk-pixbuf2.pc
+- ext/gdk_pixbuf2/rbgdk-pixbufanimation.o
+- ext/gdk_pixbuf2/rbgdk-pixbufanimation.c
+- ext/gdk_pixbuf2/rbgdk-pixdata.o
+- ext/gdk_pixbuf2/rbgdk-pixbuf-format.c
 - ext/gdk_pixbuf2/depend
+- ext/gdk_pixbuf2/gdk_pixbuf2.so
 - ext/gdk_pixbuf2/rbgdk-pixdata.c
 - ext/gdk_pixbuf2/rbgdk-pixbuf.c
-- ext/gdk_pixbuf2/rbgdk-pixbuf-loader.c
-- ext/gdk_pixbuf2/rbgdk-pixbuf-format.c
-- ext/gdk_pixbuf2/gdk_pixbuf2.def
-- ext/gdk_pixbuf2/rbgdk-pixbufanimation.c
-- sample/xpm.rb
-- sample/inline.rb
+- sample/save.rb
+- sample/simpleanim.rb
 - sample/utils.rb
-- sample/scale.rb
+- sample/rotate.rb
 - sample/pixdata.rb
+- sample/flip.rb
 - sample/loader.rb
-- sample/composite.rb
+- sample/anim.rb
 - sample/floppybuddy.gif
-- sample/rotate.rb
-- sample/save.rb
-- sample/simpleanim.rb
+- sample/scale.rb
 - sample/format.rb
+- sample/inline.rb
 - sample/gnome-foot.png
-- sample/flip.rb
-- sample/anim.rb
+- sample/xpm.rb
+- sample/composite.rb
 has_rdoc: true
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses: []
@@ -87,10 +96,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 61
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 5
+      version: 1.8.5
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: