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

libvips: use the new gettext logic

Browse Source 
This commit switches to use the new gettext logic, which involves:

 - using TARGET_NLS_DEPENDENCIES instead of hand-encoded dependencies
   on gettext/host-gettext

 - dropping BR2_PACKAGE_GETTEXT selection. We adjust the comment
   explaining the BR2_USE_WCHAR dependency, since gettext is no longer
   the reason for this dependency.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2017-07-03 22:53:56 +02:00
parent 34c5bd7266
commit 77c997b509
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/libvips/Config.in
View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBVIPS config BR2_PACKAGE_LIBVIPS
bool "libvips" bool "libvips"
depends on BR2_USE_WCHAR # gettext, libglib2 depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
# C++ support is required to build libvips # C++ support is required to build libvips
@ -8,7 +8,6 @@ config BR2_PACKAGE_LIBVIPS
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help help
libvips is a 2D image processing library. Compared to libvips is a 2D image processing library. Compared to
similar libraries, libvips runs quickly and uses little similar libraries, libvips runs quickly and uses little

2
package/libvips/libvips.mk
View File

@ -41,7 +41,7 @@ LIBVIPS_CONF_OPTS = \
LIBVIPS_INSTALL_STAGING = YES LIBVIPS_INSTALL_STAGING = YES
LIBVIPS_DEPENDENCIES = \ LIBVIPS_DEPENDENCIES = \
host-pkgconf libglib2 \ host-pkgconf libglib2 \
libxml2 $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) libxml2 $(TARGET_NLS_DEPENDENCIES)
# --disable-cxx is broken upstream # --disable-cxx is broken upstream
# https://github.com/jcupitt/libvips/issues/231 # https://github.com/jcupitt/libvips/issues/231