Patchwork Backported libgdiplus 2.10 from meta-mono

login
register
mail settings
Submitter Alex Lennon
Date March 11, 2012, 12:01 p.m.
Message ID <1331467277-7665-1-git-send-email-ajlennon@dynamicdevices.co.uk>
Download mbox | patch
Permalink /patch/23011/
State New, archived
Headers show

Comments

Alex Lennon - March 11, 2012, 12:01 p.m.
From: Alex J Lennon <ajlennon@gmail.com>

Signed-off-by: Alex J Lennon <ajlennon@gmail.com>
---
 recipes/libgdiplus/files/cairo/configure.in.diff |   31 ++++++++++++++++++++++
 recipes/libgdiplus/libgdiplus_2.10.bb            |   28 +++++++++++++++++++
 2 files changed, 59 insertions(+), 0 deletions(-)
 create mode 100644 recipes/libgdiplus/files/cairo/configure.in.diff
 create mode 100644 recipes/libgdiplus/libgdiplus_2.10.bb
Henning Heinold - March 11, 2012, 4:55 p.m.
On Sun, Mar 11, 2012 at 12:01:17PM +0000, ajlennon@dynamicdevices.co.uk wrote:
> From: Alex J Lennon <ajlennon@gmail.com>
> +SRC_URI[md5sum] = "451966e8f637e3a1f02d1d30f900255d"
> +SRC_URI[sha256sum] = "2d9e0397ef5583ed855eaafcdac8cabbe1d58463ed1e4b545be6dde5b63712a4"
> +
> +
> +FILES_${PN} += "${libdir}/libgdiplus.so"
> +INSANE_SKIP_${PN} += "dev-so"
> +
> +do_install_append() {
> +  # fix pkgconfig .pc file
> +  sed -i -e s#I${STAGING_DIR_HOST}#I#g ${D}${libdir}/pkgconfig/*.pc
> +}
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

I tought this is handled by the pkgconfigi.bbclass which you inherit.

Bye Henning
Alex Lennon - March 11, 2012, 7:17 p.m.
Hi Henning,

>I tought this is handled by the pkgconfigi.bbclass which you inherit.

It seems not, in that if I remove that stanza I get QA staging errors on 
the .pc file generated by libgdiplus.

What I don't understand is why the original recipe in meta-mono, which 
is presumably used by oe-core,
does not generate the error (I would guess). Is there a substantive 
difference between pkgconfig.bbclass
in oe-classic and oe-core? Or maybe I'm just not understanding something....

Regards,

Alex

On 11/03/2012 16:55, Henning Heinold wrote:
> On Sun, Mar 11, 2012 at 12:01:17PM +0000, ajlennon@dynamicdevices.co.uk wrote:
>> From: Alex J Lennon<ajlennon@gmail.com>
>> +SRC_URI[md5sum] = "451966e8f637e3a1f02d1d30f900255d"
>> +SRC_URI[sha256sum] = "2d9e0397ef5583ed855eaafcdac8cabbe1d58463ed1e4b545be6dde5b63712a4"
>> +
>> +
>> +FILES_${PN} += "${libdir}/libgdiplus.so"
>> +INSANE_SKIP_${PN} += "dev-so"
>> +
>> +do_install_append() {
>> +  # fix pkgconfig .pc file
>> +  sed -i -e s#I${STAGING_DIR_HOST}#I#g ${D}${libdir}/pkgconfig/*.pc
>> +}
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>
> I tought this is handled by the pkgconfigi.bbclass which you inherit.
>
> Bye Henning
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

diff --git a/recipes/libgdiplus/files/cairo/configure.in.diff b/recipes/libgdiplus/files/cairo/configure.in.diff
new file mode 100644
index 0000000..3465bf4
--- /dev/null
+++ b/recipes/libgdiplus/files/cairo/configure.in.diff
@@ -0,0 +1,31 @@ 
+--- libgdiplus-2.10.orig/cairo/configure.in	2012-01-23 15:09:19.198498003 -0500
++++ libgdiplus-2.10/cairo/configure.in	2012-01-23 15:08:24.922498003 -0500
+@@ -26,23 +26,23 @@
+ # libtool shared library version
+ 
+ # Increment if the interface has additions, changes, removals.
+-LT_CURRENT=19
++m4_define(lt_current, 19)
+ 
+ # Increment any time the source changes; set to
+ # 0 if you increment CURRENT
+-LT_REVISION=5
++m4_define(lt_revision, 5)
+ 
+ # Increment if any interfaces have been added; set to 0
+ # if any interfaces have been removed. removal has
+ # precedence over adding, so set to 0 if both happened.
+-LT_AGE=17
++m4_define(lt_age, 17)
+ 
+ dnl ===========================================================================
+ 
+-VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
++VERSION_INFO="lt_current:lt_revision:lt_age"
+ AC_SUBST(VERSION_INFO)
+ 
+-LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
++LT_CURRENT_MINUS_AGE=`expr lt_current - lt_age`
+ AC_SUBST(LT_CURRENT_MINUS_AGE)
+ 
+ CAIRO_VERSION_MAJOR=cairo_version_major()
diff --git a/recipes/libgdiplus/libgdiplus_2.10.bb b/recipes/libgdiplus/libgdiplus_2.10.bb
new file mode 100644
index 0000000..c24f551
--- /dev/null
+++ b/recipes/libgdiplus/libgdiplus_2.10.bb
@@ -0,0 +1,28 @@ 
+SUMMARY = "An Open Source implementation of the GDI+ API"
+DESCRIPTION = "This is part of the Mono project - http://mono-project.com"
+HOMEPAGE = "http://mono-project.com"
+BUGTRACKER = "http://bugzilla.xamarin.com/"
+SECTION = "libs"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fe7364dfce9f3689eb6995e7cdd56879"
+
+SRC_URI = "http://download.mono-project.com/sources/libgdiplus/libgdiplus-${PV}.tar.bz2 \
+           file://cairo/configure.in.diff"
+
+inherit autotools pkgconfig
+
+DEPENDS =+ "cairo freetype fontconfig libxft libpng"
+
+PR = "r0"
+
+SRC_URI[md5sum] = "451966e8f637e3a1f02d1d30f900255d"
+SRC_URI[sha256sum] = "2d9e0397ef5583ed855eaafcdac8cabbe1d58463ed1e4b545be6dde5b63712a4"
+
+
+FILES_${PN} += "${libdir}/libgdiplus.so"
+INSANE_SKIP_${PN} += "dev-so"
+
+do_install_append() {
+  # fix pkgconfig .pc file
+  sed -i -e s#I${STAGING_DIR_HOST}#I#g ${D}${libdir}/pkgconfig/*.pc
+}