summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog16
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
-rw-r--r--ext/Makefile.am4
-rw-r--r--gst-libs/gst/Makefile.am3
-rw-r--r--gst-libs/gst/app/Makefile.am10
-rw-r--r--gst-libs/gst/app/gstapp.c41
-rw-r--r--gst-libs/gst/app/gstappsrc.c (renamed from gst/app/gstappsrc.c)0
-rw-r--r--gst-libs/gst/app/gstappsrc.h (renamed from gst/app/gstappsrc.h)0
-rw-r--r--gst/app/Makefile.am15
-rw-r--r--gst/app/gstapp.c2
11 files changed, 78 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index c8e183ae..d51ef293 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2007-03-03 David Schleef <ds@schleef.org>
+
+ * Makefile.am:
+ * configure.ac:
+ * ext/Makefile.am:
+ * gst-libs/gst/Makefile.am:
+ * gst-libs/gst/app/Makefile.am:
+ * gst-libs/gst/app/gstapp.c:
+ * gst-libs/gst/app/gstappsrc.c:
+ * gst-libs/gst/app/gstappsrc.h:
+ * gst/app/Makefile.am:
+ * gst/app/gstapp.c:
+ * gst/app/gstappsrc.c:
+ * gst/app/gstappsrc.h:
+ Move the app library to gst-libs/gst/app (duh!)
+
2007-03-02 Christian Schaller <christian at fluendo dot com>
Patch by: Nguyen Thai Ngoc Duy <pcloud@gmail.com>
diff --git a/Makefile.am b/Makefile.am
index 10501670..53772847 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS_EXAMPLES =
endif
SUBDIRS = \
- gst gst-libs sys ext \
+ gst-libs gst sys ext \
m4 common docs tests po \
$(SUBDIRS_EXAMPLES)
diff --git a/configure.ac b/configure.ac
index 9f7b85d2..047e1c66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1076,6 +1076,7 @@ gst/real/Makefile
gst/y4m/Makefile
gst-libs/Makefile
gst-libs/gst/Makefile
+gst-libs/gst/app/Makefile
gst-libs/ext/Makefile
gst-libs/ext/amrwb/Makefile
sys/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 9a0dd8b0..d8ddaa47 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -227,13 +227,13 @@ SPC_DIR=
endif
if USE_SWFDEC
-SWFDEC_DIR=swfdec
+#SWFDEC_DIR=swfdec
else
SWFDEC_DIR=
endif
if USE_THEORADEC
-THEORA_DIR = theora
+#THEORA_DIR = theora
else
THEORA_DIR =
endif
diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
index 2df58b3b..a6ebbe91 100644
--- a/gst-libs/gst/Makefile.am
+++ b/gst-libs/gst/Makefile.am
@@ -1 +1,4 @@
+
+SUBDIRS = app
+
noinst_HEADERS = gst-i18n-plugin.h gettext.h
diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
new file mode 100644
index 00000000..50768a9d
--- /dev/null
+++ b/gst-libs/gst/app/Makefile.am
@@ -0,0 +1,10 @@
+lib_LTLIBRARIES = libgstapp-@GST_MAJORMINOR@.la
+
+libgstapp_@GST_MAJORMINOR@_la_SOURCES = gstappsrc.c
+libgstapp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
+ $(GST_PLUGINS_BASE_CFLAGS)
+libgstapp_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS)
+libgstapp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LDFLAGS)
+
+noinst_HEADERS = gstappsrc.h
+
diff --git a/gst-libs/gst/app/gstapp.c b/gst-libs/gst/app/gstapp.c
new file mode 100644
index 00000000..077c8707
--- /dev/null
+++ b/gst-libs/gst/app/gstapp.c
@@ -0,0 +1,41 @@
+/* GStreamer
+ * Copyright (C) 2007 David Schleef <ds@schleef.org>
+ *
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+
+#include "gstappsrc.h"
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+ GST_DEBUG_CATEGORY_INIT (app_src_debug, "appsrc", 0, "appsrc");
+
+ return gst_element_register (plugin, "appsrc", GST_RANK_NONE,
+ GST_TYPE_APP_SRC);
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+ GST_VERSION_MINOR,
+ "app",
+ "Elements used to communicate with applications",
+ plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/app/gstappsrc.c b/gst-libs/gst/app/gstappsrc.c
index 1d5b45c6..1d5b45c6 100644
--- a/gst/app/gstappsrc.c
+++ b/gst-libs/gst/app/gstappsrc.c
diff --git a/gst/app/gstappsrc.h b/gst-libs/gst/app/gstappsrc.h
index 48990bf9..48990bf9 100644
--- a/gst/app/gstappsrc.h
+++ b/gst-libs/gst/app/gstappsrc.h
diff --git a/gst/app/Makefile.am b/gst/app/Makefile.am
index d232d330..d9b9d0d7 100644
--- a/gst/app/Makefile.am
+++ b/gst/app/Makefile.am
@@ -1,18 +1,9 @@
-lib_LTLIBRARIES = libgstapp-0.10.la
-
plugin_LTLIBRARIES = libgstapp.la
libgstapp_la_SOURCES = gstapp.c
libgstapp_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
- $(GST_PLUGINS_BASE_CFLAGS)
-libgstapp_la_LIBADD = $(GST_BASE_LIBS) libgstapp-0.10.la
+ $(GST_PLUGINS_BASE_CFLAGS) \
+ $(top_srcdir)/gst-libs/
+libgstapp_la_LIBADD = $(GST_BASE_LIBS) $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la
libgstapp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstapp_0_10_la_SOURCES = gstappsrc.c
-libgstapp_0_10_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
- $(GST_PLUGINS_BASE_CFLAGS)
-libgstapp_0_10_la_LIBADD = $(GST_BASE_LIBS)
-libgstapp_0_10_la_LDFLAGS = $(GST_LDFLAGS)
-
-noinst_HEADERS = gstappsrc.h
-
diff --git a/gst/app/gstapp.c b/gst/app/gstapp.c
index 077c8707..6619dfac 100644
--- a/gst/app/gstapp.c
+++ b/gst/app/gstapp.c
@@ -23,7 +23,7 @@
#include <gst/gst.h>
-#include "gstappsrc.h"
+#include <gst/app/gstappsrc.h>
static gboolean
plugin_init (GstPlugin * plugin)