From bfdceba982f175c3e5cb49aa6c54832d49966797 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 25 Sep 2013 14:00:15 +0200
Subject: [PATCH] Revert "new package: add package 'makemkv-oss'"

This reverts commit 7513d13bca5d5a4dab0448a53924a3578a244ad5.
---
 packages/multimedia/makemkv-oss/package.mk    | 47 -------------------
 .../patches/makemkv-oss-crosscompiling.patch  | 28 -----------
 2 files changed, 75 deletions(-)
 delete mode 100644 packages/multimedia/makemkv-oss/package.mk
 delete mode 100644 packages/multimedia/makemkv-oss/patches/makemkv-oss-crosscompiling.patch

diff --git a/packages/multimedia/makemkv-oss/package.mk b/packages/multimedia/makemkv-oss/package.mk
deleted file mode 100644
index 23f23efa80..0000000000
--- a/packages/multimedia/makemkv-oss/package.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="makemkv-oss"
-PKG_VERSION="1.8.5"
-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_DEPENDS="openssl"
-PKG_BUILD_DEPENDS_TARGET="toolchain openssl expat"
-PKG_PRIORITY="optional"
-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_AUTORECONF="no"
-
-PKG_MAKE_OPTS_TARGET="GCC=$CC -f makefile.linux out/libmmbd.so.0"
-
-makeinstall_target() {
-  mkdir -p $INSTALL/usr/lib
-  cp -p out/libmmbd.so.0 $INSTALL/usr/lib
-
-#  link to libaacs for a libaacs replacenment
-  ln -sf libmmbd.so.0 $INSTALL/usr/lib/libaacs.so.0
-  ln -sf libmmbd.so.0 $INSTALL/usr/lib/libbdplus.so.0
-}
diff --git a/packages/multimedia/makemkv-oss/patches/makemkv-oss-crosscompiling.patch b/packages/multimedia/makemkv-oss/patches/makemkv-oss-crosscompiling.patch
deleted file mode 100644
index 63e3773e22..0000000000
--- a/packages/multimedia/makemkv-oss/patches/makemkv-oss-crosscompiling.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur makemkv-oss-1.8.5/makefile.linux makemkv-oss-1.8.5.patch/makefile.linux
---- makemkv-oss-1.8.5/makefile.linux	2013-09-13 02:30:37.000000000 +0200
-+++ makemkv-oss-1.8.5.patch/makefile.linux	2013-09-22 16:38:19.096662564 +0200
-@@ -1,7 +1,7 @@
- 
- include makefile.common
- 
--GCC=gcc
-+GCC:=gcc
- MOC=$(strip $(shell which moc-qt4))
- ifeq ($(MOC),)
- MOC=moc
-@@ -38,7 +38,7 @@
- 	install -D -m 644 makemkvgui/share/icons/128x128/makemkv.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/makemkv.png
- 
- out/%: out/%.full
--	objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
-+	$(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
- 
- out/libdriveio.so.0.full:
- 	mkdir -p out
-@@ -83,5 +83,5 @@
- tmp/image_data.o : makemkvgui/bin/image_data.bin
- 	mkdir -p tmp
- 	ld -r -b binary -o $@.rw $<
--	objcopy --rename-section .data=.rodata2,readonly,alloc,load,data,contents $@.rw $@
-+	$(OBJCOPY) --rename-section .data=.rodata2,readonly,alloc,load,data,contents $@.rw $@
-