mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

more 0.10 -> 0.11

Browse source
This commit is contained in:
Wim Taymans 2010-12-06 13:21:45 +01:00
parent 46096edff9
commit 99775e5271
19 changed files with 61 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/base.mk
View file

@ -3,7 +3,7 @@ LOCAL_PATH:= $(call my-dir)
#------------------------------------
# include section
#-----------------------------------
gst_base_COPY_HEADERS_TO := gstreamer-0.10/gst/base
gst_base_COPY_HEADERS_TO := gstreamer-0.11/gst/base
gst_base_COPY_HEADERS := \
../libs/gst/base/gstadapter.h \
../libs/gst/base/gstbasesink.h \
@ -21,7 +21,7 @@ include $(CLEAR_VARS)
LOCAL_ARM_MODE := arm
GST_MAJORMINOR:= 0.10
GST_MAJORMINOR:= 0.11
base_LOCAL_SRC_FILES:= \
libs/gst/base/gstadapter.c \
@ -40,7 +40,7 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(base_LOCAL_SRC_FILES))
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.10 \
libgstreamer-0.11 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \

6
android/controller.mk
View file

@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir)
#------------------------------------
# include section
#-----------------------------------
gst_controller_COPY_HEADERS_TO := gstreamer-0.10/gst/controller
gst_controller_COPY_HEADERS_TO := gstreamer-0.11/gst/controller
gst_controller_COPY_HEADERS := \
../libs/gst/controller/gstcontroller.h \
../libs/gst/controller/gstcontrolsource.h \
@ -14,7 +14,7 @@ include $(CLEAR_VARS)
LOCAL_ARM_MODE := arm
GST_MAJORMINOR:= 0.10
GST_MAJORMINOR:= 0.11
controller_LOCAL_SRC_FILES:= \
libs/gst/controller/lib.c \
@ -28,7 +28,7 @@ controller_LOCAL_SRC_FILES:= \
LOCAL_SRC_FILES:= $(addprefix ../,$(controller_LOCAL_SRC_FILES))
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.10 \
libgstreamer-0.11 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \

6
android/dataprotocol.mk
View file

@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir)
#------------------------------------
# include section
#-----------------------------------
gst_dataprotocol_COPY_HEADERS_TO := gstreamer-0.10/gst/dataprotocol
gst_dataprotocol_COPY_HEADERS_TO := gstreamer-0.11/gst/dataprotocol
gst_dataprotocol_COPY_HEADERS := \
../libs/gst/dataprotocol/dataprotocol.h
@ -10,7 +10,7 @@ include $(CLEAR_VARS)
LOCAL_ARM_MODE := arm
GST_MAJORMINOR:= 0.10
GST_MAJORMINOR:= 0.11
dataprotocol_LOCAL_SRC_FILES:= \
libs/gst/dataprotocol/dataprotocol.c
@ -19,7 +19,7 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(dataprotocol_LOCAL_SRC_FILES))
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.10 \
libgstreamer-0.11 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \

10
android/elements.mk
View file

@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_ARM_MODE := arm
GST_MAJORMINOR:= 0.10
GST_MAJORMINOR:= 0.11
elements_LOCAL_SRC_FILES:= \
plugins/elements/gstcapsfilter.c \
@ -26,16 +26,16 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(elements_LOCAL_SRC_FILES))
LOCAL_SHARED_LIBRARIES := \
libgstbase-0.10 \
libgstreamer-0.10 \
libgstbase-0.11 \
libgstreamer-0.11 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0
LOCAL_MODULE:= libgstcoreelements
#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/.. \

6
android/gst-inspect.mk
View file

@ -4,13 +4,13 @@ include $(CLEAR_VARS)
LOCAL_ARM_MODE := arm
GST_MAJORMINOR:= 0.10
GST_MAJORMINOR:= 0.11
LOCAL_SRC_FILES:= ../tools/gst-inspect.c
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.10 \
libgstreamer-0.11 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
@ -24,7 +24,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH) \
$(LOCAL_PATH)/.. \
$(LOCAL_PATH)/../tools \
$(TARGET_OUT_HEADERS)/gstreamer-0.10 \
$(TARGET_OUT_HEADERS)/gstreamer-0.11 \
$(TARGET_OUT_HEADERS)/glib-2.0 \
$(TARGET_OUT_HEADERS)/glib-2.0/glib \
external/libxml2/include

