From bda4fdf91217a0cd35053053146b649ed62afb2f Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Wed, 27 Aug 2014 09:24:25 +0200
Subject: mkvtoolnix: update to 7.1.0+git

This fixes compilation with boot 1.56+

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-mkv/mkvtoolnix/mkvtoolnix_7.0.0.bb     | 39 --------------------
 .../recipes-mkv/mkvtoolnix/mkvtoolnix_git.bb       | 41 ++++++++++++++++++++++
 2 files changed, 41 insertions(+), 39 deletions(-)
 delete mode 100644 meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_7.0.0.bb
 create mode 100644 meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_git.bb

(limited to 'meta-multimedia/recipes-mkv')

diff --git a/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_7.0.0.bb b/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_7.0.0.bb
deleted file mode 100644
index bd752afafd..0000000000
--- a/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_7.0.0.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "MKVToolNix -- Cross-platform tools for Matroska"
-HOMEPAGE = "http://www.bunkus.org/videotools/mkvtoolnix/source.html"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-DEPENDS = "curl boost expat zlib libebml libmatroska libogg libvorbis bzip2 lzo file ruby-native"
-
-SRC_URI = "http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-${PV}.tar.xz"
-SRC_URI[md5sum] = "ddd5ce6288d2fdaa6b79cb6d7bfffb04"
-SRC_URI[sha256sum] = "2bbdf060e193d4a7f961f84d28b28d67d859be66e3f2cdf8ee4ae380f8d15725"
-
-inherit autotools-brokensep gettext
-
-# make sure rb files are used from sysroot, not from host
-# ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/`
-# we need to replace it too (a bit longer version without importing re)
-RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
-export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[flac] = "--with-flac,--without-flac,flac"
-
-EXTRA_OECONF = " --with-boost-libdir=${STAGING_LIBDIR} \
-"
-
-# remove some hardcoded searchpaths
-do_configure_prepend() {
-    sed -i -e s:/usr/local/lib:${STAGING_LIBDIR}:g -e s:/usr/local/include:${STAGING_INCDIR}:g ${S}/ac/ebml.m4
-}
-
-# Yeah, no makefile
-do_compile() {
-    ${S}/drake
-}
-
-do_install() {
-    ${S}/drake install DESTDIR=${D}
-}
diff --git a/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_git.bb b/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_git.bb
new file mode 100644
index 0000000000..8d7702429e
--- /dev/null
+++ b/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_git.bb
@@ -0,0 +1,41 @@
+SUMMARY = "MKVToolNix -- Cross-platform tools for Matroska"
+HOMEPAGE = "http://www.bunkus.org/videotools/mkvtoolnix/source.html"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+DEPENDS = "curl boost expat zlib libebml libmatroska libogg libvorbis bzip2 lzo file ruby-native"
+
+PV = "7.1.0+git${SRCPV}"
+SRCREV = "0c89ff941bfdd9f3378312f293a84f13cf3e2a96"
+SRC_URI = "git://github.com/mbunkus/mkvtoolnix.git"
+
+S = "${WORKDIR}/git"
+
+inherit autotools-brokensep gettext
+
+# make sure rb files are used from sysroot, not from host
+# ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/`
+# we need to replace it too (a bit longer version without importing re)
+RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
+export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[flac] = "--with-flac,--without-flac,flac"
+
+EXTRA_OECONF = " --with-boost-libdir=${STAGING_LIBDIR} \
+"
+
+# remove some hardcoded searchpaths
+do_configure_prepend() {
+    sed -i -e s:/usr/local/lib:${STAGING_LIBDIR}:g -e s:/usr/local/include:${STAGING_INCDIR}:g ${S}/ac/ebml.m4
+}
+
+# Yeah, no makefile
+do_compile() {
+    ${S}/drake
+}
+
+do_install() {
+    ${S}/drake install DESTDIR=${D}
+}
-- 
cgit 1.2.3-korg