divorce with gst-plugins-pps

6 files changed, 12 insertions, 125 deletions

diff --git a/Makefile.am b/Makefile.am
index 09713bc..6e83909 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = m4 wrapper src totem po
+SUBDIRS = m4 wrapper po
 
 EXTRA_DIST = autogen.sh gst-autogen.sh
diff --git a/autogen.sh b/autogen.sh
index 9d84a03..ec2e505 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,8 +3,8 @@
 # to the right versions, or leave them unset and get the RedHat 7.3 defaults
 
 DIE=0
-package=gst-plugin
-srcfile=src/main.c
+package=libppswrapper
+srcfile=wrapper/ppswrapper.c
 
 # autogen.sh helper functions (copied from GStreamer's common/ CVS module)
 if test ! -f ./gst-autogen.sh;
diff --git a/config.h.in b/config.h.in
index 27c07b3..0a64d4b 100644
--- a/config.h.in
+++ b/config.h.in
@@ -24,10 +24,6 @@
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
-/* Define to 1 if you have the `gst_type_find_helper_for_extension' function.
-   */
-#undef HAVE_GST_TYPE_FIND_HELPER_FOR_EXTENSION
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
diff --git a/configure.ac b/configure.ac
index cfd54b9..d6aa645 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,14 @@
 #                                               -*- Autoconf -*-
-m4_define([gst_pps_major], 0)
-m4_define([gst_pps_minor], 0)
-m4_define([gst_pps_micro], 15)
-m4_define([gst_pps_nano], 15)
-AC_INIT([gst-plugins-pps], gst_pps_major.gst_pps_minor.gst_pps_micro.gst_pps_nano)
+m4_define([libppswrapper_major], 0)
+m4_define([libppswrapper_minor], 0)
+m4_define([libppswrapper_micro], 15)
+m4_define([libppswrapper_nano], 15)
+AC_INIT([libppswrapper], libppswrapper_major.libppswrapper_minor.libppswrapper_micro.libppswrapper_nano)
 
 dnl AC_INIT([$PACKAGE], [$VERSION])
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
 dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode
 dnl AM_MAINTAINER_MODE
@@ -25,7 +26,6 @@ AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_RANLIB
 AC_PROG_LIBTOOL
 
 dnl Add the languages which your application supports to po/LINGUAS
@@ -59,7 +59,7 @@ AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
 if test "x$GST_WALL" = "xyes"; then
    GST_ERROR="$GST_ERROR -Wall"
 
-   if test "x$GST_PPS_CVS" = "xyes"; then
+   if test "x$LIBPPSWRAPPER_CVS" = "xyes"; then
      AS_COMPILER_FLAG(-Werror,GST_ERROR="$GST_ERROR -Werror",GST_ERROR="$GST_ERROR")
    fi
 fi
@@ -72,74 +72,6 @@ if test "x$HAVE_PKGCONFIG" = "xno"; then
   AC_MSG_ERROR(you need to have pkgconfig installed !)
 fi
 
