Commit 21dd3e77 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

package: add selection between libjpeg and jpeg-turbo 



Introduce a virtual 'jpeg' package, which pulls in either libjpeg or
jpeg-turbo depending on a choice selection.

Rename jpeg package to libjpeg so we can reuse 'jpeg' for the virtual
package, making the change transparent to existing users and all the
packages using libjpeg.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 39348d80

package/Config.in

+0 −1
Original line number Diff line number Diff line
@@ -391,7 +391,6 @@ source "package/gtk2-engines/Config.in" 
source "package/gtk2-themes/Config.in"

source "package/imlib2/Config.in"

source "package/jpeg/Config.in"

source "package/jpeg-turbo/Config.in"

source "package/libart/Config.in"

source "package/libdmtx/Config.in"

source "package/libdrm/Config.in"

package/jpeg-turbo/Config.in

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
config BR2_PACKAGE_JPEG_TURBO

	bool "jpeg-turbo"

	help

	  Libjpeg-turbo is a derivative of libjpeg that uses SIMD

	  instructions (MMX, SSE2, NEON) to accelerate baseline JPEG

	  compression and decompression on x86, x86-64, and ARM

	  systems.



	  http://www.libjpeg-turbo.org

package/jpeg/Config.in

+27 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_JPEG

	bool "jpeg support"

	help

	  Select the desired JPEG library provider.



if BR2_PACKAGE_JPEG



choice

	prompt "jpeg variant"

	default BR2_PACKAGE_JPEG_TURBO if (BR2_X86_CPU_HAS_MMX || BR2_ARM_CPU_HAS_NEON)

	help

	  Select the older stable version, or the newer developer version



config BR2_PACKAGE_LIBJPEG

	bool "jpeg"

	help

	  The ubiquitous C library for manipulating JPEG images.



	  http://www.ijg.org/



config BR2_PACKAGE_JPEG_TURBO

	bool "jpeg-turbo"

	help

	  Libjpeg-turbo is a derivative of libjpeg that uses SIMD

	  instructions (MMX, SSE2, NEON) to accelerate baseline JPEG

	  compression and decompression on x86, x86-64, and ARM

	  systems.



	  http://www.libjpeg-turbo.org



endchoice



endif

package/jpeg/jpeg.mk

+3 −12
Original line number Diff line number Diff line 
#############################################################

#

# jpeg (libraries needed by some apps)

# jpeg

#

#############################################################

JPEG_VERSION = 8d

JPEG_SITE = http://www.ijg.org/files/

JPEG_SOURCE = jpegsrc.v$(JPEG_VERSION).tar.gz

JPEG_INSTALL_STAGING = YES



define JPEG_REMOVE_USELESS_TOOLS

	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtrans rdjpgcom wrjpgcom)

endef

jpeg: $(if $(BR2_PACKAGE_JPEG_TURBO),jpeg-turbo,libjpeg)



JPEG_POST_INSTALL_TARGET_HOOKS += JPEG_REMOVE_USELESS_TOOLS



$(eval $(autotools-package))

$(eval $(host-autotools-package))
 
host-jpeg: host-libjpeg

package/libjpeg/libjpeg.mk

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#############################################################

#

# libjpeg (libraries needed by some apps)

#

#############################################################



LIBJPEG_VERSION = 8d

LIBJPEG_SITE = http://www.ijg.org/files/

LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz

LIBJPEG_INSTALL_STAGING = YES



define LIBJPEG_REMOVE_USELESS_TOOLS

	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtrans rdjpgcom wrjpgcom)

endef



LIBJPEG_POST_INSTALL_TARGET_HOOKS += LIBJPEG_REMOVE_USELESS_TOOLS



$(eval $(autotools-package))

$(eval $(host-autotools-package))