diff -Nurd -x'*~' gst-plugins-base-0.10.35.orig/configure.ac gst-plugins-base-0.10.35/configure.ac --- gst-plugins-base-0.10.35.orig/configure.ac 2011-06-15 14:19:12.000000000 -0400 +++ gst-plugins-base-0.10.35/configure.ac 2015-02-14 16:26:42.000000000 -0500 @@ -12,7 +12,7 @@ AG_GST_INIT dnl initialize automake -AM_INIT_AUTOMAKE([-Wno-portability 1.10]) +AM_INIT_AUTOMAKE([-Wno-portability 1.10 subdir-objects]) dnl define PACKAGE_VERSION_* variables AS_VERSION diff -Nurd -x'*~' gst-plugins-base-0.10.35.orig/docs/plugins/Makefile.am gst-plugins-base-0.10.35/docs/plugins/Makefile.am --- gst-plugins-base-0.10.35.orig/docs/plugins/Makefile.am 2011-06-13 18:36:30.000000000 -0400 +++ gst-plugins-base-0.10.35/docs/plugins/Makefile.am 2015-02-14 16:26:19.000000000 -0500 @@ -138,7 +138,7 @@ # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib # contains GtkObjects/GObjects and you want to document signals and properties. -GTKDOC_CFLAGS = $(GST_BASE_CFLAGS) -I$(top_builddir) -I$(top_builddir)/gst-libs +GTKDOC_CFLAGS = -I$(top_builddir) -I$(top_builddir)/gst-libs $(GST_BASE_CFLAGS) GTKDOC_LIBS = $(SCANOBJ_DEPS) $(GST_BASE_LIBS) GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC) diff -Nurd -x'*~' gst-plugins-base-0.10.35.orig/ext/cdparanoia/gstcdparanoiasrc.c gst-plugins-base-0.10.35/ext/cdparanoia/gstcdparanoiasrc.c --- gst-plugins-base-0.10.35.orig/ext/cdparanoia/gstcdparanoiasrc.c 2011-06-14 08:52:16.000000000 -0400 +++ gst-plugins-base-0.10.35/ext/cdparanoia/gstcdparanoiasrc.c 2015-02-14 16:26:19.000000000 -0500 @@ -24,6 +24,9 @@ #include "config.h" #endif +#define GSTVERSION "@GSTVERSION@" +#undef VERSION + #include #include @@ -538,4 +541,4 @@ GST_VERSION_MINOR, "cdparanoia", "Read audio from CD in paranoid mode", - plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) + plugin_init, GSTVERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff -Nurd -x'*~' gst-plugins-base-0.10.35.orig/gst/app/Makefile.am gst-plugins-base-0.10.35/gst/app/Makefile.am --- gst-plugins-base-0.10.35.orig/gst/app/Makefile.am 2011-06-13 18:36:39.000000000 -0400 +++ gst-plugins-base-0.10.35/gst/app/Makefile.am 2015-02-14 16:26:19.000000000 -0500 @@ -1,7 +1,7 @@ plugin_LTLIBRARIES = libgstapp.la libgstapp_la_SOURCES = gstapp.c -libgstapp_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) +libgstapp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GST_BASE_CFLAGS) libgstapp_la_LIBADD = $(GST_BASE_LIBS) $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la libgstapp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstapp_la_LIBTOOLFLAGS = --tag=disable-static diff -Nurd -x'*~' gst-plugins-base-0.10.35.orig/tests/check/Makefile.am gst-plugins-base-0.10.35/tests/check/Makefile.am --- gst-plugins-base-0.10.35.orig/tests/check/Makefile.am 2011-06-14 08:52:17.000000000 -0400 +++ gst-plugins-base-0.10.35/tests/check/Makefile.am 2015-02-14 16:26:19.000000000 -0500 @@ -35,7 +35,7 @@ endif if USE_GNOME_VFS -check_gnomevfs = elements/gnomevfssink +check_gnomevfs = else check_gnomevfs = endif @@ -59,7 +59,7 @@ endif if USE_PANGO -check_pango = elements/textoverlay +check_pango = else check_pango = endif @@ -137,7 +137,6 @@ generic/clock-selection \ generic/states \ gst/typefindfunctions \ - libs/libsabi \ libs/audio \ libs/cddabasesrc \ libs/discoverer \ @@ -190,26 +189,6 @@ SUPPRESSIONS = $(top_srcdir)/common/gst.supp $(srcdir)/gst-plugins-base.supp -libs_libsabi_CFLAGS = \ - $(GST_PLUGINS_BASE_CFLAGS) \ - $(GST_BASE_CFLAGS) \ - $(AM_CFLAGS) - -libs_libsabi_LDADD = \ - $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/fft/libgstfft-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/netbuffer/libgstnetbuffer-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/rtp/libgstrtp-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/rtsp/libgstrtsp-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \ - $(GST_BASE_LIBS) \ - $(LDADD) - libs_audio_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ @@ -234,6 +213,7 @@ libs_discoverer_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ $(AM_CFLAGS) \ -DGST_TEST_FILE="\"$(abs_top_srcdir)/tests/files/partialframe.mjpeg\"" libs_discoverer_LDADD = \ @@ -272,6 +252,7 @@ libs_netbuffer_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ $(AM_CFLAGS) libs_netbuffer_LDADD = \ $(top_builddir)/gst-libs/gst/netbuffer/libgstnetbuffer-@GST_MAJORMINOR@.la \ @@ -279,6 +260,7 @@ libs_rtp_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ $(AM_CFLAGS) libs_rtp_LDADD = \ $(top_builddir)/gst-libs/gst/rtp/libgstrtp-@GST_MAJORMINOR@.la \ @@ -286,6 +268,7 @@ libs_rtsp_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ $(AM_CFLAGS) libs_rtsp_LDADD = \ $(top_builddir)/gst-libs/gst/rtsp/libgstrtsp-@GST_MAJORMINOR@.la \ @@ -301,6 +284,7 @@ libs_pbutils_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ $(AM_CFLAGS) libs_pbutils_LDADD = \ $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ @@ -309,6 +293,7 @@ libs_profile_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ $(AM_CFLAGS) libs_profile_LDADD = \ $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la $(LDADD) @@ -328,6 +313,7 @@ elements_appsink_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ $(AM_CFLAGS) elements_appsink_LDADD = \ @@ -336,6 +322,7 @@ elements_appsrc_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ $(AM_CFLAGS) elements_appsrc_LDADD = \ @@ -362,7 +349,7 @@ $(LDADD) elements_audiorate_LDADD = $(LDADD) -elements_audiorate_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS) +elements_audiorate_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS) elements_libvisual_LDADD = $(LDADD) elements_libvisual_CFLAGS = $(CFLAGS) $(AM_CFLAGS) @@ -386,7 +373,7 @@ elements_decodebin2_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS) elements_subparse_LDADD = $(LDADD) -elements_subparse_CFLAGS = $(CFLAGS) $(AM_CFLAGS) +elements_subparse_CFLAGS = $(GST_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS) elements_audioresample_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ @@ -422,6 +409,7 @@ elements_vorbisdec_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ $(AM_CFLAGS) \ $(VORBIS_CFLAGS) \ $(CFLAGS) @@ -433,6 +421,7 @@ elements_vorbistag_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ $(AM_CFLAGS) \ $(VORBIS_CFLAGS) \ $(CFLAGS) @@ -445,7 +434,7 @@ $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \ $(GST_BASE_LIBS) $(LDADD) -gst_typefindfunctions_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS) +gst_typefindfunctions_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CPPFLAGS) $(AM_CFLAGS) gst_typefindfunctions_LDADD = $(GST_BASE_LIBS) $(LDADD) libs_video_CFLAGS = \ @@ -458,22 +447,23 @@ $(GST_BASE_LIBS) \ $(LDADD) -pipelines_gio_CFLAGS = $(GIO_CFLAGS) $(AM_CFLAGS) +pipelines_gio_CFLAGS = $(GIO_CFLAGS) $(AM_CFLAGS) $(GST_BASE_CFLAGS) pipelines_gio_LDADD = $(GIO_LIBS) $(LDADD) pipelines_vorbisenc_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ $(AM_CFLAGS) # this seemingly useless CFLAGS line is here only to avoid # vorbisdec.$(OBJEXT) by triggering creation of pipelines_vorbisdec.$(OBJEXT) # instead -pipelines_vorbisdec_CFLAGS = $(AM_CFLAGS) +pipelines_vorbisdec_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS) pipelines_oggmux_LDADD = $(LDADD) $(OGG_LIBS) -pipelines_oggmux_CFLAGS = $(AM_CFLAGS) $(OGG_CFLAGS) +pipelines_oggmux_CFLAGS = $(AM_CFLAGS) $(OGG_CFLAGS) $(GST_BASE_CFLAGS) -pipelines_theoraenc_CFLAGS = $(AM_CFLAGS) $(THEORA_CFLAGS) +pipelines_theoraenc_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS) $(THEORA_CFLAGS) pipelines_theoraenc_LDADD = $(LDADD) $(THEORA_LIBS) pipelines_simple_launch_lines_CFLAGS = \ From bdb33163478fdf95938fbdca7eabad3ea920a277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 27 Apr 2013 09:25:35 +0100 Subject: video: fix compiler warning in header with C++11 / clang-3.1 ...include/gstreamer-0.10/gst/video/video.h:357:17: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] "width = "GST_VIDEO_SIZE_RANGE" , " \ https://bugzilla.gnome.org/show_bug.cgi?id=699009 --- gst-libs/gst/video/video.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/video/video.h b/gst-libs/gst/video/video.h index 876aab5..5481a5c 100644 --- a/gst-libs/gst/video/video.h +++ b/gst-libs/gst/video/video.h @@ -356,9 +356,9 @@ typedef enum { */ #define GST_VIDEO_CAPS_RGB8_PALETTED \ "video/x-raw-rgb, bpp = (int)8, depth = (int)8, " \ - "width = "GST_VIDEO_SIZE_RANGE" , " \ + "width = " GST_VIDEO_SIZE_RANGE " , " \ "height = " GST_VIDEO_SIZE_RANGE ", " \ - "framerate = "GST_VIDEO_FPS_RANGE + "framerate = " GST_VIDEO_FPS_RANGE /** * GST_VIDEO_CAPS_YUV: -- cgit v1.1