diff options
| -rw-r--r-- | meta-oe/recipes-multimedia/vlc/vlc.inc | 4 | ||||
| -rw-r--r-- | meta-oe/recipes-multimedia/vlc/vlc_1.1.4.1.bb | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/meta-oe/recipes-multimedia/vlc/vlc.inc b/meta-oe/recipes-multimedia/vlc/vlc.inc index bb67097f6c..b277f547fa 100644 --- a/meta-oe/recipes-multimedia/vlc/vlc.inc +++ b/meta-oe/recipes-multimedia/vlc/vlc.inc | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.videolan.org" | |||
| 3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
| 4 | SECTION = "multimedia" | 4 | SECTION = "multimedia" |
| 5 | 5 | ||
| 6 | DEPENDS = "libfribidi libtool hal gettext libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \ | 6 | DEPENDS = "libfribidi libtool gettext libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \ |
| 7 | ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}" | 7 | ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}" |
| 8 | 8 | ||
| 9 | SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2" | 9 | SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2" |
| @@ -60,7 +60,7 @@ EXTRA_OECONF = "\ | |||
| 60 | --enable-live555 --enable-tremor \ | 60 | --enable-live555 --enable-tremor \ |
| 61 | --enable-v4l2 --enable-v4l --disable-aa --enable-wma --disable-faad \ | 61 | --enable-v4l2 --enable-v4l --disable-aa --enable-wma --disable-faad \ |
| 62 | --enable-dbus \ | 62 | --enable-dbus \ |
| 63 | --enable-hal \ | 63 | --disable-hal \ |
| 64 | --without-contrib \ | 64 | --without-contrib \ |
| 65 | --disable-opengl --disable-glx \ | 65 | --disable-opengl --disable-glx \ |
| 66 | --enable-realrtsp \ | 66 | --enable-realrtsp \ |
diff --git a/meta-oe/recipes-multimedia/vlc/vlc_1.1.4.1.bb b/meta-oe/recipes-multimedia/vlc/vlc_1.1.4.1.bb index f28323c35a..84897b04db 100644 --- a/meta-oe/recipes-multimedia/vlc/vlc_1.1.4.1.bb +++ b/meta-oe/recipes-multimedia/vlc/vlc_1.1.4.1.bb | |||
| @@ -1,11 +1,9 @@ | |||
| 1 | # This recipe packages vlc as a library as well, so qt4 dependencies | 1 | # This recipe packages vlc as a library as well, so qt4 dependencies |
| 2 | # can be avoided when ony the library is installed. | 2 | # can be avoided when only the library is installed. |
| 3 | # Would be cool if when newer vlc is added to OE and older ones are phased | ||
| 4 | # out that could be made the default. | ||
| 5 | 3 | ||
| 6 | require vlc.inc | 4 | require vlc.inc |
| 7 | 5 | ||
| 8 | PR = "${INC_PR}.1" | 6 | PR = "r1" |
| 9 | 7 | ||
| 10 | SRC_URI[md5sum] = "ce17c335b38b322949694313173fcd49" | 8 | SRC_URI[md5sum] = "ce17c335b38b322949694313173fcd49" |
| 11 | SRC_URI[sha256sum] = "61c9ea30a17ea40c6ccbfd507026e5c83ad9e0691f221d3667c8e49696d7c2aa" | 9 | SRC_URI[sha256sum] = "61c9ea30a17ea40c6ccbfd507026e5c83ad9e0691f221d3667c8e49696d7c2aa" |
