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.

build/jam/BuildFeatures

@@ -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!

build/jam/images/definitions/regular

@@ -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

build/jam/repositories/HaikuPorts/x86

@@ -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

build/jam/repositories/HaikuPorts/x86_64

@@ -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

build/jam/repositories/HaikuPorts/x86_gcc2

@@ -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

src/add-ons/print/drivers/gutenprint/Jamfile

@@ -1,9 +1,15 @@
 SubDir HAIKU_TOP src add-ons print drivers gutenprint ;
 
-SubDirSysHdrs [ FDirName $(HAIKU_TOP) src libs print libgutenprint include ] ; 
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers libs print libprint ] ;
 
 AddResources Gutenprint : Gutenprint.rdef ;
+UsePublicHeaders kernel ;
+UseBuildFeatureHeaders gutenprint ;
+Includes [ FGristFiles GPBinding.cpp GPCapabilities.cpp 
+	GPCapabilityExtractor.cpp GPDriver.cpp GPJob.cpp
+	GPParameterVisitor.cpp GPPrinterDriver.cpp 
+	SelectPrinterDialog.cpp ]
+	: [ BuildFeatureAttribute gutenprint : headers ] ;
 
 Addon Gutenprint :
 	GPBand.cpp
@@ -19,7 +25,7 @@ Addon Gutenprint :
 	SelectPrinterDialog.cpp
 	: 
 	be 
-	libgutenprint.a 
+	[ BuildFeatureAttribute gutenprint : library ]
 	libprint.a 
 	$(TARGET_LIBSTDC++)
 ;

src/libs/print/Jamfile

@@ -1,4 +1,3 @@
 SubDir HAIKU_TOP src libs print ;
 
-SubInclude HAIKU_TOP src libs print libgutenprint ;
 SubInclude HAIKU_TOP src libs print libprint ;