mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 03:31:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

changed libgst -> libgstreamer to comply with namespace issues with gnu smalltalk various other fixes

Browse source 
Original commit message from CVS:
* changed libgst -> libgstreamer to comply with namespace issues with gnu smalltalk
* various other fixes
This commit is contained in:
Andy Wingo 2002-02-10 17:09:53 +00:00
parent c90c7ea286
commit b47aea64e1
11 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common

@ -1 +1 @@
Subproject commit 8a9436f47d6e851edbf25d4cceaf071bdc6d11a2
Subproject commit 2c019822f7097285eba6c1898ef9f3e996fadc8f

2
components/bonobo-gstmediaplay/Makefile.am
View file

@ -21,7 +21,7 @@ bonobo_gstmediaplay_CFLAGS = -Wall -O2 \
bonobo_gstmediaplay_LDADD = \
$(top_srcdir)/gstplay/libgstmediaplay.la \
$(top_srcdir)/gst/libgst.la
$(top_srcdir)/gst/libgstreamer.la
bonobo_gstmediaplay_LDFLAGS = \
$(shell gnome-config --libs gnome gnomeui bonobo bonobox) $(shell libglade-config --libs gnome) \

2
configure.ac
View file

@ -376,7 +376,7 @@ AC_SUBST(LIBGST_LIBS)
AC_SUBST(LIBGST_CFLAGS)
dnl Vars for everyone else
GST_INT_LIBS="\$(top_builddir)/gst/libgst.la"
GST_INT_LIBS="\$(top_builddir)/gst/libgstreamer.la"
GST_INT_CFLAGS="-I\$(top_srcdir)/libs -I\$(top_srcdir)/include -I\$(top_srcdir) -Wall"
AC_SUBST(GST_CFLAGS, "$GST_EXT_CFLAGS $GST_INT_CFLAGS")

18
gst/Makefile.am
View file

@ -1,5 +1,5 @@
lib_LTLIBRARIES = libgst.la
lib_LTLIBRARIES = libgstreamer.la
noinst_LTLIBRARIES = libcothreads.la
if HAVE_CPU_I386
@ -42,14 +42,14 @@ else
GST_TRACE_SRC = gsttrace.c
endif
EXTRA_libgst_la_SOURCES = gstcpuid_i386.s gstmarshal.list gstxml.c gsttypefind.c gstparse.c gstautoplug.c gsttrace.c
EXTRA_libgstreamer_la_SOURCES = gstcpuid_i386.s gstmarshal.list gstxml.c gsttypefind.c gstparse.c gstautoplug.c gsttrace.c
# cheap trick to build . first...
SUBDIRS = . types elements $(GST_AUTOPLUG_DIRS) schedulers
DIST_SUBDIRS = types elements autoplug schedulers
libcothreads_la_SOURCES = cothreads.c
libgst_la_SOURCES = \
libgstreamer_la_SOURCES = \
gst.c \
gstmarshal.c \
gstobject.c \
@ -105,8 +105,8 @@ dist-hook:
distclean-local:
rm -f $(top_builddir)/gst/gstmarshal.c $(top_builddir)/gst/gstmarshal.h
libgstincludedir = $(includedir)/gst
libgstinclude_HEADERS = \
libgstreamerincludedir = $(includedir)/gstreamer
libgstreamerinclude_HEADERS = \
cothreads.h \
gst.h \
gstconfig.h \
@ -149,16 +149,16 @@ noinst_HEADERS = \
gstarch.h \
gstpropsprivate.h
libgst_la_CFLAGS = -D_GNU_SOURCE -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \
libgstreamer_la_CFLAGS = -D_GNU_SOURCE -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \
$(LIBGST_CFLAGS) \
-D_GNU_SOURCE \
-DG_LOG_DOMAIN=g_log_domain_gstreamer \
-DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\"
# the compiler shoots cothreads.c in the head at -O6
libcothreads_la_CFLAGS = $(libgst_la_CFLAGS) -O2
libcothreads_la_CFLAGS = $(libgstreamer_la_CFLAGS) -O2
libgst_la_LIBADD = $(LIBGST_LIBS) libcothreads.la
libgst_la_LDFLAGS = @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@
libgstreamer_la_LIBADD = $(LIBGST_LIBS) libcothreads.la
libgstreamer_la_LDFLAGS = @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@
EXTRA_DIST = ROADMAP

