From 427e2cf20351bb163ce0358fc4aed29fa9e8b754 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 25 Sep 2013 13:59:08 +0200 Subject: [PATCH] Revert "libbluray: make AACS support optional, add support to choose between 'libaacs' and 'makemkv-oss' as aacs solution, set default to 'makemkv-oss'" This reverts commit dec93b479c0feb12fe609c9c500338bfdcbedd5d. --- packages/multimedia/libbluray/package.mk | 4 ++-- projects/ARCTIC_MC/options | 7 ------- projects/ATV/options | 7 ------- projects/Fusion/options | 7 ------- projects/Generic/options | 7 ------- projects/Generic_OSS/options | 7 ------- projects/ION/options | 7 ------- projects/Intel/options | 7 ------- projects/RPi/options | 7 ------- projects/Virtual/options | 7 ------- 10 files changed, 2 insertions(+), 65 deletions(-) diff --git a/packages/multimedia/libbluray/package.mk b/packages/multimedia/libbluray/package.mk index 07a34727ad..e34db7b35d 100644 --- a/packages/multimedia/libbluray/package.mk +++ b/packages/multimedia/libbluray/package.mk @@ -35,8 +35,8 @@ PKG_LONGDESC="libbluray is an open-source library designed for Blu-Ray Discs pla PKG_IS_ADDON="no" PKG_AUTORECONF="yes" -if [ "$AACS_SUPPORT" = "yes" ]; then - PKG_DEPENDS="$PKG_DEPENDS $LIBAACS" +if [ "$NONFREE_SUPPORT" = "yes" ]; then + PKG_DEPENDS="$PKG_DEPENDS libaacs" fi PKG_CONFIGURE_OPTS_TARGET="--disable-werror \ diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options index 3cbc4b2906..edc5f67463 100755 --- a/projects/ARCTIC_MC/options +++ b/projects/ARCTIC_MC/options @@ -150,13 +150,6 @@ # (RAR compression support in XBMC) (yes / no) NONFREE_SUPPORT="yes" -# build and install with AACS support -# (BD decryption support in libbluray) (yes / no) - AACS_SUPPORT="yes" - -# AACS library to use ( libaacs / makemkv-oss ) - LIBAACS="makemkv-oss" - # build and install with DVDCSS support # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" diff --git a/projects/ATV/options b/projects/ATV/options index 8a151d9029..0f4e652ccd 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -150,13 +150,6 @@ # (RAR compression support in XBMC) (yes / no) NONFREE_SUPPORT="yes" -# build and install with AACS support -# (BD decryption support in libbluray) (yes / no) - AACS_SUPPORT="yes" - -# AACS library to use ( libaacs / makemkv-oss ) - LIBAACS="makemkv-oss" - # build and install with DVDCSS support # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" diff --git a/projects/Fusion/options b/projects/Fusion/options index 6037b2211a..10b4ddb06e 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -150,13 +150,6 @@ # (RAR compression support in XBMC) (yes / no) NONFREE_SUPPORT="yes" -# build and install with AACS support -# (BD decryption support in libbluray) (yes / no) - AACS_SUPPORT="yes" - -# AACS library to use ( libaacs / makemkv-oss ) - LIBAACS="makemkv-oss" - # build and install with DVDCSS support # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" diff --git a/projects/Generic/options b/projects/Generic/options index 8a7a44f2a8..f1922e25ce 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -150,13 +150,6 @@ # (RAR compression support in XBMC) (yes / no) NONFREE_SUPPORT="yes" -# build and install with AACS support -# (BD decryption support in libbluray) (yes / no) - AACS_SUPPORT="yes" - -# AACS library to use ( libaacs / makemkv-oss ) - LIBAACS="makemkv-oss" - # build and install with DVDCSS support # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index f0c7d29640..4db66486b2 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -150,13 +150,6 @@ # (RAR compression support in XBMC) (yes / no) NONFREE_SUPPORT="yes" -# build and install with AACS support -# (BD decryption support in libbluray) (yes / no) - AACS_SUPPORT="yes" - -# AACS library to use ( libaacs / makemkv-oss ) - LIBAACS="makemkv-oss" - # build and install with DVDCSS support # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" diff --git a/projects/ION/options b/projects/ION/options index 94881e8dd6..11164213ff 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -150,13 +150,6 @@ # (RAR compression support in XBMC) (yes / no) NONFREE_SUPPORT="yes" -# build and install with AACS support -# (BD decryption support in libbluray) (yes / no) - AACS_SUPPORT="yes" - -# AACS library to use ( libaacs / makemkv-oss ) - LIBAACS="makemkv-oss" - # build and install with DVDCSS support # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" diff --git a/projects/Intel/options b/projects/Intel/options index 9747cea7e6..60f1b871e5 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -150,13 +150,6 @@ # (RAR compression support in XBMC) (yes / no) NONFREE_SUPPORT="yes" -# build and install with AACS support -# (BD decryption support in libbluray) (yes / no) - AACS_SUPPORT="yes" - -# AACS library to use ( libaacs / makemkv-oss ) - LIBAACS="makemkv-oss" - # build and install with DVDCSS support # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" diff --git a/projects/RPi/options b/projects/RPi/options index 19a282301b..db9302ea22 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -150,13 +150,6 @@ # (RAR compression support in XBMC) (yes / no) NONFREE_SUPPORT="yes" -# build and install with AACS support -# (BD decryption support in libbluray) (yes / no) - AACS_SUPPORT="yes" - -# AACS library to use ( libaacs / makemkv-oss ) - LIBAACS="makemkv-oss" - # build and install with DVDCSS support # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" diff --git a/projects/Virtual/options b/projects/Virtual/options index f1e36ed4e2..5e7f2321cc 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -145,13 +145,6 @@ # (RAR compression support in XBMC) (yes / no) NONFREE_SUPPORT="yes" -# build and install with AACS support -# (BD decryption support in libbluray) (yes / no) - AACS_SUPPORT="yes" - -# AACS library to use ( libaacs / makemkv-oss ) - LIBAACS="makemkv-oss" - # build and install with DVDCSS support # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes"