[SCM] gsequencer/upstream: fixed wrong variable
jkraehemann-guest at users.alioth.debian.org
jkraehemann-guest at users.alioth.debian.org
Sun Jun 14 16:07:00 UTC 2015
The following commit has been merged in the upstream branch:
commit 2abe92c3ea0cef4a34e47a759b1d516954d36313
Author: Joël Krähemann <weedlight at gmail.com>
Date: Fri Apr 10 19:37:06 2015 +0000
fixed wrong variable
diff --git a/Makefile b/Makefile
index 00eba52..160a361 100644
--- a/Makefile
+++ b/Makefile
@@ -569,7 +569,7 @@ PACKAGE_VERSION = 0.4.2
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
-PKG_CONFIG_PATH = /usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/X11/lib/pkgconfig:/usr/X11/share/pkgconfig
+PKG_CONFIG_PATH = /usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/X11/lib/pkgconfig:/usr/X11/share/pkgconfig:/usr/local/lib/pkgconfig
POSUB = po
PRI_MACROS_BROKEN = 0
RANLIB = ranlib
diff --git a/README b/README
index db25b73..0283bd7 100644
--- a/README
+++ b/README
@@ -37,9 +37,12 @@ DEPRECATED:
NOTES:
- AgsRecallID gives every stream an identification and makes it possible to stop a single of multiple AgsRecalls that are possible. Imagine an AgsAudio object is played and a child of it, too. A child of the child is also played and so on.
-
RELEASE NOTES:
+ags_0.4.2:
+ - first LADSPA support
+ - hardened thread safety
+
ags_0.4.0:
- many refactorings to make Advanced Gtk+ Sequencer more attractive to develop with.
- implemented threading model and safety in use with super threaded fashion.
diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index e272b39..faa3fbe 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -63,106 +63,106 @@
'configure.ac'
],
{
- 'gl_LOCK' => 1,
- 'gt_LC_MESSAGES' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
- '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
- 'AM_PATH_PROG_WITH_TEST' => 1,
+ 'AC_' => 1,
+ 'AM_RUN_LOG' => 1,
+ 'AC_DEFUN_ONCE' => 1,
'gl_THREADLIB_EARLY' => 1,
- 'AM_SANITY_CHECK' => 1,
- 'AM_XGETTEXT_OPTION_INIT' => 1,
- 'gl_SIZE_MAX' => 1,
- 'gt_CHECK_DECL' => 1,
- 'PKG_CHECK_EXISTS' => 1,
- 'm4_pattern_allow' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'gl_THREADLIB_EARLY_BODY' => 1,
- '_AM_SET_OPTION' => 1,
- 'AM_DEP_TRACK' => 1,
- '_AM_PROG_TAR' => 1,
- 'AC_LIB_FROMPACKAGE' => 1,
- 'AM_RUN_LOG' => 1,
- '_AM_DEPENDENCIES' => 1,
+ '_AM_MANGLE_OPTION' => 1,
+ 'AM_LANGINFO_CODESET' => 1,
+ 'gl_THREADLIB' => 1,
+ 'AM_SILENT_RULES' => 1,
'_m4_warn' => 1,
- 'AM_ICONV_LINKFLAGS_BODY' => 1,
- 'PKG_CHECK_MODULES' => 1,
- 'AC_LIB_PREFIX' => 1,
- 'include' => 1,
- 'AM_GNU_GETTEXT_NEED' => 1,
'AM_PROG_INSTALL_STRIP' => 1,
- 'AM_MAKE_INCLUDE' => 1,
- 'PKG_PROG_PKG_CONFIG' => 1,
- 'AM_SET_LEADING_DOT' => 1,
- 'gt_GLIBC2' => 1,
- 'gl_PREREQ_LOCK' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- 'gt_INTL_MACOSX' => 1,
- 'AM_XGETTEXT_OPTION' => 1,
- 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AC_DEFUN' => 1,
- 'AM_LANGINFO_CODESET' => 1,
- 'AM_MISSING_HAS_RUN' => 1,
- 'AC_LIB_APPENDTOVAR' => 1,
- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ 'gl_SIZE_MAX' => 1,
+ 'gl_LOCK' => 1,
'AC_TYPE_LONG_LONG_INT' => 1,
- '_AM_IF_OPTION' => 1,
- 'gt_TYPE_INTMAX_T' => 1,
- 'gl_THREADLIB' => 1,
- 'gl_XSIZE' => 1,
- 'AM_GNU_GETTEXT' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
- 'AC_LIB_RPATH' => 1,
+ 'm4_pattern_forbid' => 1,
'gl_AC_TYPE_UINTMAX_T' => 1,
'gl_GLIBC21' => 1,
- 'AC_' => 1,
- 'AM_PO_SUBDIRS' => 1,
- 'AM_NLS' => 1,
- 'AC_DEFUN_ONCE' => 1,
- 'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
- 'AC_LIB_HAVE_LINKFLAGS' => 1,
- 'gl_AC_HEADER_INTTYPES_H' => 1,
- 'AM_ICONV_LINK' => 1,
- 'gl_THREADLIB_BODY' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AM_SET_DEPDIR' => 1,
'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
- 'AM_GNU_GETTEXT_VERSION' => 1,
- 'AM_POSTPROCESS_PO_MAKEFILE' => 1,
- 'AM_PROG_MKDIR_P' => 1,
- '_AC_AM_CONFIG_HEADER_HOOK' => 1,
- 'gt_PRINTF_POSIX' => 1,
- 'm4_include' => 1,
- 'AM_INTL_SUBDIR' => 1,
- 'AU_DEFUN' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
+ 'AM_GNU_GETTEXT' => 1,
+ 'gt_TYPE_WINT_T' => 1,
'gt_INTDIV0' => 1,
- 'm4_pattern_forbid' => 1,
- '_AM_MANGLE_OPTION' => 1,
- 'gt_INTTYPES_PRI' => 1,
- 'AC_LIB_PROG_LD' => 1,
- 'gt_TYPE_WCHAR_T' => 1,
- 'gl_AC_HEADER_STDINT_H' => 1,
- 'gt_INTL_SUBDIR_CORE' => 1,
+ 'AM_ICONV_LINKFLAGS_BODY' => 1,
+ 'gl_FCNTL_O_FLAGS' => 1,
+ 'AM_PATH_PROG_WITH_TEST' => 1,
+ 'gt_CHECK_DECL' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'gl_DISABLE_THREADS' => 1,
+ 'AC_LIB_FROMPACKAGE' => 1,
+ '_AM_DEPENDENCIES' => 1,
+ 'AU_DEFUN' => 1,
+ 'gt_INTTYPES_PRI' => 1,
'AC_LIB_PROG_LD_GNU' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'AC_LIB_HAVE_LINKFLAGS' => 1,
+ 'gt_TYPE_INTMAX_T' => 1,
+ 'AM_PROG_MKDIR_P' => 1,
+ 'AM_GNU_GETTEXT_VERSION' => 1,
+ 'AC_COMPUTE_INT' => 1,
+ 'AM_NLS' => 1,
+ 'AC_LIB_ARG_WITH' => 1,
+ 'AM_SET_LEADING_DOT' => 1,
+ 'gl_PREREQ_LOCK' => 1,
+ '_AM_AUTOCONF_VERSION' => 1,
+ 'gl_XSIZE' => 1,
+ 'AC_LIB_APPENDTOVAR' => 1,
+ 'AC_DEFUN' => 1,
+ 'gl_VISIBILITY' => 1,
+ 'AC_LIB_PREPARE_PREFIX' => 1,
+ 'AM_SET_DEPDIR' => 1,
+ 'PKG_CHECK_EXISTS' => 1,
+ 'gl_THREADLIB_BODY' => 1,
+ 'gt_INTL_MACOSX' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ '_AM_IF_OPTION' => 1,
+ 'AC_LIB_PREFIX' => 1,
+ 'AM_XGETTEXT_OPTION_INIT' => 1,
+ 'PKG_PROG_PKG_CONFIG' => 1,
+ 'gt_INTL_SUBDIR_CORE' => 1,
+ '_AM_PROG_TAR' => 1,
+ 'gt_TYPE_WCHAR_T' => 1,
+ 'AM_SUBST_NOTMAKE' => 1,
+ '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+ 'AM_MAKE_INCLUDE' => 1,
'AC_LIB_LINKFLAGS_BODY' => 1,
+ 'm4_include' => 1,
+ 'AM_INTL_SUBDIR' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AM_ICONV_LINK' => 1,
+ 'AM_MISSING_HAS_RUN' => 1,
+ 'AM_GNU_GETTEXT_NEED' => 1,
+ '_AM_SET_OPTION' => 1,
+ 'gt_GLIBC2' => 1,
+ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'include' => 1,
'AC_LIB_WITH_FINAL_PREFIX' => 1,
- 'gl_VISIBILITY' => 1,
- '_AM_AUTOCONF_VERSION' => 1,
+ 'gt_LC_MESSAGES' => 1,
+ 'gt_PRINTF_POSIX' => 1,
'AC_LIB_LINKFLAGS' => 1,
- 'AM_ICONV' => 1,
- 'AC_LIB_PREPARE_PREFIX' => 1,
- 'AM_SILENT_RULES' => 1,
- 'AC_LIB_ARG_WITH' => 1,
- 'AM_MISSING_PROG' => 1,
+ 'AM_SANITY_CHECK' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'AC_LIB_PROG_LD' => 1,
+ 'AM_POSTPROCESS_PO_MAKEFILE' => 1,
+ 'AM_CONDITIONAL' => 1,
+ 'AM_PO_SUBDIRS' => 1,
'_AM_SET_OPTIONS' => 1,
- 'AM_SUBST_NOTMAKE' => 1,
+ 'AM_MISSING_PROG' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'gl_AC_HEADER_INTTYPES_H' => 1,
+ 'AM_DEP_TRACK' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
+ 'gl_AC_HEADER_STDINT_H' => 1,
+ 'AM_XGETTEXT_OPTION' => 1,
+ '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
+ 'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
'AC_LIB_PREPARE_MULTILIB' => 1,
- 'gl_FCNTL_O_FLAGS' => 1,
- 'gt_TYPE_WINT_T' => 1,
- 'AC_COMPUTE_INT' => 1
+ 'AM_ICONV' => 1,
+ 'AC_LIB_RPATH' => 1,
+ 'm4_pattern_allow' => 1,
+ 'PKG_CHECK_MODULES' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -177,65 +177,65 @@
'configure.ac'
],
{
- '_AM_COND_IF' => 1,
- 'LT_SUPPORTED_TAG' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- 'AC_CONFIG_LINKS' => 1,
- 'AH_OUTPUT' => 1,
+ 'AC_CONFIG_SUBDIRS' => 1,
+ 'AM_NLS' => 1,
+ 'AM_PROG_MKDIR_P' => 1,
'AC_FC_PP_SRCEXT' => 1,
- 'AM_XGETTEXT_OPTION' => 1,
+ 'AC_DEFINE_TRACE_LITERAL' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'AM_CONDITIONAL' => 1,
'AM_MAKEFILE_INCLUDE' => 1,
- 'include' => 1,
- 'AM_PROG_MOC' => 1,
- 'AC_SUBST' => 1,
- 'AM_PROG_F77_C_O' => 1,
- 'AC_CONFIG_SUBDIRS' => 1,
- '_AM_MAKEFILE_INCLUDE' => 1,
+ '_AM_COND_ENDIF' => 1,
+ 'AM_PROG_CXX_C_O' => 1,
'AC_CONFIG_AUX_DIR' => 1,
- 'AM_GNU_GETTEXT' => 1,
- 'AM_MAINTAINER_MODE' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'AC_FC_SRCEXT' => 1,
- 'AC_REQUIRE_AUX_FILE' => 1,
- 'LT_INIT' => 1,
+ 'AM_XGETTEXT_OPTION' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ 'AC_SUBST' => 1,
+ 'AM_PROG_MOC' => 1,
+ 'AH_OUTPUT' => 1,
+ 'AC_INIT' => 1,
+ 'm4_pattern_allow' => 1,
+ 'AM_ENABLE_MULTILIB' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
+ 'AC_SUBST_TRACE' => 1,
'AC_CANONICAL_HOST' => 1,
- 'AM_SILENT_RULES' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
+ '_AM_COND_IF' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
'_LT_AC_TAGCONFIG' => 1,
'AM_POT_TOOLS' => 1,
- 'AM_ENABLE_MULTILIB' => 1,
- 'AC_CANONICAL_TARGET' => 1,
+ 'AM_PATH_GUILE' => 1,
+ 'm4_sinclude' => 1,
+ '_AM_COND_ELSE' => 1,
'AM_PROG_AR' => 1,
+ 'AC_CONFIG_FILES' => 1,
+ 'AC_FC_SRCEXT' => 1,
+ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+ 'AC_CANONICAL_TARGET' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ 'AM_GNU_GETTEXT' => 1,
+ 'AC_CONFIG_LINKS' => 1,
+ 'm4_pattern_forbid' => 1,
'AC_PROG_LIBTOOL' => 1,
+ 'LT_INIT' => 1,
+ 'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
'AM_PROG_FC_C_O' => 1,
- 'AM_NLS' => 1,
- '_AM_COND_ENDIF' => 1,
- 'AC_SUBST_TRACE' => 1,
- 'AC_LIBSOURCE' => 1,
- 'AC_INIT' => 1,
- 'AC_DEFINE_TRACE_LITERAL' => 1,
- 'AC_CONFIG_FILES' => 1,
- 'AM_PROG_MKDIR_P' => 1,
+ 'm4_include' => 1,
'AC_CANONICAL_BUILD' => 1,
- 'AM_PATH_GUILE' => 1,
- 'sinclude' => 1,
'_m4_warn' => 1,
- 'm4_pattern_forbid' => 1,
- 'm4_include' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'AC_FC_PP_DEFINE' => 1,
- 'm4_sinclude' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
+ 'AM_SILENT_RULES' => 1,
'AC_FC_FREEFORM' => 1,
- 'm4_pattern_allow' => 1,
- 'AC_CONFIG_LIBOBJ_DIR' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- 'AM_PROG_CXX_C_O' => 1,
- 'AM_CONDITIONAL' => 1,
- '_AM_COND_ELSE' => 1,
- 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
- 'AC_CONFIG_HEADERS' => 1,
- 'AM_EXTRA_RECURSIVE_TARGETS' => 1,
- 'LT_CONFIG_LTDL_DIR' => 1
+ 'AC_FC_PP_DEFINE' => 1,
+ 'include' => 1,
+ 'AC_LIBSOURCE' => 1,
+ '_AM_MAKEFILE_INCLUDE' => 1,
+ 'sinclude' => 1,
+ 'AC_REQUIRE_AUX_FILE' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AM_PROG_F77_C_O' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -301,114 +301,114 @@
'configure.ac'
],
{
- 'gl_LOCK' => 1,
- 'gt_LC_MESSAGES' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
- '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
- 'gl_THREADLIB_EARLY' => 1,
- 'AM_PATH_PROG_WITH_TEST' => 1,
- 'AM_SANITY_CHECK' => 1,
- 'AM_XGETTEXT_OPTION_INIT' => 1,
- 'gl_SIZE_MAX' => 1,
- 'PKG_NOARCH_INSTALLDIR' => 1,
- 'm4_pattern_allow' => 1,
- 'PKG_CHECK_EXISTS' => 1,
+ '_AM_CONFIG_MACRO_DIRS' => 1,
+ 'AM_ICONV_LINK' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ 'AM_MISSING_HAS_RUN' => 1,
+ 'AC_LIB_LINKFLAGS_BODY' => 1,
+ 'm4_include' => 1,
+ 'AM_INTL_SUBDIR' => 1,
'_AM_SUBST_NOTMAKE' => 1,
- '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'gl_THREADLIB_EARLY_BODY' => 1,
- 'AC_CONFIG_MACRO_DIR' => 1,
- 'AM_DEP_TRACK' => 1,
- '_AM_SET_OPTION' => 1,
- 'gl_EXTERN_INLINE' => 1,
+ 'gt_TYPE_WCHAR_T' => 1,
+ '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+ 'AM_SUBST_NOTMAKE' => 1,
+ 'AM_MAKE_INCLUDE' => 1,
'_AM_PROG_TAR' => 1,
- 'AC_LIB_FROMPACKAGE' => 1,
- 'AM_RUN_LOG' => 1,
- '_AM_DEPENDENCIES' => 1,
- 'PKG_INSTALLDIR' => 1,
- '_m4_warn' => 1,
- 'PKG_CHECK_MODULES' => 1,
- 'AM_ICONV_LINKFLAGS_BODY' => 1,
+ 'gt_LC_MESSAGES' => 1,
+ 'AC_LIB_WITH_FINAL_PREFIX' => 1,
+ 'PKG_NOARCH_INSTALLDIR' => 1,
+ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'include' => 1,
- 'AC_LIB_PREFIX' => 1,
+ 'PKG_INSTALLDIR' => 1,
'AM_GNU_GETTEXT_NEED' => 1,
- 'AM_PROG_INSTALL_STRIP' => 1,
- 'AM_MAKE_INCLUDE' => 1,
- 'PKG_PROG_PKG_CONFIG' => 1,
- 'gl_PREREQ_LOCK' => 1,
'gt_GLIBC2' => 1,
- 'AM_SET_LEADING_DOT' => 1,
+ '_AM_SET_OPTION' => 1,
+ '_AM_SET_OPTIONS' => 1,
+ 'AM_CONDITIONAL' => 1,
+ 'AM_PO_SUBDIRS' => 1,
'AM_INIT_AUTOMAKE' => 1,
- 'gt_INTL_MACOSX' => 1,
- 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AM_XGETTEXT_OPTION' => 1,
- 'AC_DEFUN' => 1,
- 'AM_LANGINFO_CODESET' => 1,
- '_AM_PROG_CC_C_O' => 1,
+ 'AM_MISSING_PROG' => 1,
+ 'AM_POSTPROCESS_PO_MAKEFILE' => 1,
+ 'AC_LIB_PROG_LD' => 1,
+ 'gt_PRINTF_POSIX' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'AM_SANITY_CHECK' => 1,
+ 'AC_LIB_LINKFLAGS' => 1,
+ 'AC_LIB_PREPARE_MULTILIB' => 1,
+ 'AM_ICONV' => 1,
'PKG_CHECK_VAR' => 1,
- 'AM_MISSING_HAS_RUN' => 1,
- 'AC_LIB_APPENDTOVAR' => 1,
- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
- '_AM_CONFIG_MACRO_DIRS' => 1,
- 'AC_TYPE_LONG_LONG_INT' => 1,
- 'gt_TYPE_INTMAX_T' => 1,
- '_AM_IF_OPTION' => 1,
- 'gl_THREADLIB' => 1,
- 'gl_XSIZE' => 1,
- 'AM_GNU_GETTEXT' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
'AC_LIB_RPATH' => 1,
+ 'm4_pattern_allow' => 1,
+ 'PKG_CHECK_MODULES' => 1,
+ '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
+ 'gl_EXTERN_INLINE' => 1,
+ 'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
+ 'gl_AC_HEADER_STDINT_H' => 1,
+ 'AM_XGETTEXT_OPTION' => 1,
+ 'gt_GL_ATTRIBUTE' => 1,
+ 'gl_AC_HEADER_INTTYPES_H' => 1,
+ 'AM_DEP_TRACK' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
'gl_GLIBC21' => 1,
'gl_AC_TYPE_UINTMAX_T' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
+ 'AM_GNU_GETTEXT' => 1,
+ 'AM_SILENT_RULES' => 1,
+ 'AM_PROG_INSTALL_STRIP' => 1,
+ '_m4_warn' => 1,
+ 'gl_SIZE_MAX' => 1,
+ 'gl_LOCK' => 1,
+ 'AC_TYPE_LONG_LONG_INT' => 1,
+ 'gl_THREADLIB_EARLY_BODY' => 1,
+ '_AM_MANGLE_OPTION' => 1,
+ 'gl_THREADLIB' => 1,
+ 'AM_LANGINFO_CODESET' => 1,
+ 'AM_RUN_LOG' => 1,
'AC_' => 1,
- 'AM_PO_SUBDIRS' => 1,
- 'AM_NLS' => 1,
- 'gt_GL_ATTRIBUTE' => 1,
'AC_DEFUN_ONCE' => 1,
- 'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
- 'gl_AC_HEADER_INTTYPES_H' => 1,
+ 'gl_THREADLIB_EARLY' => 1,
+ 'AC_LIB_PROG_LD_GNU' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
'AC_LIB_HAVE_LINKFLAGS' => 1,
- 'gl_THREADLIB_BODY' => 1,
- 'AM_ICONV_LINK' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
- 'AM_SET_DEPDIR' => 1,
- 'AM_GNU_GETTEXT_VERSION' => 1,
- 'AM_POSTPROCESS_PO_MAKEFILE' => 1,
- 'gt_PRINTF_POSIX' => 1,
- 'AM_INTL_SUBDIR' => 1,
+ 'AC_LIB_FROMPACKAGE' => 1,
+ 'gl_DISABLE_THREADS' => 1,
+ '_AM_DEPENDENCIES' => 1,
+ 'gt_INTTYPES_PRI' => 1,
'AU_DEFUN' => 1,
- 'm4_include' => 1,
- '_AC_AM_CONFIG_HEADER_HOOK' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
+ 'AM_PATH_PROG_WITH_TEST' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
+ 'gt_TYPE_WINT_T' => 1,
'gt_INTDIV0' => 1,
- 'm4_pattern_forbid' => 1,
- '_AM_MANGLE_OPTION' => 1,
- 'gt_INTTYPES_PRI' => 1,
- 'AC_LIB_PROG_LD' => 1,
- 'gl_AC_HEADER_STDINT_H' => 1,
- 'gt_TYPE_WCHAR_T' => 1,
- 'AC_LIB_PROG_LD_GNU' => 1,
- 'gl_DISABLE_THREADS' => 1,
- 'AC_LIB_LINKFLAGS_BODY' => 1,
+ 'AM_ICONV_LINKFLAGS_BODY' => 1,
+ 'gl_FCNTL_O_FLAGS' => 1,
+ 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+ 'gl_PREREQ_LOCK' => 1,
+ '_AM_AUTOCONF_VERSION' => 1,
+ 'AM_NLS' => 1,
+ 'AC_LIB_ARG_WITH' => 1,
+ 'AM_SET_LEADING_DOT' => 1,
+ 'gt_TYPE_INTMAX_T' => 1,
+ 'AM_GNU_GETTEXT_VERSION' => 1,
+ 'AC_COMPUTE_INT' => 1,
+ 'AC_LIB_PREFIX' => 1,
+ 'AM_XGETTEXT_OPTION_INIT' => 1,
+ 'PKG_PROG_PKG_CONFIG' => 1,
+ '_AM_PROG_CC_C_O' => 1,
'gt_INTL_SUBDIR_CORE' => 1,
+ 'gt_INTL_MACOSX' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ '_AM_IF_OPTION' => 1,
+ 'AC_DEFUN' => 1,
'gl_VISIBILITY' => 1,
- 'AC_LIB_WITH_FINAL_PREFIX' => 1,
- '_AM_AUTOCONF_VERSION' => 1,
- 'AC_LIB_LINKFLAGS' => 1,
- 'AM_ICONV' => 1,
- 'AM_SILENT_RULES' => 1,
'AC_LIB_PREPARE_PREFIX' => 1,
- 'AM_MISSING_PROG' => 1,
- 'AC_LIB_ARG_WITH' => 1,
- '_AM_SET_OPTIONS' => 1,
- 'AM_SUBST_NOTMAKE' => 1,
- 'AC_LIB_PREPARE_MULTILIB' => 1,
- 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
- 'gl_FCNTL_O_FLAGS' => 1,
- 'gt_TYPE_WINT_T' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'AC_COMPUTE_INT' => 1
+ 'AM_SET_DEPDIR' => 1,
+ 'gl_THREADLIB_BODY' => 1,
+ 'PKG_CHECK_EXISTS' => 1,
+ 'AC_LIB_APPENDTOVAR' => 1,
+ 'gl_XSIZE' => 1,
+ 'AC_CONFIG_MACRO_DIR' => 1
}
], 'Autom4te::Request' )
);
diff --git a/config.log b/config.log
index 00bbfc4..e971184 100644
--- a/config.log
+++ b/config.log
@@ -4,13 +4,13 @@ running configure, to aid debugging if configure makes a mistake.
It was created by ags configure 0.4.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
- $ ./configure PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/X11/lib/pkgconfig:/usr/X11/share/pkgconfig --no-create --no-recursion
+ $ ./configure PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/X11/lib/pkgconfig:/usr/X11/share/pkgconfig:/usr/local/lib/pkgconfig --no-create --no-recursion
## --------- ##
## Platform. ##
## --------- ##
-hostname = Device-03036C
+hostname = localhost
uname -m = x86_64
uname -r = 3.14.25-rt22
uname -s = Linux
@@ -1205,7 +1205,7 @@ configure:8169: result: yes
configure:8169: checking for pthread.h
configure:8169: result: yes
configure:8207: gcc -o conftest -g -O2 conftest.c -lrt -lm -ldl >&5
-/usr/bin/ld: /tmp/cc8XWrMj.o: undefined reference to symbol 'pthread_mutexattr_init@@GLIBC_2.2.5'
+/usr/bin/ld: /tmp/ccO4J43C.o: undefined reference to symbol 'pthread_mutexattr_init@@GLIBC_2.2.5'
/lib64/libpthread.so.0: error adding symbols: DSO missing from command line
collect2: error: ld returned 1 exit status
configure:8207: $? = 1
@@ -2365,7 +2365,7 @@ ac_cv_env_LIBXML2_LIBS_value=
ac_cv_env_PKG_CONFIG_LIBDIR_set=
ac_cv_env_PKG_CONFIG_LIBDIR_value=
ac_cv_env_PKG_CONFIG_PATH_set=set
-ac_cv_env_PKG_CONFIG_PATH_value=/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/X11/lib/pkgconfig:/usr/X11/share/pkgconfig
+ac_cv_env_PKG_CONFIG_PATH_value=/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/X11/lib/pkgconfig:/usr/X11/share/pkgconfig:/usr/local/lib/pkgconfig
ac_cv_env_PKG_CONFIG_set=
ac_cv_env_PKG_CONFIG_value=
ac_cv_env_SNDFILE_CFLAGS_set=
@@ -2678,7 +2678,7 @@ PACKAGE_VERSION='0.4.2'
PATH_SEPARATOR=':'
PKG_CONFIG='/usr/bin/pkg-config'
PKG_CONFIG_LIBDIR=''
-PKG_CONFIG_PATH='/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/X11/lib/pkgconfig:/usr/X11/share/pkgconfig'
+PKG_CONFIG_PATH='/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/X11/lib/pkgconfig:/usr/X11/share/pkgconfig:/usr/local/lib/pkgconfig'
POSUB='po'
PRI_MACROS_BROKEN='0'
RANLIB='ranlib'
@@ -2928,7 +2928,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_COMMANDS =
$ ./config.status
-on Device-03036C
+on localhost
config.status:1089: creating Makefile
config.status:1089: creating config.h
@@ -2949,7 +2949,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_COMMANDS =
$ ./config.status config.h
-on Device-03036C
+on localhost
config.status:1089: creating config.h
config.status:1270: config.h is unchanged
diff --git a/config.status b/config.status
index 6474be6..ac452e5 100755
--- a/config.status
+++ b/config.status
@@ -427,7 +427,7 @@ $config_commands
Report bugs to <weedlight at gmail.com>."
-ac_cs_config="'PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/X11/lib/pkgconfig:/usr/X11/share/pkgconfig'"
+ac_cs_config="'PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/X11/lib/pkgconfig:/usr/X11/share/pkgconfig:/usr/local/lib/pkgconfig'"
ac_cs_version="\
ags config.status 0.4.2
configured by ./configure, generated by GNU Autoconf 2.69,
@@ -519,7 +519,7 @@ if $ac_cs_silent; then
fi
if $ac_cs_recheck; then
- set X /bin/sh './configure' 'PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/X11/lib/pkgconfig:/usr/X11/share/pkgconfig' $ac_configure_extra_args --no-create --no-recursion
+ set X /bin/sh './configure' 'PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/X11/lib/pkgconfig:/usr/X11/share/pkgconfig:/usr/local/lib/pkgconfig' $ac_configure_extra_args --no-create --no-recursion
shift
$as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
CONFIG_SHELL='/bin/sh'
@@ -710,7 +710,7 @@ S["LIBAO_CFLAGS"]=""
S["UUID_LIBS"]="-luuid "
S["UUID_CFLAGS"]="-I/usr/include/uuid "
S["PKG_CONFIG_LIBDIR"]=""
-S["PKG_CONFIG_PATH"]="/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/X11/lib/pkgconfig:/usr/X11/share/pkgconfig"
+S["PKG_CONFIG_PATH"]="/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/X11/lib/pkgconfig:/usr/X11/share/pkgconfig:/usr/local/lib/pkgconfig"
S["PKG_CONFIG"]="/usr/bin/pkg-config"
S["ALLOCA"]=""
S["EGREP"]="/bin/grep -E"
diff --git a/src/ags/X/machine/ags_drum.c b/src/ags/X/machine/ags_drum.c
index 9d523e9..858399f 100644
--- a/src/ags/X/machine/ags_drum.c
+++ b/src/ags/X/machine/ags_drum.c
@@ -303,7 +303,7 @@ ags_drum_init(AgsDrum *drum)
drum->run = (GtkToggleButton *) gtk_toggle_button_new_with_label("run\0");
gtk_table_attach_defaults(table0,
(GtkWidget *) drum->run,
- 1, 2, 2, 3);
+ 1, 2, 0, 3);
/* bank */
table1 = (GtkTable *) gtk_table_new(3, 5, TRUE);
diff --git a/src/ags/audio/ags_recycling_container.c b/src/ags/audio/ags_recycling_container.c
index 137b10e..0ec2808 100644
--- a/src/ags/audio/ags_recycling_container.c
+++ b/src/ags/audio/ags_recycling_container.c
@@ -290,7 +290,8 @@ ags_recycling_container_replace(AgsRecyclingContainer *recycling_container,
AgsRecycling *recycling,
gint position)
{
- if(recycling_container == NULL){
+ if(recycling_container == NULL ||
+ position >= recycling_container->length){
return;
}
@@ -665,7 +666,7 @@ ags_recycling_container_reset_recycling(AgsRecyclingContainer *recycling_contain
recycling = new_first_recycling;
for(i = 0; i < new_length; i++){
- ags_recycling_container_replace(recycling_container,
+ ags_recycling_container_replace(new_recycling_container,
recycling,
first_index + i);
recycling = recycling->next;
diff --git a/src/ags/audio/ags_recycling_container.h b/src/ags/audio/ags_recycling_container.h
index 03cfbfd..85c1f57 100644
--- a/src/ags/audio/ags_recycling_container.h
+++ b/src/ags/audio/ags_recycling_container.h
@@ -1,5 +1,5 @@
/* AGS - Advanced GTK Sequencer
- * Copyright (C) 2014 Jo?l Krähemann
+ * Copyright (C) 2014 Joël Krähemann
*
* 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
--
gsequencer packaging
More information about the pkg-multimedia-commits
mailing list