diff options
Diffstat (limited to 'meta-multimedia/recipes-multimedia/vlc/vlc.inc')
-rw-r--r-- | meta-multimedia/recipes-multimedia/vlc/vlc.inc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc index f13c0ead6..19ac8206c 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc | |||
@@ -5,7 +5,7 @@ SECTION = "multimedia" | |||
5 | LICENSE = "GPL-2.0" | 5 | LICENSE = "GPL-2.0" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
7 | 7 | ||
8 | DEPENDS = "fribidi libtool libgcrypt libgcrypt-native \ | 8 | DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native \ |
9 | dbus dbus-glib libxml2 gnutls \ | 9 | dbus dbus-glib libxml2 gnutls \ |
10 | tremor faad2 ffmpeg flac fluidsynth alsa-lib \ | 10 | tremor faad2 ffmpeg flac fluidsynth alsa-lib \ |
11 | lua-native lua libidn \ | 11 | lua-native lua libidn \ |
@@ -21,12 +21,12 @@ SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz" | |||
21 | inherit autotools gettext pkgconfig distro_features_check | 21 | inherit autotools gettext pkgconfig distro_features_check |
22 | 22 | ||
23 | ARM_INSTRUCTION_SET = "arm" | 23 | ARM_INSTRUCTION_SET = "arm" |
24 | 24 | export BUILDCC = "${BUILD_CC}" | |
25 | EXTRA_OECONF = "\ | 25 | EXTRA_OECONF = "\ |
26 | --enable-run-as-root \ | 26 | --enable-run-as-root \ |
27 | --enable-xvideo \ | 27 | --enable-xvideo \ |
28 | --disable-screen --disable-caca \ | 28 | --disable-screen --disable-caca \ |
29 | --enable-httpd --enable-vlm \ | 29 | --enable-vlm \ |
30 | --enable-freetype \ | 30 | --enable-freetype \ |
31 | --enable-tremor \ | 31 | --enable-tremor \ |
32 | --enable-v4l2 --disable-aa --disable-faad \ | 32 | --enable-v4l2 --disable-aa --disable-faad \ |
@@ -35,22 +35,22 @@ EXTRA_OECONF = "\ | |||
35 | --without-kde-solid \ | 35 | --without-kde-solid \ |
36 | --enable-realrtsp \ | 36 | --enable-realrtsp \ |
37 | --disable-libtar \ | 37 | --disable-libtar \ |
38 | --enable-avcodec \ | ||
38 | ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \ | 39 | ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \ |
39 | ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \ | 40 | ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \ |
40 | ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ | 41 | ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ |
41 | " | 42 | " |
42 | 43 | ||
43 | PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread png ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl vdpau', '', d)}" | 44 | PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread png ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
45 | |||
44 | PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" | 46 | PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" |
45 | PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl libsdl-image " | ||
46 | PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" | 47 | PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" |
47 | PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" | 48 | PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" |
48 | PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555" | 49 | PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555" |
49 | PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" | 50 | PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" |
50 | PACKAGECONFIG[mkv] = "--enable-mkv,--disable-mkv,libmatroska libebml" | ||
51 | PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" | 51 | PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" |
52 | PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva" | ||
52 | PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" | 53 | PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" |
53 | PACKAGECONFIG[libva] = "--enable-libva --enable-avcodec,--disable-libva --disable-avcodec,libva libav" | ||
54 | PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" | 54 | 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" | 55 | 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" | 56 | PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" |
@@ -81,7 +81,6 @@ do_configure_prepend() { | |||
81 | } | 81 | } |
82 | 82 | ||
83 | do_configure_append() { | 83 | do_configure_append() { |
84 | sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${B}/include\ -DSYS_LINUX:g ${B}/modules/gui/qt4/Makefile | ||
85 | sed -i -e s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g ${B}/doltlibtool | 84 | sed -i -e s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g ${B}/doltlibtool |
86 | } | 85 | } |
87 | 86 | ||
@@ -94,10 +93,11 @@ FILES_libvlc = "${libdir}/lib*.so.*" | |||
94 | 93 | ||
95 | FILES_${PN} += "\ | 94 | FILES_${PN} += "\ |
96 | ${bindir}/vlc \ | 95 | ${bindir}/vlc \ |
96 | ${libdir}/vlc/vlc/libvlc_vdpau.so \ | ||
97 | ${datadir}/applications \ | 97 | ${datadir}/applications \ |
98 | ${datadir}/vlc/ \ | 98 | ${datadir}/vlc/ \ |
99 | ${datadir}/icons \ | 99 | ${datadir}/icons \ |
100 | ${lindir}/vlc/vlc/libvlc_vdpau.so \ | 100 | ${datadir}/metainfo/vlc.appdata.xml \ |
101 | " | 101 | " |
102 | 102 | ||
103 | FILES_${PN}-dbg += "\ | 103 | FILES_${PN}-dbg += "\ |