Skip to contentSkip to conversation

Clean up fontconfig recipes

PATCH New Ross Burton 1 participant 4 messages Feb 11, 2013

lore
Share & tools
lore
#1 lore raw

PATCH 1/3 fontconfig: remove unexplainable and broken build tweaking

In reply to Ross Burton

The build flag twiddling in do_configure_append was unexplainable and clearly wrong (native flags for a cross build), remove it all.

Parallel make appears to be working now, so enable it.

The tarball doesn't contain read only sources, remove the unpack hacking.

The pkgconfig doesn't need patching as the freetype link lines are the same.

Don't need to specify where freetype is, it's found automatically.

Merge fontconfig-util-dbg into fontconfig-dbg.

Don't export HASDOCBOOK, --disable-docs is sufficient to turn off documentation building.

---
 .../fontconfig-2.10.2/fix-pkgconfig.patch          |   15 -------
 .../fontconfig/fontconfig_2.10.2.bb                |   47 ++------------------
 2 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig-2.10.2/fix-pkgconfig.patch
meta/recipes-graphics/fontconfig/fontconfig-2.10.2/fix-pkgconfig.patch deleted +0 -15
deleted file mode 100644
index 6be04a1..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- fontconfig.pc.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- fontconfig-2.9.0.orig/fontconfig.pc.in
-+++ fontconfig-2.9.0/fontconfig.pc.in
-@@ -7,5 +7,5 @@
- Description: Font configuration and customization library
- Version: @VERSION@
- Libs: -L${libdir} -lfontconfig
--Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@
-+Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ -L${libdir} -lfreetype @ICONV_LIBS@
- Cflags: -I${includedir}
meta/recipes-graphics/fontconfig/fontconfig_2.10.2.bb +3 -44

64 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/3 fontconfig: drop explicit -native recipe

In reply to Ross Burton

Instead, use BBCLASSEXTEND=native in fontconfig.

We can drop the installation of fc-lang/fc-glyphname, they are not used by fontconfig's build anymore as it ships the generated files in the tarball.

---
 .../fontconfig/fontconfig-native_2.10.2.bb               |   14 --------------
 meta/recipes-graphics/fontconfig/fontconfig_2.10.2.bb    |    2 ++
 2 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig-native_2.10.2.bb
meta/recipes-graphics/fontconfig/fontconfig-native_2.10.2.bb deleted +0 -14
deleted file mode 100644
index cee94de..0000000
@@ -1,14 +0,0 @@
-require fontconfig_${PV}.bb
-inherit native
-DEPENDS = "freetype-native expat-native zlib-native"
-
-EXTRA_OEMAKE = ""
-EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % d.getVar('STAGING_BINDIR', True)][os.path.isfile('%s/freetype-config' % d.getVar('STAGING_BINDIR', True))]}"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-${PV}:"
-
-do_install_append () {
-	install -d ${D}${bindir}/
-	install fc-lang/fc-lang ${D}${bindir}/
-	install fc-glyphname/fc-glyphname ${D}${bindir}/
-}
meta/recipes-graphics/fontconfig/fontconfig_2.10.2.bb +2 -0
index 6f2456d..45631ed 100644
@@ -42,3 +42,5 @@ DEBIAN_NOAUTONAME_fontconfig-utils = "1"
 inherit autotools pkgconfig
 
 EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts"
+
+BBCLASSEXTEND = "native"
Signature · 1 line
1.7.10.4
#0 lore raw

cover Clean up fontconfig recipes

Hi,

The fontconfig recipes were showing their age with lots of cruft and plain odd constructs. Distressingly the majority of them were from myself with no clear commit logs. Thus I was guilt-tripped into cleaning the fontconfig recipes up.

Ross

The following changes since commit 00a2411470b989ca80bc2a6de08d105bc400dae5:

libiconv: Remove RPATH from binaries (2013-02-11 15:41:20 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib ross/fontconfig

for you to fetch changes up to 27fe822aa3e7bfc8523f9a074c623ee0270cbefa:

fontconfig: rename the patches directory (2013-02-11 16:00:58 +0000)

----------------------------------------------------------------
Ross Burton (3):
fontconfig: remove unexplainable and broken build tweaking
fontconfig: drop explicit -native recipe
fontconfig: rename the patches directory

 ...Add-sysroot-option-to-fc-cache-and-fc-cat.patch |    0
 .../fontconfig-2.10.2/fix-pkgconfig.patch          |   15 -------
 .../fontconfig/fontconfig-native_2.10.2.bb         |   14 ------
 .../fontconfig/fontconfig_2.10.2.bb                |   47 ++------------------
 4 files changed, 4 insertions(+), 72 deletions(-)
 rename meta/recipes-graphics/fontconfig/{fontconfig-2.10.2 => files}/Add-sysroot-option-to-fc-cache-and-fc-cat.patch (100%)
 delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig-2.10.2/fix-pkgconfig.patch
 delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig-native_2.10.2.bb

Ross Burton (3):
fontconfig: remove unexplainable and broken build tweaking
fontconfig: drop explicit -native recipe
fontconfig: rename the patches directory

 ...Add-sysroot-option-to-fc-cache-and-fc-cat.patch |    0
 .../fontconfig-2.10.2/fix-pkgconfig.patch          |   15 -------
 .../fontconfig/fontconfig-native_2.10.2.bb         |   14 ------
 .../fontconfig/fontconfig_2.10.2.bb                |   47 ++------------------
 4 files changed, 4 insertions(+), 72 deletions(-)
 rename meta/recipes-graphics/fontconfig/{fontconfig-2.10.2 => files}/Add-sysroot-option-to-fc-cache-and-fc-cat.patch (100%)
 delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig-2.10.2/fix-pkgconfig.patch
 delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig-native_2.10.2.bb
Signature · 1 line
1.7.10.4
#3 lore raw

PATCH 3/3 fontconfig: rename the patches directory

Rename the patches directory to files as we only have one version of fontconfig, so the hassle of moving these files every upgrade can be avoided.

---
 .../Add-sysroot-option-to-fc-cache-and-fc-cat.patch                    |    0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-graphics/fontconfig/{fontconfig-2.10.2 => files}/Add-sysroot-option-to-fc-cache-and-fc-cat.patch (100%)
meta/recipes-graphics/fontconfig/files/Add-sysroot-option-to-fc-cache-and-fc-cat.patch renamed from meta/recipes-graphics/fontconfig/fontconfig-2.10.2/Add-sysroot-option-to-fc-cache-and-fc-cat.patch +0 -0
similarity index 100%
rename from meta/recipes-graphics/fontconfig/fontconfig-2.10.2/Add-sysroot-option-to-fc-cache-and-fc-cat.patch
rename to meta/recipes-graphics/fontconfig/files/Add-sysroot-option-to-fc-cache-and-fc-cat.patch
Signature · 1 line
1.7.10.4