[SCM] gsequencer/master: Imported Upstream version 0.4.2-64
jkraehemann-guest at users.alioth.debian.org
jkraehemann-guest at users.alioth.debian.org
Tue Jun 16 16:46:37 UTC 2015
The following commit has been merged in the master branch:
commit 495203eea18576c7913da8a81e5f5aadb93dd4f5
Author: Joël Krähemann <jkraehemann at gmail.com>
Date: Tue Jun 16 17:55:00 2015 +0200
Imported Upstream version 0.4.2-64
diff --git a/Makefile.am b/Makefile.am
index 7664d5a..e58154f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,13 +11,9 @@ LDFLAGS = -fPIE -pie -Wl,-z,relro -Wl,-z,now
# the previous manual Makefile
noinst_LIBRARIES =
bin_PROGRAMS = ags
-EXTRA_DIST = gsequencer.share acsite.m4
+EXTRA_DIST = gsequencer.share acsite.m4 ags.1
CLEANFILES =
-
-if HAVE_HELP2MAN
-dist_man_MANS=ags.1
-CLEANFILES=$(MANPAGES)
-endif
+man1_MANS = ags.1
# library
libags_a_CFLAGS= $(GOBJECT_CFLAGS) $(LIBXML2_CFLAGS)
@@ -40,11 +36,6 @@ ags_SOURCES = ./src/ags-lib/object/ags_connectable.c ./src/ags-lib/object/ags_co
ags.desktop: ags.desktop.in
$(AM_V_GEN)sed -e 's,\@datadir\@,$(datadir),g' < "$<" > $@
-if HAVE_HELP2MAN
-ags.1:
- $(HELP2MAN) -o $@ ags
-endif
-
install-data-local:
mkdir -p $(DESTDIR)/$(datadir)/gsequencer/icons
mkdir -p $(DESTDIR)/$(datadir)/gsequencer/images
diff --git a/Makefile.in b/Makefile.in
index 09775dc..6497f39 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -82,9 +82,9 @@ bin_PROGRAMS = ags$(EXEEXT)
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/config.h.in depcomp $(dist_man_MANS) AUTHORS COPYING \
- ChangeLog INSTALL NEWS README compile config.guess \
- config.rpath config.sub install-sh missing
+ $(srcdir)/config.h.in depcomp AUTHORS COPYING ChangeLog \
+ INSTALL NEWS README compile config.guess config.rpath \
+ config.sub install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -412,7 +412,7 @@ am__uninstall_files_from_dir = { \
}
man1dir = $(mandir)/man1
NROFF = nroff
-MANS = $(dist_man_MANS)
+MANS = $(man1_MANS)
DATA = $(appdata_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)config.h.in
@@ -485,7 +485,6 @@ GOBJECT_LIBS = @GOBJECT_LIBS@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
-HELP2MAN = @HELP2MAN@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -504,7 +503,6 @@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
LIBXML2_LIBS = @LIBXML2_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
-MANPAGES = @MANPAGES@
MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@@ -576,10 +574,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/src -DDESTDIR=\"$(DESTDIR)$(datadir)\" -D_FORTIFY_
# this lists the binaries to produce, the (non-PHONY, binary) targets in
# the previous manual Makefile
noinst_LIBRARIES =
-EXTRA_DIST = gsequencer.share acsite.m4 ags.desktop.in
- at HAVE_HELP2MAN_TRUE@CLEANFILES = $(MANPAGES)
+EXTRA_DIST = gsequencer.share acsite.m4 ags.1 ags.desktop.in
CLEANFILES = $(appdata_DATA)
- at HAVE_HELP2MAN_TRUE@dist_man_MANS = ags.1
+man1_MANS = ags.1
# library
libags_a_CFLAGS = $(GOBJECT_CFLAGS) $(LIBXML2_CFLAGS)
@@ -6085,10 +6082,10 @@ ags-ags_ladspa_manager.obj: src/ags/plugin/ags_ladspa_manager.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/ags/plugin/ags_ladspa_manager.c' object='ags-ags_ladspa_manager.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ags_CFLAGS) $(CFLAGS) -c -o ags-ags_ladspa_manager.obj `if test -f 'src/ags/plugin/ags_ladspa_manager.c'; then $(CYGPATH_W) 'src/ags/plugin/ags_ladspa_manager.c'; else $(CYGPATH_W) '$(srcdir)/src/ags/plugin/ags_ladspa_manager.c'; fi`
-install-man1: $(dist_man_MANS)
+install-man1: $(man1_MANS)
@$(NORMAL_INSTALL)
- @list1=''; \
- list2='$(dist_man_MANS)'; \
+ @list1='$(man1_MANS)'; \
+ list2=''; \
test -n "$(man1dir)" \
&& test -n "`echo $$list1$$list2`" \
|| exit 0; \
@@ -6121,10 +6118,8 @@ install-man1: $(dist_man_MANS)
uninstall-man1:
@$(NORMAL_UNINSTALL)
- @list=''; test -n "$(man1dir)" || exit 0; \
+ @list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
files=`{ for i in $$list; do echo "$$i"; done; \
- l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
- sed -n '/\.1[a-z]*$$/p'; \
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
@@ -6512,9 +6507,6 @@ uninstall-man: uninstall-man1
ags.desktop: ags.desktop.in
$(AM_V_GEN)sed -e 's,\@datadir\@,$(datadir),g' < "$<" > $@
- at HAVE_HELP2MAN_TRUE@ags.1:
- at HAVE_HELP2MAN_TRUE@ $(HELP2MAN) -o $@ ags
-
install-data-local:
mkdir -p $(DESTDIR)/$(datadir)/gsequencer/icons
mkdir -p $(DESTDIR)/$(datadir)/gsequencer/images
diff --git a/ags.1 b/ags.1
index 1c8dd46..e69afbb 100644
--- a/ags.1
+++ b/ags.1
@@ -1,40 +1,74 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
-.TH ADVANCED "1" "June 2015" "Advanced Gtk+ Sequencer 0.4.2" "User Commands"
-.SH NAME
-Advanced \- manual page for Advanced Gtk+ Sequencer 0.4.2
-.SH DESCRIPTION
-Advanced Gtk+ Sequencer `ags` is an audio sequencer and notation editor
-.SS "Usage:"
-.TP
-\fB\-\-filename\fR file
-open file
-.TP
+'\" t
+.\" Title:
+ ags
+
+.\" Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\" Date: 2015-06-15
+.\" Manual: ags v0.4.2
+.\" Source: ags v0.4.2
+.\" Language: English
+.\"
+.TH "AGS" "1" "2015\-06\-15" "ags v0.4.2" "ags v0.4.2"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+ags \- Advanced Gtk+ Sequencer is an audio sequencer and composition editor
+.SH "SYNOPSIS"
+.HP \w'\fB/usr/bin/ags\fR\ 'u
+\fB/usr/bin/ags\fR [\-\-help] [\-\-version] [\-\-single\-thread] [\-\-filename\ \fIfile\fR...]
+.SH "DESCRIPTION"
+.PP
+Advanced GTK+ Sequencer is intended to use for music composition\&. It features a piano roll, as well a synth, matrix editor, drum machine, soundfont2 player, mixer and an output panel\&. It\(cqs designed to be highly configurable\&. You may add effects to its effect chain; and add or remove audio channels/pads\&. You may set up a fully functional network of engines, thus there is a link editor for linking audio lines\&.
+.PP
+LADSPA support has been added to version 0\&.4\&.2 as well export to WAV audio file\&.
+.PP
+\&...
+.SH "OPTIONS"
+.PP
+The program follows the usual GNU command line syntax, with long options starting with two dashes (`\-\*(Aq)\&. A summary of options is included below\&. For a complete description, see the
+\fBinfo\fR(1)
+files\&.
+.PP
+\fB\-\-filename file\fR
+.RS 4
+Open file from command line\&.
+.RE
+.PP
\fB\-\-single\-thread\fR
-run in single thread mode
-.TP
+.RS 4
+Run in single thread mode\&.
+.RE
+.PP
\fB\-\-help\fR
-display this help and exit
-.TP
+.RS 4
+Show summary of options\&.
+.RE
+.PP
\fB\-\-version\fR
-output version information and exit
-.SH AUTHOR
-Written by Jo??l Kr??hemann
-.SH "REPORTING BUGS"
-Report bugs to <jkraehemann at gmail.com>
-.SH COPYRIGHT
-Copyright \(co 2005\-2015 Jo??l Kr??hemann
-.br
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.SH "SEE ALSO"
-The full documentation for
-.B Advanced
-is maintained as a Texinfo manual. If the
-.B info
-and
-.B Advanced
-programs are properly installed at your site, the command
-.IP
-.B info Advanced
-.PP
-should give you access to the complete manual.
+.RS 4
+Show version of program\&.
+.RE
+.SH "BUGS"
+.PP
+None\&. So far I know\&.
+.SH "AUTHOR"
+.PP
+Joël Krähemann
diff --git a/configure b/configure
index 4b1c3bf..2277487 100755
--- a/configure
+++ b/configure
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ags 0.4.2-63.
+# Generated by GNU Autoconf 2.69 for ags 0.4.2-64.
#
-# Report bugs to <weedlight at gmail.com>.
+# Report bugs to <jkraehemann at gmail.com>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -267,7 +267,7 @@ fi
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf at gnu.org and
-$0: weedlight at gmail.com about your system, including any
+$0: jkraehemann at gmail.com about your system, including any
$0: error possibly output before this message. Then install
$0: a modern shell, or manually run the script under such a
$0: shell if you do have one."
@@ -580,9 +580,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ags'
PACKAGE_TARNAME='ags'
-PACKAGE_VERSION='0.4.2-63'
-PACKAGE_STRING='ags 0.4.2-63'
-PACKAGE_BUGREPORT='weedlight at gmail.com'
+PACKAGE_VERSION='0.4.2-64'
+PACKAGE_STRING='ags 0.4.2-64'
+PACKAGE_BUGREPORT='jkraehemann at gmail.com'
PACKAGE_URL=''
ac_unique_file="config.h.in"
@@ -654,10 +654,6 @@ ALLOCA
EGREP
GREP
XMKMF
-HAVE_HELP2MAN_FALSE
-HAVE_HELP2MAN_TRUE
-MANPAGES
-HELP2MAN
CPP
am__fastdepCC_FALSE
am__fastdepCC_TRUE
@@ -1321,7 +1317,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ags 0.4.2-63 to adapt to many kinds of systems.
+\`configure' configures ags 0.4.2-64 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1391,7 +1387,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ags 0.4.2-63:";;
+ short | recursive ) echo "Configuration of ags 0.4.2-64:";;
esac
cat <<\_ACEOF
@@ -1464,7 +1460,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <weedlight at gmail.com>.
+Report bugs to <jkraehemann at gmail.com>.
_ACEOF
ac_status=$?
fi
@@ -1527,7 +1523,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ags configure 0.4.2-63
+ags configure 0.4.2-64
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1926,9 +1922,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ---------------------------------- ##
-## Report this to weedlight at gmail.com ##
-## ---------------------------------- ##"
+( $as_echo "## ------------------------------------ ##
+## Report this to jkraehemann at gmail.com ##
+## ------------------------------------ ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -2004,7 +2000,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ags $as_me 0.4.2-63, which was
+It was created by ags $as_me 0.4.2-64, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2870,7 +2866,7 @@ fi
# Define the identity of the package.
PACKAGE='ags'
- VERSION='0.4.2-63'
+ VERSION='0.4.2-64'
cat >>confdefs.h <<_ACEOF
@@ -4146,65 +4142,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{
-for ac_prog in help2man
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_HELP2MAN+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$HELP2MAN"; then
- ac_cv_prog_HELP2MAN="$HELP2MAN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_HELP2MAN="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-HELP2MAN=$ac_cv_prog_HELP2MAN
-if test -n "$HELP2MAN"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HELP2MAN" >&5
-$as_echo "$HELP2MAN" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$HELP2MAN" && break
-done
-
-if ! test -z "$HELP2MAN"
-then
-MANPAGES=ags.1
-
-HAVE_HELP2MAN=true
-fi
- if test x$HAVE_HELP2MAN = xtrue; then
- HAVE_HELP2MAN_TRUE=
- HAVE_HELP2MAN_FALSE='#'
-else
- HAVE_HELP2MAN_TRUE='#'
- HAVE_HELP2MAN_FALSE=
-fi
-
-}
-
# Checks for libraries.
# FIXME: Replace `main' with a function in `-lX11':
@@ -6827,10 +6764,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${HAVE_HELP2MAN_TRUE}" && test -z "${HAVE_HELP2MAN_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_HELP2MAN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
@@ -7228,7 +7161,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ags $as_me 0.4.2-63, which was
+This file was extended by ags $as_me 0.4.2-64, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7288,13 +7221,13 @@ $config_headers
Configuration commands:
$config_commands
-Report bugs to <weedlight at gmail.com>."
+Report bugs to <jkraehemann at gmail.com>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ags config.status 0.4.2-63
+ags config.status 0.4.2-64
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index b43dd09..7126f25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([ags],[0.4.2-63],[weedlight at gmail.com])
+AC_INIT([ags],[0.4.2-64],[jkraehemann at gmail.com])
AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_HEADERS([config.h])
@@ -12,8 +12,6 @@ AC_PROG_CC
AC_PROG_CPP
AC_PROG_INSTALL
-AC_PROG_HELP2MAN([ags.1])
-
# Checks for libraries.
# FIXME: Replace `main' with a function in `-lX11':
AC_CHECK_LIB([X11], [main])
diff --git a/src/ags/audio/recall/ags_copy_audio_signal.c b/src/ags/audio/recall/ags_copy_audio_signal.c
index e2a45c1..cf1c1af 100644
--- a/src/ags/audio/recall/ags_copy_audio_signal.c
+++ b/src/ags/audio/recall/ags_copy_audio_signal.c
@@ -65,10 +65,10 @@ static gpointer ags_copy_audio_signal_parent_class = NULL;
static AgsConnectableInterface *ags_copy_audio_signal_parent_connectable_interface;
static AgsDynamicConnectableInterface *ags_copy_audio_signal_parent_dynamic_connectable_interface;
-extern void ags_audio_signal_copy_buffer_to_buffer(signed short *destination, guint dchannels,
- signed short *source, guint schannels, guint size)
- __attribute__ ((hot))
- __attribute__ ((fastcall));
+//extern void ags_audio_signal_copy_buffer_to_buffer(signed short *destination, guint dchannels,
+// signed short *source, guint schannels, guint size)
+// __attribute__ ((hot))
+// __attribute__ ((fastcall));
GType
ags_copy_audio_signal_get_type()
diff --git a/src/ags/main.c b/src/ags/main.c
index 50bef7c..4bfa1b7 100644
--- a/src/ags/main.c
+++ b/src/ags/main.c
@@ -818,8 +818,8 @@ main(int argc, char **argv)
filename = NULL;
for(i = 0; i < argc; i++){
- if(!strncmp(argv[i], "--help\0", 16)){
- printf("Advanced Gtk+ Sequencer `ags` is an audio sequencer and notation editor\n\n\0");
+ if(!strncmp(argv[i], "--help\0", 7)){
+ printf("GSequencer `ags` is an audio sequencer and notation editor\n\n\0");
printf("Usage:\n\t%s\n\t%s\n\t%s\n\t%s\n\nReport bugs to <jkraehemann at gmail.com>\n\0",
"--filename file open file\0",
@@ -828,8 +828,8 @@ main(int argc, char **argv)
"--version output version information and exit\0");
exit(0);
- }else if(!strncmp(argv[i], "--version\0", 16)){
- printf("Advanced Gtk+ Sequencer 0.4.2\n\n\0");
+ }else if(!strncmp(argv[i], "--version\0", 10)){
+ printf("GSequencer 0.4.2\n\n\0");
printf("%s\n%s\n%s\n\n\0",
"Copyright (C) 2005-2015 Joël Krähemann\0",
--
gsequencer packaging
More information about the pkg-multimedia-commits
mailing list