summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2012-05-28 08:47:58 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-30 12:04:46 +0100
commit7bf02ebc52cbe2a43e702034cda979746c9543aa (patch)
tree7e30c36a6b4a91cfe4f2f58ca4e5a4f72a826037
parente8dac5a58a77d01d427add12617a7c01f412bcc4 (diff)
downloadpoky-7bf02ebc52cbe2a43e702034cda979746c9543aa.tar.gz
fontconfig: upgrade to 2.9.0
Other changes: - licence checksums because the licence headers changed slightly: several other authors were added and Keith Packard's name has been replaced with "author(s)". That's it. - rebased the fix-pkgconfig.patch to apply on 2.9.0 - removed all sed instructions in do_configure_append() that were changing fc-arch/Makefile. In the new version the fc-arch/ directory has been removed in order to make the package cross-compiling safe (From OE-Core rev: 8e219dea0373dc3a37d51f63c41f1a8449029dd5) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig (renamed from meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig)0
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch (renamed from meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch)4
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb (renamed from meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb)0
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb (renamed from meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb)16
4 files changed, 8 insertions, 12 deletions
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig
index 2993959dbb..2993959dbb 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig
+++ b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
index 30415fce76..6be04a1509 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
+++ b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
@@ -4,8 +4,8 @@ Upstream-Status: Inappropriate [configuration]
4 fontconfig.pc.in | 2 +- 4 fontconfig.pc.in | 2 +-
5 1 file changed, 1 insertion(+), 1 deletion(-) 5 1 file changed, 1 insertion(+), 1 deletion(-)
6 6
7--- fontconfig-2.8.0.orig/fontconfig.pc.in 7--- fontconfig-2.9.0.orig/fontconfig.pc.in
8+++ fontconfig-2.8.0/fontconfig.pc.in 8+++ fontconfig-2.9.0/fontconfig.pc.in
9@@ -7,5 +7,5 @@ 9@@ -7,5 +7,5 @@
10 Description: Font configuration and customization library 10 Description: Font configuration and customization library
11 Version: @VERSION@ 11 Version: @VERSION@
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb b/meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb
index cee94de534..cee94de534 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
index 55c04cc909..7f3f111a91 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
@@ -12,22 +12,22 @@ HOMEPAGE = "http://www.fontconfig.org"
12BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig" 12BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
13 13
14LICENSE = "MIT-style & MIT & PD" 14LICENSE = "MIT-style & MIT & PD"
15LIC_FILES_CHKSUM = "file://COPYING;md5=f3ad4145dea6ca7efa2f1bee8165a7a1 \ 15LIC_FILES_CHKSUM = "file://COPYING;md5=dc5b39c592e47a22dbec44855988d2a0 \
16 file://src/fcfreetype.c;endline=45;md5=bc3dd139e2f7245a02fde5545b203a6f \ 16 file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \
17 file://src/fccache.c;beginline=1020;endline=1035;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f" 17 file://src/fccache.c;beginline=1077;endline=1092;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
18 18
19SECTION = "libs" 19SECTION = "libs"
20 20
21DEPENDS = "expat freetype zlib" 21DEPENDS = "expat freetype zlib"
22 22
23PR = "r4" 23PR = "r0"
24 24
25SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ 25SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
26 file://fix-pkgconfig.patch \ 26 file://fix-pkgconfig.patch \
27 file://97_fontconfig" 27 file://97_fontconfig"
28 28
29SRC_URI[md5sum] = "77e15a92006ddc2adbb06f840d591c0e" 29SRC_URI[md5sum] = "26c83855ed256b5c032baae032fadc4f"
30SRC_URI[sha256sum] = "fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335" 30SRC_URI[sha256sum] = "ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a"
31 31
32PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " 32PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
33FILES_fontconfig-utils-dbg = "${bindir}/*.dbg" 33FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
@@ -66,22 +66,18 @@ do_configure_append () {
66 sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile 66 sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
67 sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile 67 sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
68 sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile 68 sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
69 sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
70 69
71 sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile 70 sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
72 sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile 71 sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
73 sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile 72 sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
74 sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
75 73
76 sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile 74 sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
77 sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile 75 sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile
78 sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile 76 sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
79 sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile
80 77
81 sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile 78 sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
82 sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile 79 sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
83 sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile 80 sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
84 sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile
85 81
86} 82}
87 83