From 187514d41f23c492cc842c66340bd36bbb9c1b8c Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 30 May 2011 23:12:47 +0200
Subject: [PATCH] makemkv: convert to addon, update to makemkv-1.6.10, cleanup

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/addons/multimedia/makemkv/addon      |  33 +++++++++++++++
 .../{ => addons}/multimedia/makemkv/build     |   4 +-
 .../addons/multimedia/makemkv/changelog.txt   |   2 +
 .../addons/multimedia/makemkv/icon/icon.png   | Bin 0 -> 19620 bytes
 packages/{ => addons}/multimedia/makemkv/meta |  11 +++--
 ...akemkv-1.6.10-000-crosscompiling-0.1.patch |  27 +++++++++++++
 .../multimedia/makemkv/source/bin/makemkvcon} |  10 ++---
 .../multimedia/makemkv/source/default.py      |  23 +++++++++++
 packages/addons/multimedia/makemkv/unpack     |  38 ++++++++++++++++++
 .../patches/makemkv-v1.6.8_oss-noqt-0.1.patch |  35 ----------------
 10 files changed, 137 insertions(+), 46 deletions(-)
 create mode 100755 packages/addons/multimedia/makemkv/addon
 rename packages/{ => addons}/multimedia/makemkv/build (95%)
 create mode 100644 packages/addons/multimedia/makemkv/changelog.txt
 create mode 100644 packages/addons/multimedia/makemkv/icon/icon.png
 rename packages/{ => addons}/multimedia/makemkv/meta (85%)
 create mode 100644 packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.6.10-000-crosscompiling-0.1.patch
 rename packages/{multimedia/makemkv/install => addons/multimedia/makemkv/source/bin/makemkvcon} (84%)
 create mode 100644 packages/addons/multimedia/makemkv/source/default.py
 create mode 100755 packages/addons/multimedia/makemkv/unpack
 delete mode 100644 packages/multimedia/makemkv/patches/makemkv-v1.6.8_oss-noqt-0.1.patch

diff --git a/packages/addons/multimedia/makemkv/addon b/packages/addons/multimedia/makemkv/addon
new file mode 100755
index 0000000000..c52d5db31c
--- /dev/null
+++ b/packages/addons/multimedia/makemkv/addon
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+MAKEMKV_ARCH=i386
+[ "$TARGET_ARCH" = x86_64 ] && MAKEMKV_ARCH=amd64
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/bin/bin/$MAKEMKV_ARCH/makemkvcon $ADDON_BUILD/$PKG_ADDON_ID/bin/makemkvcon.bin
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp $PKG_BUILD/lib/out/libmakemkv.so.[0-9] $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp $PKG_BUILD/lib/out/libdriveio.so.[0-9] $ADDON_BUILD/$PKG_ADDON_ID/lib
diff --git a/packages/multimedia/makemkv/build b/packages/addons/multimedia/makemkv/build
similarity index 95%
rename from packages/multimedia/makemkv/build
rename to packages/addons/multimedia/makemkv/build
index 0adfdefe30..14bf9aea62 100755
--- a/packages/multimedia/makemkv/build
+++ b/packages/addons/multimedia/makemkv/build
@@ -22,6 +22,6 @@
 
 . config/options $1
 
-cd $PKG_BUILD
+cd $PKG_BUILD/lib
 
-make -f makefile.linux
+make GCC=$CC -f makefile.linux
diff --git a/packages/addons/multimedia/makemkv/changelog.txt b/packages/addons/multimedia/makemkv/changelog.txt
new file mode 100644
index 0000000000..9c9c58eb1c
--- /dev/null
+++ b/packages/addons/multimedia/makemkv/changelog.txt
@@ -0,0 +1,2 @@
+0.99.1
+- initial addon based on makemkv-1.6.10
diff --git a/packages/addons/multimedia/makemkv/icon/icon.png b/packages/addons/multimedia/makemkv/icon/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0411d8ac6506300f7485723aa5f70c2572bd3ce
GIT binary patch
literal 19620
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

literal 0
HcmV?d00001

diff --git a/packages/multimedia/makemkv/meta b/packages/addons/multimedia/makemkv/meta
similarity index 85%
rename from packages/multimedia/makemkv/meta
rename to packages/addons/multimedia/makemkv/meta
index 2f13a23058..ce4cb7ddeb 100644
--- a/packages/multimedia/makemkv/meta
+++ b/packages/addons/multimedia/makemkv/meta
@@ -19,18 +19,21 @@
 ################################################################################
 
 PKG_NAME="makemkv"
-PKG_VERSION="v1.6.8_oss"
+PKG_VERSION="1.6.10"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3"
-PKG_URL="http://www.makemkv.com/download/${PKG_NAME}_${PKG_VERSION}.tar.gz"
+PKG_URL="http://www.makemkv.com/download/${PKG_NAME}_v${PKG_VERSION}_oss.tar.gz"
+PKG_URL="$PKG_URL http://www.makemkv.com/download/${PKG_NAME}_v${PKG_VERSION}_bin.tar.gz"
 PKG_DEPENDS="openssl"
 PKG_BUILD_DEPENDS="toolchain openssl"
 PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
+PKG_SECTION="lib/multimedia"
 PKG_SHORTDESC="MakeMKV converts the video clips from proprietary (and usually encrypted) disc into a set of MKV files, preserving most information but not changing it in any way."
 PKG_LONGDESC="MakeMKV can instantly stream decrypted video without intermediate conversion to wide range of players, so you may watch Blu-ray and DVD discs with your favorite player on your favorite OS or on your favorite device."
-PKG_IS_ADDON="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
 
 PKG_AUTORECONF="no"
