[PATCH] qt4: replace underscore with dash in library name

[PATCH] qt4: replace underscore with dash in library name

[Chase Maupin]

* For libraries that are added to the QT_LIB_NAMES or
  QT_EXTRA_LIBS variables replace any "_" characters in the
  library name with "-" for use in the package name.
* The actual library file names are left alone.
* Bump the PR for packages using qt4.inc

Signed-off-by: Chase Maupin <chase.maupin@ti.com>
---
 recipes/qt4/qt4-embedded.inc |    2 +-
 recipes/qt4/qt4-x11-free.inc |    2 +-
 recipes/qt4/qt4.inc          |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
index 111716d..9331302 100644
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL QPL"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r23"
+INC_PR = "r24"
 
 QT_BASE_NAME ?= "qt4-embedded"
 QT_BASE_LIB  ?= "libqt-embedded"
diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc
index 66e6d1c..ff4e454 100644
--- a/recipes/qt4/qt4-x11-free.inc
+++ b/recipes/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL QPL"
 DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
 
-INC_PR = "r20"
+INC_PR = "r21"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
            file://0001-cross-compile.patch \
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index ffd56dd..6721265 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -34,7 +34,7 @@ python __anonymous () {
     dev_packages = []
     dbg_packages = []
     for name in bb.data.getVar("QT_LIB_NAMES", d, 1).split():
-        pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "") + "4"
+        pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "").replace("_", "-") + "4"
         # NOTE: the headers for QtAssistantClient are different
         incname = name.replace("QtAssistantClient", "QtAssistant")
         bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d)
@@ -52,7 +52,7 @@ python __anonymous () {
         dbg_packages.append("%s-dbg" % name)
 
     for name in bb.data.getVar("QT_EXTRA_LIBS", d, 1).split():
-        pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "") + "4"
+        pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "").replace("_", "-") + "4"
         bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals(), d)
         bb.data.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl
                   ${libdir}/lib%(name)s.a
-- 
1.7.0.4

Re: [PATCH] qt4: replace underscore with dash in library name

[Maupin, Chase]

> -----Original Message-----
> From: Chase Maupin [mailto:chasemaupin03@gmail.com]
> Sent: Tuesday, October 12, 2010 8:25 AM
> To: openembedded-devel@lists.openembedded.org
> Cc: Maupin, Chase; Maupin, Chase
> Subject: [PATCH] qt4: replace underscore with dash in library name
> 
> * For libraries that are added to the QT_LIB_NAMES or
>   QT_EXTRA_LIBS variables replace any "_" characters in the
>   library name with "-" for use in the package name.
> * The actual library file names are left alone.
> * Bump the PR for packages using qt4.inc
> 
> Signed-off-by: Chase Maupin <chase.maupin@ti.com>

ping

> ---
>  recipes/qt4/qt4-embedded.inc |    2 +-
>  recipes/qt4/qt4-x11-free.inc |    2 +-
>  recipes/qt4/qt4.inc          |    4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
> index 111716d..9331302 100644
> --- a/recipes/qt4/qt4-embedded.inc
> +++ b/recipes/qt4/qt4-embedded.inc
> @@ -4,7 +4,7 @@ LICENSE = "GPL QPL"
>  PRIORITY = "optional"
>  HOMEPAGE = "http://www.trolltech.com"
>  DEPENDS += "directfb tslib"
> -INC_PR = "r23"
> +INC_PR = "r24"
> 
>  QT_BASE_NAME ?= "qt4-embedded"
>  QT_BASE_LIB  ?= "libqt-embedded"
> diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc
> index 66e6d1c..ff4e454 100644
> --- a/recipes/qt4/qt4-x11-free.inc
> +++ b/recipes/qt4/qt4-x11-free.inc
> @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com"
>  LICENSE = "GPL QPL"
>  DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr
> libxcursor"
> 
> -INC_PR = "r20"
> +INC_PR = "r21"
> 
>  SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-
> ${PV}.tar.gz \
>             file://0001-cross-compile.patch \
> diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
> index ffd56dd..6721265 100644
> --- a/recipes/qt4/qt4.inc
> +++ b/recipes/qt4/qt4.inc
> @@ -34,7 +34,7 @@ python __anonymous () {
>      dev_packages = []
>      dbg_packages = []
>      for name in bb.data.getVar("QT_LIB_NAMES", d, 1).split():
> -        pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "") + "4"
> +        pkg = "${QT_BASE_LIB}" + name.lower().replace("qt",
> "").replace("_", "-") + "4"
>          # NOTE: the headers for QtAssistantClient are different
>          incname = name.replace("QtAssistantClient", "QtAssistant")
>          bb.data.setVar("FILES_%s" % pkg,
> "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d)
> @@ -52,7 +52,7 @@ python __anonymous () {
>          dbg_packages.append("%s-dbg" % name)
> 
>      for name in bb.data.getVar("QT_EXTRA_LIBS", d, 1).split():
> -        pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "") + "4"
> +        pkg = "${QT_BASE_LIB}" + name.lower().replace("qt",
> "").replace("_", "-") + "4"
>          bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" %
> locals(), d)
>          bb.data.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl
>                    ${libdir}/lib%(name)s.a
> --
> 1.7.0.4

Re: [PATCH] qt4: replace underscore with dash in library name

[Holger Freyther]

On 10/12/2010 03:25 PM, Chase Maupin wrote:
> * For libraries that are added to the QT_LIB_NAMES or
>   QT_EXTRA_LIBS variables replace any "_" characters in the
>   library name with "-" for use in the package name.
> * The actual library file names are left alone.
> * Bump the PR for packages using qt4.inc

Which library is that? OpenVG? PowerVR related things? In general it looks fine.

Acked-by: Holger Hans Peter Freyther <holger@moiji-mobile.com>

Re: [PATCH] qt4: replace underscore with dash in library name

[Maupin, Chase]

> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org
> [mailto:openembedded-devel-bounces@lists.openembedded.org] On Behalf Of
> Holger Freyther
> Sent: Monday, October 18, 2010 9:39 AM
> To: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [PATCH] qt4: replace underscore with dash in library
> name
> 
> On 10/12/2010 03:25 PM, Chase Maupin wrote:
> > * For libraries that are added to the QT_LIB_NAMES or
> >   QT_EXTRA_LIBS variables replace any "_" characters in the
> >   library name with "-" for use in the package name.
> > * The actual library file names are left alone.
> > * Bump the PR for packages using qt4.inc
> 
> Which library is that? OpenVG? PowerVR related things? In general it looks
> fine.

In this case it is another library named TICPUBLT_BX which helped me find this issue.  So in my recipe I am adding:

QT_EXTRA_LIBS += "TICPUBLT_BX"

> 
> Acked-by: Holger Hans Peter Freyther <holger@moiji-mobile.com>
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: [PATCH] qt4: replace underscore with dash in library name

[Holger Freyther]

On 10/18/2010 05:01 PM, Maupin, Chase wrote:

> In this case it is another library named TICPUBLT_BX which helped me find this issue.  So in my recipe I am adding:
> 
> QT_EXTRA_LIBS += "TICPUBLT_BX"

Why do you need to patch Qt? :)

Re: [PATCH] qt4: replace underscore with dash in library name

[Maupin, Chase]

> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org
> [mailto:openembedded-devel-bounces@lists.openembedded.org] On Behalf Of
> Holger Freyther
> Sent: Monday, October 18, 2010 11:21 AM
> To: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [PATCH] qt4: replace underscore with dash in library
> name
> 
> On 10/18/2010 05:01 PM, Maupin, Chase wrote:
> 
> > In this case it is another library named TICPUBLT_BX which helped me
> find this issue.  So in my recipe I am adding:
> >
> > QT_EXTRA_LIBS += "TICPUBLT_BX"
> 
> Why do you need to patch Qt? :)

This library allows Qt to use the NEON processor on our Cortex-A8 for bitblit operations.  Currently this recipe is being carried in our overlay but will be moved to the OE mainline once we have all the licensing worked out.

> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: [PATCH] qt4: replace underscore with dash in library name

[Holger Freyther]

On 10/18/2010 06:24 PM, Maupin, Chase wrote:

>> Why do you need to patch Qt? :)
> 
> This library allows Qt to use the NEON processor on our Cortex-A8 for bitblit operations.  Currently this recipe is being carried in our overlay but will be moved to the OE mainline once we have all the licensing worked out.


Interesting, I worked on the raster engine in the 4.7 release cycle, did some
neon code as well. Samuel has done his version from scratch and integrated it.

Is that handwritten neon code or using gcc mnemonics? How does it compare to
what is in 4.7? Qt 4.7 can use ARM NEON even for string compares and other
parts of libQtCore.


PS: Do you need someone to integrate your patch?

Re: [PATCH] qt4: replace underscore with dash in library name

[Maupin, Chase]

> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org
> [mailto:openembedded-devel-bounces@lists.openembedded.org] On Behalf Of
> Holger Freyther
> Sent: Monday, October 18, 2010 11:28 AM
> To: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [PATCH] qt4: replace underscore with dash in library
> name
> 
> On 10/18/2010 06:24 PM, Maupin, Chase wrote:
> 
> >> Why do you need to patch Qt? :)
> >
> > This library allows Qt to use the NEON processor on our Cortex-A8 for
> bitblit operations.  Currently this recipe is being carried in our overlay
> but will be moved to the OE mainline once we have all the licensing worked
> out.
> 
> 
> Interesting, I worked on the raster engine in the 4.7 release cycle, did
> some
> neon code as well. Samuel has done his version from scratch and integrated
> it.
> 
> Is that handwritten neon code or using gcc mnemonics? How does it compare
> to
> what is in 4.7? Qt 4.7 can use ARM NEON even for string compares and other
> parts of libQtCore.

This is something a third party did for us.  I don't know all the details behind the library, but I do know that there is a patch to Qt to enable it to use our library instead of it's normal routines (this is for 4.6.2).

> 
> 
> PS: Do you need someone to integrate your patch?

The patch to Qt is to use our library.  I'd be happy to share the patch to Qt if you are interested, but I don't think it is very useful generically since the licensing of our library says it is only to be used on TI devices (A third party license restriction).  Thanks for the offer though.

> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel