From 322f636ba726f545890f54634bbb6f67bc24d3be Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 6 Mar 2013 17:33:18 +0200
Subject: [PATCH] makemkv:update to makemkv-1.8.0

- closes #2013
---
 packages/addons/multimedia/makemkv/changelog.txt  |  3 +++
 packages/addons/multimedia/makemkv/meta           |  4 ++--
 ...patch => makemkv-000-crosscompiling-0.1.patch} | 15 +++++++--------
 ...h => makemkv-001-crosscompiling-objcopy.patch} |  0
 4 files changed, 12 insertions(+), 10 deletions(-)
 rename packages/addons/multimedia/makemkv/patches.upstream/{makemkv-1.7.2-000-crosscompiling-0.1.patch => makemkv-000-crosscompiling-0.1.patch} (51%)
 rename packages/addons/multimedia/makemkv/patches.upstream/{makemkv-1.7.2-001-crosscompiling-objcopy.patch => makemkv-001-crosscompiling-objcopy.patch} (100%)

diff --git a/packages/addons/multimedia/makemkv/changelog.txt b/packages/addons/multimedia/makemkv/changelog.txt
index c0754ab8a7..8504b40552 100644
--- a/packages/addons/multimedia/makemkv/changelog.txt
+++ b/packages/addons/multimedia/makemkv/changelog.txt
@@ -1,3 +1,6 @@
+3.0.4
+- update to makemkv-1.8.0
+
 3.0.3
 - update to makemkv-1.7.10
 
diff --git a/packages/addons/multimedia/makemkv/meta b/packages/addons/multimedia/makemkv/meta
index 4d2871caf3..c69ce17f6d 100644
--- a/packages/addons/multimedia/makemkv/meta
+++ b/packages/addons/multimedia/makemkv/meta
@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="makemkv"
-PKG_VERSION="1.7.10"
-PKG_REV="3"
+PKG_VERSION="1.8.0"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3"
diff --git a/packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.7.2-000-crosscompiling-0.1.patch b/packages/addons/multimedia/makemkv/patches.upstream/makemkv-000-crosscompiling-0.1.patch
similarity index 51%
rename from packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.7.2-000-crosscompiling-0.1.patch
rename to packages/addons/multimedia/makemkv/patches.upstream/makemkv-000-crosscompiling-0.1.patch
index b34d0b7881..e2ca9f4ce5 100644
--- a/packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.7.2-000-crosscompiling-0.1.patch
+++ b/packages/addons/multimedia/makemkv/patches.upstream/makemkv-000-crosscompiling-0.1.patch
@@ -1,14 +1,13 @@
-diff -Naur makemkv-1.6.10/lib/makefile.linux makemkv-1.6.10.patch/lib/makefile.linux
---- makemkv-1.6.10/lib/makefile.linux	2011-05-29 23:17:48.000000000 +0200
-+++ makemkv-1.6.10.patch/lib/makefile.linux	2011-05-30 15:29:15.510417904 +0200
-@@ -1,11 +1,11 @@
+diff --git a/lib/makefile.linux b/lib/makefile.linux
+index b3b5afa..07322ad 100644
+--- a/lib/makefile.linux
++++ b/lib/makefile.linux
+@@ -1,10 +1,10 @@
  
  include makefile.common
  
 -GCC=gcc
--RCC=rcc
 +GCC:=gcc
-+RCC:=rcc
  MOC=$(strip $(shell which moc-qt4))
  ifeq ($(MOC),)
 -MOC=moc
@@ -16,8 +15,8 @@ diff -Naur makemkv-1.6.10/lib/makefile.linux makemkv-1.6.10.patch/lib/makefile.l
  endif
  
  CXXOPTS=-Os -D_GNU_SOURCE -D_linux_
-@@ -14,7 +14,7 @@
- BUILDINFO_BUILD_DATE=$(shell date)
+@@ -16,7 +16,7 @@ PREFIX=/usr
+ LIBDIR=${PREFIX}/lib
  
  
 -all: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv
diff --git a/packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.7.2-001-crosscompiling-objcopy.patch b/packages/addons/multimedia/makemkv/patches.upstream/makemkv-001-crosscompiling-objcopy.patch
similarity index 100%
rename from packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.7.2-001-crosscompiling-objcopy.patch
rename to packages/addons/multimedia/makemkv/patches.upstream/makemkv-001-crosscompiling-objcopy.patch