summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/checksums.ini4
-rw-r--r--packages/vlc/vlc_0.9.2.bb4
-rw-r--r--packages/vlc/vlc_0.9.4.bb60
3 files changed, 66 insertions, 2 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 061fa32dd1..002d7c03e6 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -15426,6 +15426,10 @@ sha256=50ed87c869228274043b7fa468f908fe6ee571196510177593c701d99b357221
md5=f7d843d0725abb57196c4012eeb0e636
sha256=b839353694fa5d47b8874573525a6612ce22654774c7cd2d9d4a16f7044b7854
+[http://videolan.mirror.technotop.nl/vlc/0.9.4/vlc-0.9.4.tar.bz2]
+md5=786628aaf8f30a9b812975b67c88b971
+sha256=6e6ce0fc497d380b3ed1b8c77c4ce5d089a90070ef38626b9af71a13e52b4faf
+
[http://194.213.43.198/vmedit/vmedit-0.02.tar.gz]
md5=7550ea1dd951d2f7fb1a54caa88860b2
sha256=bca8b0073d9527c0293b831c9b8d8f89fc3dc7b5ab30898e7b748843af07a978
diff --git a/packages/vlc/vlc_0.9.2.bb b/packages/vlc/vlc_0.9.2.bb
index f50c5dd304..b6150ed4eb 100644
--- a/packages/vlc/vlc_0.9.2.bb
+++ b/packages/vlc/vlc_0.9.2.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
PRIORITY = "optional"
SECTION = "multimedia"
-PR = "r1"
+PR = "r0"
DEPENDS = "libtool hal gettext libgcrypt schroedinger libsdl-x11 qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
@@ -24,7 +24,7 @@ EXTRA_OECONF = "\
--enable-sdl \
--enable-png \
--enable-live555 --enable-tremor \
- --enable-v4l2 --disable-aa --enable-wma --disable-faad \
+ --enable-v4l2 --enable-video4linux --disable-aa --enable-wma --disable-faad \
--enable-dbus \
--enable-hal \
--without-contrib \
diff --git a/packages/vlc/vlc_0.9.4.bb b/packages/vlc/vlc_0.9.4.bb
new file mode 100644
index 0000000000..bf0efac0a3
--- /dev/null
+++ b/packages/vlc/vlc_0.9.4.bb
@@ -0,0 +1,60 @@
+DESCRIPTION = "Video player and streamer - davinci edition"
+HOMEPAGE = "http://www.videolan.org"
+LICENSE = "GPL"
+PRIORITY = "optional"
+SECTION = "multimedia"
+
+PR = "r0"
+
+DEPENDS = "libtool hal gettext libgcrypt schroedinger libsdl-x11 qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
+
+SRC_URI = "http://videolan.mirror.technotop.nl/vlc/${PV}/vlc-${PV}.tar.bz2"
+
+inherit autotools
+
+EXTRA_OECONF = "\
+ --enable-libtool \
+ --with-contrib \
+ --disable-dvdread \
+ --disable-wxwidgets \
+ --enable-x11 --enable-xvideo \
+ --disable-screen --disable-caca \
+ --enable-httpd --enable-vlm \
+ --enable-freetype \
+ --enable-sdl \
+ --enable-png \
+ --enable-live555 --enable-tremor \
+ --enable-v4l2 --enable-video4linux --disable-aa --enable-wma --disable-faad \
+ --enable-dbus \
+ --enable-hal \
+ --without-contrib \
+ ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
+ ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \
+ ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
+"
+
+
+do_configure() {
+ cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/
+ ./bootstrap
+ gnu-configize --force
+ libtoolize --force
+ #autoreconf --force -i
+ cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/
+ oe_runconf
+ rm config.log
+ sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
+ sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+
+FILES_${PN} += "${bindir}/vlc \
+ ${datadir}/applications \
+ ${datadir}/vlc/ \
+ "
+
+FILES_${PN}-dbg += "${libdir}/vlc/*/.debug"