From 0584f69356a0d8ca0f88dd476f16b8e1397ddca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Fri, 9 May 2014 20:19:35 +0200 Subject: [PATCH] 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 | 17 +++++++++++++++++ build/jam/images/definitions/regular | 6 +++--- build/jam/repositories/HaikuPorts/x86 | 3 +++ build/jam/repositories/HaikuPorts/x86_64 | 3 +++ build/jam/repositories/HaikuPorts/x86_gcc2 | 3 +++ src/add-ons/print/drivers/gutenprint/Jamfile | 10 ++++++++-- src/libs/print/Jamfile | 1 - 7 files changed, 37 insertions(+), 6 deletions(-) diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures index 821c9eeca1..bed9530b8f 100644 --- a/build/jam/BuildFeatures +++ b/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! diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular index af07cec4cc..2006006509 100644 --- a/build/jam/images/definitions/regular +++ b/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 diff --git a/build/jam/repositories/HaikuPorts/x86 b/build/jam/repositories/HaikuPorts/x86 index 4e86c310e7..9a5eadbb87 100644 --- a/build/jam/repositories/HaikuPorts/x86 +++ b/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 diff --git a/build/jam/repositories/HaikuPorts/x86_64 b/build/jam/repositories/HaikuPorts/x86_64 index e6f67b13da..79186c513f 100644 --- a/build/jam/repositories/HaikuPorts/x86_64 +++ b/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 diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2 b/build/jam/repositories/HaikuPorts/x86_gcc2 index 72c1c273fa..9321d7b9c2 100644 --- a/build/jam/repositories/HaikuPorts/x86_gcc2 +++ b/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 diff --git a/src/add-ons/print/drivers/gutenprint/Jamfile b/src/add-ons/print/drivers/gutenprint/Jamfile index e9b76a0f01..6133abb033 100644 --- a/src/add-ons/print/drivers/gutenprint/Jamfile +++ b/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++) ; diff --git a/src/libs/print/Jamfile b/src/libs/print/Jamfile index f28feb2e01..499c1ee131 100644 --- a/src/libs/print/Jamfile +++ b/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 ;