Commit 15c098ea authored by Kevin Cozens's avatar Kevin Cozens Committed by Kevin Cozens

HACKING Changed CVS reference to SVN.

2007-02-09  Kevin Cozens  <kcozens@cvs.gnome.org>

	* HACKING
	* autogen.sh: Changed CVS reference to SVN.

	* NEWS: Changed CVS reference to SVN. Fixed spelling of a
	contributor name.

	* configure.in: Set GEGL_UNSTABLE to 1 for odd micro numbers
	when major and minor are both 0 or base it on odd value of
	minor number.

	* gegl.pc.in: Changed some hard-coded values to use
	values from run of configure. Added version number
	to library name. Added some extra checks when building
	on Windows machines.

	* gegl/Makefile.am: Included version number in name of library.
	Define -no-undefined when building under Windows.

	* gegl/gegl.h: Fixed grammatical errors in comment blocks.

	* operations/blur/Makefile.am
	* operations/color/Makefile.am
	* operations/core/Makefile.am
	* operations/display/Makefile.am
	* operations/file-io/Makefile.am
	* operations/generated/Makefile.am
	* operations/meta/Makefile.am
	* operations/render/Makefile.am
	* operations/svg/Makefile.am
	* operations/transform/Makefile.am
	* operations/transparency/Makefile.am
	* operations/workshop/Makefile.am
	* operations/workshop/generated/Makefile.am: Included version
	number in name of directory for operations files.

