Skip to contentSkip to conversation

package/jpeg-turbo: Add an option to allow tools install

PATCH New Clément Péron 2 participants 3 messages Apr 12, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/jpeg-turbo: Add an option to allow tools install

JPEG Turbo tools are not useless for everybody.

Add an option to allow their installation.

---
 package/jpeg-turbo/jpeg-turbo.mk | 6 ++++--
 package/jpeg/Config.in           | 9 +++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
package/jpeg-turbo/jpeg-turbo.mk +4 -2
index 126b470630b2..9d487e29c5d3 100644
@@ -41,10 +41,12 @@ ifeq ($(BR2_STATIC_LIBS),)
 JPEG_TURBO_CONF_OPTS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 endif
 
-define JPEG_TURBO_REMOVE_USELESS_TOOLS
+define JPEG_TURBO_REMOVE_TOOLS
 	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom)
 endef
 
-JPEG_TURBO_POST_INSTALL_TARGET_HOOKS += JPEG_TURBO_REMOVE_USELESS_TOOLS
+ifneq ($(BR2_PACKAGE_JPEG_TURBO_TOOLS),y)
+	JPEG_TURBO_POST_INSTALL_TARGET_HOOKS += JPEG_TURBO_REMOVE_TOOLS
+endif
 
 $(eval $(cmake-package))
package/jpeg/Config.in +9 -0
index 3d0fea83b182..11ea01daf35b 100644
@@ -38,6 +38,15 @@ config BR2_PACKAGE_JPEG_TURBO
 
 	  http://www.libjpeg-turbo.org
 
+config BR2_PACKAGE_JPEG_TURBO_TOOLS
+	bool "jpeg-turbo tools"
+	depends on BR2_PACKAGE_JPEG_TURBO
+	default n
+	help
+	  Libjpeg-turbo can also provide some tools like  cjpeg,
+	  djpeg, jpegtran, rdjpgcom, tjbench and wrjpgcom.
+	  If you want to keep them enable this option.
+
 # libjpeg from br2-external trees, if any
 source "$BR2_BASE_DIR/.br2-external.in.jpeg"
 
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/jpeg-turbo: Add an option to allow tools install

Cl?ment, All,

On 2020-04-12 13:06 +0200, Cl?ment P?ron spake thusly:

Quoted 15 lines

JPEG Turbo tools are not useless for everybody.

Add an option to allow their installation.

---
 package/jpeg-turbo/jpeg-turbo.mk | 6 ++++--
 package/jpeg/Config.in           | 9 +++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
package/jpeg-turbo/jpeg-turbo.mk +0 -0
index 126b470630b2..9d487e29c5d3 100644

package/jpeg-turbo/jpeg-turbo.mk ifeq ($(BR2_STATIC_LIBS),) · line 48

Quoted 10 lines
package/jpeg-turbo/jpeg-turbo.mk +2 -2
@@ -41,10 +41,12 @@ ifeq ($(BR2_STATIC_LIBS),)
 JPEG_TURBO_CONF_OPTS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 endif
 
-define JPEG_TURBO_REMOVE_USELESS_TOOLS
+define JPEG_TURBO_REMOVE_TOOLS
 	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom)
 endef
 
-JPEG_TURBO_POST_INSTALL_TARGET_HOOKS += JPEG_TURBO_REMOVE_USELESS_TOOLS
+ifneq ($(BR2_PACKAGE_JPEG_TURBO_TOOLS),y)

We usually have the conditional block also encompass the hook definition.

package/jpeg-turbo/jpeg-turbo.mk ifeq ($(BR2_STATIC_LIBS),) · line 49

Quoted 1 line
package/jpeg-turbo/jpeg-turbo.mk +1 -0
+	JPEG_TURBO_POST_INSTALL_TARGET_HOOKS += JPEG_TURBO_REMOVE_TOOLS

we usually do not indent the variable assignments.

Quoted 8 lines
package/jpeg-turbo/jpeg-turbo.mk +1 -0
+endif
 
 $(eval $(cmake-package))
package/jpeg/Config.in +0 -0
index 3d0fea83b182..11ea01daf35b 100644

package/jpeg/Config.in config BR2_PACKAGE_JPEG_TURBO · line 44

Quoted 7 lines
package/jpeg/Config.in +4 -0
@@ -38,6 +38,15 @@ config BR2_PACKAGE_JPEG_TURBO
 
 	  http://www.libjpeg-turbo.org
 
