gstlal-calibration: update build system for gstreamer 1.x

gstlal-calibration/configure.ac

@@ -103,14 +103,13 @@ PKG_PROG_PKG_CONFIG()
 #
 
 
-AM_PATH_PYTHON([2.6],,)
+MIN_PYTHON_VERSION="2.7"
+AM_PATH_PYTHON(["$MIN_PYTHON_VERSION"],,)
 AX_PYTHON_DEVEL()
 # hack to remove default lib dirs from PYTHON_LDFLAGS.  only tested on
 # Debian and SL6.  FIXME:  find a way to do this properly
 PYTHON_LDFLAGS="`echo $PYTHON_LDFLAGS | sed -e 'sX-L/usr/lib\(64\)\?\(/\)\?[[:space:]]*XXg'`"
-# hack to add missing options to PYTHON_LDFLAGS.  sigh, what's the point of
-# AX_PYTHON_DEVEL!?
-PYTHON_LDFLAGS="-module -avoid-version $PYTHON_LDFLAGS"
+AC_SUBST([MIN_PYTHON_VERSION])
 # force python modules into same directory as gstlal
 AC_SUBST([pkgpythondir], ["\${pythondir}/gstlal"])
 AC_SUBST([pkgpyexecdir], ["\${pyexecdir}/gstlal"])
@@ -149,9 +148,9 @@ AC_CHECK_LIB([m], [main], , [AC_MSG_ERROR([Not found!])])
 #
 
 
-AC_SUBST([GSTREAMER_RELEASE], [0.10])
-AC_SUBST([MIN_GSTREAMER_VERSION], [0.10.32])
-PKG_CHECK_MODULES([gstreamer], [gstreamer-${GSTREAMER_RELEASE} >= ${MIN_GSTREAMER_VERSION} gstreamer-base-${GSTREAMER_RELEASE} >= ${MIN_GSTREAMER_VERSION}])
+AC_SUBST([GSTREAMER_RELEASE], [1.0])
+AC_SUBST([MIN_GSTREAMER_VERSION], [1.2.4])
+PKG_CHECK_MODULES([gstreamer], [gstreamer-${GSTREAMER_RELEASE} >= ${MIN_GSTREAMER_VERSION} gstreamer-base-${GSTREAMER_RELEASE} >= ${MIN_GSTREAMER_VERSION} gstreamer-controller-${GSTREAMER_RELEASE} >= ${MIN_GSTREAMER_VERSION}])
 AC_SUBST([gstreamer_CFLAGS])
 AC_SUBST([gstreamer_LIBS])
 AC_SUBST([plugindir], [${libdir}/gstreamer-${GSTREAMER_RELEASE}])
@@ -180,8 +179,8 @@ AM_CONDITIONAL([COND_GSTBASEPARSE], [test "x${HAVE_GSTBASEPARSE}" == "xyes"])
 #
 
 
-AC_SUBST([GSTREAMER_AUDIO_RELEASE], [0.10])
-AC_SUBST([MIN_GSTREAMER_AUDIO_VERSION], [0.10.32])
+AC_SUBST([GSTREAMER_AUDIO_RELEASE], [1.0])
+AC_SUBST([MIN_GSTREAMER_AUDIO_VERSION], [1.2.4])
 PKG_CHECK_MODULES([gstreamer_audio], [gstreamer-audio-${GSTREAMER_AUDIO_RELEASE} >= ${MIN_GSTREAMER_AUDIO_VERSION}])
 AC_SUBST([gstreamer_audio_CFLAGS])
 AC_SUBST([gstreamer_audio_LIBS])
@@ -192,9 +191,18 @@ AC_SUBST([gstreamer_audio_LIBS])
 #
 
 
-PKG_CHECK_MODULES([pygobject], [pygobject-2.0])
-AC_SUBST([pygobject_CFLAGS])
-AC_SUBST([pygobject_LIBS])
+GOBJECT_INTROSPECTION_CHECK([1.30.0])
+AC_SUBST([GIR_VERSION], [${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}])
+AC_SUBST([GIR_VERSION_], [${GIR_VERSION/./_}])
+AS_IF([test "x$found_introspection" = "xyes"], [
+	AC_SUBST([girdir], ["\${datadir}/gir-1.0"])
+	AC_SUBST([typelibdir], ["\${libdir}/girepository-1.0"])
+	AC_MSG_NOTICE([If you have chosen to install the software in a location not included in your gobject introspection typelib search path, you might need to add the directory
+
+	$typelibdir
+
+to your GI_TYPELIB_PATH environment variable.])
+])
 
 
 #
@@ -218,7 +226,7 @@ CFLAGS="$old_CFLAGS"
 #
 
 
-AC_SUBST([MIN_LAL_VERSION], [6.15.0])
+AC_SUBST([MIN_LAL_VERSION], [6.15.2])
 AC_SUBST([MIN_LALMETAIO_VERSION], [1.2.6])
 PKG_CHECK_MODULES([LAL], [lal >= ${MIN_LAL_VERSION} lalmetaio >= ${MIN_LALMETAIO_VERSION} lalsupport])
 AC_SUBST([LAL_CFLAGS])
@@ -231,7 +239,7 @@ AC_SUBST([LAL_LIBS])
 
 
 AC_SUBST([MIN_GLUE_VERSION], [1.49])
-AC_SUBST([MIN_PYLAL_VERSION], [0.8.0])
+AC_SUBST([MIN_PYLAL_VERSION], [0.9.0])
 AX_PYTHON_GLUE()
 AX_PYTHON_PYLAL()
 
@@ -241,7 +249,7 @@ AX_PYTHON_PYLAL()
 #
 
 
-AC_SUBST([MIN_GSTLAL_VERSION], [0.10.3])
+AC_SUBST([MIN_GSTLAL_VERSION], [0.10.4])
 AC_SUBST([MIN_GSTLALUGLY_VERSION], [0.9.2])
 PKG_CHECK_MODULES([GSTLAL], [gstlal >= ${MIN_GSTLAL_VERSION}])
 AC_SUBST([GSTLAL_VERSION], [`$PKG_CONFIG --modversion gstlal`])

gstlal-calibration/debian/control.in

@@ -3,29 +3,34 @@ Maintainer: Madeline Wade <madeline.wade@gravity.phys.uwm.edu>
 Section: lscsoft
 Priority: optional
 Standards-Version: 3.9.2
-X-Python-Version: >= 2.6
+X-Python-Version: >= @MIN_PYTHON_VERSION@
 Build-Depends:
  debhelper (>= 8),
- python-all-dev (>= 2.6),
- gstlal-dep (>= 2.2) | gstenvironment,
- python-gobject-dev,
- python-numpy,
+ fakeroot,
+ gstlal-dev (>= @MIN_GSTLAL_VERSION@),
  lal-dev (>= @MIN_LAL_VERSION@),
  lalmetaio-dev (>= @MIN_LALMETAIO_VERSION@),
- python-glue (>= @MIN_GLUE_VERSION@),
- fakeroot,
+ libgstreamer1.0-dev (>= @MIN_GSTREAMER_VERSION@),
+ libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  pkg-config,
- gstlal-dev (>= @MIN_GSTLAL_VERSION@)
+ python-all-dev (>= @MIN_PYTHON_VERSION@),
+ python-glue (>= @MIN_GLUE_VERSION@),
+ python-numpy
 
 Package: gstlal-calibration
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python (>= 2.6),
+ python (>= @MIN_PYTHON_VERSION@),
  python-glue (>= @MIN_GLUE_VERSION@),
  python-glue-segments (>= @MIN_GLUE_VERSION@),
  python-pylal (>= @MIN_PYLAL_VERSION@),
- gstlal-dep (>= 2.2) | gstenvironment,
- python-gobject,
+ gstreamer1.0-plugins-base (>= @MIN_GSTREAMER_VERSION@),
+ gstreamer1.0-plugins-good (>= @MIN_GSTREAMER_VERSION@),
+ libgstreamer1.0-0 (>= @MIN_GSTREAMER_VERSION@),
+ libgstreamer-plugins-base1.0-0 (>= @MIN_GSTREAMER_VERSION@),
+ gstreamer1.0-tools (>= @MIN_GSTREAMER_VERSION@),
+ gir1.2-gstreamer-1.0 (>= @MIN_GSTREAMER_VERSION@),
+ gir1.2-gst-plugins-base-1.0 (>= @MIN_GSTREAMER_VERSION@),
  python-numpy,
  python-scipy,
  lal (>= @MIN_LAL_VERSION@),

gstlal-calibration/gst/lal/Makefile.am

-AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib
-
-plugin_LTLIBRARIES = libgstlalcalibration.la libgstlalinterleave.la libgstlaldeinterleave.la
+plugin_LTLIBRARIES = libgstlalcalibration.la
 
 libgstlalcalibration_la_SOURCES = \
 	gstlalcalibration.c \
         gstlal_wings.c gstlal_wings.h 
-libgstlalcalibration_la_CFLAGS = $(AM_CFLAGS) $(LAL_CFLAGS) $(GSTLAL_CFLAGS) $(gstreamer_CFLAGS)
-#libgstlalcalibration_la_LIBADD = $(top_builddir)/lib/libgstlalcalibration.la
-libgstlalcalibration_la_LDFLAGS = $(AM_LDFLAGS) $(LAL_LIBS) $(GSTLAL_LIBS) $(gstreamer_LIBS) $(GSTLAL_PLUGIN_LDFLAGS)
-
-libgstlalinterleave_la_SOURCES = \
-	gstinterleave.c gstinterleave.h
-libgstlalinterleave_la_CFLAGS = $(AM_CFLAGS) $(LAL_CFLAGS) $(GSTLAL_CFLAGS) $(gstreamer_CFLAGS) $(gstreamer_audio_CFLAGS) -DGST_PACKAGE_NAME=\"gstlal\" -DGST_PACKAGE_ORIGIN=\"\"
-#libgstlalinterleave_la_LIBADD = $(top_builddir)/lib/gstlal/libgstlaltypes.la
-libgstlalinterleave_la_LDFLAGS = $(AM_LDFLAGS) $(LAL_LIBS) $(GSTLAL_LIBS) $(gstreamer_LIBS) $(gstreamer_audio_LIBS) $(GSTLAL_PLUGIN_LDFLAGS)
-
-libgstlaldeinterleave_la_SOURCES = \
-	gstdeinterleave.c gstdeinterleave.h
-libgstlaldeinterleave_la_CFLAGS = $(AM_CFLAGS) $(LAL_CFLAGS) $(GSTLAL_CFLAGS) $(gstreamer_CFLAGS) $(gstreamer_audio_CFLAGS) -DGST_PACKAGE_NAME=\"gstlal\" -DGST_PACKAGE_ORIGIN=\"\"
-#libgstlalinterleave_la_LIBADD = $(top_builddir)/lib/gstlal/libgstlaltypes.la
-libgstlaldeinterleave_la_LDFLAGS = $(AM_LDFLAGS) $(LAL_LIBS) $(GSTLAL_LIBS) $(gstreamer_LIBS) $(gstreamer_audio_LIBS) $(GSTLAL_PLUGIN_LDFLAGS)
+libgstlalcalibration_la_CFLAGS = $(AM_CFLAGS) $(LAL_CFLAGS) $(GSTLAL_CFLAGS) $(gstreamer_CFLAGS) $(gstreamer_audio_CFLAGS)
+libgstlalcalibration_la_LDFLAGS = $(AM_LDFLAGS) $(LAL_LIBS) $(GSTLAL_LIBS) $(gstreamer_LIBS) $(gstreamer_audio_LIBS) $(GSTLAL_PLUGIN_LDFLAGS)

gstlal-calibration/gst/lal/gstdeinterleave.h

-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *                    2007 Andy Wingo <wingo at pobox.com>
- *                    2008 Sebastian Dröge <slomo@circular-chaos.org>
- *
- * deinterleave.c: deinterleave samples
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __DEINTERLEAVE_H__
-#define __DEINTERLEAVE_H__
-
-G_BEGIN_DECLS
-
-#include <gst/gst.h>
-#include <gst/audio/multichannel.h>
-
-#define GST_TYPE_DEINTERLEAVE            (gst_deinterleave_get_type())
-#define GST_DEINTERLEAVE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DEINTERLEAVE,GstLALDeinterleave))
-#define GST_DEINTERLEAVE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DEINTERLEAVE,GstLALDeinterleaveClass))
-#define GST_DEINTERLEAVE_GET_CLASS(obj) \
-        (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_DEINTERLEAVE,GstLALDeinterleaveClass))
-#define GST_IS_DEINTERLEAVE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DEINTERLEAVE))
-#define GST_IS_DEINTERLEAVE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DEINTERLEAVE))
-
-typedef struct _GstLALDeinterleave GstLALDeinterleave;
-typedef struct _GstLALDeinterleaveClass GstLALDeinterleaveClass;
-
-typedef void (*GstLALDeinterleaveFunc) (gpointer out, gpointer in, guint stride, guint nframes);
-
-struct _GstLALDeinterleave
-{
-  GstElement element;
-
-  /*< private > */
-  GList *srcpads;
-  GstCaps *sinkcaps;
-  gint channels;
-  GstAudioChannelPosition *pos;
-  gboolean keep_positions;
-
-  GstPad *sink;
-
-  gint width;
-  GstLALDeinterleaveFunc func;
-
-  GList *pending_events;
-};
-
-struct _GstLALDeinterleaveClass
-{
-  GstElementClass parent_class;
-};
-
-GType gst_deinterleave_get_type (void);
-
-G_END_DECLS
-
-#endif /* __DEINTERLEAVE_H__ */

gstlal-calibration/gst/lal/gstinterleave.h

