Message ID | 5f0db9f0630d4bed004df1c9b93c8544cfd3d3d7.1388738593.git.kibo@prevas.dk |
---|---|
State | Changes Requested |
Delegated to: | Esben Haabendal |
Headers | show |
Kim Bøndergaard <kibo@prevas.dk> writes: > --- > recipes/freetype/freetype.inc | 14 ++++++++++++-- > recipes/freetype/freetype_2.5.1.oe | 1 + > recipes/freetype/freetype_2.5.1.oe.sig | 1 + > 3 files changed, 14 insertions(+), 2 deletions(-) > create mode 100644 recipes/freetype/freetype_2.5.1.oe > create mode 100644 recipes/freetype/freetype_2.5.1.oe.sig > > diff --git a/recipes/freetype/freetype.inc b/recipes/freetype/freetype.inc > index ce722a9..80f4821 100644 > --- a/recipes/freetype/freetype.inc > +++ b/recipes/freetype/freetype.inc > @@ -6,12 +6,19 @@ RECIPE_TYPES = "machine native" > > inherit library autotools pkgconfig binconfig > > -DEPENDS = "libz" > +DEPENDS = "libz bzip2 libpng" Adding this in freetype.inc also adds to old recipe versions, in this case 2.4.6. Is that really the intention? If not, you should add to DEPENDS in the new .oe file. > require conf/fetch/savannah.conf > SRC_URI = "${SAVANNAH_MIRROR}/freetype/freetype-${PV}.tar.bz2" > > -SRC_URI += "file://no-hardcode.patch" > +RECIPE_FLAGS += "freetype_without_png" > +DEFAULT_USE_freetype_without_png = " " Why specify it as a negative, and assing a single-space string to it? To follow the convention used so far, you should add a USE_freetype_png flag instead. And let's try and stick with assigning "0" or "1" to these boolean flags, unless there are special reasons for doing it different. > + > +EXTRA_OECONF:>USE_freetype_without_png += " --without-png" Similar to above comment, is this new USE flag supposed to be supported by the old version also? > + > +# Following required for configure to accept libpng > +export LIBPNG_CFLAGS = " " > +export LIBPNG_DFLAGS = " " > > do_compile[postfuncs] += "do_compile_apinames" > do_compile_apinames() { > @@ -20,3 +27,6 @@ do_compile_apinames() { > > FILES_${PN} = "${sharedlibdir}/lib*${SOLIBS}" > FILES_${PN}-dev += "${bindir}" > + > +DEPENDS_${PN} += "libc libz libpng" > +RDEPENDS_${PN} += "libc libz libpng" > diff --git a/recipes/freetype/freetype_2.5.1.oe b/recipes/freetype/freetype_2.5.1.oe > new file mode 100644 > index 0000000..b0606b1 > --- /dev/null > +++ b/recipes/freetype/freetype_2.5.1.oe > @@ -0,0 +1 @@ > +require freetype.inc > diff --git a/recipes/freetype/freetype_2.5.1.oe.sig b/recipes/freetype/freetype_2.5.1.oe.sig > new file mode 100644 > index 0000000..7fc22c6 > --- /dev/null > +++ b/recipes/freetype/freetype_2.5.1.oe.sig > @@ -0,0 +1 @@ > +38f561bf3eaa3627015503cb736e137da2fafc6c freetype-2.5.1.tar.bz2
I merged your patch and made the requested changes. /Esben
diff --git a/recipes/freetype/freetype.inc b/recipes/freetype/freetype.inc index ce722a9..80f4821 100644 --- a/recipes/freetype/freetype.inc +++ b/recipes/freetype/freetype.inc @@ -6,12 +6,19 @@ RECIPE_TYPES = "machine native" inherit library autotools pkgconfig binconfig -DEPENDS = "libz" +DEPENDS = "libz bzip2 libpng" require conf/fetch/savannah.conf SRC_URI = "${SAVANNAH_MIRROR}/freetype/freetype-${PV}.tar.bz2" -SRC_URI += "file://no-hardcode.patch" +RECIPE_FLAGS += "freetype_without_png" +DEFAULT_USE_freetype_without_png = " " + +EXTRA_OECONF:>USE_freetype_without_png += " --without-png" + +# Following required for configure to accept libpng +export LIBPNG_CFLAGS = " " +export LIBPNG_DFLAGS = " " do_compile[postfuncs] += "do_compile_apinames" do_compile_apinames() { @@ -20,3 +27,6 @@ do_compile_apinames() { FILES_${PN} = "${sharedlibdir}/lib*${SOLIBS}" FILES_${PN}-dev += "${bindir}" + +DEPENDS_${PN} += "libc libz libpng" +RDEPENDS_${PN} += "libc libz libpng" diff --git a/recipes/freetype/freetype_2.5.1.oe b/recipes/freetype/freetype_2.5.1.oe new file mode 100644 index 0000000..b0606b1 --- /dev/null +++ b/recipes/freetype/freetype_2.5.1.oe @@ -0,0 +1 @@ +require freetype.inc diff --git a/recipes/freetype/freetype_2.5.1.oe.sig b/recipes/freetype/freetype_2.5.1.oe.sig new file mode 100644 index 0000000..7fc22c6 --- /dev/null +++ b/recipes/freetype/freetype_2.5.1.oe.sig @@ -0,0 +1 @@ +38f561bf3eaa3627015503cb736e137da2fafc6c freetype-2.5.1.tar.bz2