jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-25 20:26:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/poppler: remove qt option

Browse Source 
The qt option uses the obsolete qt4 package, which we are about to remove,
so remove the poppler qt option as well.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Peter Korsgaard 2019-02-06 15:10:50 +01:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 3a3fdaebd9
commit 3f821fcc9c
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Config.in.legacy
View File

@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2019.02" comment "Legacy options removed in 2019.02"
config BR2_PACKAGE_POPPLER_QT
bool "poppler qt option removed"
select BR2_LEGACY
help
The poppler qt option was removed.
config BR2_PACKAGE_OPENCV3_WITH_QT config BR2_PACKAGE_OPENCV3_WITH_QT
bool "opencv3 qt backend option removed" bool "opencv3 qt backend option removed"
select BR2_LEGACY select BR2_LEGACY

8
package/poppler/Config.in
View File

@ -13,14 +13,6 @@ config BR2_PACKAGE_POPPLER
if BR2_PACKAGE_POPPLER if BR2_PACKAGE_POPPLER
config BR2_PACKAGE_POPPLER_QT
bool "Qt support"
depends on BR2_PACKAGE_QT
select BR2_PACKAGE_QT_GUI_MODULE
select BR2_PACKAGE_QT_XML
help
Build Qt support into the Poppler library
config BR2_PACKAGE_POPPLER_QT5 config BR2_PACKAGE_POPPLER_QT5
bool "Qt5 support" bool "Qt5 support"
depends on BR2_PACKAGE_QT5 depends on BR2_PACKAGE_QT5

9
package/poppler/poppler.mk
View File

@ -12,7 +12,7 @@ POPPLER_LICENSE = GPL-2.0+
POPPLER_LICENSE_FILES = COPYING POPPLER_LICENSE_FILES = COPYING
POPPLER_INSTALL_STAGING = YES POPPLER_INSTALL_STAGING = YES
POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \ POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \
--enable-xpdf-headers --enable-xpdf-headers --disable-poppler-qt4
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
POPPLER_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -latomic" POPPLER_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -latomic"
@ -84,13 +84,6 @@ else
POPPLER_CONF_OPTS += --without-x POPPLER_CONF_OPTS += --without-x
endif endif
ifeq ($(BR2_PACKAGE_POPPLER_QT),y)
POPPLER_DEPENDENCIES += qt
POPPLER_CONF_OPTS += --enable-poppler-qt4
else
POPPLER_CONF_OPTS += --disable-poppler-qt4
endif
ifeq ($(BR2_PACKAGE_POPPLER_QT5),y) ifeq ($(BR2_PACKAGE_POPPLER_QT5),y)
POPPLER_DEPENDENCIES += qt5base POPPLER_DEPENDENCIES += qt5base
POPPLER_CONF_OPTS += --enable-poppler-qt5 POPPLER_CONF_OPTS += --enable-poppler-qt5