jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 13:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/jpeg-turbo: allow installing tools

Browse Source 
Currently, the jpeg-turbo tools are forcibly removed, but they can be
usefull (e.g. to test performance on the target, or to script batch
conversions).

Add an option to allow keeping them.

Signed-off-by: Clément Péron <peron.clem@gmail.com>
[yann.morin.1998@free.fr
  - move the option out of the choice
  - move the option to a Config.in.options
  - drop the default 'n', which is ... the default
  - use positive logic to define the hook
  - move definition of the hook in the conditional block
  - don't indent the hook assignment
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Clément Péron 2020-04-12 13:06:32 +02:00 committed by Yann E. MORIN
parent 7a48ac725f
commit 3d71ffcf8d
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package/jpeg-turbo/Config.in.options Normal file
View File

@ -0,0 +1,11 @@
if BR2_PACKAGE_JPEG_TURBO
config BR2_PACKAGE_JPEG_TURBO_TOOLS
bool "jpeg-turbo tools"
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.
endif

7
package/jpeg-turbo/jpeg-turbo.mk
View File

@ -41,10 +41,11 @@ ifeq ($(BR2_STATIC_LIBS),)
JPEG_TURBO_CONF_OPTS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON JPEG_TURBO_CONF_OPTS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON
endif endif
define JPEG_TURBO_REMOVE_USELESS_TOOLS ifeq ($(BR2_PACKAGE_JPEG_TURBO_TOOLS),)
define JPEG_TURBO_REMOVE_TOOLS
rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom) rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom)
endef endef
JPEG_TURBO_POST_INSTALL_TARGET_HOOKS += JPEG_TURBO_REMOVE_TOOLS
JPEG_TURBO_POST_INSTALL_TARGET_HOOKS += JPEG_TURBO_REMOVE_USELESS_TOOLS endif
$(eval $(cmake-package)) $(eval $(cmake-package))

2
package/jpeg/Config.in
View File

@ -43,6 +43,8 @@ source "$BR2_BASE_DIR/.br2-external.in.jpeg"
endchoice endchoice
source "package/jpeg-turbo/Config.in.options"
config BR2_PACKAGE_HAS_JPEG config BR2_PACKAGE_HAS_JPEG
bool bool