From d4df872bb80b1313f959cda2637f4145543d55d1 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Thu, 10 Jul 2014 14:48:19 +0400
Subject: [PATCH] libdvdnav: fix hybrid support

---
 media-libs/libdvdnav/libdvdnav-4.2.1.recipe | 27 ++++++++++-----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/media-libs/libdvdnav/libdvdnav-4.2.1.recipe b/media-libs/libdvdnav/libdvdnav-4.2.1.recipe
index 83dd97331..d7d9d59d0 100644
--- a/media-libs/libdvdnav/libdvdnav-4.2.1.recipe
+++ b/media-libs/libdvdnav/libdvdnav-4.2.1.recipe
@@ -9,40 +9,39 @@ COPYRIGHT="2000 Rich Wareham
 	2001-2004 the dvdnav project"
 SRC_URI="http://dvdnav.mplayerhq.hu/releases/libdvdnav-$portVersion.tar.xz"
 CHECKSUM_SHA256="7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372"
-REVISION="1"
+REVISION="2"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
 
-PATCHES="libdvdnav-4.2.1.patch"
+PATCHES="libdvdnav-4.2.0.patch"
 
 PROVIDES="
-	libdvdnav${secondaryArchSuffix} = $portVersion
-	lib:libdvdnav
-	cmd:dvdnav_config
+	libdvdnav$secondaryArchSuffix = $portVersion
+	lib:libdvdnav$secondaryArchSuffix
+	cmd:dvdnav_config$secondaryArchSuffix
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
-	libdvdread${secondaryArchSuffix}
-	libdvdcss${secondaryArchSuffix}
+	haiku$secondaryArchSuffix >= $haikuVersion
+	libdvdread$secondaryArchSuffix
+	libdvdcss$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	libdvdread${secondaryArchSuffix}_devel
+	libdvdcss${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	libdvdread${secondaryArchSuffix}_devel
-	libdvdcss${secondaryArchSuffix}_devel
-	cmd:gcc${secondaryArchSuffix}
-	cmd:ld${secondaryArchSuffix}
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:libtoolize
 	cmd:aclocal
 	cmd:autoconf
-	cmd:pkg_config
+	cmd:pkg_config$secondaryArchSuffix
 	"
 
 SOURCE_DIR="libdvdnav-${portVersion}"