Speech Dispatcher branch, master, updated. 0.8.1-4-g45586da

[Trevor Saunders]

On Thu, Oct 23, 2014 at 10:53:29PM +0200, Luke Yelavich wrote:
> commit 6e098ec62f6194133bbc889ea85dc703f48c11d0
> Author: Luke Yelavich <themuso at themuso.com>
> Date:   Thu Oct 23 15:41:56 2014 -0400
> 
>     Remove calls to g_thread_init() and bump GLib version requirement
>     
>     g_thread_init() has been deprecated since version 2.32 of GLib.

So, I'm glad to see this go away, but it seems kind of unfortunate we're
requiring such a recent glib.  However I guess the difference between
2.28 and 2.32 doesn't effect what you need to do on rhel 6 or debian old
stable, so I guess this doesn't really make things worse.

Trev

> 
> -----------------------------------------------------------------------
> 
> Summary of changes:
>  .gitignore                |    2 +
>  Makefile.am               |   11 +++-
>  configure.ac              |    4 +-
>  git-version-gen           |  172 
> +++++++++++++++++++++++++++++++++++++++++++++
>  src/modules/espeak.c      |    3 -
>  src/modules/module_main.c |    2 -
>  src/modules/pico.c        |    3 -
>  src/server/speechd.c      |    3 -
>  8 files changed, 186 insertions(+), 14 deletions(-)
>  create mode 100755 git-version-gen
> 
> diff --git a/.gitignore b/.gitignore
> index f8574a3..d1c130e 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -1,5 +1,7 @@
>  .deps
>  .libs
> +.version
> +.tarball-version
>  *.o
>  *.la
>  *.lo
> diff --git a/Makefile.am b/Makefile.am
> index 4b163b7..4b59d14 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -3,11 +3,20 @@
>  pkgconfigdir = $(libdir)/pkgconfig
>  pkgconfig_DATA = speech-dispatcher.pc
>  
> +BUILT_SOURCES = $(top_srcdir)/.version
> +
>  SUBDIRS= include src config doc po
>  
> -EXTRA_DIST= ANNOUNCE BUGS FAQ README.packagers README.translators 
> README.style build.sh
> +EXTRA_DIST= ANNOUNCE BUGS FAQ README.packagers README.translators 
> README.style build.sh git-version-gen
>  
>  MAINTAINERCLEANFILES=configure
>  
>  testinstall: install check
>       cd src/tests && $(MAKE) $(AM_MAKEFLAGS) testinstall
> +
> +$(top_srcdir)/.version:
> +     echo $(VERSION) > address@hidden && mv address@hidden $@
> +
> +dist-hook:
> +     echo $(VERSION) > $(distdir)/.tarball-version
> +     echo $(VERSION) > $(distdir)/.version
> diff --git a/configure.ac b/configure.ac
> index e81ddb1..ff5eaea 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -2,7 +2,7 @@
>  # Process this file with autoconf to produce a configure script.
>  
>  AC_PREREQ([2.63])
> -AC_INIT([speech-dispatcher], [0.8.1], [speechd at lists.freebsoft.org])
> +AC_INIT([speech-dispatcher], [m4_esyscmd(./git-version-gen 
> .tarball-version)], [speechd at lists.freebsoft.org])
>  AM_INIT_AUTOMAKE([foreign])
>  m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
>  LT_PREREQ([2.2])
> @@ -27,7 +27,7 @@ AC_SEARCH_LIBS([pthread_create], [pthread], [],
>  AC_SEARCH_LIBS([lt_dlopen], [ltdl], [],
>       [AC_MSG_FAILURE([ltdl library missing])])
>  
> -PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])
> +PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.32])
>  AC_SUBST([GLIB_CFLAGS])
>  AC_SUBST([GLIB_LIBS])
>  
> diff --git a/git-version-gen b/git-version-gen
> new file mode 100755
> index 0000000..c7f087a
> --- /dev/null
> +++ b/git-version-gen
> @@ -0,0 +1,172 @@
> +#!/bin/sh
> +# Print a version string.
> +scriptversion=2012-09-25.20
> +
> +# Copyright (C) 2007-2008 Free Software Foundation
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 3, or (at your option)
> +# any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> +# 02110-1301, USA.
> +
> +# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
> +# It may be run two ways:
> +# - from a git repository in which the "git describe" command below
> +#   produces useful output (thus requiring at least one signed tag)
> +# - from a non-git-repo directory containing a .tarball-version file, which
> +#   presumes this script is invoked like "./git-version-gen 
> .tarball-version".
> +
> +# In order to use intra-version strings in your project, you will need two
> +# separate generated version string files:
> +#
> +# .tarball-version - present only in a distribution tarball, and not in
> +#   a checked-out repository.  Created with contents that were learned at
> +#   the last time autoconf was run, and used by git-version-gen.  Must not
> +#   be present in either $(srcdir) or $(builddir) for git-version-gen to
> +#   give accurate answers during normal development with a checked out tree,
> +#   but must be present in a tarball when there is no version control system.
> +#   Therefore, it cannot be used in any dependencies.  GNUmakefile has
> +#   hooks to force a reconfigure at distribution time to get the value
> +#   correct, without penalizing normal development with extra reconfigures.
> +#
> +# .version - present in a checked-out repository and in a distribution
> +#   tarball.  Usable in dependencies, particularly for files that don't
> +#   want to depend on config.h but do want to track version changes.
> +#   Delete this file prior to any autoconf run where you want to rebuild
> +#   files to pick up a version string change; and leave it stale to
> +#   minimize rebuild time after unrelated changes to configure sources.
> +#
> +# It is probably wise to add these two files to .gitignore, so that you
> +# don't accidentally commit either generated file.
> +#
> +# Use the following line in your configure.ac, so that $(VERSION) will
> +# automatically be up-to-date each time configure is run (and note that
> +# since configure.ac no longer includes a version string, Makefile rules
> +# should not depend on configure.ac for version updates).
> +#
> +# AC_INIT([GNU project],
> +#         m4_esyscmd([build-aux/git-version-gen .tarball-version]),
> +#         [bug-project at example])
> +#
> +# Then use the following lines in your Makefile.am, so that .version
> +# will be present for dependencies, and so that .tarball-version will
> +# exist in distribution tarballs.
> +#
> +# BUILT_SOURCES = $(top_srcdir)/.version
> +# $(top_srcdir)/.version:
> +#    echo $(VERSION) > address@hidden && mv address@hidden $@
> +# dist-hook:
> +#    echo $(VERSION) > $(distdir)/.tarball-version
> +#    echo $(VERSION) > $(distdir)/.version
> +
> +case $# in
> +    1) ;;
> +    *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;;
> +esac
> +
> +tarball_version_file=$1
> +nl='
> +'
> +v=
> +
> +# First see if there is a tarball-only version file.
> +# then try "git describe", then default.
> +if test -f $tarball_version_file
> +then
> +    v=`cat $tarball_version_file` || exit 1
> +    case $v in
> +     *$nl*) v= ;; # reject multi-line output
> +     [0-9]*) ;;
> +     *) v= ;;
> +    esac
> +    test -z "$v" \
> +     && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2
> +fi
> +
> +# This is presently used by the GNOME-OSTree build system; it
> +# helps support the case where the meta-build system has already
> +# determined the git revision, but we may not be able to run "git describe"
> +# because we're inside a chroot.
> +if test -n "$GIT_DESCRIBE_FOR_BUILD";
> +then
> +    v=$GIT_DESCRIBE_FOR_BUILD
> +fi
> +
> +if test -n "$v"
> +then
> +    : # use $v
> +elif test -e .git \
> +    && v=`git describe --abbrev=4 --match='[0-9]*' HEAD 2>/dev/null` \
> +    && [ -n "$v" ]
> +then
> +    # If we are on a "dev" tag, we need to check that it is not the same
> +    # reference as the a previous version tag (this only happens when we are
> +    # working with a release tag).
> +    # NB The below trick relies on the $v being an exact tag to work which
> +    # will only work when HEAD == tag. When further commits have been made 
> on top
> +    # of the tag, the $v will be supplimented with the number of commits 
> since
> +    # that tag and the commit ref of the most recent commit and thus will
> +    # fail the test below (as intended)
> +    v2=`git describe --abbrev=4 --match='[0-9]\.[0-9]' --contains $v 
> 2>/dev/null | cut -d'^' -f1`
> +    [ -n "$v2" ] && v=$v2
> +
> +    # Is this a new git that lists number of commits since the last
> +    # tag or the previous older version that did not?
> +    #   Newer: v6.10-77-g0f8faeb
> +    #   Older: v6.10-g0f8faeb
> +#    case $v in
> +#    *-*-*) : git describe is okay three part flavor ;;
> +#    *-*)
> +#        : git describe is older two part flavor
> +#        # Recreate the number of commits and rewrite such that the
> +#        # result is the same as if we were using the newer version
> +#        # of git describe.
> +#        vtag=`echo "$v" | sed 's/-.*//'`
> +#        numcommits=`git rev-list "$vtag"..HEAD | wc -l`
> +#        v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
> +#        ;;
> +#    esac
> +
> +    # Change the first '-' to a '.', so version-comparing tools work 
> properly.
> +    # Remove the "g" in git describe's output string, to save a byte.
> +#    v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
> +    :
> +else
> +    echo 1>&2 "$0: Failed to determine git revision"
> +    exit 1
> +fi
> +
> +v=`echo "$v" |sed 's/^v//'`
> +
> +# Don't declare a version "dirty" merely because a time stamp has changed.
> +git status > /dev/null 2>&1
> +
> +dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
> +case "$dirty" in
> +    '') ;;
> +    *) # Append the suffix only if there isn't one already.
> +     case $v in
> +       *-dirty) ;;
> +       *) v="$v-dirty" ;;
> +     esac ;;
> +esac
> +
> +# Omit the trailing newline, so that m4_esyscmd can use the result directly.
> +echo "$v" | tr -d '\012'
> +
> +# Local variables:
> +# eval: (add-hook 'write-file-hooks 'time-stamp)
> +# time-stamp-start: "scriptversion="
> +# time-stamp-format: "%:y-%02m-%02d.%02H"
> +# time-stamp-end: "$"
> +# End:
> diff --git a/src/modules/espeak.c b/src/modules/espeak.c
> index 1457121..8d5f39e 100644
> --- a/src/modules/espeak.c
> +++ b/src/modules/espeak.c
> @@ -235,9 +235,6 @@ int module_init(char **status_info)
>  
>       DBG("Espeak: Module init().");
>       INIT_INDEX_MARKING();
> -     /* Make sure the glib functions are thread safe. */
> -     if (!g_thread_supported())
> -             g_thread_init(NULL);
>  
>       *status_info = NULL;
>  
> diff --git a/src/modules/module_main.c b/src/modules/module_main.c
> index baca7b3..b67c1b4 100644
> --- a/src/modules/module_main.c
> +++ b/src/modules/module_main.c
> @@ -78,8 +78,6 @@ main(int argc, char *argv[])
>      char *configfilename = NULL;
>      char *status_info = NULL;
>  
> -    g_thread_init(NULL);
> -
>      /* Initialize ltdl's list of preloaded audio backends. */
>      LTDL_SET_PRELOADED_SYMBOLS();
>      module_num_dc_options = 0;
> diff --git a/src/modules/pico.c b/src/modules/pico.c
> index 9df4622..1da514e 100644
> --- a/src/modules/pico.c
> +++ b/src/modules/pico.c
> @@ -394,9 +394,6 @@ int module_init(char **status_info)
>       void *pmem;
>       GError *error = NULL;
>  
> -     if (!g_thread_supported())
> -             g_thread_init(NULL);
> -
>       sem_init(&pico_play_semaphore, 0, 0);
>       sem_init(&pico_idle_semaphore, 0, 0);
>  
> diff --git a/src/server/speechd.c b/src/server/speechd.c
> index af4c21e..f8f18c1 100644
> --- a/src/server/speechd.c
> +++ b/src/server/speechd.c
> @@ -929,9 +929,6 @@ int main(int argc, char *argv[])
>       int spawn_port = 0;
>       char *spawn_socket_path = NULL;
>  
> -     /* Initialize threading and thread safety in Glib */
> -     g_thread_init(NULL);
> -
>       /* Strip all permisions for 'others' from the files created */
>       umask(007);
>  
> 
> 
> hooks/post-receive
> -- 
> Speech Dispatcher
> 
> _______________________________________________
> Speechd-commits mailing list
> Speechd-commits at lists.freebsoft.org
> http://lists.freebsoft.org/cgi-bin/mailman/listinfo/speechd-commits
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: 
<http://lists.freebsoft.org/pipermail/speechd/attachments/20141023/ea32534a/attachment.pgp>