6
android/gst-launch.mk
View file

@ -4,12 +4,12 @@ include $(CLEAR_VARS)
LOCAL_ARM_MODE := arm
GST_MAJORMINOR:= 0.10
GST_MAJORMINOR:= 0.11
LOCAL_SRC_FILES:= ../tools/gst-launch.c
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.10 \
libgstreamer-0.11 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
@ -22,7 +22,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH) \
$(LOCAL_PATH)/.. \
$(LOCAL_PATH)/../tools \
$(TARGET_OUT_HEADERS)/gstreamer-0.10 \
$(TARGET_OUT_HEADERS)/gstreamer-0.11 \
$(TARGET_OUT_HEADERS)/glib-2.0 \
$(TARGET_OUT_HEADERS)/glib-2.0/glib \
external/libxml2/include

6
android/gst-plugin-scanner.mk
View file

@ -4,12 +4,12 @@ include $(CLEAR_VARS)
LOCAL_ARM_MODE := arm
GST_MAJORMINOR:= 0.10
GST_MAJORMINOR:= 0.11
LOCAL_SRC_FILES:= ../libs/gst/helpers/gst-plugin-scanner.c
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.10 \
libgstreamer-0.11 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
@ -22,7 +22,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH) \
$(LOCAL_PATH)/.. \
$(LOCAL_PATH)/../tools \
$(TARGET_OUT_HEADERS)/gstreamer-0.10 \
$(TARGET_OUT_HEADERS)/gstreamer-0.11 \
$(TARGET_OUT_HEADERS)/glib-2.0 \
$(TARGET_OUT_HEADERS)/glib-2.0/glib \
external/libxml2/include

4
android/gst.mk
View file

@ -3,7 +3,7 @@ LOCAL_PATH:= $(call my-dir)
#------------------------------------
# include section
#-----------------------------------
gst_COPY_HEADERS_TO := gstreamer-0.10/gst
gst_COPY_HEADERS_TO := gstreamer-0.11/gst
gst_COPY_HEADERS_BASE := \
glib-compat.h \
gst.h \
@ -74,7 +74,7 @@ include $(CLEAR_VARS)
LOCAL_ARM_MODE := arm
GST_MAJORMINOR:= 0.10
GST_MAJORMINOR:= 0.11
gst_LOCAL_SRC_FILES_BASE:= \
gst.c \

10
android/indexers.mk
View file

@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_ARM_MODE := arm
GST_MAJORMINOR:= 0.10
GST_MAJORMINOR:= 0.11
indexers_LOCAL_SRC_FILES:= \
plugins/indexers/gstindexers.c \
@ -17,16 +17,16 @@ LOCAL_STATIC_LIBRARIES := \
libxml2
LOCAL_SHARED_LIBRARIES := \
libgstbase-0.10 \
libgstreamer-0.10 \
libgstbase-0.11 \
libgstreamer-0.11 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0
LOCAL_MODULE:= libgstcoreindexers
#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/.. \

6
android/net.mk
View file

@ -1,6 +1,6 @@
LOCAL_PATH:= $(call my-dir)
gst_net_COPY_HEADERS_TO := gstreamer-0.10/gst/net
gst_net_COPY_HEADERS_TO := gstreamer-0.11/gst/net
gst_net_COPY_HEADERS := \
../libs/gst/net/gstnet.h \
../libs/gst/net/gstnetclientclock.h \
@ -11,7 +11,7 @@ include $(CLEAR_VARS)
LOCAL_ARM_MODE := arm
GST_MAJORMINOR:= 0.10
GST_MAJORMINOR:= 0.11
net_LOCAL_SRC_FILES:= \
libs/gst/net/gstnetclientclock.c \
@ -21,7 +21,7 @@ net_LOCAL_SRC_FILES:= \
LOCAL_SRC_FILES:= $(addprefix ../,$(net_LOCAL_SRC_FILES))
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.10 \
libgstreamer-0.11 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \

2
configure.ac
View file

@ -819,7 +819,7 @@ sed \
-e "s/.* PACKAGE_STRING$/#define PACKAGE_STRING \"$PACKAGE_STRING\"/" \
-e 's/.* PACKAGE_TARNAME$/#define PACKAGE_TARNAME "'$PACKAGE_TARNAME'"/' \
-e 's/.* PACKAGE_VERSION$/#define PACKAGE_VERSION "'$PACKAGE_VERSION'"/' \
-e 's/.* PLUGINDIR$/#ifdef _DEBUG\n# define PLUGINDIR PREFIX "\\\\debug\\\\lib\\\\gstreamer-0.10"\n#else\n# define PLUGINDIR PREFIX "\\\\lib\\\\gstreamer-0.10"\n#endif/' \
-e 's/.* PLUGINDIR$/#ifdef _DEBUG\n# define PLUGINDIR PREFIX "\\\\debug\\\\lib\\\\gstreamer-0.11"\n#else\n# define PLUGINDIR PREFIX "\\\\lib\\\\gstreamer-0.11"\n#endif/' \
-e 's/.* GST_PLUGIN_SCANNER_INSTALLED$/#define GST_PLUGIN_SCANNER_INSTALLED LIBDIR "\\\\gst-plugin-scanner"/' \
-e 's/.* VERSION$/#define VERSION "'$VERSION'"/' \
config.h.in >win32/common/config.h-new

4
gst/Makefile.am
View file

@ -259,7 +259,7 @@ Gst-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_MAJORMINOR@
-I$(top_builddir) \
-DIN_GOBJECT_INTROSPECTION=1 \
--c-include='gst/gst.h' \
--library=libgstreamer-0.10.la \
--library=libgstreamer-0.11.la \
--include=GLib-2.0 \
--include=GObject-2.0 \
--include=GModule-2.0 \
@ -270,7 +270,7 @@ Gst-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_MAJORMINOR@
--pkg gmodule-no-export-2.0 \
--pkg gthread-2.0 \
--pkg libxml-2.0 \
--pkg-export gstreamer-0.10 \
--pkg-export gstreamer-0.11 \
--output $@ \
$(gir_headers) \
$(gir_sources)

8
libs/gst/base/Makefile.am
View file

@ -62,11 +62,11 @@ GstBase-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_MAJORMINO
-I$(top_srcdir) \
$(gir_cincludes) \
--add-include-path=$(top_builddir)/gst \
--library=libgstbase-0.10.la \
--include=Gst-0.10 \
--library=libgstbase-0.11.la \
--include=Gst-0.11 \
--libtool="$(top_builddir)/libtool" \
--pkg gstreamer-0.10 \
--pkg-export gstreamer-base-0.10 \
--pkg gstreamer-0.11 \
--pkg-export gstreamer-base-0.11 \
--output $@ \
$(gir_headers) \
$(gir_sources)

8
libs/gst/check/Makefile.am
View file

@ -122,11 +122,11 @@ GstCheck-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_MAJORMI
-I$(top_srcdir) \
$(gir_cincludes) \
--add-include-path=$(top_builddir)/gst \
--library=libgstcheck-0.10.la \
--include=Gst-0.10 \
--library=libgstcheck-0.11.la \
--include=Gst-0.11 \
--libtool="$(top_builddir)/libtool" \
--pkg gstreamer-0.10 \
--pkg-export gstreamer-check-0.10 \
--pkg gstreamer-0.11 \
--pkg-export gstreamer-check-0.11 \
--output $@ \
$(gir_headers) \
$(gir_sources)

8
libs/gst/controller/Makefile.am
View file