2
gst/elements/Makefile.am
View file

@ -2,7 +2,7 @@ plugindir = $(libdir)/gst
plugin_LTLIBRARIES = libgstelements.la
libgstelements_la_DEPENDENCIES = ../libgst.la
libgstelements_la_DEPENDENCIES = ../libgstreamer.la
libgstelements_la_SOURCES = \
gstelements.c \
gstfakesrc.c \

2
gst/elements/gstfakesrc.c
View file

@ -267,6 +267,7 @@ gst_fakesrc_init (GstFakeSrc *fakesrc)
fakesrc->loop_based = FALSE;
gst_fakesrc_update_functions (fakesrc);
fakesrc->output = FAKESRC_FIRST_LAST_LOOP;
fakesrc->num_buffers = -1;
fakesrc->rt_num_buffers = -1;
fakesrc->buffer_count = 0;
@ -390,6 +391,7 @@ gst_fakesrc_set_property (GObject *object, guint prop_id, const GValue *value, G
gst_fakesrc_update_functions (src);
break;
case ARG_OUTPUT:
g_warning ("not yet implemented");
break;
case ARG_DATA:
src->data = g_value_get_enum (value);

2
gstreamer-uninstalled.pc.in
View file

@ -7,6 +7,6 @@ Name: GStreamer Uninstalled
Description: Streaming-media framework, Not Installed
Version: @VERSION@
Requires: @GST_PKG_DEPS@@LIBXML_PKG@
Libs: ${pcfiledir}/gst/libgst.la -L${pcfiledir}/libs/gst/control/
Libs: ${pcfiledir}/gst/libgstreamer.la -L${pcfiledir}/libs/gst/control/
Cflags: -I${pcfiledir} -I${pcfiledir}/libs -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir}/@srcdir@/libs @GST_PKG_CFLAGS@

2
gstreamer.pc.in
View file

@ -7,5 +7,5 @@ Name: GStreamer
Description: Streaming-media framework
Requires: @GST_PKG_DEPS@@LIBXML_PKG@
Version: @VERSION@
Libs: -L${libdir} -L${libdir}/gst -lgst
Libs: -L${libdir} -L${libdir}/gst -lgstreamer
Cflags: -I${includedir} @GST_PKG_CFLAGS@

4
libs/Makefile.am
View file

@ -1,3 +1,3 @@
SUBDIRS = gst ## ext
SUBDIRS = gst ext
DIST_SUBDIRS = gst ## ext
DIST_SUBDIRS = gst ext

2
plugins/elements/Makefile.am
View file

@ -2,7 +2,7 @@ plugindir = $(libdir)/gst
plugin_LTLIBRARIES = libgstelements.la
libgstelements_la_DEPENDENCIES = ../libgst.la
libgstelements_la_DEPENDENCIES = ../libgstreamer.la
libgstelements_la_SOURCES = \
gstelements.c \
gstfakesrc.c \

2
plugins/elements/gstfakesrc.c
View file

@ -267,6 +267,7 @@ gst_fakesrc_init (GstFakeSrc *fakesrc)
fakesrc->loop_based = FALSE;
gst_fakesrc_update_functions (fakesrc);
fakesrc->output = FAKESRC_FIRST_LAST_LOOP;
fakesrc->num_buffers = -1;
fakesrc->rt_num_buffers = -1;
fakesrc->buffer_count = 0;
@ -390,6 +391,7 @@ gst_fakesrc_set_property (GObject *object, guint prop_id, const GValue *value, G
gst_fakesrc_update_functions (src);
break;
case ARG_OUTPUT:
g_warning ("not yet implemented");
break;
case ARG_DATA:
src->data = g_value_get_enum (value);