svn path=/trunk/; revision=1312
parent 8f4bc48d
2007-02-09 Kevin Cozens <kcozens@cvs.gnome.org>
* HACKING
* autogen.sh: Changed CVS reference to SVN.
* NEWS: Changed CVS reference to SVN. Fixed spelling of a
contributor name.
* configure.in: Set GEGL_UNSTABLE to 1 for odd micro numbers
when major and minor are both 0 or base it on odd value of
minor number.
* gegl.pc.in: Changed some hard-coded values to use
values from run of configure. Added version number
to library name. Added some extra checks when building
on Windows machines.
* gegl/Makefile.am: Included version number in name of library.
Define -no-undefined when building under Windows.
* gegl/gegl.h: Fixed grammatical errors in comment blocks.
* operations/blur/Makefile.am
* operations/color/Makefile.am
* operations/core/Makefile.am
* operations/display/Makefile.am
* operations/file-io/Makefile.am
* operations/generated/Makefile.am
* operations/meta/Makefile.am
* operations/render/Makefile.am
* operations/svg/Makefile.am
* operations/transform/Makefile.am
* operations/transparency/Makefile.am
* operations/workshop/Makefile.am
* operations/workshop/generated/Makefile.am: Included version
number in name of directory for operations files.
2007-02-09 Øyvind Kolås <pippin@gimp.org>
* gegl/buffer/gegl-buffer.c: (gegl_buffer_void): Avoid leaking
......
......@@ -7,7 +7,7 @@ The cvs version of gegl is known to work with the following autotools:
Other versions of these tools probably work. Probably the tools that
work for current versions of glib will work for gegl as well.
To compile a CVS version of gegl on your system, you will need to take several
To compile a SVN version of gegl on your system, you will need to take several
steps to setup the tree for compilation. You can do all these steps at once by
running:
......
......@@ -3,7 +3,7 @@
------------------------------------
GEGL only has released development snapshots thus far. Odd micro versions are
from CVS whilst even micro numbers indicate released snapshots.
from SVN whilst even micro numbers indicate released snapshots.
Changes in GEGL 0.0.10
======================
......@@ -30,7 +30,7 @@ Changes in GEGL 0.0.6
Contributions from:
Dominik Ernst, Kevin Cozens, Micael Schumacher and Øyvind Kolås.
Dominik Ernst, Kevin Cozens, Michael Schumacher and Øyvind Kolås.
Changes in GEGL 0.0.4
=====================
......
......@@ -75,7 +75,7 @@ check_version ()
echo
echo "I am testing that you have the tools required to build the"
echo "$PROJECT from CVS. This test is not foolproof,"
echo "$PROJECT project from SVN. This test is not foolproof,"
echo "so if anything goes wrong, see the file HACKING for more information..."
echo
......@@ -315,6 +315,10 @@ $AUTOCONF || exit $?
cd $ORIGDIR
echo
echo "Running ./configure..."
echo
$srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@"
RC=$?
if test $RC -ne 0; then
......
......@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.54)
dnl Making releases:
dnl Making releases on the stable branch:
dnl GEGL_MICRO_VERSION += 1;
dnl GEGL_INTERFACE_AGE += 1;
dnl GEGL_BINARY_AGE += 1;
......@@ -11,12 +11,15 @@ dnl set GEGL_INTERFACE_AGE to 0.
dnl if backwards compatibility has been broken,
dnl set GEGL_BINARY_AGE _and_ GEGL_INTERFACE_AGE to 0.
m4_define([gegl_major_version], [0])
m4_define([gegl_minor_version], [0])
m4_define([gegl_micro_version], [11])
m4_define([gegl_real_version],
[gegl_major_version.gegl_minor_version.gegl_micro_version])
m4_define([gegl_version], [gegl_real_version])
dnl Number of releases since we've added interfaces
m4_define([gegl_interface_age], [0])
m4_define([gegl_binary_age],
[m4_eval(100 * gegl_minor_version + gegl_micro_version)])
......@@ -24,10 +27,13 @@ m4_define([gegl_binary_age],
dnl The X.Y in -lgegl-X.Y line. This is expected to stay 1.0 until Gegl 2.
m4_define([gegl_api_version], [1.0])
m4_define([stability_version_number],
m4_if(m4_eval(gegl_major_version || gegl_minor_version), [0],
[gegl_micro_version], [gegl_minor_version]))
m4_define([gegl_unstable],
m4_if(m4_eval(gegl_minor_version % 2), [1], [yes], [no]))
m4_if(m4_eval(stability_version_number % 2), [1], [yes], [no]))
m4_define([gegl_stable],
m4_if(m4_eval(gegl_minor_version % 2), [0], [yes], [no]))
m4_if(m4_eval(stability_version_number % 2), [0], [yes], [no]))
m4_define([gimp_full_name], [Generic Graphical Library])
......@@ -44,7 +50,8 @@ m4_define([openexr_required_version], [0.0.0])
m4_define([sdl_required_version], [0.0.0])
m4_define([graphviz_required_version], [0.0.0])
AC_INIT(gegl/gegl-init.c)
AC_INIT(gegl, gegl_major_version.gegl_minor_version.gegl_micro_version)
AC_CONFIG_SRCDIR([gegl/gegl.h])
dnl ==========================================================================
dnl Versioning
......@@ -54,45 +61,45 @@ dnl The triplet
GEGL_MAJOR_VERSION=gegl_major_version
GEGL_MINOR_VERSION=gegl_minor_version
GEGL_MICRO_VERSION=gegl_micro_version
GEGL_API_VERSION=gegl_api_version
GEGL_INTERFACE_AGE=gegl_interface_age
GEGL_BINARY_AGE=gegl_binary_age
GEGL_VERSION=gegl_version
GEGL_REAL_VERSION=gegl_real_version
GEGL_VERSION=gegl_version
GEGL_UNSTABLE=gegl_unstable
GEGL_FULL_NAME="gegl_full_name"
GEGL_API_VERSION=gegl_api_version
AC_SUBST(GEGL_MAJOR_VERSION)
AC_SUBST(GEGL_MINOR_VERSION)
AC_SUBST(GEGL_MICRO_VERSION)
AC_SUBST(GEGL_API_VERSION)
AC_SUBST(GEGL_REAL_VERSION)
AC_SUBST(GEGL_VERSION)
AC_SUBST(GEGL_UNSTABLE)
AC_SUBST(GEGL_FULL_NAME)
dnl Number of releases since we've added interfaces
GEGL_INTERFACE_AGE=gegl_interface_age
GEGL_BINARY_AGE=gegl_binary_age
AC_SUBST(GEGL_INTERFACE_AGE)
AC_SUBST(GEGL_BINARY_AGE)
AC_SUBST(GEGL_VERSION)
AC_SUBST(GEGL_REAL_VERSION)
AC_SUBST(GEGL_API_VERSION)
GEGL_RELEASE=gegl_api_version
AC_SUBST(GEGL_RELEASE)
dnl The symbol GEGL_UNSTABLE is defined above for substitution in
dnl Makefiles and conditionally defined here as a preprocessor symbol
dnl and automake conditional.
GEGL_UNSTABLE=gegl_unstable
if test "x$GEGL_UNSTABLE" = "xyes"; then
AC_DEFINE(GEGL_UNSTABLE, 1,
[Define to 1 if this is an unstable version of the GIMP])
[Define to 1 if this is an unstable version of GEGL])
fi
AM_CONDITIONAL(GEGL_UNSTABLE, test "x$GEGL_UNSTABLE" = "xyes")
AC_SUBST(GEGL_UNSTABLE)
dnl libtool versioning
m4_define([lt_current], [m4_eval(100 * gegl_minor_version + gegl_micro_version - gegl_interface_age)])
m4_define([lt_revision], [gegl_interface_age])
m4_define([lt_age], [m4_eval(gegl_binary_age - gegl_interface_age)])
LT_VERSION_INFO="lt_current:lt_revision:lt_age"
LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
AC_SUBST(LT_VERSION_INFO)
AC_SUBST(LT_CURRENT_MINUS_AGE)
GEGL_LIBRARY_VERSION="lt_current:lt_revision:lt_age"
GEGL_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
AC_SUBST(GEGL_LIBRARY_VERSION)
AC_SUBST(GEGL_CURRENT_MINUS_AGE)
gegltargetlib=libgegl-$GEGL_API_VERSION.la
AC_SUBST(gegltargetlib)
......@@ -102,10 +109,13 @@ GTK_REQUIRED_VERSION=gtk_required_version
AC_SUBST(GLIB_REQUIRED_VERSION)
AC_SUBST(GTK_REQUIRED_VERSION)
PACKAGE_NAME=gegl
AC_SUBST(PACKAGE_NAME)
dnl ==========================================================================
AM_INIT_AUTOMAKE(gegl,$GEGL_VERSION)
AM_INIT_AUTOMAKE(no-define)
AM_CONFIG_HEADER(config.h)
dnl Initialize libtool
......@@ -210,20 +220,38 @@ AC_MSG_RESULT([$target_or_host])
# Check for Win32
#################
AC_MSG_CHECKING([for some Win32 platform])
case "$target_or_host" in
*-*-mingw* | *-*-cygwin*)
platform_win32=yes
;;
*)
platform_win32=no
;;
esac
AC_MSG_RESULT([$platform_win32])
AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
MATH_LIB=-lm
AC_MSG_CHECKING([for native Win32])
case "$target_or_host" in
*-*-mingw*)
os_win32=yes
PATHSEP=';'
MATH_LIB=
;;
*)
os_win32=no
PATHSEP=':'
;;
esac
AC_MSG_RESULT([$os_win32])
AC_SUBST(PATH_SEP)
AC_SUBST(MATH_LIB)
AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
dnl Checks for programs.
#AC_PROG_YACC
......
......@@ -5,7 +5,7 @@ includedir=@includedir@
Name: Gegl
Description: Gegl Graphical Library
Version: @VERSION@
Version: @GEGL_REAL_VERSION@
Requires: @GLIB_PACKAGES@ babl
Libs: -L${libdir} -lgegl-@GEGL_API_VERSION@
Cflags: -I${includedir}/gegl-1.0
Libs: -L${libdir} -l@PACKAGE_NAME@-@GEGL_API_VERSION@
Cflags: -I${includedir}/@PACKAGE_NAME@-@GEGL_API_VERSION@
noinst_PROGRAMS =
if OS_WIN32
no_undefined = -no-undefined
endif
SUBDIRS = buffer module
......@@ -7,17 +9,6 @@ libmodule = $(top_builddir)/gegl/module/libmodule.la
lib_LTLIBRARIES = libgegl-@GEGL_API_VERSION@.la
EXTRA_DIST = \
gegl-cr-visitor.h \
gegl-debug-rect-visitor.h \
gegl-eval-mgr.h \
gegl-eval-visitor.h \
gegl-finish-visitor.h \
gegl-have-visitor.h \
gegl-instrument.h \
gegl-need-visitor.h \
gegl-prepare-visitor.h
GEGL_sources = \
gegl-color.c \
gegl-connection.c \
......@@ -83,28 +74,39 @@ GEGL_sources = \
GEGL_public_headers = gegl-paramspecs.h \
gegl-utils.h
EXTRA_DIST = \
gegl-cr-visitor.h \
gegl-debug-rect-visitor.h \
gegl-eval-mgr.h \
gegl-eval-visitor.h \
gegl-finish-visitor.h \
gegl-have-visitor.h \
gegl-instrument.h \
gegl-need-visitor.h \
gegl-prepare-visitor.h
libgegl_@GEGL_API_VERSION@_la_SOURCES = $(GEGL_sources) $(GEGL_public_headers)
libgegl_@GEGL_API_VERSION@_la_LIBADD = $(libbuffer) $(libmodule)
libgegl_@GEGL_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO)
${no_undefined} \
-version-info $(GEGL_LIBRARY_VERSION)
INCLUDES = \
-I$(top_srcdir) \
@DEP_CFLAGS@ @BABL_CFLAGS@
AM_LDFLAGS = \
-no-undefined \
@DEP_LIBS@ @BABL_LIBS@
#AM_LDFLAGS = \
# @DEP_LIBS@ @BABL_LIBS@
AM_CPPFLAGS = -DPREFIX=\""$(prefix)"\"
libgeglincludedir = $(includedir)/gegl-$(GEGL_API_VERSION)
libgeglsubincludedir = $(includedir)/gegl-$(GEGL_API_VERSION)/gegl
libgegl_@GEGL_API_VERSION@includedir = $(includedir)/gegl-$(GEGL_API_VERSION)
libgegl_@GEGL_API_VERSION@subincludedir = $(includedir)/gegl-$(GEGL_API_VERSION)/gegl
libgeglinclude_HEADERS = gegl.h
libgeglsubinclude_HEADERS = $(GEGL_public_headers)
libgegl_@GEGL_API_VERSION@include_HEADERS = gegl.h
libgegl_@GEGL_API_VERSION@subinclude_HEADERS = $(GEGL_public_headers)
#BUILT_SOURCES = \
......
......@@ -156,7 +156,7 @@ GeglNode * gegl_node_new (void);
* a subgraph with special middle-man routing nodes created with
* #gegl_node_get_output_proxy and #gegl_node_get_input_proxy.
*
* Returns a newly created node, the node will be destroyed by the parent.
* Returns a newly created node. The node will be destroyed by the parent.
* Calling g_object_unref on a node will cause the node to be dropped by the
* parent. (You may also add additional references using
* g_object_ref/g_objecr_unref, but in general relying on the parents reference
......@@ -169,7 +169,7 @@ GeglNode * gegl_node_new_child (GeglNode *parent,
/***
* Making connections:
*
* Nodes in GEGL are connected to each other, the resulting graph of nodes
* Nodes in GEGL are connected to each other. The resulting graph of nodes
* represents the image processing pipeline to be processed.
*
* ---
......@@ -229,7 +229,7 @@ void gegl_node_link (GeglNode *source,
* @first_sink: the first consumer of data.
* @...: NULL, or optionally more consumers followed by NULL.
*
* Synthetic sugar for linking a chain of nodes with "input"->"output", the
* Synthetic sugar for linking a chain of nodes with "input"->"output". The
* list is NULL terminated.
*/
void gegl_node_link_many (GeglNode *source,
......@@ -332,7 +332,7 @@ void gegl_node_blit (GeglNode *node,
* @sink_node: a #GeglNode without outputs.
*
* Render a composition. This can be used for instance on a node with a "png-save"
* operation to render all neccesary data, and make it be written to file, the
* operation to render all neccesary data, and make it be written to file. The
* function is blocking for a non blocking way of doing the same see #GeglProcessor.
* ---
* GeglNode *gegl;
......@@ -629,7 +629,7 @@ GeglNode * gegl_node_get_producer (GeglNode *node,
* resolved in relation to.
*
* The #GeglNode returned contains the graph described by the tree of stacks
* in the XML document, the tree is connected to the "output" pad of the
* in the XML document. The tree is connected to the "output" pad of the
* returned node and thus can be used directly for processing.
*
* Returns a GeglNode containing the parsed XML as a subgraph.
......@@ -683,7 +683,7 @@ struct _GeglRectangle
* with a NULL string to create a new blank one, gegl_colors are destroyed
* with g_object_unref when they no longer are needed.
*
* The colors used by gegls are described in a format similar to CSS, the
* The colors used by gegls are described in a format similar to CSS. The
* textstring "rgb(1.0,1.0,1.0)" signifies opaque white and
* "rgba(1.0,0.0,0.0,0.75)" is a 75% opaque red. Hexadecimal forms like #RRGGBB
* and #RRGGBBAA are also supported.
......@@ -691,7 +691,7 @@ struct _GeglRectangle
typedef struct _GeglColor GeglColor;
GType gegl_color_get_type (void) G_GNUC_CONST;
#define GEGL_TYPE_COLOR (gegl_color_get_type())
#define GEGL_COLOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_COLOR, GeglColor))
#define GEGL_COLOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_COLOR, GeglColor))
#endif
/**
......@@ -749,7 +749,7 @@ void gegl_color_set_rgba (GeglColor *color,
*
* Creates a new processing node that performs the specified operation.
*
* Returns a newly created node, the node will be destroyed by the parent.
* Returns a newly created node. The node will be destroyed by the parent.
* Calling g_object_unref on a node will cause the node to be dropped by the
* parent. (You may also add additional references using
* g_object_ref/g_objecr_unref, but in general relying on the parents reference
......
......@@ -21,7 +21,7 @@ LDADD = @DEP_LIBS@ @BABL_LIBS@
clean-local:
rm -f $(SOBJS) *~
ext_dir = $(DESTDIR)$(prefix)/lib/gegl
ext_dir = $(DESTDIR)$(prefix)/lib/gegl-@GEGL_API_VERSION@
install-exec-local: all-local
$(INSTALL) -d $(ext_dir)
......
......@@ -21,7 +21,7 @@ LDADD = @DEP_LIBS@ @BABL_LIBS@
clean-local:
rm -f $(SOBJS) *~
ext_dir = $(DESTDIR)$(prefix)/lib/gegl
ext_dir = $(DESTDIR)$(prefix)/lib/gegl-@GEGL_API_VERSION@
install-exec-local: all-local
$(INSTALL) -d $(ext_dir)
......
......@@ -21,7 +21,7 @@ LDADD = @DEP_LIBS@ @BABL_LIBS@
clean-local:
rm -f $(SOBJS) *~
ext_dir = $(DESTDIR)$(prefix)/lib/gegl
ext_dir = $(DESTDIR)$(prefix)/lib/gegl-@GEGL_API_VERSION@
install-exec-local: all-local
$(INSTALL) -d $(ext_dir)
......
......@@ -26,7 +26,7 @@ display.so: display.c $(GEGLHEADERS)
clean-local:
rm -f $(SOBJS) *~
ext_dir = $(DESTDIR)$(prefix)/lib/gegl
ext_dir = $(DESTDIR)$(prefix)/lib/gegl-@GEGL_API_VERSION@
install-exec-local: all-local
$(INSTALL) -d $(ext_dir)
......
......@@ -64,7 +64,7 @@ exr-load.so: exr-load.cpp
clean-local:
rm -f $(SOBJS) *~
ext_dir = $(DESTDIR)$(prefix)/lib/gegl
ext_dir = $(DESTDIR)$(prefix)/lib/gegl-@GEGL_API_VERSION@
install-exec-local: all-local
$(INSTALL) -d $(ext_dir)
......
......@@ -21,7 +21,7 @@ LDADD = @DEP_LIBS@ @BABL_LIBS@
clean-local:
rm -f $(SOBJS) *~
ext_dir = $(DESTDIR)$(prefix)/lib/gegl
ext_dir = $(DESTDIR)$(prefix)/lib/gegl-@GEGL_API_VERSION@
install-exec-local: all-local
$(INSTALL) -d $(ext_dir)
......
......@@ -21,7 +21,7 @@ LDADD = @DEP_LIBS@ @BABL_LIBS@
clean-local:
rm -f $(SOBJS) *~
ext_dir = $(DESTDIR)$(prefix)/lib/gegl
ext_dir = $(DESTDIR)$(prefix)/lib/gegl-@GEGL_API_VERSION@
install-exec-local: all-local
$(INSTALL) -d $(ext_dir)
......
......@@ -27,7 +27,7 @@ text.so: text.c $(GEGLHEADERS)
clean-local:
rm -f $(SOBJS) *~
ext_dir = $(DESTDIR)$(prefix)/lib/gegl
ext_dir = $(DESTDIR)$(prefix)/lib/gegl-@GEGL_API_VERSION@
install-exec-local: all-local
$(INSTALL) -d $(ext_dir)
......
......@@ -21,7 +21,7 @@ LDADD = @DEP_LIBS@ @BABL_LIBS@
clean-local:
rm -f $(SOBJS) *~
ext_dir = $(DESTDIR)$(prefix)/lib/gegl
ext_dir = $(DESTDIR)$(prefix)/lib/gegl-@GEGL_API_VERSION@
install-exec-local: all-local
$(INSTALL) -d $(ext_dir)
......
......@@ -25,7 +25,7 @@ affine.so: $(OFILES)
clean-local:
rm -f $(SOBJS) *.o *~
ext_dir = $(DESTDIR)$(prefix)/lib/gegl
ext_dir = $(DESTDIR)$(prefix)/lib/gegl-@GEGL_API_VERSION@
install-exec-local: all-local
$(INSTALL) -d $(ext_dir)
......
......@@ -22,7 +22,7 @@ LDADD = @DEP_LIBS@ @BABL_LIBS@
clean-local:
rm -f $(SOBJS) *~
ext_dir = $(DESTDIR)$(prefix)/lib/gegl
ext_dir = $(DESTDIR)$(prefix)/lib/gegl-@GEGL_API_VERSION@
install-exec-local: all-local
$(INSTALL) -d $(ext_dir)
......
......@@ -20,7 +20,7 @@ LDADD = @DEP_LIBS@ @BABL_LIBS@
clean-local:
rm -f $(SOBJS) *~
ext_dir = $(DESTDIR)$(prefix)/lib/gegl
ext_dir = $(DESTDIR)$(prefix)/lib/gegl-@GEGL_API_VERSION@
install-exec-local: all-local
$(INSTALL) -d $(ext_dir)
......
......@@ -21,7 +21,7 @@ LDADD = @DEP_LIBS@ @BABL_LIBS@
clean-local:
rm -f $(SOBJS) *~
ext_dir = $(DESTDIR)$(prefix)/lib/gegl
ext_dir = $(DESTDIR)$(prefix)/lib/gegl-@GEGL_API_VERSION@
install-exec-local: all-local
$(INSTALL) -d $(ext_dir)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment