[PATCH] libjpeg-turbo: fix libturbojpeg packaging

[PATCH] libjpeg-turbo: fix libturbojpeg packaging

[ml]

From: Jack Mitchell <jack@embed.me.uk>

put libjpegturbo library files and headers into correct packages rather
than them being in the main libjpeg-turbo package.

remove INSANE_SKIP[dev-so]
move .so, .a into -dev package
move .la into -staticdev
move .so.* into main library package

Signed-off-by: Jack Mitchell <jack@embed.me.uk>
---
 meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb b/meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb
index 8e214c9..16f62c5 100644
--- a/meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb
+++ b/meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb
@@ -25,13 +25,14 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--with-jpeg8 "
 
-PACKAGES =+ "jpeg-tools libturbojpeg"
+PACKAGES =+ "jpeg-tools libturbojpeg libturbojpeg-staticdev libturbojpeg-dev"
 
 DESCRIPTION_jpeg-tools = "The jpeg-tools package includes client programs to access libjpeg functionality.  These tools allow for the compression, decompression, transformation and display of JPEG files and benchmarking of the libjpeg library."
 FILES_jpeg-tools = "${bindir}/*"
 
-FILES_libturbojpeg = "${libdir}/libturbojpeg.so"
-INSANE_SKIP_libturbojpeg = "dev-so"
+FILES_libturbojpeg = "${libdir}/libturbojpeg.so.*"
+FILES_libturbojpeg-staticdev = "${libdir}/libturbojpeg.a"
+FILES_libturbojpeg-dev = "${libdir}/libturbojpeg.la ${incdir}/turbojpeg.h ${libdir}/libturbojpeg.so"
 
 BBCLASSEXTEND = "native"
 DEPENDS = "nasm-native"
-- 
2.5.1

Re: [PATCH] libjpeg-turbo: fix libturbojpeg packaging

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2513 bytes --]

On Wed, Sep 02, 2015 at 12:10:59PM +0100, ml@communistcode.co.uk wrote:
> From: Jack Mitchell <jack@embed.me.uk>
> 
> put libjpegturbo library files and headers into correct packages rather
> than them being in the main libjpeg-turbo package.
> 
> remove INSANE_SKIP[dev-so]
> move .so, .a into -dev package
> move .la into -staticdev
> move .so.* into main library package
> 
> Signed-off-by: Jack Mitchell <jack@embed.me.uk>
> ---
>  meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb b/meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb
> index 8e214c9..16f62c5 100644
> --- a/meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb
> +++ b/meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb
> @@ -25,13 +25,14 @@ inherit autotools pkgconfig
>  
>  EXTRA_OECONF = "--with-jpeg8 "
>  
> -PACKAGES =+ "jpeg-tools libturbojpeg"
> +PACKAGES =+ "jpeg-tools libturbojpeg libturbojpeg-staticdev libturbojpeg-dev"
>  
>  DESCRIPTION_jpeg-tools = "The jpeg-tools package includes client programs to access libjpeg functionality.  These tools allow for the compression, decompression, transformation and display of JPEG files and benchmarking of the libjpeg library."
>  FILES_jpeg-tools = "${bindir}/*"
>  
> -FILES_libturbojpeg = "${libdir}/libturbojpeg.so"
> -INSANE_SKIP_libturbojpeg = "dev-so"
> +FILES_libturbojpeg = "${libdir}/libturbojpeg.so.*"

You can use libturbojpeg*${SOLIBS}

> +FILES_libturbojpeg-staticdev = "${libdir}/libturbojpeg.a"
> +FILES_libturbojpeg-dev = "${libdir}/libturbojpeg.la ${incdir}/turbojpeg.h ${libdir}/libturbojpeg.so"

libturbojpeg.so -> lib*${SOLIBSDEV} and we should use only one
-dev/-staticdev package for recipe (people who need to install
-dev/-staticdef package to rootfs usually don't mind getting few more
files installed as well).

But more importantly I don't understand how dev-so and other files got
into libturbojpeg package when it's using:

FILES_libturbojpeg = "${libdir}/libturbojpeg.so"

So I think the problem is somewhere else.
>  
>  BBCLASSEXTEND = "native"
>  DEPENDS = "nasm-native"
> -- 
> 2.5.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH] libjpeg-turbo: fix libturbojpeg packaging

[Khem Raj]

On Wed, Sep 2, 2015 at 6:23 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> But more importantly I don't understand how dev-so and other files got
> into libturbojpeg package when it's using:
>
> FILES_libturbojpeg = "${libdir}/libturbojpeg.so"
>
> So I think the problem is somewhere else.

it uses PACKAGES =+ "jpeg-tools libturbojpeg" that could precede the
default packages

Re: [PATCH] libjpeg-turbo: fix libturbojpeg packaging

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 959 bytes --]

On Wed, Sep 02, 2015 at 11:25:07AM -0700, Khem Raj wrote:
> On Wed, Sep 2, 2015 at 6:23 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > But more importantly I don't understand how dev-so and other files got
> > into libturbojpeg package when it's using:
> >
> > FILES_libturbojpeg = "${libdir}/libturbojpeg.so"
> >
> > So I think the problem is somewhere else.
> 
> it uses PACKAGES =+ "jpeg-tools libturbojpeg" that could precede the
> default packages

yes, but FILES_libturbojpeg includes only one file, not the headers and
the staticdev files, so changing it to
FILES_libturbojpeg = "${libdir}/libturbojpeg${SOLIBS}"
should be enough to remove that INSANE_SKIP.

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

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH] libjpeg-turbo: fix libturbojpeg packaging

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 02-09-15 om 15:23 schreef Martin Jansa:
> On Wed, Sep 02, 2015 at 12:10:59PM +0100, ml@communistcode.co.uk wrote:
>> From: Jack Mitchell <jack@embed.me.uk>
>> 
>> put libjpegturbo library files and headers into correct packages
>> rather than them being in the main libjpeg-turbo package.
>> 
>> remove INSANE_SKIP[dev-so] move .so, .a into -dev package move .la into
>> -staticdev move .so.* into main library package
>> 
>> Signed-off-by: Jack Mitchell <jack@embed.me.uk> --- 
>> meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb | 7 ++++--- 1 file
>> changed, 4 insertions(+), 3 deletions(-)
>> 
>> diff --git a/meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb
>> b/meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb index
>> 8e214c9..16f62c5 100644 ---
>> a/meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb +++
>> b/meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb @@ -25,13 +25,14
>> @@ inherit autotools pkgconfig
>> 
>> EXTRA_OECONF = "--with-jpeg8 "
>> 
>> -PACKAGES =+ "jpeg-tools libturbojpeg" +PACKAGES =+ "jpeg-tools
>> libturbojpeg libturbojpeg-staticdev libturbojpeg-dev"
>> 
>> DESCRIPTION_jpeg-tools = "The jpeg-tools package includes client
>> programs to access libjpeg functionality.  These tools allow for the
>> compression, decompression, transformation and display of JPEG files
>> and benchmarking of the libjpeg library." FILES_jpeg-tools =
>> "${bindir}/*"
>> 
>> -FILES_libturbojpeg = "${libdir}/libturbojpeg.so" 
>> -INSANE_SKIP_libturbojpeg = "dev-so" +FILES_libturbojpeg =
>> "${libdir}/libturbojpeg.so.*"
> 
> You can use libturbojpeg*${SOLIBS}
> 
>> +FILES_libturbojpeg-staticdev = "${libdir}/libturbojpeg.a" 
>> +FILES_libturbojpeg-dev = "${libdir}/libturbojpeg.la
>> ${incdir}/turbojpeg.h ${libdir}/libturbojpeg.so"
> 
> libturbojpeg.so -> lib*${SOLIBSDEV} and we should use only one 
> -dev/-staticdev package for recipe (people who need to install 
> -dev/-staticdef package to rootfs usually don't mind getting few more 
> files installed as well).

The "one -dev package to rule them all" lead to the "why does my rootfs
suddenly have systemd?!?!" earlier on. I advocate doing the proper splitting
like Jack does above, but with a small change: RDEPENDS_${PN}-dev +=
libturbojpeg-dev.
I admit that I don't have a strong opinion on the split in this specific
case, though.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFV6BMIMkyGM64RGpERAlZ3AJ9VqAy7Y+dNKcouMHPdUoh/9YqjbgCfVhAz
3vd4pqQozNXCBvm7ULIyMcI=
=UfL0
-----END PGP SIGNATURE-----