+config BR2_PACKAGE_JPEG_TURBO_TOOLS
+	bool "jpeg-turbo tools"
+	depends on BR2_PACKAGE_JPEG_TURBO
+	default n

No need for 'default n' since.. this is the default.

I also noved that out of the choice, because the layout becomes slightly weird.

I also moved it to its own Config.in.options in the jpeg-turbo directory.

Pushed to master, thanks.

Regards,
Yann E. MORIN.

Quoted 15 lines
package/jpeg/Config.in +5 -0
+	help
+	  Libjpeg-turbo can also provide some tools like  cjpeg,
+	  djpeg, jpegtran, rdjpgcom, tjbench and wrjpgcom.
+	  If you want to keep them enable this option.
+
 # libjpeg from br2-external trees, if any
 source "$BR2_BASE_DIR/.br2-external.in.jpeg"
 
Signature · 6 lines
2.20.1

_______________________________________________
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 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/jpeg-turbo: Add an option to allow tools install

Hi Yann,

Quoted 33 lines · Yann E. MORIN

Cl?ment, All,

On 2020-04-12 13:06 +0200, Cl?ment P?ron spake thusly:

Quoted 15 lines

JPEG Turbo tools are not useless for everybody.

Add an option to allow their installation.

---
 package/jpeg-turbo/jpeg-turbo.mk | 6 ++++--
 package/jpeg/Config.in           | 9 +++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
package/jpeg-turbo/jpeg-turbo.mk +0 -0
index 126b470630b2..9d487e29c5d3 100644

package/jpeg-turbo/jpeg-turbo.mk ifeq ($(BR2_STATIC_LIBS),) · line 48

Quoted 10 lines
package/jpeg-turbo/jpeg-turbo.mk +2 -2
@@ -41,10 +41,12 @@ ifeq ($(BR2_STATIC_LIBS),)
 JPEG_TURBO_CONF_OPTS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 endif
 
-define JPEG_TURBO_REMOVE_USELESS_TOOLS
+define JPEG_TURBO_REMOVE_TOOLS
      rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom)
 endef
 
-JPEG_TURBO_POST_INSTALL_TARGET_HOOKS += JPEG_TURBO_REMOVE_USELESS_TOOLS
+ifneq ($(BR2_PACKAGE_JPEG_TURBO_TOOLS),y)

We usually have the conditional block also encompass the hook definition.

Quoted 3 lines

package/jpeg-turbo/jpeg-turbo.mk ifeq ($(BR2_STATIC_LIBS),) · line 49

Quoted 1 line
package/jpeg-turbo/jpeg-turbo.mk +1 -0
+     JPEG_TURBO_POST_INSTALL_TARGET_HOOKS += JPEG_TURBO_REMOVE_TOOLS

we usually do not indent the variable assignments.

Thanks for the explanation and taking care of this. I will follow these rules next time.

Regards,
Clement

Quoted 53 lines
Quoted 9 lines
package/jpeg-turbo/jpeg-turbo.mk +1 -0
+endif
 
 $(eval $(cmake-package))
package/jpeg/Config.in +0 -0
index 3d0fea83b182..11ea01daf35b 100644

package/jpeg/Config.in config BR2_PACKAGE_JPEG_TURBO · line 44

Quoted 7 lines
package/jpeg/Config.in +4 -0
@@ -38,6 +38,15 @@ config BR2_PACKAGE_JPEG_TURBO
 
        http://www.libjpeg-turbo.org
 
+config BR2_PACKAGE_JPEG_TURBO_TOOLS
+     bool "jpeg-turbo tools"
+     depends on BR2_PACKAGE_JPEG_TURBO
+     default n

No need for 'default n' since.. this is the default.

I also noved that out of the choice, because the layout becomes slightly weird.

I also moved it to its own Config.in.options in the jpeg-turbo directory.

Pushed to master, thanks.

Regards,
Yann E. MORIN.

Quoted 11 lines
package/jpeg/Config.in +5 -1
+     help
+       Libjpeg-turbo can also provide some tools like  cjpeg,
+       djpeg, jpegtran, rdjpgcom, tjbench and wrjpgcom.
+       If you want to keep them enable this option.
+
 # libjpeg from br2-external trees, if any
 source "$BR2_BASE_DIR/.br2-external.in.jpeg"
 
--

2.20.1

Quoted 4 lines

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

--
.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |

'------------------------------^-------^------------------^--------------------'