diff --git a/packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.6.10-000-crosscompiling-0.1.patch b/packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.6.10-000-crosscompiling-0.1.patch
new file mode 100644
index 0000000000..b34d0b7881
--- /dev/null
+++ b/packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.6.10-000-crosscompiling-0.1.patch
@@ -0,0 +1,27 @@
+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 @@
+ 
+ include makefile.common
+ 
+-GCC=gcc
+-RCC=rcc
++GCC:=gcc
++RCC:=rcc
+ MOC=$(strip $(shell which moc-qt4))
+ ifeq ($(MOC),)
+-MOC=moc
++MOC:=moc
+ endif
+ 
+ CXXOPTS=-Os -D_GNU_SOURCE -D_linux_
+@@ -14,7 +14,7 @@
+ BUILDINFO_BUILD_DATE=$(shell date)
+ 
+ 
+-all: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv
++all: out/libdriveio.so.0 out/libmakemkv.so.1
+ 	@echo "type \"sudo make -f makefile.linux install\" to install"
+ 
+ clean:
diff --git a/packages/multimedia/makemkv/install b/packages/addons/multimedia/makemkv/source/bin/makemkvcon
similarity index 84%
rename from packages/multimedia/makemkv/install
rename to packages/addons/multimedia/makemkv/source/bin/makemkvcon
index 105bd56871..b5c3cd1a1b 100755
--- a/packages/multimedia/makemkv/install
+++ b/packages/addons/multimedia/makemkv/source/bin/makemkvcon
@@ -20,9 +20,9 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-. config/options $1
+ADDON_DIR="/storage/.xbmc/addons/lib.multimedia.makemkv"
 
-mkdir -p $INSTALL/usr/lib
-  rm -f $PKG_BUILD/out/*full
-  cp -P $PKG_BUILD/out/libmakemkv.so.* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/out/libdriveio.so.* $INSTALL/usr/lib
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ADDON_DIR/lib"
+
+chmod 755 $ADDON_DIR/lib/*
+makemkvcon.bin $@
diff --git a/packages/addons/multimedia/makemkv/source/default.py b/packages/addons/multimedia/makemkv/source/default.py
new file mode 100644
index 0000000000..2085a1f96d
--- /dev/null
+++ b/packages/addons/multimedia/makemkv/source/default.py
@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import os
+import sys
+import xbmcaddon
diff --git a/packages/addons/multimedia/makemkv/unpack b/packages/addons/multimedia/makemkv/unpack
new file mode 100755
index 0000000000..2db146ae00
--- /dev/null
+++ b/packages/addons/multimedia/makemkv/unpack
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+require_eglibc $1
+
+[ -d $PKG_BUILD ] && rm -rf $PKG_BUILD
+
+mkdir -p $BUILD/$PKG_NAME-$PKG_VERSION
+mv $BUILD/${PKG_NAME}_v${PKG_VERSION}_oss $BUILD/$PKG_NAME-$PKG_VERSION/lib
+mv $BUILD/${PKG_NAME}_v${PKG_VERSION}_bin $BUILD/$PKG_NAME-$PKG_VERSION/bin
+
+echo "### Applying upstream patches ###"
+
+for patch in `ls $PKG_DIR/patches.upstream/*.patch`; do
+  cat $patch | patch -d \
+    `echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1
+done
diff --git a/packages/multimedia/makemkv/patches/makemkv-v1.6.8_oss-noqt-0.1.patch b/packages/multimedia/makemkv/patches/makemkv-v1.6.8_oss-noqt-0.1.patch
deleted file mode 100644
index eac96659b2..0000000000
--- a/packages/multimedia/makemkv/patches/makemkv-v1.6.8_oss-noqt-0.1.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- makemkv_v1.6.8_oss/makefile.linux	2011-04-25 08:44:43.000000000 +0200
-+++ makemkv_v1.6.8_oss.patch/makefile.linux	2011-04-25 21:26:11.262636081 +0200
-@@ -14,7 +14,7 @@
- BUILDINFO_BUILD_DATE=$(shell date)
- 
- 
--all: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv
-+all: out/libdriveio.so.0 out/libmakemkv.so.1
- 	@echo "type \"sudo make -f makefile.linux install\" to install"
- 
- clean:
-@@ -23,13 +23,11 @@
- 	rm -f out/*
- 	rm -f tmp/*
- 
--install: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv
-+install: out/libdriveio.so.0 out/libmakemkv.so.1
- 	rm -f /usr/lib/libdriveio.so.0
- 	rm -f /usr/lib/libmakemkv.so.1
--	rm -f /usr/bin/makemkv
- 	install -t /usr/lib out/libdriveio.so.0 out/libmakemkv.so.1
- 	ldconfig
--	install -t /usr/bin out/makemkv
- 
- out/%: out/%.full
- 	objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
-@@ -42,7 +40,7 @@
- 
- out/libmakemkv.so.1.full: tmp/gen_buildinfo.h
- 	mkdir -p out
--	$(GCC) $(CXXOPTS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBMATROSKA_INC) \
-+	$(GCC) $(CXXOPTS) -L$(PKG_CONFIG_SYSROOT_DIR)/usr/lib -DOPENSSL_NO_EC -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBMATROSKA_INC) \
- 	$(LIBMAKEMKV_INC) $(SSTRING_INC) $(MAKEMKVGUI_INC) $(LIBABI_INC) $(LIBFFCODEC_INC) \
- 	$(LIBEBML_SRC) $(LIBMATROSKA_SRC) $(LIBMAKEMKV_SRC) $(GLIBC_SRC) $(SSTRING_SRC) \
- 	$(LIBABI_SRC) $(LIBABI_SRC_LINUX) $(LIBFFCODEC_SRC) \