[3/3] freetype: disable bzip2 compressed font support

Submitted by Paul Eggleton on Sept. 19, 2011, 10:58 a.m.

Details

Message ID 8d56fe29bb6f9502c56eae71640da4cc31f7e1a4.1316429640.git.paul.eggleton@linux.intel.com
State New, archived
Headers show

Commit Message

Paul Eggleton Sept. 19, 2011, 10:58 a.m.
If we do not disable this then it is enabled sometimes and disabled at
others depending on whether bzip2 has been built at the time, and worst
case it will cause a race condition if bzip2 is building at the same
time.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-graphics/freetype/freetype_2.4.6.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-graphics/freetype/freetype_2.4.6.bb b/meta/recipes-graphics/freetype/freetype_2.4.6.bb
index 8150dd4..94a389a 100644
--- a/meta/recipes-graphics/freetype/freetype_2.4.6.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.4.6.bb
@@ -13,7 +13,7 @@  LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=28d5381b1bef2649c59f20c20bae4f39
 
 SECTION = "libs"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
            file://no-hardcode.patch"
@@ -28,7 +28,7 @@  inherit autotools pkgconfig binconfig
 LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
 EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
 EXTRA_OEMAKE_virtclass-native = ""
-EXTRA_OECONF = "--without-zlib"
+EXTRA_OECONF = "--without-zlib --without-bzip2"
 
 do_configure() {
 	cd builds/unix

Comments

Henning Heinold Sept. 19, 2011, 11:07 a.m.
On Mon, Sep 19, 2011 at 11:58:36AM +0100, Paul Eggleton wrote:
> If we do not disable this then it is enabled sometimes and disabled at
> others depending on whether bzip2 has been built at the time, and worst
> case it will cause a race condition if bzip2 is building at the same
> time.
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>  meta/recipes-graphics/freetype/freetype_2.4.6.bb |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-graphics/freetype/freetype_2.4.6.bb b/meta/recipes-graphics/freetype/freetype_2.4.6.bb
> index 8150dd4..94a389a 100644
> --- a/meta/recipes-graphics/freetype/freetype_2.4.6.bb
> +++ b/meta/recipes-graphics/freetype/freetype_2.4.6.bb
> @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=28d5381b1bef2649c59f20c20bae4f39
>  
>  SECTION = "libs"
>  
> -PR = "r0"
> +PR = "r1"
>  
>  SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
>             file://no-hardcode.patch"
> @@ -28,7 +28,7 @@ inherit autotools pkgconfig binconfig
>  LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
>  EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
>  EXTRA_OEMAKE_virtclass-native = ""
> -EXTRA_OECONF = "--without-zlib"
> +EXTRA_OECONF = "--without-zlib --without-bzip2"
>  
>  do_configure() {
>  	cd builds/unix

Hi,

wouldn't it been better to let freetype depend on bz2 and libz. It may save some space in particular situations for some
people.

Bye Henning
Richard Purdie Sept. 19, 2011, 1:06 p.m.
On Mon, 2011-09-19 at 13:07 +0200, Henning Heinold wrote:
> On Mon, Sep 19, 2011 at 11:58:36AM +0100, Paul Eggleton wrote:
> > If we do not disable this then it is enabled sometimes and disabled at
> > others depending on whether bzip2 has been built at the time, and worst
> > case it will cause a race condition if bzip2 is building at the same
> > time.
> > 
> > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> > ---
> >  meta/recipes-graphics/freetype/freetype_2.4.6.bb |    4 ++--
> >  1 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/recipes-graphics/freetype/freetype_2.4.6.bb b/meta/recipes-graphics/freetype/freetype_2.4.6.bb
> > index 8150dd4..94a389a 100644
> > --- a/meta/recipes-graphics/freetype/freetype_2.4.6.bb
> > +++ b/meta/recipes-graphics/freetype/freetype_2.4.6.bb
> > @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=28d5381b1bef2649c59f20c20bae4f39
> >  
> >  SECTION = "libs"
> >  
> > -PR = "r0"
> > +PR = "r1"
> >  
> >  SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
> >             file://no-hardcode.patch"
> > @@ -28,7 +28,7 @@ inherit autotools pkgconfig binconfig
> >  LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
> >  EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
> >  EXTRA_OEMAKE_virtclass-native = ""
> > -EXTRA_OECONF = "--without-zlib"
> > +EXTRA_OECONF = "--without-zlib --without-bzip2"
> >  
> >  do_configure() {
> >  	cd builds/unix
> 
> Hi,
> 
> wouldn't it been better to let freetype depend on bz2 and libz. It may save some space in particular situations for some
> people.

Likely we should compress the fonts but this patch at least makes the
build deterministic. I'd probably take a further patch allowing
compression although whether it would make the release at this stage I'm
not sure.

Cheers,

Richard