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 0000000000..e0411d8ac6 Binary files /dev/null and b/packages/addons/multimedia/makemkv/icon/icon.png differ 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) \