[oe-commits] Koen Kooi : vlc: update to 1.1.11 and fix xml2 build

[git version control]

Module: meta-openembedded.git
Branch: master
Commit: 9c4ff53d2fa688581d257eb7e045f9e6a20470d3
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=9c4ff53d2fa688581d257eb7e045f9e6a20470d3

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Thu Sep 15 15:59:26 2011 +0200

vlc: update to 1.1.11 and fix xml2 build

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb  |   13 +++++++++++++
 meta-oe/recipes-multimedia/vlc/vlc_1.1.4.1.bb |   10 ----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb b/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb
new file mode 100644
index 0000000..fb69e05
--- /dev/null
+++ b/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb
@@ -0,0 +1,13 @@
+# This recipe packages vlc as a library as well, so qt4 dependencies
+# can be avoided when only the library is installed.
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
+
+require vlc.inc
+
+# work around build failure
+EXTRA_OECONF += " --enable-libxml2=no"
+
+SRC_URI[md5sum] = "a64846d6f21ea179ae8e8bfb6f9447fe"
+SRC_URI[sha256sum] = "682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb"
+
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
deleted file mode 100644
index 84897b0..0000000
--- a/meta-oe/recipes-multimedia/vlc/vlc_1.1.4.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# This recipe packages vlc as a library as well, so qt4 dependencies
-# can be avoided when only the library is installed.
-
-require vlc.inc
-
-PR = "r1"
-
-SRC_URI[md5sum] = "ce17c335b38b322949694313173fcd49"
-SRC_URI[sha256sum] = "61c9ea30a17ea40c6ccbfd507026e5c83ad9e0691f221d3667c8e49696d7c2aa"
-