gutenprint: use outsourced package.

* data files are still in the source tree. * gutenprint headers contain a image.h header file which collides with ours. This is solved by forcing include search first on os/kernel directory.
2014-05-09 20:19:35 +02:00
parent 4f08777610
commit 0584f69356
7 changed files with 37 additions and 6 deletions
@@ -203,6 +203,23 @@ if [ IsPackageAvailable freetype_devel ] {
 }


+# Gutenprint
+if [ IsPackageAvailable gutenprint_devel ] {
+	ExtractBuildFeatureArchives gutenprint :
+		file: base gutenprint
+			runtime: lib
+		file: devel gutenprint_devel
+			depends: base
+			library: $(developLibDir)/libgutenprint.a
+			headers: $(developHeadersDir) $(developHeadersDir)/gutenprint
+		;
+
+	EnableBuildFeatures gutenprint ;
+} else {
+	Echo "Gutenprint support not available on $(TARGET_PACKAGING_ARCH)" ;
+}
+
+
 # TagLib

 # TODO: Update to packages!
@@ -144,16 +144,16 @@ SYSTEM_ADD_ONS_MEDIA_PLUGINS += [ FFilterByBuildFeatures
 	raw_decoder
 ] ;

-SYSTEM_ADD_ONS_PRINT +=
+SYSTEM_ADD_ONS_PRINT += [ FFilterByBuildFeatures
 	Canon\ LIPS3\ Compatible
 	Canon\ LIPS4\ Compatible
-	Gutenprint
+	Gutenprint@gutenprint
 	PCL5\ Compatible
 	PCL6\ Compatible
 	PDF\ Writer
 	PS\ Compatible
 	Preview
-;
+] ;

 SYSTEM_ADD_ONS_PRINT_TRANSPORT +=
 	HP\ JetDirect
@@ -56,6 +56,8 @@ RemotePackageRepository HaikuPorts
 	gperf-3.0.4-1
 	grep-2.14-5
 	groff-1.20.1-3
+	gutenprint-5.2.9-1
+	gutenprint_devel-5.2.9-1
 	haikuwebkit-1.3.1-1
 	haikuwebkit_devel-1.3.1-1
 	htmldoc-1.8.27-3
@@ -228,6 +230,7 @@ RemotePackageRepository HaikuPorts
 	gperf
 	grep
 	groff
+	gutenprint
 	htmldoc
 	icu
 	jam
@@ -53,6 +53,8 @@ RemotePackageRepository HaikuPorts
 	gperf-3.0.4-1
 	grep-2.14-5
 	groff-1.20.1-3
+	gutenprint-5.2.9-1
+	gutenprint_devel-5.2.9-1
 	haikuwebkit-1.2.2-1
 	haikuwebkit_devel-1.2.2-1
 	htmldoc-1.8.27-3
@@ -166,6 +168,7 @@ RemotePackageRepository HaikuPorts
 	gperf
 	grep
 	groff
+	gutenprint
 	haikuwebkit
 	htmldoc
 	icu
@@ -72,6 +72,8 @@ RemotePackageRepository HaikuPorts
 	groff-1.20.1-3
 	guilib-1.2.1-1
 	guilib_devel-1.2.1-1
+	gutenprint-5.2.9-1
+	gutenprint_devel-5.2.9-1
 	htmldoc-1.8.27-3
 	icu-4.8.1.1-4
 	icu_devel-4.8.1.1-4
@@ -425,6 +427,7 @@ RemotePackageRepository HaikuPorts
 	grep
 	groff
 	guilib
+	gutenprint
 	haikuwebkit_x86
 	htmldoc
 	icu