From ec5b063003093b842d5af5205fa467b3b99b3146 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Tue, 13 Sep 2016 21:57:46 +0000
Subject: [PATCH] libdvdcss: drop libtool file, plus minor and/or cosmetic
 fixes.

Also pass --add-missing to automake to allow building on secondary
architectures.
---
 media-libs/libdvdcss/libdvdcss-1.2.13.recipe | 27 ++++++++++++--------
 media-libs/libdvdcss/libdvdcss-1.3.0.recipe  | 22 +++++++++++-----
 media-libs/libdvdcss/libdvdcss-1.4.0.recipe  | 20 ++++++++++-----
 3 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/media-libs/libdvdcss/libdvdcss-1.2.13.recipe b/media-libs/libdvdcss/libdvdcss-1.2.13.recipe
index 932dea073..4c9918635 100644
--- a/media-libs/libdvdcss/libdvdcss-1.2.13.recipe
+++ b/media-libs/libdvdcss/libdvdcss-1.2.13.recipe
@@ -4,19 +4,18 @@ block device without having to bother about the decryption."
 HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html"
 COPYRIGHT="1998-2013 VideoLAN"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.videolan.org/pub/libdvdcss/$portVersion/libdvdcss-$portVersion.tar.bz2"
 CHECKSUM_SHA256="84f1bba6cfef1df87f774fceaefc8e73c4cda32e8f6700b224ad0acb5511ba2c"
-SOURCE_DIR="libdvdcss-${portVersion}"
-PATCHES="libdvdcss-${portVersion}.patch"
+SOURCE_DIR="libdvdcss-$portVersion"
+PATCHES="libdvdcss-$portVersion.patch"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc"
-SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libdvdcss$secondaryArchSuffix = $portVersion
-	lib:libdvdcss$secondaryArchSuffix
-	cmd:dvdcss_config$secondaryArchSuffix
+	lib:libdvdcss$secondaryArchSuffix = 2.1.0 compat >= 2
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -24,7 +23,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libdvdcss${secondaryArchSuffix}_devel = $portVersion
-	devel:libdvdcss$secondaryArchSuffix = $portVersion
+	devel:libdvdcss$secondaryArchSuffix = 2.1.0 compat >= 2
 	"
 REQUIRES_devel="
 	libdvdcss$secondaryArchSuffix == $portVersion base
@@ -37,7 +36,7 @@ BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
-	cmd:libtoolize
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:aclocal
 	cmd:autoconf
 	"
@@ -47,7 +46,7 @@ BUILD()
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
-	automake
+	automake --add-missing
 	runConfigure ./configure
 	make
 }
@@ -56,10 +55,18 @@ INSTALL()
 {
 	make install
 
+	# remove libtool file
+	rm $libDir/libdvdcss.la
+
 	# prepare develop/lib
-	prepareInstalledDevelLibs libdvdcss
+	prepareInstalledDevelLib libdvdcss
 	fixPkgconfig
 
 	packageEntries devel \
 		$developDir
 }
+
+TEST()
+{
+	make check
+}
diff --git a/media-libs/libdvdcss/libdvdcss-1.3.0.recipe b/media-libs/libdvdcss/libdvdcss-1.3.0.recipe
index 335e229b1..f708a9f55 100644
--- a/media-libs/libdvdcss/libdvdcss-1.3.0.recipe
+++ b/media-libs/libdvdcss/libdvdcss-1.3.0.recipe
@@ -4,14 +4,14 @@ block device without having to bother about the decryption."
 HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html"
 COPYRIGHT="1998-2014 VideoLAN"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.videolan.org/pub/libdvdcss/$portVersion/libdvdcss-$portVersion.tar.bz2"
 CHECKSUM_SHA256="7c414acd520c4e4dd7267952f72d738ff50321a7869af4d75c65aefad44f1395"
-SOURCE_DIR="libdvdcss-${portVersion}"
-PATCHES="libdvdcss-${portVersion}.patchset"
+SOURCE_DIR="libdvdcss-$portVersion"
+PATCHES="libdvdcss-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc"
-SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libdvdcss$secondaryArchSuffix = $portVersion
@@ -36,7 +36,7 @@ BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
-	cmd:libtoolize
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:aclocal
 	cmd:autoconf
 	"
@@ -46,7 +46,7 @@ BUILD()
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
-	automake
+	automake --add-missing
 	runConfigure ./configure
 	make
 }
@@ -55,10 +55,18 @@ INSTALL()
 {
 	make install
 
+	# remove libtool file
+	rm $libDir/libdvdcss.la
+
 	# prepare develop/lib
-	prepareInstalledDevelLibs libdvdcss
+	prepareInstalledDevelLib libdvdcss
 	fixPkgconfig
 
 	packageEntries devel \
 		$developDir
 }
+
+TEST()
+{
+	make check
+}
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.0.recipe b/media-libs/libdvdcss/libdvdcss-1.4.0.recipe
index 56b15b383..e3591047b 100644
--- a/media-libs/libdvdcss/libdvdcss-1.4.0.recipe
+++ b/media-libs/libdvdcss/libdvdcss-1.4.0.recipe
@@ -4,11 +4,11 @@ block device without having to bother about the decryption."
 HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html"
 COPYRIGHT="1998-2015 VideoLAN"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.videolan.org/pub/libdvdcss/$portVersion/libdvdcss-$portVersion.tar.bz2"
 CHECKSUM_SHA256="2089375984800df29a4817b37f3123c1706723342d6dab4d0a8b75c25c2c845a"
-SOURCE_DIR="libdvdcss-${portVersion}"
-PATCHES="libdvdcss-${portVersion}.patchset"
+SOURCE_DIR="libdvdcss-$portVersion"
+PATCHES="libdvdcss-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -36,7 +36,7 @@ BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
-	cmd:libtoolize
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:aclocal
 	cmd:autoconf
 	"
@@ -46,7 +46,7 @@ BUILD()
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
-	automake
+	automake --add-missing
 	runConfigure ./configure
 	make
 }
@@ -55,10 +55,18 @@ INSTALL()
 {
 	make install
 
+	# remove libtool file
+	rm $libDir/libdvdcss.la
+
 	# prepare develop/lib
-	prepareInstalledDevelLibs libdvdcss
+	prepareInstalledDevelLib libdvdcss
 	fixPkgconfig
 
 	packageEntries devel \
 		$developDir
 }
+
+TEST()
+{
+	make check
+}