-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *                    2007 Andy Wingo <wingo at pobox.com>
- *                    2008 Sebastian Dröge <slomo@circular-chaos.org>
- *
- * interleave.c: interleave samples, mostly based on adder
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_INTERLEAVE_H__
-#define __GST_INTERLEAVE_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstcollectpads.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_INTERLEAVE            (gst_interleave_get_type())
-#define GST_INTERLEAVE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_INTERLEAVE,GstLALInterleave))
-#define GST_INTERLEAVE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_INTERLEAVE,GstLALInterleaveClass))
-#define GST_INTERLEAVE_GET_CLASS(obj) \
-        (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_INTERLEAVE,GstLALInterleaveClass))
-#define GST_IS_INTERLEAVE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_INTERLEAVE))
-#define GST_IS_INTERLEAVE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_INTERLEAVE))
-
-typedef struct _GstLALInterleave GstLALInterleave;
-typedef struct _GstLALInterleaveClass GstLALInterleaveClass;
-
-typedef void (*GstLALInterleaveFunc) (gpointer out, gpointer in, guint stride, guint nframes);
-
-struct _GstLALInterleave
-{
-  GstElement element;
-
-  /*< private >*/
-  GstCollectPads *collect;
-
-  gint channels;
-  gint padcounter;
-  gint rate;
-  gint width;
-
-  GValueArray *channel_positions;
-  GValueArray *input_channel_positions;
-  gboolean channel_positions_from_input;
-
-  GstCaps *sinkcaps;
-
-  GstClockTime timestamp;
-  guint64 offset;
-  gboolean synchronous;
-
-  gboolean segment_pending;
-  guint64 segment_position;
-  gdouble segment_rate;
-  GstSegment segment;
-
-  gboolean flush_stop_pending;
-
-  GstPadEventFunction collect_event;
-
-  GstLALInterleaveFunc func;
-
-  GstPad *src;
-
-  GList *pending_events;
-};
-
-struct _GstLALInterleaveClass
-{
-  GstElementClass parent_class;
-};
-
-GType gst_interleave_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GST_INTERLEAVE_H__ */

gstlal-calibration/gstlal-calibration.spec.in

-%define gstreamername gstreamer_lscsoft
+%define gstreamername gstreamer1
 
 Name: @PACKAGE_NAME@
 Version: @PACKAGE_VERSION@
@@ -6,8 +6,8 @@ Release: 1.lscsoft
 Summary: GSTLAL Calibration
 License: GPL
 Group: LSC Software/Data Analysis
-Requires: gstlal >= @MIN_GSTLAL_VERSION@ gstlal-ugly >= @MIN_GSTLALUGLY_VERSION@ python >= 2.6 glue >= @MIN_GLUE_VERSION@ glue-segments >= @MIN_GLUE_VERSION@ python-pylal >= @MIN_PYLAL_VERSION@ %{gstreamername} >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-good >= 0.10.27 gstreamer_lscsoft-python >= 0.10.21 pygobject2 numpy scipy lal >= @MIN_LAL_VERSION@ lalmetaio >= @MIN_LALMETAIO_VERSION@
-BuildRequires: gstlal-devel >= @MIN_GSTLAL_VERSION@ python-devel >= 2.6 fftw-devel >= 3 %{gstreamername}-devel >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base-devel >= @MIN_GSTREAMER_VERSION@ pygobject2-devel lal-devel >= @MIN_LAL_VERSION@ lalmetaio-devel >= @MIN_LALMETAIO_VERSION@
+Requires: gstlal >= @MIN_GSTLAL_VERSION@ gstlal-ugly >= @MIN_GSTLALUGLY_VERSION@ python >= @MIN_PYTHON_VERSION@ glue >= @MIN_GLUE_VERSION@ glue-segments >= @MIN_GLUE_VERSION@ python-pylal >= @MIN_PYLAL_VERSION@ %{gstreamername} >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-good >= 0.10.27 %{gstreamername}-python >= 0.10.21 numpy scipy lal >= @MIN_LAL_VERSION@ lalmetaio >= @MIN_LALMETAIO_VERSION@
+BuildRequires: gstlal-devel >= @MIN_GSTLAL_VERSION@ python-devel >= @MIN_PYTHON_VERSION@ fftw-devel >= 3 %{gstreamername}-devel >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base-devel >= @MIN_GSTREAMER_VERSION@ lal-devel >= @MIN_LAL_VERSION@ lalmetaio-devel >= @MIN_LALMETAIO_VERSION@
 Conflicts: gstlal-ugly < 0.6.0
 Source: @PACKAGE_NAME@-%{version}.tar.gz
 URL: https://www.lsc-group.phys.uwm.edu/daswg/projects/gstlal.html