librsvg: upgrade to 2.40.6
Upstream now ships it's own vapigen.m4, so don't install our own copy. (From OE-Core rev: 7235da88c6ed6555cfa271714331595a8c3dd2e4) (From OE-Core rev: a06bdaf8c25fbe838c416e67aaf4a6bc0335681c) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
Richard Purdie
parent
450a4aaf1a
commit
67786c471a
|
|
@ -1,96 +0,0 @@
|
|||
dnl vapigen.m4
|
||||
dnl
|
||||
dnl Copyright 2012 Evan Nemerson
|
||||
dnl
|
||||
dnl This library is free software; you can redistribute it and/or
|
||||
dnl modify it under the terms of the GNU Lesser General Public
|
||||
dnl License as published by the Free Software Foundation; either
|
||||
dnl version 2.1 of the License, or (at your option) any later version.
|
||||
dnl
|
||||
dnl This library is distributed in the hope that it will be useful,
|
||||
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
dnl Lesser General Public License for more details.
|
||||
dnl
|
||||
dnl You should have received a copy of the GNU Lesser General Public
|
||||
dnl License along with this library; if not, write to the Free Software
|
||||
dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND-INTROSPECTION], [DEFAULT])
|
||||
# --------------------------------------
|
||||
# Check vapigen existence and version
|
||||
#
|
||||
# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation
|
||||
AC_DEFUN([VAPIGEN_CHECK],
|
||||
[
|
||||
AC_BEFORE([GOBJECT_INTROSPECTION_CHECK],[$0])
|
||||
AC_BEFORE([GOBJECT_INTROSPECTION_REQUIRE],[$0])
|
||||
|
||||
AC_ARG_ENABLE([vala],
|
||||
[AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]],[build Vala bindings @<:@default=]ifelse($4,,auto,$4)[@:>@])],,[
|
||||
AS_IF([test "x$4" = "x"], [
|
||||
enable_vala=auto
|
||||
], [
|
||||
enable_vala=$4
|
||||
])
|
||||
])
|
||||
|
||||
AS_CASE([$enable_vala], [no], [enable_vala=no],
|
||||
[yes], [
|
||||
AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
|
||||
AC_MSG_ERROR([Vala bindings require GObject Introspection])
|
||||
])
|
||||
], [auto], [
|
||||
AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
|
||||
enable_vala=no
|
||||
])
|
||||
], [
|
||||
AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@])
|
||||
])
|
||||
|
||||
AS_IF([test "x$2" = "x"], [
|
||||
vapigen_pkg_name=vapigen
|
||||
], [
|
||||
vapigen_pkg_name=vapigen-$2
|
||||
])
|
||||
AS_IF([test "x$1" = "x"], [
|
||||
vapigen_pkg="$vapigen_pkg_name"
|
||||
], [
|
||||
vapigen_pkg="$vapigen_pkg_name >= $1"
|
||||
])
|
||||
|
||||
PKG_PROG_PKG_CONFIG
|
||||
|
||||
PKG_CHECK_EXISTS([$vapigen_pkg], [
|
||||
AS_IF([test "$enable_vala" = "auto"], [
|
||||
enable_vala=yes
|
||||
])
|
||||
], [
|
||||
AS_CASE([$enable_vala], [yes], [
|
||||
AC_MSG_ERROR([$vapigen_pkg not found])
|
||||
], [auto], [
|
||||
enable_vala=no
|
||||
])
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING([for vala])
|
||||
|
||||
AS_CASE([$enable_vala],
|
||||
[yes], [
|
||||
VAPIGEN=`$PKG_CONFIG --variable=vapigen vapigen`
|
||||
VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir vapigen`/vala/Makefile.vapigen
|
||||
AS_IF([test "x$2" = "x"], [
|
||||
VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir vapigen`
|
||||
], [
|
||||
VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned vapigen`
|
||||
])
|
||||
])
|
||||
|
||||
AC_MSG_RESULT([$enable_vala])
|
||||
|
||||
AC_SUBST([VAPIGEN])
|
||||
AC_SUBST([VAPIGEN_VAPIDIR])
|
||||
AC_SUBST([VAPIGEN_MAKEFILE])
|
||||
|
||||
AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$enable_vala" = "xyes")
|
||||
])
|
||||
|
|
@ -14,11 +14,10 @@ inherit autotools pkgconfig gnomebase gtk-doc pixbufcache
|
|||
|
||||
GNOME_COMPRESS_TYPE = "xz"
|
||||
|
||||
SRC_URI += "file://gtk-option.patch \
|
||||
file://vapigen.m4"
|
||||
SRC_URI += "file://gtk-option.patch"
|
||||
|
||||
SRC_URI[archive.md5sum] = "acdecdb9f08f3bf662a68bf7dafb8b82"
|
||||
SRC_URI[archive.sha256sum] = "48049b643294636df7de1a4b997414d699666f5dc44776945c218a257d2a291c"
|
||||
SRC_URI[archive.md5sum] = "259fd160b47ec11f3c27d7e18e507c99"
|
||||
SRC_URI[archive.sha256sum] = "8af349f241677b04b7a1ea6b9b33a6343e781bcccc8a09d00208a47342584f06"
|
||||
|
||||
EXTRA_OECONF = "--disable-introspection --disable-vala"
|
||||
|
||||
|
|
@ -32,15 +31,6 @@ PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gdk-p
|
|||
# GTK+ test application (rsvg-view)
|
||||
PACKAGECONFIG[gtk] = "--with-gtk3,--without-gtk3,gtk+3"
|
||||
|
||||
# The tarball doesn't ship with macros, so drop a vapigen in there so we don't
|
||||
# need to build vala to configure.
|
||||
do_configure_prepend() {
|
||||
if test ! -e ${S}/m4/vapigen.m4; then
|
||||
mkdir --parents ${S}/m4
|
||||
mv ${WORKDIR}/vapigen.m4 ${S}/m4/
|
||||
fi
|
||||
}
|
||||
|
||||
do_install_append() {
|
||||
# Loadable modules don't need .a or .la on Linux
|
||||
rm -f ${D}${libdir}/gdk-pixbuf-2.0/*/loaders/*.a ${D}${libdir}/gdk-pixbuf-2.0/*/loaders/*.la
|
||||
Loading…
Reference in New Issue