projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f22687b fa300ae)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 28 Feb 2011 10:47:44 +0000 (11:47 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 28 Feb 2011 10:47:44 +0000 (11:47 +0100)
Conflicts:
configure.ac
gst-libs/gst/pbutils/Makefile.am

18 files changed:
1  2 
configure.ac patch | diff1 | diff2 | blob | history
ext/ogg/gstoggdemux.c patch | diff1 | diff2 | blob | history
gst-libs/gst/app/Makefile.am patch | diff1 | diff2 | blob | history
gst-libs/gst/audio/Makefile.am patch | diff1 | diff2 | blob | history
gst-libs/gst/cdda/Makefile.am patch | diff1 | diff2 | blob | history
gst-libs/gst/fft/Makefile.am patch | diff1 | diff2 | blob | history
gst-libs/gst/interfaces/Makefile.am patch | diff1 | diff2 | blob | history
gst-libs/gst/netbuffer/Makefile.am patch | diff1 | diff2 | blob | history
gst-libs/gst/pbutils/Makefile.am patch | diff1 | diff2 | blob | history
gst-libs/gst/riff/Makefile.am patch | diff1 | diff2 | blob | history
gst-libs/gst/rtp/Makefile.am patch | diff1 | diff2 | blob | history
gst-libs/gst/rtsp/Makefile.am patch | diff1 | diff2 | blob | history
gst-libs/gst/sdp/Makefile.am patch | diff1 | diff2 | blob | history
gst-libs/gst/tag/Makefile.am patch | diff1 | diff2 | blob | history
gst-libs/gst/video/Makefile.am patch | diff1 | diff2 | blob | history
gst/playback/gstdecodebin2.c patch | diff1 | diff2 | blob | history
gst/tcp/gstmultifdsink.c patch | diff1 | diff2 | blob | history
gst/tcp/gstmultifdsink.h patch | diff1 | diff2 | blob | history

diff --cc configure.ac
index 71d0349,5b08865..f33b979
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1031,10 -1058,10 +1058,10 @@@ 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/.* USE_BINARY_REGISTRY$/#define USE_BINARY_REGISTRY/' \
      -e 's/.* VERSION$/#define VERSION "'$VERSION'"/' \
-     -e "s/.* DEFAULT_AUDIOSINK$/#define DEFAULT_AUDIOSINK \"directaudiosink\"/" \
+     -e "s/.* DEFAULT_AUDIOSINK$/#define DEFAULT_AUDIOSINK \"directsoundsink\"/" \
      -e "s/.* DEFAULT_VIDEOSINK$/#define DEFAULT_VIDEOSINK \"directdrawsink\"/" \
      -e "s/.* DEFAULT_VISUALIZER$/#define DEFAULT_VISUALIZER \"goom\"/" \
      config.h.in >win32/common/config.h-new
diff --cc ext/ogg/gstoggdemux.c
Simple merge
diff --cc gst-libs/gst/app/Makefile.am
index ad55d00,cf2c852..1064239
--- 1/gst-libs/gst/app/Makefile.am
--- 2/gst-libs/gst/app/Makefile.am
+++ b/gst-libs/gst/app/Makefile.am
@@@ -70,11 -70,12 +70,12 @@@ typelibsdir = $(libdir)/girepository-1.
  typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
  
  %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
 -              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
 -              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
 +              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-`@GST_MAJORMINOR@ \
 +              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-`@GST_MAJORMINOR@ \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
  
  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --cc gst-libs/gst/audio/Makefile.am
Simple merge
diff --cc gst-libs/gst/cdda/Makefile.am
Simple merge
diff --cc gst-libs/gst/fft/Makefile.am
index 2ab5265,bf14e55..7e84eae
--- 1/gst-libs/gst/fft/Makefile.am
--- 2/gst-libs/gst/fft/Makefile.am
+++ b/gst-libs/gst/fft/Makefile.am
@@@ -77,10 -77,11 +77,11 @@@ typelibsdir = $(libdir)/girepository-1.
  typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
  
  %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
 -              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
 +              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
  
  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --cc gst-libs/gst/interfaces/Makefile.am
index 6fd5a30,eca6a80..f462211
--- 1/gst-libs/gst/interfaces/Makefile.am
--- 2/gst-libs/gst/interfaces/Makefile.am
+++ b/gst-libs/gst/interfaces/Makefile.am
@@@ -108,10 -108,11 +108,11 @@@ typelibsdir = $(libdir)/girepository-1.
  typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
  
  %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
 -              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
 +              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
  
  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --cc gst-libs/gst/netbuffer/Makefile.am
index ec86c57,9f70a39..fced57c
--- 1/gst-libs/gst/netbuffer/Makefile.am
--- 2/gst-libs/gst/netbuffer/Makefile.am
+++ b/gst-libs/gst/netbuffer/Makefile.am
@@@ -42,10 -42,11 +42,11 @@@ typelibsdir = $(libdir)/girepository-1.
  typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
  
  %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
 -              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
 +              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
  
  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --cc gst-libs/gst/pbutils/Makefile.am
index 2962897,2a129c9..e26ef9b
--- 1/gst-libs/gst/pbutils/Makefile.am
--- 2/gst-libs/gst/pbutils/Makefile.am
+++ b/gst-libs/gst/pbutils/Makefile.am
@@@ -79,13 -83,16 +83,16 @@@ GstPbutils-@GST_MAJORMINOR@.gir: $(INTR
                -I$(top_srcdir)/gst-libs \
                -I$(top_builddir)/gst-libs \
                --add-include-path=$(srcdir)/../video \
 -              --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
 -              --library=libgstpbutils-0.10.la \
 -              --library-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10` \
 -              --library=gstreamer-0.10 \
 -              --include=Gst-0.10 \
 +              --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \
 +              --library=libgstpbutils-@GST_MAJORMINOR@.la \
++              --library-path=`$(PKG_CONFIG) --variable=libdir gstreamer-@GST_MAJORMINOR@` \
++              --library=gstreamer-@GST_MAJORMINOR@ \
 +              --include=Gst-@GST_MAJORMINOR@ \
                --libtool="$(top_builddir)/libtool" \
 -              --pkg gstreamer-0.10 \
 +              --pkg gstreamer-@GST_MAJORMINOR@ \
                --pkg gstreamer-video-@GST_MAJORMINOR@ \
                --pkg-export gstreamer-pbutils-@GST_MAJORMINOR@ \
+               --add-init-section="gst_init(NULL,NULL);" \
                --output $@ \
                $(gir_headers) \
                $(gir_sources)
diff --cc gst-libs/gst/riff/Makefile.am
Simple merge
diff --cc gst-libs/gst/rtp/Makefile.am
index 7921b09,36a423a..130f2c9
--- 1/gst-libs/gst/rtp/Makefile.am
--- 2/gst-libs/gst/rtp/Makefile.am
+++ b/gst-libs/gst/rtp/Makefile.am
@@@ -57,11 -57,12 +57,12 @@@ typelibsdir = $(libdir)/girepository-1.
  typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
  
  %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
 -              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
 -              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
 +              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \
 +              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
  
  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --cc gst-libs/gst/rtsp/Makefile.am
Simple merge
diff --cc gst-libs/gst/sdp/Makefile.am
index 1ba7dc3,55480eb..6c8dae2
--- 1/gst-libs/gst/sdp/Makefile.am
--- 2/gst-libs/gst/sdp/Makefile.am
+++ b/gst-libs/gst/sdp/Makefile.am
@@@ -45,10 -45,11 +45,11 @@@ typelibsdir = $(libdir)/girepository-1.
  typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
  
  %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
 -              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
 +              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
  
  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --cc gst-libs/gst/tag/Makefile.am
index 7443059,15263dd..9dce438
--- 1/gst-libs/gst/tag/Makefile.am
--- 2/gst-libs/gst/tag/Makefile.am
+++ b/gst-libs/gst/tag/Makefile.am
@@@ -54,11 -54,12 +54,12 @@@ typelibsdir = $(libdir)/girepository-1.
  typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
  
  %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
 -              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
 -              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
 +              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \
 +              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
  
  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --cc gst-libs/gst/video/Makefile.am
index 793ede5,26d5d1b..fd91258
--- 1/gst-libs/gst/video/Makefile.am
--- 2/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@@ -68,11 -68,12 +68,12 @@@ typelibsdir = $(libdir)/girepository-1.
  typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
  
  %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
 -              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
 -              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
 +              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \
 +              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
  
  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --cc gst/playback/gstdecodebin2.c
Simple merge
diff --cc gst/tcp/gstmultifdsink.c
Simple merge
diff --cc gst/tcp/gstmultifdsink.h
Simple merge
Domain: Multimedia / Media Common;