diff options
-rw-r--r-- | meta-oe/recipes-support/zbar/zbar_git.bb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/meta-oe/recipes-support/zbar/zbar_git.bb b/meta-oe/recipes-support/zbar/zbar_git.bb index 5cb7baae33..a33aa2c960 100644 --- a/meta-oe/recipes-support/zbar/zbar_git.bb +++ b/meta-oe/recipes-support/zbar/zbar_git.bb | |||
@@ -10,8 +10,8 @@ LICENSE = "LGPL-2.1" | |||
10 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5e9ee833a2118adc7d8b5ea38e5b1cef" | 10 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5e9ee833a2118adc7d8b5ea38e5b1cef" |
11 | 11 | ||
12 | SRC_URI = "git://github.com/mchehab/zbar.git;branch=master \ | 12 | SRC_URI = "git://github.com/mchehab/zbar.git;branch=master \ |
13 | file://0001-qt-Create-subdir-in-Makefile.patch \ | 13 | file://0001-qt-Create-subdir-in-Makefile.patch \ |
14 | file://0002-zbarcam-Create-subdir-in-Makefile.patch \ | 14 | file://0002-zbarcam-Create-subdir-in-Makefile.patch \ |
15 | " | 15 | " |
16 | SRCREV = "89e7900d85dd54ef351a7ed582aec6a5a5d7fa37" | 16 | SRCREV = "89e7900d85dd54ef351a7ed582aec6a5a5d7fa37" |
17 | 17 | ||
@@ -21,15 +21,15 @@ PV = "0.23.1+git${SRCPV}" | |||
21 | DEPENDS += "xmlto-native" | 21 | DEPENDS += "xmlto-native" |
22 | 22 | ||
23 | PACKAGECONFIG ??= "\ | 23 | PACKAGECONFIG ??= "\ |
24 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | 24 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ |
25 | " | 25 | " |
26 | 26 | ||
27 | PACKAGECONFIG ??= "video python3" | 27 | PACKAGECONFIG ??= "video python3" |
28 | 28 | ||
29 | inherit autotools pkgconfig gettext \ | 29 | inherit autotools pkgconfig gettext \ |
30 | ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)} \ | 30 | ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)} \ |
31 | ${@bb.utils.contains('PACKAGECONFIG', 'gtk3', 'gobject-introspection', '', d)} \ | 31 | ${@bb.utils.contains('PACKAGECONFIG', 'gtk3', 'gobject-introspection', '', d)} \ |
32 | ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} | 32 | ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} |
33 | 33 | ||
34 | PACKAGECONFIG[x11] = "--with-x, --without-x, libxv" | 34 | PACKAGECONFIG[x11] = "--with-x, --without-x, libxv" |
35 | PACKAGECONFIG[video] = "--enable-video, --disable-video, v4l-utils libv4l" | 35 | PACKAGECONFIG[video] = "--enable-video, --disable-video, v4l-utils libv4l" |
@@ -40,15 +40,15 @@ PACKAGECONFIG[qt5] = "--with-qt5, --without-qt5, qtbase qtbase-native qtx11extra | |||
40 | PACKAGECONFIG[imagemagick] = "--with-imagemagick, --without-imagemagick, imagemagick" | 40 | PACKAGECONFIG[imagemagick] = "--with-imagemagick, --without-imagemagick, imagemagick" |
41 | 41 | ||
42 | FILES_${PN} += "${bindir} \ | 42 | FILES_${PN} += "${bindir} \ |
43 | ${@bb.utils.contains('DEPENDS', 'python3-native', '${libdir}', '', d)} \ | 43 | ${@bb.utils.contains('DEPENDS', 'python3-native', '${libdir}', '', d)} \ |
44 | " | 44 | " |
45 | 45 | ||
46 | CPPFLAGS_append = "\ | 46 | CPPFLAGS_append = "\ |
47 | ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '\ | 47 | ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '\ |
48 | -I${STAGING_INCDIR}/QtX11Extras \ | 48 | -I${STAGING_INCDIR}/QtX11Extras \ |
49 | -I${STAGING_INCDIR}/dbus-1.0 \ | 49 | -I${STAGING_INCDIR}/dbus-1.0 \ |
50 | -I${STAGING_LIBDIR}/dbus-1.0/include \ | 50 | -I${STAGING_LIBDIR}/dbus-1.0/include \ |
51 | ', '', d)} \ | 51 | ', '', d)} \ |
52 | " | 52 | " |
53 | 53 | ||
54 | TARGET_CXXFLAGS_append = " -fPIC" | 54 | TARGET_CXXFLAGS_append = " -fPIC" |