packages: ghostscript/ghostscript.spec, ghostscript/ghostscript-svga-shared...

qboosh qboosh at pld-linux.org
Sat Feb 11 16:02:17 CET 2012 

Author: qboosh                       Date: Sat Feb 11 15:02:17 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added svga-shared patch, now svgalib drivers are built as dynamic; added -svga subpackage with them
- updated comments, dropped nop jasper option
- build with system lcms2 by default

---- Files affected:
packages/ghostscript:
   ghostscript.spec (1.217 -> 1.218) , ghostscript-svga-shared.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ghostscript/ghostscript.spec
diff -u packages/ghostscript/ghostscript.spec:1.217 packages/ghostscript/ghostscript.spec:1.218
--- packages/ghostscript/ghostscript.spec:1.217	Fri Feb 10 11:11:55 2012
+++ packages/ghostscript/ghostscript.spec	Sat Feb 11 16:02:12 2012
@@ -1,12 +1,12 @@
 # $Revision$, $Date$
 # TODO:
-# - fix svga bcond
 # - add djvu driver:
 #   http://dl.sourceforge.net/djvu/gsdjvu-1.3.tar.gz (or newer)
 #
 # Conditional build:
 %bcond_without	cairo		# disable cairo support (for cairo bootstrap)
 %bcond_without	system_jbig2dec	# build with included jbig2dec
+%bcond_without	system_lcms2	# build with included lcms2
 %bcond_with	svga		# svgalib display support (vgalib,lvga256 devices) [broken in sources]
 %bcond_without	gtk		# gsx (GTK+ based frontend)
 %bcond_without	texdocs		# skip tetex BRs
@@ -29,19 +29,19 @@
 Patch0:		%{name}-missquotes.patch
 Patch1:		%{name}-setuid.patch
 Patch2:		%{name}-time_h.patch
+Patch3:		%{name}-svga-shared.patch
 Patch5:		%{name}-cups-sh.patch
 Patch6:		%{name}-gdevcd8-fixes.patch
 Patch7:		%{name}-fPIC.patch
 Patch8:		%{name}-zlib.patch
 
 # fedora
-Patch20: ghostscript-scripts.patch
-Patch21: ghostscript-runlibfileifexists.patch
-
-Patch26: ghostscript-cups-filters.patch
-Patch27: ghostscript-Fontmap.local.patch
-Patch28: ghostscript-iccprofiles-initdir.patch
-Patch29: ghostscript-gdevcups-debug-uninit.patch
+Patch20:	%{name}-scripts.patch
+Patch21:	%{name}-runlibfileifexists.patch
+Patch26:	%{name}-cups-filters.patch
+Patch27:	%{name}-Fontmap.local.patch
+Patch28:	%{name}-iccprofiles-initdir.patch
+Patch29:	%{name}-gdevcups-debug-uninit.patch
 
 URL:		http://www.ghostscript.com/
 BuildRequires:	autoconf >= 2.57
@@ -54,6 +54,7 @@
 BuildRequires:	freetype-devel >= 2.0
 %{?with_gtk:BuildRequires:	gtk+2-devel >= 1:2.0.0}
 %{?with_system_jbig2dec:BuildRequires:	jbig2dec-devel}
+%{?with_system_lcms2:BuildRequires:	lcms2-devel >= 2.3}
 BuildRequires:	libidn-devel
 BuildRequires:	libpaper-devel
 BuildRequires:	libpng-devel >= 1.2.42
@@ -72,6 +73,7 @@
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXt-devel
 BuildRequires:	zlib-devel >= 1.2.3
+%{?with_system_lcms2:Requires:	lcms2-devel >= 2.3}
 Obsoletes:	ghostscript-afpl
 Obsoletes:	ghostscript-esp
 Obsoletes:	ghostscript-gpl
@@ -139,6 +141,18 @@
 %description gtk -l pl.UTF-8
 Ghostscript z konsolą GTK+.
 
+%package svga
+Summary:	SVGAlib drivers for Ghostscript
+Summary(pl.UTF-8):	Sterowniki SVGAlib dla Ghostscripta
+Group:		Applications/Graphics
+Requires:	%{name} = %{version}-%{release}
+
+%description svga
+SVGAlib output drivers for Ghostscript: lvga256, vgalib.
+
+%description svga -l pl.UTF-8
+Sterowniki wyjściowe SVGAlib dla Ghostscripta: lvga256, vgalib.
+
 %package x11
 Summary:	X Window System drivers for Ghostscript
 Summary(pl.UTF-8):	Sterowniki systemu X Window dla Ghostscripta
@@ -198,6 +212,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %patch5 -p1
 %patch6 -p1
@@ -218,7 +233,12 @@
 %endif
 # use system libs (sources contain unmodified zlib 1.2.3 and libpng 1.2.42)
 %{__rm} -r libpng zlib
-# jpeg is built with different configuration (D_MAX_BLOCKS_IN_MCU=64), jasper and lcms are modified
+# jpeg is built with different configuration (D_MAX_BLOCKS_IN_MCU=64)
+# openjpeg is post-1.4 or modified
+# jasper is modified (and not used if openjpeg is not explicitly disabled)
+# lcms is modified, but lcms2 is used by default
+%{__rm} -r lcms
+%{?with_system_lcms2:%{__rm} -r lcms2}
 cd jasper
 %{__libtoolize}
 %{__aclocal}
@@ -233,12 +253,11 @@
 	%{!?with_cairo:--disable-cairo} \
 	--disable-compile-inits \
 	--enable-dynamic \
-	--with-drivers=ALL%{?with_svga:,vgalib,lvga256} \
+	--with-drivers=ALL%{?with_svga:,svga} \
 	--with-fontpath="%{_datadir}/fonts:%{_datadir}/fonts/Type1" \
 	--with-ijs \
 	--with-install-cups \
 	--with-jbig2dec \
-	--with-jasper \
 	--with-pdftoraster \
 	--with-system-libtiff \
 	--with-x
@@ -404,6 +423,13 @@
 %attr(755,root,root) %{_bindir}/gsx
 %endif
 
+%if %{with svga}
+%files svga
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/%{version}/lvga256.so
+%attr(755,root,root) %{_libdir}/%{name}/%{version}/vgalib.so
+%endif
+
 %files x11
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/%{version}/X11.so
@@ -432,6 +458,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.218  2012/02/11 15:02:12  qboosh
+- added svga-shared patch, now svgalib drivers are built as dynamic; added -svga subpackage with them
+- updated comments, dropped nop jasper option
+- build with system lcms2 by default
+
 Revision 1.217  2012/02/10 10:11:55  arekm
 - up to 9.05
 

================================================================
Index: packages/ghostscript/ghostscript-svga-shared.patch
diff -u /dev/null packages/ghostscript/ghostscript-svga-shared.patch:1.1
--- /dev/null	Sat Feb 11 16:02:17 2012
+++ packages/ghostscript/ghostscript-svga-shared.patch	Sat Feb 11 16:02:12 2012
@@ -0,0 +1,50 @@
+--- ghostscript-9.05/configure.ac.orig	2012-02-11 13:01:13.934739538 +0100
++++ ghostscript-9.05/configure.ac	2012-02-11 14:41:09.408273622 +0100
+@@ -1389,6 +1389,7 @@
+ PS_DEVS='psdf psdcmyk psdrgb pdfwrite pswrite ps2write epswrite psgray psmono psrgb bbox txtwrite inkcov'
+ MISC_FDEVS='ccr cif inferno mag16 mag256 mgr4 mgr8 mgrgray2 mgrgray4 mgrgray8 mgrmono miff24 plan9bm sgirgb sunhmono bit bitrgb bitrgbtags bitcmyk devicen spotcmyk xcf'
+ SVGDEV='svgwrite'
++SVGA_DEVS=
+ 
+ while test -n "$drivers"; do
+         if echo $drivers |grep "," >/dev/null; then
+@@ -1527,6 +1528,9 @@
+                         AC_MSG_WARN(Unable to include opvp/oprp driver due to missing or disabled prerequisites...)
+                 fi
+                 ;;
++	svga)
++		SVGA_DEVS="vgalib.dev lvga256.dev"
++		;;
+         *)
+                 # It's a driver name (or a user messup)
+                 P_DEVS0="$P_DEVS0 `echo $THIS |sed -e 's,\.dev$,,'`"
+@@ -1578,6 +1582,7 @@
+ AC_SUBST(JBIG2_DEVS)
+ AC_SUBST(IJS_DEVS)
+ AC_SUBST(PNG_DEVS)
++AC_SUBST(SVGA_DEVS)
+ 
+ # This now gets done after handling --enable-dynamic
+ # AC_SUBST(X11_DEVS)
+@@ -1633,6 +1638,10 @@
+                         else
+                                 DYNAMIC_DEVS=""
+                         fi
++			if test "x$SVGA_DEVS" != x; then
++				DYNAMIC_DEVS="$DYNAMIC_DEVS \$(GLOBJDIR)/lvga256.so \$(GLOBJDIR)/vgalib.so"
++				SVGA_DEVS=
++			fi
+                         DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
+                         X11_DEVS=""
+                         OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS"
+--- ghostscript-9.05/base/Makefile.in.orig	2012-02-08 09:48:48.000000000 +0100
++++ ghostscript-9.05/base/Makefile.in	2012-02-11 14:41:19.274940617 +0100
+@@ -521,7 +521,7 @@
+ DEVICE_DEVS6=@PNG_DEVS@
+ DEVICE_DEVS7=@JBIG2_DEVS@
+ DEVICE_DEVS8=@SVG_DEVS@
+-DEVICE_DEVS9=
++DEVICE_DEVS9=@SVGA_DEVS@
+ DEVICE_DEVS10=
+ DEVICE_DEVS11=
+ DEVICE_DEVS12=
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghostscript/ghostscript.spec?r1=1.217&r2=1.218&f=u

More information about the pld-cvs-commit mailing list