diff options
| -rw-r--r-- | patches/gstreamer-0.10.25/0001-do-not-poison-gst_trace_add_entry.patch | 29 | ||||
| -rw-r--r-- | patches/gstreamer-0.10.25/series | 1 | ||||
| -rw-r--r-- | rules/gstreamer.make | 45 |
3 files changed, 52 insertions, 23 deletions
diff --git a/patches/gstreamer-0.10.25/0001-do-not-poison-gst_trace_add_entry.patch b/patches/gstreamer-0.10.25/0001-do-not-poison-gst_trace_add_entry.patch new file mode 100644 index 000000000..f209bae17 --- /dev/null +++ b/patches/gstreamer-0.10.25/0001-do-not-poison-gst_trace_add_entry.patch @@ -0,0 +1,29 @@ +From 485ae69c9e02f316eb820bfd80eac6c7b14fb973 Mon Sep 17 00:00:00 2001 +From: Peter Kjellerstedt <pkj@axis.com> +Date: Wed, 14 Oct 2009 08:54:32 +0000 +Subject: trace: Do not poison gst_trace_add_entry() + +Since gst_trace_add_entry() is a macro, gcc will barf when it is +defined in case it has been poisoned due to trace support being +disabled. + +STATUS: Cherry picked from upstream, should not be needed +anymore when 0.10.26 is released + +Signed-off-by: Erwin Rol <erwin@erwinrol.com> + +--- +diff --git a/gst/gsttrace.h b/gst/gsttrace.h +index 6372224..59bb340 100644 +--- a/gst/gsttrace.h ++++ b/gst/gsttrace.h +@@ -223,7 +223,6 @@ extern gint _gst_trace_on; + #pragma GCC poison gst_trace_set_default + #pragma GCC poison _gst_trace_add_entry + #pragma GCC poison gst_trace_read_tsc +-#pragma GCC poison gst_trace_add_entry + #endif + + #define gst_alloc_trace_register(name) (NULL) +-- +cgit v0.8.3-6-g21f6 diff --git a/patches/gstreamer-0.10.25/series b/patches/gstreamer-0.10.25/series new file mode 100644 index 000000000..8a1876092 --- /dev/null +++ b/patches/gstreamer-0.10.25/series @@ -0,0 +1 @@ +0001-do-not-poison-gst_trace_add_entry.patch diff --git a/rules/gstreamer.make b/rules/gstreamer.make index 19bc82e61..7c193e903 100644 --- a/rules/gstreamer.make +++ b/rules/gstreamer.make @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_GSTREAMER) += gstreamer # # Paths and names # -GSTREAMER_VERSION := 0.10.22 +GSTREAMER_VERSION := 0.10.25 GSTREAMER := gstreamer-$(GSTREAMER_VERSION) GSTREAMER_SUFFIX := tar.bz2 GSTREAMER_URL := http://gstreamer.freedesktop.org/src/gstreamer/$(GSTREAMER).$(GSTREAMER_SUFFIX) @@ -35,9 +35,6 @@ $(GSTREAMER_SOURCE): # Prepare # ---------------------------------------------------------------------------- -GSTREAMER_PATH := PATH=$(CROSS_PATH) -GSTREAMER_ENV := $(CROSS_ENV) - # # autoconf # @@ -56,13 +53,15 @@ GSTREAMER_AUTOCONF := \ --disable-tests \ --disable-failing-tests \ --disable-poisoning \ - --disable-binary-registry \ - --disable-large-file \ --disable-docbook \ --disable-gtk-doc \ --without-libiconv-prefix \ --without-libintl-prefix \ - --without-check + --enable-largefile \ + --disable-introspection \ + --disable-check \ + --enable-shave + ifdef PTXCONF_GSTREAMER__DEBUG GSTREAMER_AUTOCONF += --enable-gst-debug @@ -132,30 +131,30 @@ ifdef PTXCONF_GSTREAMER__INSTALL_LAUNCH endif ifdef PTXCONF_GSTREAMER__NETDIST @$(call install_copy, gstreamer, 0, 0, 0644, -, \ - /usr/lib/libgstnet-0.10.so.0.19.0) + /usr/lib/libgstnet-0.10.so.0.22.0) @$(call install_link, gstreamer, \ - libgstnet-0.10.so.0.19.0, \ + libgstnet-0.10.so.0.22.0, \ /usr/lib/libgstnet-0.10.so.0) @$(call install_link, gstreamer, \ - libgstnet-0.10.so.0.19.0, \ + libgstnet-0.10.so.0.22.0, \ /usr/lib/libgstnet-0.10.so) endif @$(call install_copy, gstreamer, 0, 0, 0644, -, \ - /usr/lib/libgstcontroller-0.10.so.0.19.0) + /usr/lib/libgstcontroller-0.10.so.0.22.0) @$(call install_link, gstreamer, \ - libgstcontroller-0.10.so.0.19.0, \ + libgstcontroller-0.10.so.0.22.0, \ /usr/lib/libgstcontroller-0.10.so.0) @$(call install_link, gstreamer, \ - libgstcontroller-0.10.so.0.19.0, \ + libgstcontroller-0.10.so.0.22.0, \ /usr/lib/libgstcontroller-0.10.so) @$(call install_copy, gstreamer, 0, 0, 0644, -, \ - /usr/lib/libgstreamer-0.10.so.0.19.0) + /usr/lib/libgstreamer-0.10.so.0.22.0) @$(call install_link, gstreamer, \ - libgstreamer-0.10.so.0.19.0, \ + libgstreamer-0.10.so.0.22.0, \ /usr/lib/libgstreamer-0.10.so.0) @$(call install_link, gstreamer, \ - libgstreamer-0.10.so.0.19.0, \ + libgstreamer-0.10.so.0.22.0, \ /usr/lib/libgstreamer-0.10.so) @$(call install_copy, gstreamer, 0, 0, 0644, -, \ @@ -165,22 +164,22 @@ endif /usr/lib/gstreamer-0.10/libgstcoreindexers.so) @$(call install_copy, gstreamer, 0, 0, 0644, -, \ - /usr/lib/libgstdataprotocol-0.10.so.0.19.0) + /usr/lib/libgstdataprotocol-0.10.so.0.22.0) @$(call install_link, gstreamer, \ - libgstdataprotocol-0.10.so.0.19.0, \ + libgstdataprotocol-0.10.so.0.22.0, \ /usr/lib/libgstdataprotocol-0.10.so.0) @$(call install_link, gstreamer, \ - libgstdataprotocol-0.10.so.0.19.0, \ + libgstdataprotocol-0.10.so.0.22.0, \ /usr/lib/libgstdataprotocol-0.10.so) @$(call install_copy, gstreamer, 0, 0, 0644, -, \ - /usr/lib/libgstbase-0.10.so.0.19.0) + /usr/lib/libgstbase-0.10.so.0.22.0) @$(call install_link, gstreamer, \ - libgstbase-0.10.so.0.19.0, \ + libgstbase-0.10.so.0.22.0, \ /usr/lib/libgstbase-0.10.so.0) @$(call install_link, gstreamer, \ - libgstbase-0.10.so.0.19.0, \ - /usr/lib/libgstbase-0.10.so.0) + libgstbase-0.10.so.0.22.0, \ + /usr/lib/libgstbase-0.10.so) @$(call install_finish, gstreamer) |