-dnl Now we're ready to ask for gstreamer libs and cflags
-dnl And we can also ask for the right version of gstreamer
-
-dnl versions of gstreamer and plugins-base
-GST_MAJORMINOR=0.10
-GST_REQUIRED=0.10.0
-
-PKG_CHECK_MODULES(GST, \
-  gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED,
-  HAVE_GST=yes,HAVE_GST=no)
-
-dnl Give error and exit if we don't have gstreamer
-if test "x$HAVE_GST" = "xno"; then
-  AC_MSG_ERROR(you need gstreamer development packages installed !)
-fi
-
-dnl append GST_ERROR cflags to GST_CFLAGS
-GST_CFLAGS="$GST_CFLAGS $GST_ERROR"
-
-dnl make GST_CFLAGS and GST_LIBS available
-AC_SUBST(GST_CFLAGS)
-AC_SUBST(GST_LIBS)
-
-dnl make GST_MAJORMINOR available in Makefile.am
-AC_SUBST(GST_MAJORMINOR)
-
-dnl If we need them, we can also use the base class libraries
-PKG_CHECK_MODULES(GST_BASE, gstreamer-base-$GST_MAJORMINOR >= $GST_REQUIRED,
-                  HAVE_GST_BASE=yes, HAVE_GST_BASE=no)
-
-dnl Give a warning if we don't have gstreamer libs
-dnl you can turn this into an error if you need them
-if test "x$HAVE_GST_BASE" = "xno"; then
-  AC_MSG_NOTICE(no GStreamer base class libraries found (gstreamer-base-$GST_MAJORMINOR))
-fi
-
-dnl make _CFLAGS and _LIBS available
-AC_SUBST(GST_BASE_CFLAGS)
-AC_SUBST(GST_BASE_LIBS)
-
-saved_CFLAGS="$CFLAGS"
-saved_LIBS="$LIBS"
-CFLAGS="$CFLAGS $GST_BASE_CFLAGS"
-LIBS="$LIBS $GST_BASE_LIBS"
-
-AC_CHECK_FUNCS([gst_type_find_helper_for_extension])
-
-CFLAGS=$saved_CFLAGS
-LIBS=$saved_LIBS
-
-dnl set the plugindir where plugins should be installed
-if test "x${prefix}" = "x$HOME"; then
-  ppsdir="$HOME/.gstreamer-$GST_MAJORMINOR/plugins"
-else
-  ppsdir="\$(libdir)/gstreamer-$GST_MAJORMINOR"
-fi
-AC_SUBST(ppsdir)
-
-dnl set proper LDFLAGS for plugins
-GST_PPS_LDFLAGS='-module -avoid-version -export-symbols-regex [_]*\(gst_\|Gst\|GST_\).*'
-AC_SUBST(GST_PPS_LDFLAGS)
-
-AC_ARG_ENABLE(wrapper,
-  AS_HELP_STRING([--enable-wrapper],
-                 [Use pps wrapper]),
-		 [use_wrapper=$enableval],
-		 [use_wrapper=auto])
-
 savedLDFLAGS=$LDFLAGS
 savedLIB=$LIBS
 
@@ -196,44 +128,9 @@ AC_SUBST(WRAPPER_CFLAGS)
 AC_SUBST(WRAPPER_PRELOAD_LDFLAGS)
 AC_SUBST(WRAPPER_PRELOAD_CFLAGS)
 
-AM_CONDITIONAL(USE_PPSWRAPPER, [test "x$use_wrapper" != "xno"])
-
-dnl ================================================================
-dnl Totem plugins
-dnl ================================================================
-PLUGINDIR='${libdir}/totem/plugins'
-AC_SUBST(PLUGINDIR)
-
-AC_MSG_CHECKING([whether Totem plugin support is requested])
-AC_ARG_ENABLE([totem],
-	AS_HELP_STRING([--enable-totem],[Enable totem support]),
-	[enable_totem=$enableval have_totem=$enableval],
-	[enable_totem=autodetect have_totem=yes])
-AC_MSG_RESULT([$enable_totem])
-
-if test "x$have_totem" != "xno"; then
-	AM_PATH_PYTHON([2.3],[],[have_totem=no])
-	if test "x$PYTHON" = "x:"; then
-		have_totem=no
-	fi
-fi
-
 AC_OUTPUT(Makefile
 	  m4/Makefile
-	  src/Makefile
           po/Makefile.in
 	  wrapper/Makefile
-	  wrapper/ppswrapper-run-server
-	  totem/Makefile
-          totem/plugin/Makefile)
+	  wrapper/ppswrapper-run-server)
 
-if test x$use_wrapper = xyes;then
-   AC_MSG_NOTICE([** Using pps wrapper])
-else
-   AC_MSG_NOTICE([** Not using pps wrapper, ppssrc may can only be used by root])
-fi
-if test x$have_totem = xyes;then
-   AC_MSG_NOTICE([** Totem plugin enabled])
-else
-   AC_MSG_NOTICE([   Totem plugin disabled])
-fi
diff --git a/ins.sh b/ins.sh
deleted file mode 100755
index 57d8eef..0000000
--- a/ins.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-make -C build/local
-sudo cp build/local/src/.libs/libgstpesfilter.so /usr/lib/gstreamer-0.10/
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7979e42..6341b73 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,5 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
-src/gstppssrc.c
-totem/plugin/ppstream.py
-totem/plugin/ppstream.ui
-totem/plugin/ppstream-config.ui
+