rpms/openoffice.org/FC-4 workspace.systemagg.patch,NONE,1.1
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Dec 21 18:45:09 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv14614
Added Files:
workspace.systemagg.patch
Log Message:
sigh
workspace.systemagg.patch:
canvas/prj/build.lst | 2 -
canvas/source/tools/image.cxx | 70 +++++++++++++++++------------------
canvas/source/tools/image.hxx | 2 -
config_office/configure.in | 19 +++++++++
config_office/set_soenv.in | 1
scp2/source/canvas/canvascommons.scp | 2 +
scp2/source/canvas/makefile.mk | 4 ++
solenv/inc/libs.mk | 4 ++
8 files changed, 67 insertions(+), 37 deletions(-)
--- NEW FILE workspace.systemagg.patch ---
Index: prj/build.lst
===================================================================
RCS file: /cvs/gsl/canvas/prj/build.lst,v
retrieving revision 1.6
retrieving revision 1.6.12.1
diff -u -r1.6 -r1.6.12.1
--- openoffice.org.orig/canvas/prj/build.lst 2 Nov 2005 12:46:09 -0000 1.6
+++ openoffice.org/canvas/prj/build.lst 23 Nov 2005 10:58:29 -0000 1.6.12.1
@@ -1,4 +1,4 @@
-uc canvas : javaunohelper comphelper cppuhelper offuh unoil tools goodies vcl agg basegfx NULL
+uc canvas : javaunohelper comphelper cppuhelper offuh unoil tools goodies vcl AGG:agg basegfx NULL
uc canvas usr1 - all uc_mkout NULL
uc canvas\source\tools nmake - all uc_tools NULL
uc canvas\source\vcl nmake - all uc_vcl uc_tools NULL
Index: source/tools/image.cxx
===================================================================
RCS file: /cvs/gsl/canvas/source/tools/image.cxx,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- openoffice.org.orig/canvas/source/tools/image.cxx 9 Nov 2005 13:27:56 -0000 1.3
+++ openoffice.org/canvas/source/tools/image.cxx 23 Nov 2005 10:58:29 -0000 1.3.6.1
@@ -63,41 +63,41 @@
// includes from antigrain [i would love to write this stuff by myself]
//////////////////////////////////////////////////////////////////////////////////
-#include <agg/agg_rendering_buffer.h>
-#include <agg/agg_pixfmt_rgb.h>
-#include <agg/agg_pixfmt_rgba.h>
-#include <agg/agg_renderer_base.h>
-#include <agg/agg_color_rgba.h>
-#include <agg/agg_rasterizer_outline_aa.h>
-#include <agg/agg_rasterizer_scanline_aa.h>
-#include <agg/agg_scanline_p.h>
-#include <agg/agg_scanline_u.h>
-#include <agg/agg_renderer_scanline.h>
-#include <agg/agg_renderer_outline_aa.h>
-#include <agg/agg_renderer_primitives.h>
-#include <agg/agg_path_storage.h>
-#include <agg/agg_span_pattern.h>
-#include <agg/agg_span_pattern_rgba.h>
-#include <agg/agg_span_pattern_resample_rgb.h>
-#include <agg/agg_span_pattern_resample_rgba.h>
-#include <agg/agg_span_interpolator_linear.h>
-#include <agg/agg_span_gradient.h>
-#include <agg/agg_span_image_resample_rgb.h>
-#include <agg/agg_span_image_resample_rgba.h>
-#include <agg/agg_image_filters.h>
-#include <agg/agg_dda_line.h>
-#include <agg/agg_scanline_storage_aa.h>
-#include <agg/agg_scanline_storage_bin.h>
-#include <agg/agg_scanline_bin.h>
-#include <agg/agg_path_storage_integer.h>
-#include <agg/agg_conv_contour.h>
-#include <agg/agg_conv_curve.h>
-#include <agg/agg_conv_stroke.h>
-#include <agg/agg_conv_transform.h>
-#include <agg/agg_trans_affine.h>
-#include <agg/agg_font_cache_manager.h>
-#include <agg/agg_bitset_iterator.h>
-#include <agg/agg_path_storage.h>
+#include <agg2/agg_rendering_buffer.h>
+#include <agg2/agg_pixfmt_rgb.h>
+#include <agg2/agg_pixfmt_rgba.h>
+#include <agg2/agg_renderer_base.h>
+#include <agg2/agg_color_rgba.h>
+#include <agg2/agg_rasterizer_outline_aa.h>
+#include <agg2/agg_rasterizer_scanline_aa.h>
+#include <agg2/agg_scanline_p.h>
+#include <agg2/agg_scanline_u.h>
+#include <agg2/agg_renderer_scanline.h>
+#include <agg2/agg_renderer_outline_aa.h>
+#include <agg2/agg_renderer_primitives.h>
+#include <agg2/agg_path_storage.h>
+#include <agg2/agg_span_pattern.h>
+#include <agg2/agg_span_pattern_rgba.h>
+#include <agg2/agg_span_pattern_resample_rgb.h>
+#include <agg2/agg_span_pattern_resample_rgba.h>
+#include <agg2/agg_span_interpolator_linear.h>
+#include <agg2/agg_span_gradient.h>
+#include <agg2/agg_span_image_resample_rgb.h>
+#include <agg2/agg_span_image_resample_rgba.h>
+#include <agg2/agg_image_filters.h>
+#include <agg2/agg_dda_line.h>
+#include <agg2/agg_scanline_storage_aa.h>
+#include <agg2/agg_scanline_storage_bin.h>
+#include <agg2/agg_scanline_bin.h>
+#include <agg2/agg_path_storage_integer.h>
+#include <agg2/agg_conv_contour.h>
+#include <agg2/agg_conv_curve.h>
+#include <agg2/agg_conv_stroke.h>
+#include <agg2/agg_conv_transform.h>
+#include <agg2/agg_trans_affine.h>
+#include <agg2/agg_font_cache_manager.h>
+#include <agg2/agg_bitset_iterator.h>
+#include <agg2/agg_path_storage.h>
//////////////////////////////////////////////////////////////////////////////////
// platform-dependend includes [wrapped into their own namepsaces]
Index: source/tools/image.hxx
===================================================================
RCS file: /cvs/gsl/canvas/source/tools/image.hxx,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- openoffice.org.orig/canvas/source/tools/image.hxx 9 Nov 2005 13:28:09 -0000 1.3
+++ openoffice.org/canvas/source/tools/image.hxx 23 Nov 2005 10:58:30 -0000 1.3.6.1
@@ -54,7 +54,7 @@
#endif
#include <canvas/elapsedtime.hxx>
-#include <agg/agg_rendering_buffer.h>
+#include <agg2/agg_rendering_buffer.h>
struct BitmapSystemData;
Index: configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.139
retrieving revision 1.139.18.1
diff -u -r1.139 -r1.139.18.1
--- openoffice.org.orig/config_office/configure.in 25 Oct 2005 11:23:57 -0000 1.139
+++ openoffice.org/config_office/configure.in 23 Nov 2005 10:58:35 -0000 1.139.18.1
@@ -266,6 +266,9 @@
AC_ARG_WITH(system-neon,
[ --with-system-neon Use neon already on system
],,)
+AC_ARG_WITH(system-agg,
+[ --with-system-agg Use AGG already on system
+],,)
AC_ARG_WITH(system-myspell,
[ --with-system-myspell Use myspell already on system
],,)
@@ -3207,6 +3210,22 @@
AC_SUBST(SYSTEM_NEON)
AC_SUBST(NEON_LIBS)
AC_SUBST(NEON_CFLAGS)
+
+dnl ===================================================================
+dnl Check for system AGG
+dnl ===================================================================
+AC_MSG_CHECKING([which AGG to use])
+if test -n "$with_system_agg" -o -n "$with_system_libs" && \
+ test "$with_system_agg" != "no"; then
+ AC_MSG_RESULT([external])
+ PKG_CHECK_MODULES(AGG, libagg >= 2.3)
+ SYSTEM_AGG=YES
+else
+ AC_MSG_RESULT([internal])
+ SYSTEM_AGG=NO
+ BUILD_TYPE="$BUILD_TYPE AGG"
+fi
+AC_SUBST(SYSTEM_AGG)
dnl ===================================================================
dnl Check for system myspell
Index: set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.78
retrieving revision 1.78.16.1
diff -u -r1.78 -r1.78.16.1
--- openoffice.org.orig/config_office/set_soenv.in 28 Oct 2005 11:59:53 -0000 1.78
+++ openoffice.org/config_office/set_soenv.in 23 Nov 2005 10:58:36 -0000 1.78.16.1
@@ -1781,6 +1781,7 @@
ToFile( "SYSTEM_NEON", "@SYSTEM_NEON@", "e" );
ToFile( "NEON_LIBS", "@NEON_LIBS@", "e" );
ToFile( "NEON_CFLAGS", "@NEON_CFLAGS@", "e" );
+ToFile( "SYSTEM_AGG", "@SYSTEM_AGG@", "e" );
ToFile( "BUILD_DMAKE", "@BUILD_DMAKE@", "e" );
ToFile( "USE_XINERAMA", "@USE_XINERAMA@", "e" );
ToFile( "XINERAMA_LINK", "@XINERAMA_LINK@", "e" );
Index: source/canvas/canvascommons.scp
===================================================================
RCS file: /cvs/installation/scp2/source/canvas/canvascommons.scp,v
retrieving revision 1.5
retrieving revision 1.5.48.1
diff -u -r1.5 -r1.5.48.1
--- openoffice.org.orig/scp2/source/canvas/canvascommons.scp 2 Nov 2005 14:07:37 -0000 1.5
+++ openoffice.org/scp2/source/canvas/canvascommons.scp 1 Dec 2005 21:19:13 -0000 1.5.48.1
@@ -37,5 +37,7 @@
STD_LIB_FILE_PATCH(gid_File_Lib_CppCanvas, cppcanvas)
STD_LIB_FILE_PATCH(gid_File_Lib_CanvasTools, canvastools)
+#ifndef SYSTEM_AGG
STD_LIB_FILE_PATCH(gid_File_Lib_Agg, agg)
+#endif
SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(gid_File_CanvasFactory, canvasfactory.uno)
Index: source/canvas/makefile.mk
===================================================================
RCS file: /cvs/installation/scp2/source/canvas/makefile.mk,v
retrieving revision 1.2
retrieving revision 1.2.150.2
diff -u -r1.2 -r1.2.150.2
--- openoffice.org.orig/scp2/source/canvas/makefile.mk 9 Sep 2005 01:23:24 -0000 1.2
+++ openoffice.org/scp2/source/canvas/makefile.mk 1 Dec 2005 23:13:20 -0000 1.2.150.2
@@ -47,6 +47,10 @@
SCP_PRODUCT_TYPE=osl
+.IF "$(SYSTEM_AGG)" == "YES"
+SCPDEFS+=-DSYSTEM_AGG
+.ENDIF
+
PARFILES= canvascommons.par \
directxcanvas.par \
vclcanvas.par
Index: inc/libs.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/libs.mk,v
retrieving revision 1.94
retrieving revision 1.94.32.1
diff -u -r1.94 -r1.94.32.1
--- openoffice.org.orig/solenv/inc/libs.mk 2 Nov 2005 13:52:18 -0000 1.94
+++ openoffice.org/solenv/inc/libs.mk 23 Nov 2005 10:58:37 -0000 1.94.32.1
@@ -114,7 +114,11 @@
BASEGFXLIB=-lbasegfx$(OFFICEUPD)$(DLLPOSTFIX)
CANVASTOOLSLIB=-lcanvastools$(OFFICEUPD)$(DLLPOSTFIX)
CPPCANVASLIB=-lcppcanvas$(OFFICEUPD)$(DLLPOSTFIX)
+.IF "$(SYSTEM_AGG)" == "YES"
+AGGLIB=-lagg
+.ELSE
AGGLIB=-lagg$(OFFICEUPD)$(DLLPOSTFIX)
+.ENDIF
.IF "$(SYSTEM_FREETYPE)"=="YES"
FREETYPELIB=$(FREETYPE_LIBS)
FREETYPELIBST=$(FREETYPE_LIBS)
More information about the fedora-cvs-commits
mailing list