From 51e278c70b60a07a6575965b48393026dc0b522f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Mon, 10 Jul 2017 22:14:02 +0200
Subject: [PATCH] Adjust jasper soname for x86_64.

---
 build/jam/BuildFeatures | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 367da69e12..eb3c34ebf0 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -440,15 +440,25 @@ if [ IsPackageAvailable libicns_devel ] {
 
 # Jasper
 if [ IsPackageAvailable jasper_devel ] {
-	ExtractBuildFeatureArchives jasper :
-		file: base jasper
-			runtime: lib
-		file: devel jasper_devel
-			depends: base
-			library: $(developLibDir)/libjasper.so.1
-			headers: $(developHeadersDir) $(developHeadersDir)/jasper
-		;
-
+	if $(HAIKU_PACKAGING_ARCH) = x86_64 {
+		ExtractBuildFeatureArchives jasper :
+			file: base jasper
+				runtime: lib
+			file: devel jasper_devel
+				depends: base
+				library: $(developLibDir)/libjasper.so.4
+				headers: $(developHeadersDir) $(developHeadersDir)/jasper
+			;
+	} else {
+		ExtractBuildFeatureArchives jasper :
+			file: base jasper
+				runtime: lib
+			file: devel jasper_devel
+				depends: base
+				library: $(developLibDir)/libjasper.so.1
+				headers: $(developHeadersDir) $(developHeadersDir)/jasper
+			;
+	}
 	EnableBuildFeatures jasper ;
 } else {
 	Echo "Jasper support not available on $(TARGET_PACKAGING_ARCH)" ;