Commit 0c36a1c6 authored by HIGUCHI Daisuke (VDR dai)'s avatar HIGUCHI Daisuke (VDR dai)

Merge tag 'upstream/1.14.1'

Upstream version 1.14.1
parents 342a3f4a d94cb7f8
((sh-mode . ((indent-tabs-mode . nil)
(sh-indentation . 2)
(sh-basic-offset . 2))))
Release 1.14.1 (2014-12-23) Kouhei Sutou <kou@cozmixng.org>
===========================================================
Windows users must upgrade. Non Windows users doesn't need to
upgrade.
Improvements
------------
* Upgraded bundled libraries for Windows. libpng is upgraded to
1.6.16 from 1.6.14. libpng 1.6.14 has vulnerability.
Release 1.14.0 (2014-11-24) Kouhei Sutou <kou@cozmixng.org>
===========================================================
......
......@@ -450,16 +450,16 @@ windows_task = WindowsTask.new(spec) do |task|
},
{
:name => "libpng",
:version => "1.6.14",
:download_base_url => "http://sourceforge.net/projects/libpng/files/libpng16/1.6.14",
:version => "1.6.16",
:download_base_url => "http://sourceforge.net/projects/libpng/files/libpng16/1.6.16",
:windows => {
:built_file => "bin/libpng16-16.dll",
},
},
{
:name => "freetype",
:version => "2.5.3",
:download_base_url => "http://sourceforge.net/projects/freetype/files/freetype2/2.5.3",
:version => "2.5.4",
:download_base_url => "http://sourceforge.net/projects/freetype/files/freetype2/2.5.4",
:compression_method => "bz2",
:windows => {
:built_file => "bin/libfreetype-6.dll",
......@@ -609,6 +609,16 @@ file "Makefile" => ["extconf.rb", "ext/cairo/extconf.rb"] do
ruby("extconf.rb")
end
namespace :make do
namespace :debug_flags do
task :reset do
ENV["MAKE"] ||= "make debugflags="
end
end
end
task :cross => "make:debug_flags:reset"
desc "Configure"
task :configure => "Makefile"
......
......@@ -101,4 +101,4 @@ run rake windows:build
run rake cross compile native gem
run mkdir -p /vagrant/pkg
run cp */pkg/*.gem /vagrant/pkg/
run cp pkg/*.gem /vagrant/pkg/
......@@ -73,7 +73,7 @@ RB_CAIRO_BEGIN_DECLS
#define RB_CAIRO_VERSION_MAJOR 1
#define RB_CAIRO_VERSION_MINOR 14
#define RB_CAIRO_VERSION_MICRO 0
#define RB_CAIRO_VERSION_MICRO 1
RB_CAIRO_VAR VALUE rb_mCairo;
RB_CAIRO_VAR VALUE rb_cCairo_Context;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment