Commit ff0c9107 authored by Edward Hervey's avatar Edward Hervey 🤘
Browse files

recipes: Update most dependencies and build-tools

* Remove/Update patches where applicable
* Tested on all linux/android variant, the build slaves will pick up
  the rest...
parent eb6d106e
Status of recipes (compared to upstream versions)
Last updated/reviewed: February 11th 2015
Last updated/reviewed: February 14th 2015
recipe name | Version Used | Latest upstream version
------------------------------------------------------------------------
m4 | 1.4.17 |
autoconf | 2.69 |
automake | 1.14 |
automake | 1.15 |
libtool | 2.4.2 |
pkg-config | 0.28 |
gettext-{m4,tools} | 0.19.4 |
......@@ -15,42 +15,42 @@ libiconv | 1.14 |
gnustl | ????
libffi | 3.2.1 |
zlib | 1.2.8 |
glib | 2.42.0 | 2.42.1 (2014-11-10)
glib | 2.42.1 |
gtk-doc(-lite) | 1.21 |
libxml2 | 2.9.1 | 2.9.2
libogg | 1.3.1 | 1.3.2
libpng | 1.6.10 | 1.6.16
pixman | 0.32.4 | 0.32.6
libxml2 | 2.9.2 |
libogg | 1.3.2 |
libpng | 1.6.16 |
pixman | 0.32.6 |
expat | 2.1.0 |
bzip2 | 1.0.6 |
freetype | 2.5.3 | 2.5.5
freetype | 2.5.5 |
fontconfig | 2.11.1 |
cairo | 1.12.18 |
harfbuzz | 0.9.24 | 0.9.38 (2015-01-23)
pango | 1.36.7 | 1.36.8 (2014-09-22)
harfbuzz | 0.9.38 |
pango | 1.36.8 |
libvorbis | 1.3.4 |
libtheora | 1.1.1 |
libjpeg-turbo | 1.3.1 | 1.4.0 (2015-01-07)
gdk-pixbuf | 2.30.7 | 2.30.8 (2014-05-27)
libjpeg-turbo | 1.4.0 |
gdk-pixbuf | 2.30.8 |
gmp | 6.0.0a |
nettle | 2.7.1 |
libtasn1 | 2.14 | 4.2 (2014-09-15)
gnutls | 3.2.18 | 3.2.21 (2014-11-12) / 3.3.12 (2014-11-12)
glib-networking | 2.42.0 | 2.42.1 (2014-12-07)
libsoup | 2.46.0 | 2.48.1 (2014-12-07)
libtasn1 | 4.2 |
gnutls | 3.2.21 |
glib-networking | 2.42.1 |
libsoup | 2.48.1 |
libvpx | 1.3.0 |
fribidi | 0.19.6 |
openh264 | 1.3.1 |
opus | 1.1 |
libgpg-error | 1.12 | 1.17
libgcrypt | 1.6.0 | 1.6.2
libgpg-error | 1.17 |
libgcrypt | 1.6.2 |
libsrtp | 1.5.0 |
vo-aacenc | 0.1.3 |
libcroco | 0.6.5 | 0.6.8 (2012-10-25)
libcroco | 0.6.8 |
openjpeg | 1.5.2 | 2.1.0 (2014-04-29)
pygobject | 3.12.1 | 3.14.0 (2014-09-22)
gobject-introspection | 1.40.0 | 1.42.0 (2014-09-23)
flac | 1.3.0 | 1.3.1 (2014-11-27)
gobject-introspection | 1.42.0 |
flac | 1.3.1 |
lame | 3.99.5 |
libnice | 0.1.10 |
......@@ -68,8 +68,8 @@ gnome-icon-theme | 3.10.0 | 3.12.0 (2014-03-25)
gnome-themes-standard | 3.10.0 | 3.12.0 (2014-03-25)
gtk+3 | 3.10.7 | 3.12.2 (2014-05-12)
hicolor-icon-theme | 0.11 | 0.13 (2013-12-17)
librsvg | 2.40.2 | 2.40.6 (2014-12-03)
librsvg-gtk | 2.40.2 | 2.40.6 (2014-12-03)
librsvg | 2.40.6 |
librsvg-gtk | 2.40.6 |
numpy | 1.8.1 |
pycairo | 1.10.0 |
python3 | 3.3.5 | 3.4.1 (2014-05-19)
......
......@@ -3,12 +3,12 @@
class Recipe(recipe.Recipe):
name = 'automake'
version = '1.14'
version = '1.15'
licenses = [License.GPLv2]
stype = SourceType.TARBALL
url = 'http://ftp.gnu.org/gnu/automake/automake-1.14.tar.xz'
url = 'http://ftp.gnu.org/gnu/automake/automake-1.15.tar.xz'
deps = ['autoconf']
files_bin = ['bin/automake', 'bin/aclocal',
'bin/automake-1.14', 'bin/aclocal-1.14']
files_share = ['share/aclocal-1.14', 'share/automake-1.14']
'bin/automake-1.15', 'bin/aclocal-1.15']
files_share = ['share/aclocal-1.15', 'share/automake-1.15']
......@@ -3,10 +3,10 @@ import shutil
class Recipe(recipe.Recipe):
name = 'bison'
version = '3.0.2'
version = '3.0.4'
licenses = [License.GPLv2]
stype = SourceType.TARBALL
url = 'http://ftpmirror.gnu.org/bison/bison-3.0.2.tar.gz'
url = 'http://ftpmirror.gnu.org/bison/bison-3.0.4.tar.gz'
files_bins = ['bison']
......
......@@ -2,7 +2,7 @@
class Recipe(recipe.Recipe):
name = 'flex'
version = '2.5.37'
version = '2.5.39'
licenses = [License.BSD_like]
stype = SourceType.TARBALL
url = 'http://freefr.dl.sourceforge.net/project/{0}/{0}-{1}.tar.gz'.format(name, version)
......
......@@ -3,10 +3,10 @@ import shutil
class Recipe(recipe.Recipe):
name = 'gettext-m4'
version = '0.18.3.2'
version = '0.19.4'
stype = SourceType.TARBALL
tarball_dirname = 'gettext-%(version)s'
url = 'http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.3.2.tar.gz'
url = 'http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.4.tar.gz'
# only libraries are LGPLv2+, tools are GPLv3+ and defined below
licenses = [License.LGPLv2Plus]
autoreconf = True
......
......@@ -3,12 +3,12 @@ from cerbero.utils import shell
class Recipe(recipe.Recipe):
name = 'gettext-tools'
version = '0.18.3.2'
version = '0.19.4'
licenses = [License.GPLv3]
srcdir = 'gettext-tools'
stype = SourceType.TARBALL
tarball_dirname = 'gettext-%(version)s'
url = 'http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.3.2.tar.gz'
url = 'http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.4.tar.gz'
platform_deps = {
Platform.DARWIN: ['libiconv', 'sed'],
Platform.WINDOWS: ['libiconv', 'mingw-runtime'],}
......
......@@ -3,7 +3,7 @@
class Recipe(recipe.Recipe):
name = 'sed'
version = '4.2'
version = '4.2.2'
licenses = [License.GPLv2]
stype = SourceType.TARBALL
url = 'http://ftp.gnu.org/gnu/sed/sed-4.2.tar.gz'
url = 'http://ftp.gnu.org/gnu/sed/sed-4.2.2.tar.gz'
......@@ -8,7 +8,7 @@ class Recipe(recipe.Recipe):
"""
name = 'gobject-introspection-m4'
_name = 'gobject-introspection'
version = '1.40.0'
version = '1.42.0'
stype = SourceType.TARBALL
maj_ver = '.'.join(version.split('.')[0:2])
url = 'http://ftp.gnome.org/pub/GNOME/sources/{0}/{2}/{0}-{1}.tar.xz'
......
......@@ -3,10 +3,10 @@ import shutil
class Recipe(recipe.Recipe):
name = 'libtool'
version = '2.4.2'
version = '2.4.5'
licenses = [License.GPLv2]
stype = SourceType.TARBALL
url = 'http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz'
url = 'http://ftpmirror.gnu.org/libtool/libtool-2.4.5.tar.gz'
files_bin = ['bin/libtool', 'bin/libtoolize']
files_libs = ['libltdl']
......
......@@ -3,9 +3,9 @@
class Recipe(recipe.Recipe):
name = 'tar'
version = '1.26'
version = '1.28'
licenses = [License.GPLv3]
stype = SourceType.TARBALL
url = 'http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2'
url = 'http://ftp.gnu.org/gnu/tar/tar-1.28.tar.bz2'
files_bins = ['tar']
......@@ -9,7 +9,7 @@ class Recipe(recipe.Recipe):
"""
name = 'vala-m4'
_name = 'vala'
version = '0.26.1'
version = '0.26.2'
stype = SourceType.TARBALL
maj_ver = '.'.join(version.split('.')[0:2])
url = 'http://ftp.gnome.org/pub/GNOME/sources/{0}/{2}/{0}-{1}.tar.xz'
......
......@@ -3,9 +3,9 @@
class Recipe(recipe.Recipe):
name = 'xz'
version = '5.0.4'
version = '5.2.0'
licenses = [License.GPLv3]
stype = SourceType.TARBALL
url = 'http://tukaani.org/xz/xz-5.0.4.tar.bz2'
url = 'http://tukaani.org/xz/xz-5.2.0.tar.bz2'
files_bins = ['xz']
......@@ -3,10 +3,10 @@
class Recipe(recipe.Recipe):
name = 'yasm'
version = '1.2.0'
version = '1.3.0'
licenses = [License.GPLv3]
stype = SourceType.TARBALL
url = 'http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz'
url = 'http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz'
files_bins = ['yasm']
......
......@@ -4,17 +4,17 @@ from cerbero.utils import shell
class Recipe(recipe.Recipe):
name = 'flac'
version = '1.3.0'
version = '1.3.1'
# only libraries are Xiph.org (aka BSD-like), tools are GPLv2+ and defined below
licenses = [License.BSD_like]
stype = SourceType.TARBALL
url = 'http://downloads.xiph.org/releases/flac/flac-1.3.0.tar.xz'
patches = ['flac/0001-Fix-windows-compilation.patch',
'flac/0002-fix-autoreconf.patch',
'flac/0003-Detect-Clang-masquerading-as-GCC.patch']
url = 'http://downloads.xiph.org/releases/flac/flac-1.3.1.tar.xz'
patches = ['flac/0002-fix-autoreconf.patch',
]
deps = [ 'libogg' ]
configure_options = ' --disable-cpplibs --enable-static'
autoreconf = True
files_libs = ['libFLAC']
files_bins = ['flac', 'metaflac']
......
From c78bf9fb6f4bc6c316c53ba83b72444545caa538 Mon Sep 17 00:00:00 2001
From: Andoni Morales Alastruey <ylatuya@gmail.com>
Date: Thu, 1 Mar 2012 16:42:30 +0100
Subject: [PATCH 1/2] Fix windows compilation
---
configure.ac | 3 +++
src/libFLAC/Makefile.am | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 50ef80e..6947075 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,12 +127,15 @@ esac
AM_CONDITIONAL(FLaC__CPU_PPC_SPE, test "x$abi_spe" = xtrue)
os_is_windows=no
+MINGW_WINSOCK_LIBS=
+
case "$host" in
*-*-cygwin|*mingw*)
# define this variable for enabling strict exports with libtool; for now, it's supported by Win32 and OS/2
LT_NO_UNDEFINED="-no-undefined"
CPPFLAGS="-D__MSVCRT_VERSION__=0x0601 $CPPFLAGS"
os_is_windows=yes
+ MINGW_WINSOCK_LIBS=-lws2_32
;;
*emx*)
LT_NO_UNDEFINED="-no-undefined"
diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index 86155ab..3c964f1 100644
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -113,7 +113,7 @@ extra_ogg_sources = \
endif
# see 'http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning' for numbering convention
-libFLAC_la_LDFLAGS = $(AM_LDFLAGS) -version-info 11:0:3 $(LOCAL_EXTRA_LDFLAGS) @LT_NO_UNDEFINED@
+libFLAC_la_LDFLAGS = $(AM_LDFLAGS) -version-info 11:0:3 $(LOCAL_EXTRA_LDFLAGS) @LT_NO_UNDEFINED@ $(MINGW_WINSOCK_LIBS)
libFLAC_sources = \
bitmath.c \
--
1.9.0
From 20daea0bbad28c63e4d2c9129df9d0350a6bed22 Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Fri, 22 Nov 2013 18:13:36 +1100
Subject: [PATCH 3/3] Detect Clang masquerading as GCC.
Autoconf detects the Clang compiler as GNU GCC (clang sets defines like
__GNUC__ etc) but Clang is *not* completely compatible. If we detect
Clang we set ac_vc_c_compiler_gnu to 'no'.
Conflicts:
configure.ac
---
configure.ac | 2 ++
m4/clang.m4 | 31 +++++++++++++++++++++++++++++++
m4/really_gcc.m4 | 32 ++++++++++++++++++++++++++++++++
3 files changed, 65 insertions(+)
create mode 100644 m4/clang.m4
create mode 100644 m4/really_gcc.m4
diff --git a/configure.ac b/configure.ac
index 6947075..134a84a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,8 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
LT_INIT([win32-dll disable-static pic-only])
AM_PROG_AS
AC_PROG_CXX
+XIPH_C_COMPILER_IS_CLANG
+XIPH_GCC_REALLY_IS_GCC
AC_PROG_MAKE_SET
AC_SYS_LARGEFILE
diff --git a/m4/clang.m4 b/m4/clang.m4
new file mode 100644
index 0000000..036f0e6
--- /dev/null
+++ b/m4/clang.m4
@@ -0,0 +1,31 @@
+dnl @synopsis XIPH_C_COMPILER_IS_CLANG
+dnl
+dnl Find out if a compiler claiming to be gcc really is gcc (clang lies).
+dnl @version 1.0 Oct 31 2013
+dnl @author Erik de Castro Lopo <erikd AT mega-nerd DOT com>
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this file for any
+dnl purpose is hereby granted without fee, provided that the above copyright
+dnl and this permission notice appear in all copies. No representations are
+dnl made about the suitability of this software for any purpose. It is
+dnl provided "as is" without express or implied warranty.
+dnl
+
+
+AC_DEFUN([XIPH_C_COMPILER_IS_CLANG],
+[AC_CACHE_CHECK(whether we are using the CLANG C compiler,
+ xiph_cv_c_compiler_clang,
+ [ AC_LANG_ASSERT(C)
+ AC_TRY_LINK([
+ #include <stdio.h>
+ ],
+ [
+ #ifndef __clang__
+ This is not clang!
+ #endif
+ ],
+ xiph_cv_c_compiler_clang=yes,
+ xiph_cv_c_compiler_clang=no
+ ])
+ )]
+)
diff --git a/m4/really_gcc.m4 b/m4/really_gcc.m4
new file mode 100644
index 0000000..cba53ab
--- /dev/null
+++ b/m4/really_gcc.m4
@@ -0,0 +1,32 @@
+dnl @synopsis XIPH_GCC_REALLY_IS_GCC
+dnl
+dnl Find out if a compiler claiming to be gcc really is gcc (clang lies).
+dnl @version 1.0 Oct 31 2013
+dnl @author Erik de Castro Lopo <erikd AT mega-nerd DOT com>
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this file for any
+dnl purpose is hereby granted without fee, provided that the above copyright
+dnl and this permission notice appear in all copies. No representations are
+dnl made about the suitability of this software for any purpose. It is
+dnl provided "as is" without express or implied warranty.
+dnl
+
+# If the configure script has already detected GNU GCC, then make sure it
+# isn't CLANG masquerading as GCC.
+
+AC_DEFUN([XIPH_GCC_REALLY_IS_GCC],
+[ AC_LANG_ASSERT(C)
+ if test "x$ac_cv_c_compiler_gnu" = "xyes" ; then
+ AC_TRY_LINK([
+ #include <stdio.h>
+ ],
+ [
+ #ifdef __clang__
+ This is clang!
+ #endif
+ ],
+ ac_cv_c_compiler_gnu=yes,
+ ac_cv_c_compiler_gnu=no
+ )
+ fi
+])
--
1.9.0
......@@ -3,9 +3,9 @@
class Recipe(recipe.Recipe):
name = 'freetype'
version = '2.5.3'
version = '2.5.5'
stype = SourceType.TARBALL
url = 'http://download.savannah.gnu.org/releases/freetype/freetype-2.5.3.tar.bz2'
url = 'http://download.savannah.gnu.org/releases/freetype/freetype-2.5.5.tar.bz2'
licenses = [License.FreeType]
configure_tpl = "%(config-sh)s --prefix=%(prefix)s --libdir=%(libdir)s"
deps = ['zlib', 'bzip2']
......
......@@ -4,13 +4,13 @@ from cerbero.utils import shell
class Recipe(recipe.Recipe):
name = 'gdk-pixbuf'
version = '2.30.7'
version = '2.30.8'
licenses = [License.LGPLv2Plus]
stype = SourceType.TARBALL
url = 'http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.30/gdk-pixbuf-2.30.7.tar.xz'
url = 'http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.30/gdk-pixbuf-2.30.8.tar.xz'
patches = [
'gdk-pixbuf/0001-io-extened-support-for-relotations-to-OS-X-and-Linux.patch',
'gdk-pixbuf/0002-nls-update-gettext-macros-for-0.18.patch',
'gdk-pixbuf/0002-nls-update-gettext-macros-for-0.19.patch',
]
configure_options = '--with-included-loaders --enable-static --enable-gio-sniffing=no '
deps = ['libjpeg-turbo', 'glib', 'libpng', 'tiff', 'zlib' ]
......
From 711465ad9d5be8c566af839a5ef4de4ac25abfe4 Mon Sep 17 00:00:00 2001
From: Andoni Morales Alastruey <ylatuya@gmail.com>
Date: Fri, 22 Mar 2013 21:27:53 +0100
Subject: [PATCH] nls: update gettext macros for 0.18
Subject: [PATCH] nls: update gettext macros for 0.19
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 626e9e9..57fdad8 100644
index 409fceb..0b13f4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,7 +335,7 @@ if test "$gtk_ok" = "yes"; then
@@ -338,7 +338,7 @@ if test "$gtk_ok" = "yes"; then
fi
# i18n stuff
-AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT_VERSION([0.18])
+AM_GNU_GETTEXT_VERSION([0.19])
AM_GNU_GETTEXT([external])
GETTEXT_PACKAGE="$PACKAGE"
--
1.9.0
2.1.0
......@@ -4,7 +4,7 @@ from cerbero.utils.shell import which
class Recipe(recipe.Recipe):
name = 'glib-networking'
version = '2.42.0'
version = '2.42.1'
licenses = [License.LGPLv2Plus]
stype = SourceType.TARBALL
url = 'http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.42/glib-networking-%(version)s.tar.xz'
......
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