Skip to content

Commit

Permalink
Release Spectrum3D v2.4.0
Browse files Browse the repository at this point in the history
Release notes for Spectrum3d version 2.4.0:

This new release is valid for Ubuntu 12.10 and should replace version 2.3.0. (bug in recorded file length).
It can be compiled against Gstreamer-1.0 or Gstreamer-0.10.

Touchscreen manipulations of the diplay seems not to work anymore due to a bug in libgeis in gesture type identification.

* gstreamer.c : spectrum3d can now be compiled against gstreamer-1.0 or gstreamer-0.10;
* record.c and typesource.c : length of a audio file depending on its recorded (a timer is run when recording) or preexisting origin (a pipeline is created and its length is measured); there was a bug with this in Spectrum3d-2.4.0;

---
filename: 'spectrum3d-2.4.0.tar.gz'
sha256: '383151b4b4b15f95a2358f3c9f1a5f22b36f510df82db53ba75a48e373350c67'
...
  • Loading branch information
Bernard Victor Delvaux committed Feb 26, 2013
1 parent fb10896 commit 1a600ca
Show file tree
Hide file tree
Showing 14 changed files with 349 additions and 275 deletions.
7 changes: 6 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
2012-02-15 Bernard Victor Delvaux <[email protected]>
2013-02-26 Bernard Victor Delvaux <[email protected]>
Version : Spectrum3d-2.4.0 :
* gstreamer.c : spectrum3d can now be compiled against gstreamer-1.0 or gstreamer-0.10;
* record.c and typesource.c : length of a audio file depending on its recorded (a timer is run when recording) or preexisting origin (a pipeline is created and its length is measured); there was a bug with this in Spectrum3d-2.4.0;

2013-02-15 Bernard Victor Delvaux <[email protected]>
Version : Spectrum3d-2.3.0 :
* general changes : some deprecated functions have been replaced in Gtk3;
* general changes : new main icon;
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ FOR UBUNTU from 10.10 : All dependencies are available in the Ubuntu repositorie

- gcc, pkg-config, automake;
- libgtk-2.0-dev or libgtk-3.0-dev;
- libgstreamer0.10-dev;
- libgstreamer0.10-dev or libgstreamer1.0-dev;
For DISPLAY (OpenGL extension): SDL is used by default; GtkGlExt can be used instead and its version should match the GTK version (GTKGLEXT1 for GTK2, GTKGLEXT3 for GTK3); however, GTKGLEXT3 is still in development; the development version should be installed then (see later); the display of harmonics itself will look exactly the same regardless of the library that is used.
- EITHER : lidsdl1.2-dev; this should be the default choice;
- OR : libgtkglext1-dev for Gtk2 or libgtkglext for Gtk3 (this version is in developpment and should be compiled from source (see documentation) but is already supported in Spectrum3d); note that GtkGlExt version should match Gtk version;
Expand Down
200 changes: 185 additions & 15 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for Spectrum3d 2.3.0.
# Generated by GNU Autoconf 2.69 for Spectrum3d 2.4.0.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Spectrum3d'
PACKAGE_TARNAME='spectrum3d'
PACKAGE_VERSION='2.3.0'
PACKAGE_STRING='Spectrum3d 2.3.0'
PACKAGE_VERSION='2.4.0'
PACKAGE_STRING='Spectrum3d 2.4.0'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL='spectrum3d.sourceforge.net'

Expand Down Expand Up @@ -1300,7 +1300,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 Spectrum3d 2.3.0 to adapt to many kinds of systems.
\`configure' configures Spectrum3d 2.4.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1366,7 +1366,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Spectrum3d 2.3.0:";;
short | recursive ) echo "Configuration of Spectrum3d 2.4.0:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1484,7 +1484,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Spectrum3d configure 2.3.0
Spectrum3d configure 2.4.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1853,7 +1853,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 Spectrum3d $as_me 2.3.0, which was
It was created by Spectrum3d $as_me 2.4.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -2670,7 +2670,7 @@ fi

# Define the identity of the package.
PACKAGE='spectrum3d'
VERSION='2.3.0'
VERSION='2.4.0'


cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -3857,6 +3857,7 @@ jack=1
geis=1
gtk=0
gtkglext=0
gstreamer=0

# Check and link for GTK3

Expand Down Expand Up @@ -4457,7 +4458,150 @@ else
fi


# Check and link for GSTREAMER-0.10
# Check and link for GSTREAMER : version 1.0 is searched by default, then version 0.10 is searched

pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5
$as_echo_n "checking for GSTREAMER... " >&6; }

if test -n "$GSTREAMER_CFLAGS"; then
pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "gstreamer-1.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-1.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test -n "$GSTREAMER_LIBS"; then
pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "gstreamer-1.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-1.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi



if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }

if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-1.0" 2>&1`
else
GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-1.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GSTREAMER_PKG_ERRORS" >&5



pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5
$as_echo_n "checking for GSTREAMER... " >&6; }

if test -n "$GSTREAMER_CFLAGS"; then
pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10\""; } >&5
($PKG_CONFIG --exists --print-errors "gstreamer-0.10") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.10" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test -n "$GSTREAMER_LIBS"; then
pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10\""; } >&5
($PKG_CONFIG --exists --print-errors "gstreamer-0.10") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-0.10" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi



if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }

if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-0.10" 2>&1`
else
GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-0.10" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GSTREAMER_PKG_ERRORS" >&5

as_fn_error $? "Gstreamer library (libgstreamer-0.10 or libgstreamer-1.0) is required" "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "Gstreamer library (libgstreamer-0.10 or libgstreamer-1.0) is required" "$LINENO" 5
else
GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS
GSTREAMER_LIBS=$pkg_cv_GSTREAMER_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }

gstreamer=0
CFLAGS="$CFLAGS $GSTREAMER_CFLAGS"
LIBS="$LIBS $GSTREAMER_LIBS"

$as_echo "#define GSTREAMER0 1" >>confdefs.h


fi

elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }


pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5
Expand Down Expand Up @@ -4517,19 +4661,38 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$GSTREAMER_PKG_ERRORS" >&5

as_fn_error $? "GSTREAMER (gstreamer-0.10) library (libgstreamer) is required" "$LINENO" 5
as_fn_error $? "Gstreamer library (libgstreamer-0.10 or libgstreamer-1.0) is required" "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "GSTREAMER (gstreamer-0.10) library (libgstreamer) is required" "$LINENO" 5
as_fn_error $? "Gstreamer library (libgstreamer-0.10 or libgstreamer-1.0) is required" "$LINENO" 5
else
GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS
GSTREAMER_LIBS=$pkg_cv_GSTREAMER_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }

gstreamer=0
CFLAGS="$CFLAGS $GSTREAMER_CFLAGS"
LIBS="$LIBS $GSTREAMER_LIBS"

$as_echo "#define GSTREAMER0 1" >>confdefs.h


fi

else
GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS
GSTREAMER_LIBS=$pkg_cv_GSTREAMER_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }

CFLAGS="$CFLAGS $GSTREAMER_CFLAGS"
LIBS="$LIBS $GSTREAMER_LIBS"
gstreamer=1
CFLAGS="$CFLAGS $GSTREAMER_CFLAGS"
LIBS="$LIBS $GSTREAMER_LIBS"

$as_echo "#define GSTREAMER1 1" >>confdefs.h


fi

Expand Down Expand Up @@ -5697,7 +5860,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 Spectrum3d $as_me 2.3.0, which was
This file was extended by Spectrum3d $as_me 2.4.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -5764,7 +5927,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
Spectrum3d config.status 2.3.0
Spectrum3d config.status 2.4.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down Expand Up @@ -6639,6 +6802,13 @@ $as_echo "$as_me: If you want to use gtkglext, its version should match the gtk
$as_echo
{ $as_echo "$as_me:${as_lineno-$LINENO}: ******************************************" >&5
$as_echo "$as_me: ******************************************" >&6;}
if test "$gstreamer" == "1"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: * Gstreamer version ...............1.0 *" >&5
$as_echo "$as_me: * Gstreamer version ...............1.0 *" >&6;}
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: * Gstreamer version ..............0.10 *" >&5
$as_echo "$as_me: * Gstreamer version ..............0.10 *" >&6;}
fi
if test "$gtk" == "2"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: * GTK version .................GTK-2.0 *" >&5
$as_echo "$as_me: * GTK version .................GTK-2.0 *" >&6;}
Expand Down
25 changes: 19 additions & 6 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
############### INITIALIZE EVERYTHING ######################

