Skip to contentSkip to conversation

package/dillo: enable jpeg support only with libjpeg provider

PATCH New Romain Naour 3 participants 4 messages Jan 1, 2016

lore
Share & tools
lore

Romain Naour

author
#0 lore raw

PATCH 1/1 package/dillo: enable jpeg support only with libjpeg provider

dillo add libjpeg to his dependencies when the virtual package jpeg is selected. This is wrong because jpeg-turbo can be selected instead of libjpeg. So the build of libjpeg can be trigged at Makefile level when jpeg-turbo is selected at Config.in level by the user.

Since 28f67899e54f15c6e48484ea2976c3e431756bcb, the build stop if a package build is trigged at Makefile level without being selected at Config.in level.

Use a dependency on the jpeg provider intead of the virtual package.

Signed-off-by Romain Naour <[email protected]>
---
 package/dillo/dillo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/dillo/dillo.mk +1 -1
index 8eb8d88..45fd611 100644
@@ -30,7 +30,7 @@ else
 DILLO_CONF_OPTS += --disable-png
 endif
 
-ifeq ($(BR2_PACKAGE_JPEG),y)
+ifeq ($(BR2_PACKAGE_LIBJPEG),y)
 DILLO_CONF_OPTS += --enable-jpeg
 DILLO_DEPENDENCIES += libjpeg
 else
Signature · 1 line
2.4.3
#1 lore raw

PATCH 1/1 package/dillo: enable jpeg support only with libjpeg provider

Romain, All,

On 2016-01-01 19:08 +0100, Romain Naour spake thusly:

Quoted 23 lines

dillo add libjpeg to his dependencies when the virtual package jpeg is selected. This is wrong because jpeg-turbo can be selected instead of libjpeg. So the build of libjpeg can be trigged at Makefile level when jpeg-turbo is selected at Config.in level by the user.

Since 28f67899e54f15c6e48484ea2976c3e431756bcb, the build stop if a package build is trigged at Makefile level without being selected at Config.in level.

Use a dependency on the jpeg provider intead of the virtual package.

Signed-off-by Romain Naour <[email protected]>
---
 package/dillo/dillo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/dillo/dillo.mk +0 -0
index 8eb8d88..45fd611 100644

package/dillo/dillo.mk else · line 35

Quoted 7 lines
package/dillo/dillo.mk +1 -1
@@ -30,7 +30,7 @@ else
 DILLO_CONF_OPTS += --disable-png
 endif
 
-ifeq ($(BR2_PACKAGE_JPEG),y)
+ifeq ($(BR2_PACKAGE_LIBJPEG),y)
 DILLO_CONF_OPTS += --enable-jpeg
 DILLO_DEPENDENCIES += libjpeg

Can dillo be build with jpeg-turbo? If so, it would better to do:

    ifeq ($(BR2_PACKAGE_HAS_JPEG),y)
    DILLO_CONF_OPTS += --enable-jpeg
    DILLO_DEPENDENCIES += jpeg
    else
    DILLO_CONF_OPTS += --disable-jpeg
    endif

Regards,
Yann E. MORIN.

Quoted 8 lines
package/dillo/dillo.mk +0 -0
 else
Signature · 6 lines
2.4.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#2 lore raw

PATCH 1/1 package/dillo: enable jpeg support only with libjpeg provider

Yann, All,

Le 01/01/2016 19:13, Yann E. MORIN a ?crit :

Quoted 29 lines

Romain, All,

On 2016-01-01 19:08 +0100, Romain Naour spake thusly:

Quoted 26 lines

dillo add libjpeg to his dependencies when the virtual package jpeg is selected. This is wrong because jpeg-turbo can be selected instead of libjpeg. So the build of libjpeg can be trigged at Makefile level when jpeg-turbo is selected at Config.in level by the user.

Since 28f67899e54f15c6e48484ea2976c3e431756bcb, the build stop if a package build is trigged at Makefile level without being selected at Config.in level.

Use a dependency on the jpeg provider intead of the virtual package.

Signed-off-by Romain Naour <[email protected]>
---
 package/dillo/dillo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/dillo/dillo.mk +0 -0
index 8eb8d88..45fd611 100644
@@ -30,7 +30,7 @@ else
 DILLO_CONF_OPTS += --disable-png
 endif
Quoted 6 lines

package/dillo/dillo.mk else · line 35

Quoted 4 lines
package/dillo/dillo.mk +1 -1
-ifeq ($(BR2_PACKAGE_JPEG),y)
+ifeq ($(BR2_PACKAGE_LIBJPEG),y)
 DILLO_CONF_OPTS += --enable-jpeg
 DILLO_DEPENDENCIES += libjpeg

Can dillo be build with jpeg-turbo? If so, it would better to do:

Yes indeed but I don't know much dillo, I'm not sure it can be build or used with jpeg-turbo. I added a dependency on the jpeg provider because it how it work right now.

Best regards,
Romain

Quoted 20 lines
    ifeq ($(BR2_PACKAGE_HAS_JPEG),y)
    DILLO_CONF_OPTS += --enable-jpeg
    DILLO_DEPENDENCIES += jpeg
    else
    DILLO_CONF_OPTS += --disable-jpeg
    endif

Regards,
Yann E. MORIN.

Quoted 8 lines
package/dillo/dillo.mk +0 -0
 else
Signature · 6 lines
2.4.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
#3 lore raw

PATCH 1/1 package/dillo: enable jpeg support only with libjpeg provider

Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Romain" == Romain Naour <[email protected]> writes:

Can dillo be build with jpeg-turbo? If so, it would better to do:

Yes indeed but I don't know much dillo, I'm not sure it can be build or used with jpeg-turbo. I added a dependency on the jpeg provider because it how it work right now.

jpeg-turbo is in general compatible with libjpeg (E.G. we afaik don't have any other packages that only works with libjpeg). A quick test build also shows that dillo can be built against jpeg-turbo, so I've changed it to use 'jpeg' instead - Thanks.

Signature · 1 line
Bye, Peter Korsgaard