[DRE-commits] [ruby-cairo] 09/13: New upstream version 1.15.2
Daisuke Higuchi
dai at moszumanska.debian.org
Wed Oct 26 05:57:08 UTC 2016
This is an automated email from the git hooks/post-receive script.
dai pushed a commit to branch master
in repository ruby-cairo.
commit 7af6983fd8712a70858101f00aff87616f0f2a20
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date: Wed Oct 26 12:41:48 2016 +0900
New upstream version 1.15.2
---
.travis.yml | 4 +++-
NEWS | 11 +++++++++++
Rakefile | 20 +++++++++++---------
build/Vagrantfile | 4 ++--
build/build-windows.sh | 5 +++--
ext/cairo/rb_cairo.h | 6 +++---
ext/cairo/rb_cairo_surface.c | 33 ++++++++++++++++++++++++++++-----
7 files changed, 61 insertions(+), 22 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index be18ced..1698080 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,9 @@ notifications:
recipients:
- rcairo at ml.commit-email.info
rvm:
- - 2.0.0
- 2.1
- 2.2
+ - 2.3.0
- ruby-head
+before_install:
+ - gem update bundler
diff --git a/NEWS b/NEWS
index 57c1bff..17d2b7c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Release 1.15.2 (2016-04-02) Kouhei Sutou <kou at cozmixng.org>
+===========================================================
+
+Improvements
+------------
+
+ * Supported cairo 1.15.2.
+ * Cairo::Win32Surface.new(hdc, format): Added.
+ * Dropped Ruby 2.0 support.
+ * Windows: Supported Ruby 2.3.
+
Release 1.14.3 (2015-09-08) Kouhei Sutou <kou at cozmixng.org>
===========================================================
diff --git a/Rakefile b/Rakefile
index 586da12..d5127c3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -117,6 +117,8 @@ class Package < Struct.new(:name,
case download_site
when :cairo
base_url = "http://cairographics.org/releases"
+ when :cairo_snapshots
+ base_url = "http://cairographics.org/snapshots"
when :gnome
base_url = "http://ftp.gnome.org/pub/gnome/sources"
release_series = version.gsub(/\A(\d+\.\d+).+\z/, '\1')
@@ -441,7 +443,7 @@ windows_task = WindowsTask.new(spec) do |task|
{
:name => "zlib",
:version => "1.2.8",
- :download_base_url => "http://sourceforge.net/projects/libpng/files/zlib/1.2.8",
+ :download_base_url => "http://downloads.sourceforge.net/project/libpng/zlib/1.2.8",
:compression_method => "gz",
:windows => {
:builder => ZlibBuilder.new,
@@ -450,16 +452,16 @@ windows_task = WindowsTask.new(spec) do |task|
},
{
:name => "libpng",
- :version => "1.6.18",
- :download_base_url => "http://sourceforge.net/projects/libpng/files/libpng16/1.6.18",
+ :version => "1.6.21",
+ :download_base_url => "http://downloads.sourceforge.net/project/libpng/libpng16/1.6.21",
:windows => {
:built_file => "bin/libpng16-16.dll",
},
},
{
:name => "freetype",
- :version => "2.6",
- :download_base_url => "http://sourceforge.net/projects/freetype/files/freetype2/2.6",
+ :version => "2.6.3",
+ :download_base_url => "http://downloads.sourceforge.net/project/freetype/freetype2/2.6.3",
:compression_method => "bz2",
:windows => {
:built_file => "bin/libfreetype-6.dll",
@@ -484,7 +486,7 @@ windows_task = WindowsTask.new(spec) do |task|
{
:name => "fontconfig",
:version => "2.11.1",
- :download_base_url => "http://www.freedesktop.org/software/fontconfig/release",
+ :download_base_url => "https://www.freedesktop.org/software/fontconfig/release",
:compression_method => "bz2",
:windows => {
:built_file => "bin/libfontconfig-1.dll",
@@ -509,8 +511,8 @@ windows_task = WindowsTask.new(spec) do |task|
},
{
:name => "cairo",
- :version => "1.14.2",
- :download_site => :cairo,
+ :version => "1.15.2",
+ :download_site => :cairo_snapshots,
:windows => {
:built_file => "bin/libcairo-2.dll",
:configure_args => [
@@ -534,7 +536,7 @@ namespace :vm do
architectures.each do |architecture|
desc "Build all packages for Windows #{architecture}"
task_name = "win#{architecture}"
- build_tasks << task_name
+ build_tasks << "vm:windows:build:#{task_name}"
task task_name do
cd("build") do
sh("vagrant", "destroy", "--force", task_name)
diff --git a/build/Vagrantfile b/build/Vagrantfile
index ebdda9e..5e9fe9e 100644
--- a/build/Vagrantfile
+++ b/build/Vagrantfile
@@ -12,8 +12,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
targets.each do |target|
config.vm.define(target) do |node|
- node.vm.box = "ubuntu-15.04-x86_64"
- node.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-15.04_chef-provisionerless.box"
+ node.vm.box = "ubuntu-15.10-x86_64"
+ node.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-15.10_chef-provisionerless.box"
node.vm.synced_folder("../", "/rcairo")
node.vm.synced_folder("../../pkg-config", "/pkg-config")
diff --git a/build/build-windows.sh b/build/build-windows.sh
index 717c49f..a3f8e27 100755
--- a/build/build-windows.sh
+++ b/build/build-windows.sh
@@ -3,8 +3,8 @@
export LANG=C
export DEBIAN_FRONTEND=noninteractive
-ruby_versions="2.0.0-p647 2.1.7 2.2.3"
-export RUBY_CC_VERSION="2.0.0:2.1.7:2.2.3"
+ruby_versions="2.1.10 2.2.4 2.3.0"
+export RUBY_CC_VERSION="2.1.10:2.2.4:2.3.0"
N_CPUS=$(grep '^processor' /proc/cpuinfo | wc -l)
export MAKE_N_JOBS=${N_CPUS}
@@ -66,6 +66,7 @@ if [ ! -d ~/.wine/ ]; then
until [ -f ~/.wine/system.reg ]; do
sleep 1
done
+ sleep 10
wine_home="z:/home/vagrant"
wine_rcairo="${wine_home}/rcairo.${DIRECTORY_SUFFIX}"
wine_ruby_gnome2="${wine_home}/ruby-gnome2.${DIRECTORY_SUFFIX}"
diff --git a/ext/cairo/rb_cairo.h b/ext/cairo/rb_cairo.h
index 019bcc3..bba429c 100644
--- a/ext/cairo/rb_cairo.h
+++ b/ext/cairo/rb_cairo.h
@@ -5,7 +5,7 @@
* $Author: kou $
* $Date: 2008-09-19 12:56:27 $
*
- * Copyright 2006-2015 Kouhei Sutou <kou at cozmixng.org>
+ * Copyright 2006-2016 Kouhei Sutou <kou at cozmixng.org>
* Copyright 2005 Øyvind Kolås <pippin at freedesktop.org>
* Copyright 2004-2005 MenTaLguY <mental at rydia.com>
*
@@ -72,8 +72,8 @@ RB_CAIRO_BEGIN_DECLS
#endif
#define RB_CAIRO_VERSION_MAJOR 1
-#define RB_CAIRO_VERSION_MINOR 14
-#define RB_CAIRO_VERSION_MICRO 3
+#define RB_CAIRO_VERSION_MINOR 15
+#define RB_CAIRO_VERSION_MICRO 2
RB_CAIRO_VAR VALUE rb_mCairo;
RB_CAIRO_VAR VALUE rb_cCairo_Context;
diff --git a/ext/cairo/rb_cairo_surface.c b/ext/cairo/rb_cairo_surface.c
index cb224ab..44851ec 100644
--- a/ext/cairo/rb_cairo_surface.c
+++ b/ext/cairo/rb_cairo_surface.c
@@ -1232,11 +1232,34 @@ cr_win32_surface_initialize (int argc, VALUE *argv, VALUE self)
surface = cairo_win32_surface_create (NUM2PTR (hdc));
break;
case 2:
- width = arg1;
- height = arg2;
- surface = cairo_win32_surface_create_with_dib (CAIRO_FORMAT_ARGB32,
- NUM2INT (width),
- NUM2INT (height));
+# if CAIRO_CHECK_VERSION(1, 11, 4)
+# define CAIRO_FORMAT_MAX CAIRO_FORMAT_RGB30
+# else
+# define CAIRO_FORMAT_MAX CAIRO_FORMAT_RGB16_565
+# endif
+ if (CAIRO_FORMAT_ARGB32 <= NUM2INT (arg2) &&
+ NUM2INT (arg2) <= CAIRO_FORMAT_MAX)
+ {
+# if CAIRO_CHECK_VERSION(1, 15, 2)
+ hdc = arg1;
+ format = arg2;
+ surface =
+ cairo_win32_surface_create_with_format (NUM2PTR (hdc),
+ RVAL2CRFORMAT (format));
+# else
+ rb_raise (rb_eArgError,
+ "Cairo::Win32Surface.new(hdc, format) "
+ "is available since cairo >= 1.15.2");
+# endif
+ }
+ else
+ {
+ width = arg1;
+ height = arg2;
+ surface = cairo_win32_surface_create_with_dib (CAIRO_FORMAT_ARGB32,
+ NUM2INT (width),
+ NUM2INT (height));
+ }
break;
case 3:
if (NIL_P (arg1) ||
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-cairo.git
More information about the Pkg-ruby-extras-commits
mailing list