diff options
Diffstat (limited to 'meta-multimedia/recipes-multimedia/vlc/vlc.inc')
-rw-r--r-- | meta-multimedia/recipes-multimedia/vlc/vlc.inc | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc index 19ac8206c..9bbc6685d 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc | |||
@@ -36,12 +36,17 @@ EXTRA_OECONF = "\ | |||
36 | --enable-realrtsp \ | 36 | --enable-realrtsp \ |
37 | --disable-libtar \ | 37 | --disable-libtar \ |
38 | --enable-avcodec \ | 38 | --enable-avcodec \ |
39 | ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \ | 39 | ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \ |
40 | ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \ | 40 | ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/rcc \ |
41 | ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ | 41 | ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/uic \ |
42 | " | 42 | " |
43 | 43 | ||
44 | PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread png ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 44 | PACKAGECONFIG ?= " \ |
45 | live555 dc1394 dv1394 notify fontconfig freetype dvdread png \ | ||
46 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | ||
47 | " | ||
48 | |||
49 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} | ||
45 | 50 | ||
46 | PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" | 51 | PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" |
47 | PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" | 52 | PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" |
@@ -54,7 +59,7 @@ PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" | |||
54 | PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" | 59 | PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" |
55 | PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gst-plugins-bad" | 60 | PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gst-plugins-bad" |
56 | PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" | 61 | PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" |
57 | PACKAGECONFIG[qt4] = "--enable-qt,--disable-qt, qt4-x11-free" | 62 | PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg" |
58 | PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" | 63 | PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" |
59 | PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi" | 64 | PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi" |
60 | PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" | 65 | PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" |
@@ -76,12 +81,13 @@ PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util | |||
76 | PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" | 81 | PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" |
77 | PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" | 82 | PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" |
78 | 83 | ||
79 | do_configure_prepend() { | ||
80 | cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true | ||
81 | } | ||
82 | |||
83 | do_configure_append() { | 84 | do_configure_append() { |
84 | sed -i -e s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g ${B}/doltlibtool | 85 | sed -i -e s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g ${B}/doltlibtool |
86 | |||
87 | # moc needs support: precreate build paths | ||
88 | for qtpath in adapters components/epg components/playlist components/sout dialogs managers styles util/buttons; do | ||
89 | mkdir -p "${B}/modules/gui/qt/$qtpath" | ||
90 | done | ||
85 | } | 91 | } |
86 | 92 | ||
87 | # This recipe packages vlc as a library as well, so qt4 dependencies | 93 | # This recipe packages vlc as a library as well, so qt4 dependencies |