mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-29 17:41:05 +02:00
Upgraded the libart_lgpl Portage package
Upgraded media-libs/libart_lgpl to version 2.3.21-r1 on amd64 Needed by dia. BUG=None TEST=`emerge dia` worked Change-Id: I1cc4efa04a9d468e8f55b1bf7830d403d75d1f49 Reviewed-on: https://gerrit.chromium.org/gerrit/22159 Reviewed-by: Jason Glasgow <jglasgow@chromium.org> Commit-Ready: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger
Gerrit
parent
ce86ae2efd
commit
d71aa61b2e
1
sdk_container/src/third_party/portage-stable/media-libs/libart_lgpl/Manifest
vendored
Normal file
1
sdk_container/src/third_party/portage-stable/media-libs/libart_lgpl/Manifest
vendored
Normal file
@ -0,0 +1 @@
|
||||
DIST libart_lgpl-2.3.21.tar.bz2 329102 RMD160 ed40181ffc9d6646630c1db64532217acf7dd036 SHA1 dbac185c65696381ef188de1f98b348b530e22f9 SHA256 fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa
|
||||
@ -0,0 +1,19 @@
|
||||
diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN libart_lgpl-2.3.19.orig/art_misc.h libart_lgpl-2.3.19/art_misc.h
|
||||
--- libart_lgpl-2.3.19.orig/art_misc.h 2007-01-01 18:59:22.000000000 -0500
|
||||
+++ libart_lgpl-2.3.19/art_misc.h 2007-03-01 11:35:47.000000000 -0500
|
||||
@@ -34,9 +34,15 @@
|
||||
#include <libart_lgpl/art_config.h>
|
||||
#endif
|
||||
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
void *art_alloc(size_t size);
|
||||
void art_free(void *ptr);
|
||||
void *art_realloc(void *ptr, size_t size);
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif /* __cplusplus */
|
||||
|
||||
/* These aren't, strictly speaking, configuration macros, but they're
|
||||
damn handy to have around, and may be worth playing with for
|
||||
@ -0,0 +1,54 @@
|
||||
diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libart_lgpl-2.3.19.orig/art_config.h libart_lgpl-2.3.19/art_config.h
|
||||
--- libart_lgpl-2.3.19.orig/art_config.h 2007-02-28 08:00:44.000000000 -0500
|
||||
+++ libart_lgpl-2.3.19/art_config.h 2007-08-24 16:25:28.000000000 -0400
|
||||
@@ -1,10 +1,7 @@
|
||||
/* Automatically generated by gen_art_config.c */
|
||||
|
||||
-#define ART_SIZEOF_CHAR 1
|
||||
-#define ART_SIZEOF_SHORT 2
|
||||
-#define ART_SIZEOF_INT 4
|
||||
-#define ART_SIZEOF_LONG 4
|
||||
+#include <stdint.h>
|
||||
|
||||
-typedef unsigned char art_u8;
|
||||
-typedef unsigned short art_u16;
|
||||
-typedef unsigned int art_u32;
|
||||
+typedef uint8_t art_u8;
|
||||
+typedef uint16_t art_u16;
|
||||
+typedef uint32_t art_u32;
|
||||
diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libart_lgpl-2.3.19.orig/Makefile.am libart_lgpl-2.3.19/Makefile.am
|
||||
--- libart_lgpl-2.3.19.orig/Makefile.am 2007-01-01 18:59:22.000000000 -0500
|
||||
+++ libart_lgpl-2.3.19/Makefile.am 2007-08-24 15:42:44.000000000 -0400
|
||||
@@ -3,11 +3,6 @@ noinst_PROGRAMS = testart testuta gen_ar
|
||||
bin_SCRIPTS = \
|
||||
libart2-config
|
||||
|
||||
-BUILT_SOURCES = art_config.h
|
||||
-
|
||||
-art_config.h: gen_art_config$(EXEEXT)
|
||||
- ./gen_art_config > art_config.h
|
||||
-
|
||||
EXTRA_DIST = \
|
||||
libart.def \
|
||||
libart-config.in \
|
||||
diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libart_lgpl-2.3.19.orig/Makefile.in libart_lgpl-2.3.19/Makefile.in
|
||||
--- libart_lgpl-2.3.19.orig/Makefile.in 2007-02-28 08:00:24.000000000 -0500
|
||||
+++ libart_lgpl-2.3.19/Makefile.in 2007-08-24 15:42:44.000000000 -0400
|
||||
@@ -254,7 +254,6 @@ top_srcdir = @top_srcdir@
|
||||
bin_SCRIPTS = \
|
||||
libart2-config
|
||||
|
||||
-BUILT_SOURCES = art_config.h
|
||||
EXTRA_DIST = \
|
||||
libart.def \
|
||||
libart-config.in \
|
||||
@@ -915,9 +914,6 @@ uninstall-am: uninstall-binSCRIPTS unins
|
||||
uninstall-pkgconfigDATA
|
||||
|
||||
|
||||
-art_config.h: gen_art_config$(EXEEXT)
|
||||
- ./gen_art_config > art_config.h
|
||||
-
|
||||
@OS_WIN32_TRUE@install-libtool-import-lib:
|
||||
@OS_WIN32_TRUE@ $(INSTALL) .libs/libart_lgpl_2.dll.a $(DESTDIR)$(libdir)
|
||||
@OS_WIN32_TRUE@uninstall-libtool-import-lib:
|
||||
@ -0,0 +1,79 @@
|
||||
From e1443c945a4cf67096d8c27721aadd7368382b3f Mon Sep 17 00:00:00 2001
|
||||
From: Gilles Dartiguelongue <eva@gentoo.org>
|
||||
Date: Tue, 6 Apr 2010 15:22:25 +0200
|
||||
Subject: [PATCH 2/2] gentoo: use ISO types for fixed type size
|
||||
|
||||
---
|
||||
Makefile.am | 11 ++---------
|
||||
art_config.h | 5 +++++
|
||||
configure.in | 10 ----------
|
||||
3 files changed, 7 insertions(+), 19 deletions(-)
|
||||
create mode 100644 art_config.h
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 95952da..6aa2fe3 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -2,13 +2,6 @@ check_PROGRAMS = testart testuta
|
||||
|
||||
bin_SCRIPTS = \
|
||||
libart2-config
|
||||
-
|
||||
-noinst_SCRIPTS = gen_art_config.sh
|
||||
-
|
||||
-BUILT_SOURCES = art_config.h
|
||||
-
|
||||
-art_config.h:
|
||||
- ./gen_art_config.sh > art_config.h
|
||||
|
||||
EXTRA_DIST = \
|
||||
libart.def \
|
||||
@@ -173,5 +166,5 @@ install-data-local: install-ms-lib install-libtool-import-lib
|
||||
|
||||
uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
|
||||
|
||||
-CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS)
|
||||
-DISTCLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS)
|
||||
+CLEANFILES = $(bin_SCRIPTS)
|
||||
+DISTCLEANFILES = $(bin_SCRIPTS)
|
||||
diff --git a/art_config.h b/art_config.h
|
||||
new file mode 100644
|
||||
index 0000000..5985f1f
|
||||
--- a/art_config.h
|
||||
+++ b/art_config.h
|
||||
@@ -0,0 +1,5 @@
|
||||
+#include <stdint.h>
|
||||
+
|
||||
+typedef uint8_t art_u8;
|
||||
+typedef uint16_t art_u16;
|
||||
+typedef uint32_t art_u32;
|
||||
diff --git a/configure.in b/configure.in
|
||||
index e4804f7..ddcac4f 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -92,15 +92,6 @@ AC_FUNC_ALLOCA
|
||||
|
||||
AC_C_BIGENDIAN
|
||||
|
||||
-AC_CHECK_SIZEOF(char)
|
||||
-AC_SUBST(ART_SIZEOF_CHAR, $ac_cv_sizeof_char)
|
||||
-AC_CHECK_SIZEOF(short)
|
||||
-AC_SUBST(ART_SIZEOF_SHORT, $ac_cv_sizeof_short)
|
||||
-AC_CHECK_SIZEOF(int)
|
||||
-AC_SUBST(ART_SIZEOF_INT, $ac_cv_sizeof_int)
|
||||
-AC_CHECK_SIZEOF(long)
|
||||
-AC_SUBST(ART_SIZEOF_LONG, $ac_cv_sizeof_long)
|
||||
-
|
||||
AC_CONFIG_FILES([
|
||||
libart-features.h
|
||||
Makefile
|
||||
@@ -109,6 +100,5 @@ libart-2.0-uninstalled.pc
|
||||
libart-zip])
|
||||
|
||||
AC_CONFIG_FILES([libart-config],[chmod +x libart-config])
|
||||
-AC_CONFIG_FILES([gen_art_config.sh],[chmod +x gen_art_config.sh])
|
||||
|
||||
AC_OUTPUT
|
||||
--
|
||||
1.7.0.4
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
From f3afed3b06c34c588a7c67cb83064e16255f54b4 Mon Sep 17 00:00:00 2001
|
||||
From: Gilles Dartiguelongue <eva@gentoo.org>
|
||||
Date: Tue, 6 Apr 2010 15:11:46 +0200
|
||||
Subject: [PATCH 1/2] gentoo: do not build tests if not required
|
||||
|
||||
---
|
||||
Makefile.am | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index aec6c5d..95952da 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1,4 +1,4 @@
|
||||
-noinst_PROGRAMS = testart testuta
|
||||
+check_PROGRAMS = testart testuta
|
||||
|
||||
bin_SCRIPTS = \
|
||||
libart2-config
|
||||
--
|
||||
1.7.0.4
|
||||
|
||||
41
sdk_container/src/third_party/portage-stable/media-libs/libart_lgpl/libart_lgpl-2.3.21-r1.ebuild
vendored
Normal file
41
sdk_container/src/third_party/portage-stable/media-libs/libart_lgpl/libart_lgpl-2.3.21-r1.ebuild
vendored
Normal file
@ -0,0 +1,41 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-libs/libart_lgpl/libart_lgpl-2.3.21-r1.ebuild,v 1.11 2012/05/05 08:02:38 jdhore Exp $
|
||||
|
||||
EAPI="3"
|
||||
GCONF_DEBUG="no"
|
||||
|
||||
inherit autotools eutils gnome2
|
||||
|
||||
DESCRIPTION="a LGPL version of libart"
|
||||
HOMEPAGE="http://www.levien.com/libart"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="virtual/pkgconfig"
|
||||
|
||||
# The provided tests are interactive only
|
||||
RESTRICT="test"
|
||||
|
||||
DOCS="AUTHORS ChangeLog NEWS README"
|
||||
|
||||
pkg_setup() {
|
||||
G2CONF="${G2CONF} --disable-static"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
gnome2_src_prepare
|
||||
|
||||
# Fix crosscompiling, bug #185684
|
||||
rm "${S}"/art_config.h
|
||||
epatch "${FILESDIR}"/${PN}-2.3.21-crosscompile.patch
|
||||
|
||||
# Do not build tests if not required
|
||||
epatch "${FILESDIR}"/${PN}-2.3.21-no-test-build.patch
|
||||
|
||||
AT_NOELIBTOOLIZE=yes eautoreconf
|
||||
}
|
||||
12
sdk_container/src/third_party/portage-stable/metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r1
vendored
Normal file
12
sdk_container/src/third_party/portage-stable/metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r1
vendored
Normal file
@ -0,0 +1,12 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
|
||||
DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
|
||||
DESCRIPTION=a LGPL version of libart
|
||||
EAPI=3
|
||||
HOMEPAGE=http://www.levien.com/libart
|
||||
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
|
||||
LICENSE=LGPL-2.1
|
||||
RESTRICT=test
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.21.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d eutils 33ef77a15337022e05342d2c772a7a5a fdo-mime 9c46e30acd923ff12e325dbe96bb98b9 gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 e766f648c9d51ea0afabaf25bddb1ad9 gnome2-utils 0067e2e4dc66e2ff223a9c527e329407 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed
|
||||
_md5_=a1a4c2b9c9fdcb63ab9189449619d0fd
|
||||
Loading…
x
Reference in New Issue
Block a user