AC_INIT([Spectrum3d],
[2.3.0],
[2.4.0],
[[email protected]],
[spectrum3d],
[spectrum3d.sourceforge.net])
Expand Down Expand Up @@ -43,6 +43,7 @@ jack=1
geis=1
gtk=0
gtkglext=0
gstreamer=0

# Check and link for GTK3
AS_IF([test "x$enable_gtk3" != "xno" && test "x$enable_gtk2" != "xyes"], [
Expand Down Expand Up @@ -90,11 +91,20 @@ AC_CHECK_LIB([GL], [glClear], [],
AC_CHECK_LIB([GLU], [gluBeginCurve], [],
[AC_MSG_ERROR([OpenGL(GLU) library is required for this program])])

# Check and link for GSTREAMER-0.10
PKG_CHECK_MODULES([GSTREAMER], [gstreamer-0.10], [
CFLAGS="$CFLAGS $GSTREAMER_CFLAGS"
LIBS="$LIBS $GSTREAMER_LIBS"
], [AC_MSG_ERROR([GSTREAMER (gstreamer-0.10) library (libgstreamer) is required])])
# Check and link for GSTREAMER : version 1.0 is searched by default, then version 0.10 is searched
PKG_CHECK_MODULES([GSTREAMER], [gstreamer-1.0], [
gstreamer=1
CFLAGS="$CFLAGS $GSTREAMER_CFLAGS"
LIBS="$LIBS $GSTREAMER_LIBS"
AC_DEFINE([GSTREAMER1], [1], [Define to 1 if you have the `Gstreamer-1.0' library])
], [
PKG_CHECK_MODULES([GSTREAMER], [gstreamer-0.10], [
gstreamer=0
CFLAGS="$CFLAGS $GSTREAMER_CFLAGS"
LIBS="$LIBS $GSTREAMER_LIBS"
AC_DEFINE([GSTREAMER0], [1], [Define to 1 if you have the `Gstreamer-0.10' library])
], [AC_MSG_ERROR([Gstreamer library (libgstreamer-0.10 or libgstreamer-1.0) is required])])
])

# Check and link for JACK (if jacklib is present and if this option is not disabled)
AS_IF([test "x$enable_jack" != "xno"], [
Expand Down Expand Up @@ -137,6 +147,9 @@ AS_ECHO()
AC_MSG_NOTICE([If you want to use gtkglext, its version should match the gtk version (gtkglext-1.0 for gtk-2.0, gtkglext-3.0 for gtk-3.0)])
AS_ECHO()
AC_MSG_NOTICE([ ******************************************])
AS_IF([test "$gstreamer" == "1"],
[AC_MSG_NOTICE([ * Gstreamer version ...............1.0 *])],
[AC_MSG_NOTICE([ * Gstreamer version ..............0.10 *])])
AS_IF([test "$gtk" == "2"],
[AC_MSG_NOTICE([ * GTK version .................GTK-2.0 *])],
[AC_MSG_NOTICE([ * GTK version .................GTK-3.0 *])])
Expand Down
6 changes: 6 additions & 0 deletions src/config.h.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
/* src/config.h.in. Generated from configure.ac by autoheader. */

/* Define to 1 if you have the `Gstreamer-0.10' library */
#undef GSTREAMER0

/* Define to 1 if you have the `Gstreamer-1.0' library */
#undef GSTREAMER1

/* Define to 1 if you have the `GTK2' library */
#undef GTK2

Expand Down
Loading

0 comments on commit 1a600ca

Please sign in to comment.