@ -47,11 +47,11 @@ GstController-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@G
-I$(top_srcdir) \
$(gir_cincludes) \
--add-include-path=$(top_builddir)/gst \
--library=libgstcontroller-0.10.la \
--include=Gst-0.10 \
--library=libgstcontroller-@GST_MAJORMINOR@.la \
--include=Gst-@GST_MAJORMINOR@ \
--libtool="$(top_builddir)/libtool" \
--pkg gstreamer-0.10 \
--pkg-export gstreamer-controller-0.10 \
--pkg gstreamer-@GST_MAJORMINOR@ \
--pkg-export gstreamer-controller-@GST_MAJORMINOR@ \
--output $@ \
$(gir_headers) \
$(gir_sources)

8
libs/gst/dataprotocol/Makefile.am
View file

@ -37,11 +37,11 @@ GstDataprotocol-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstdataprotoco
-I$(top_srcdir) \
$(gir_cincludes) \
--add-include-path=$(top_builddir)/gst \
--library=libgstdataprotocol-0.10.la \
--include=Gst-0.10 \
--library=libgstdataprotocol-@GST_MAJORMINOR@.la \
--include=Gst-@GST_MAJORMINOR@ \
--libtool="$(top_builddir)/libtool" \
--pkg gstreamer-0.10 \
--pkg-export=gstreamer-dataprotocol-0.10 \
--pkg gstreamer-@GST_MAJORMINOR@ \
--pkg-export=gstreamer-dataprotocol-@GST_MAJORMINOR@ \
--output $@ \
$(gir_headers) \
$(gir_sources)

8
libs/gst/net/Makefile.am
View file

@ -38,11 +38,11 @@ GstNet-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_MAJORMINOR@
-I$(top_srcdir) \
$(gir_cincludes) \
--add-include-path=$(top_builddir)/gst \
--library=libgstnet-0.10.la \
--include=Gst-0.10 \
--library=libgstnet-@GST_MAJORMINOR@.la \
--include=Gst-@GST_MAJORMINOR@ \
--libtool="$(top_builddir)/libtool" \
--pkg gstreamer-0.10 \
--pkg-export="gstreamer-net-0.10" \
--pkg gstreamer-@GST_MAJORMINOR@ \
--pkg-export="gstreamer-net-@GST_MAJORMINOR@" \
--output $@ \
$(gir_headers) \
$(gir_sources)

6
tools/gst-feedback-m.m
View file

@ -49,7 +49,7 @@ do
echo
done
for mm in 0.9 0.10
for mm in 0.9 0.10 0.11
do
for module in gstreamer gstreamer-base gstreamer-check gstreamer-controller\
gstreamer-dataprotocol gstreamer-plugins-base gstreamer-net\
@ -69,7 +69,7 @@ command_output "gst-inspect"
command_output "gst-inspect fakesrc"
command_output "gst-inspect fakesink"
command_output "gst-launch fakesrc num-buffers=5 ! fakesink"
for mm in 0.6 0.7 0.8 0.9 0.10
for mm in 0.6 0.7 0.8 0.9 0.10 0.11
do
echo "+ GSTREAMER INFORMATION ($mm)"
command_output "which gst-inspect-$mm"
@ -94,7 +94,7 @@ done
echo "+ GSTREAMER PLUG-INS INFORMATION"
command_output "gst-inspect volume"
for mm in 0.6 0.7 0.8 0.9 0.10
for mm in 0.6 0.7 0.8 0.9 0.10 0.11
do
command_output "gst-inspect-$mm volume"
done

4
tools/gstreamer-completion
View file

@ -6,8 +6,8 @@ _gst_launch()
{
local cur
: ${GST_REGISTRY:=~/.gstreamer-0.10/registry.xml}
: ${GST_COMPLETE:=~/.gstreamer-0.10/complete}
: ${GST_REGISTRY:=~/.gstreamer-0.11/registry.xml}
: ${GST_COMPLETE:=~/.gstreamer-0.11/complete}
if [ ! -f "${GST_REGISTRY}" ] ; then
return 0