jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-01 15:37:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

vdr: 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

 - using TARGET_NLS_LIBS to force linking against libintl

 - dropping BR2_PACKAGE_GETTEXT selection

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2017-07-03 23:22:43 +02:00
parent 7426b582f6
commit feaf0570d8
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/vdr/Config.in
View File

@ -7,7 +7,6 @@ config BR2_PACKAGE_VDR
depends on !BR2_TOOLCHAIN_USES_MUSL # _nl_msg_cat_cntr depends on !BR2_TOOLCHAIN_USES_MUSL # _nl_msg_cat_cntr
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FONTCONFIG
select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_FREETYPE
select BR2_PACKAGE_JPEG select BR2_PACKAGE_JPEG

9
package/vdr/vdr.mk
View File

@ -14,7 +14,8 @@ VDR_DEPENDENCIES = \
freetype \ freetype \
fontconfig \ fontconfig \
jpeg \ jpeg \
libcap libcap \
$(TARGET_NLS_DEPENDENCIES)
VDR_INCLUDE_DIRS = -I$(STAGING_DIR)/usr/include/freetype2 VDR_INCLUDE_DIRS = -I$(STAGING_DIR)/usr/include/freetype2
VDR_MAKE_FLAGS = \ VDR_MAKE_FLAGS = \
@ -22,11 +23,7 @@ VDR_MAKE_FLAGS = \
PLUGINLIBDIR=/usr/lib/vdr \ PLUGINLIBDIR=/usr/lib/vdr \
PREFIX=/usr \ PREFIX=/usr \
VIDEODIR=/var/lib/vdr VIDEODIR=/var/lib/vdr
VDR_LDFLAGS = $(TARGET_NLS_LIBS)
ifeq ($(BR2_NEEDS_GETTEXT),y)
VDR_DEPENDENCIES += gettext
VDR_LDFLAGS += -lintl
endif
ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
VDR_DEPENDENCIES += libfribidi VDR_DEPENDENCIES += libfribidi