While being there, add a lib version variable. Signed-off-by: Robert Schwebel <[email protected]> --- .../0001-do-not-poison-gst_trace_add_entry.patch | 29 ------------ patches/gstreamer-0.10.25/series | 1 - rules/gstreamer.make | 46 ++++++++++--------- 3 files changed, 24 insertions(+), 52 deletions(-) delete mode 100644 patches/gstreamer-0.10.25/0001-do-not-poison-gst_trace_add_entry.patch delete mode 100644 patches/gstreamer-0.10.25/series
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 deleted file mode 100644 index f209bae..0000000 --- a/patches/gstreamer-0.10.25/0001-do-not-poison-gst_trace_add_entry.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 485ae69c9e02f316eb820bfd80eac6c7b14fb973 Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt <[email protected]> -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 <[email protected]> - ---- -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 deleted file mode 100644 index 8a18760..0000000 --- a/patches/gstreamer-0.10.25/series +++ /dev/null @@ -1 +0,0 @@ -0001-do-not-poison-gst_trace_add_entry.patch diff --git a/rules/gstreamer.make b/rules/gstreamer.make index 784bfc7..2f32e3e 100644 --- a/rules/gstreamer.make +++ b/rules/gstreamer.make @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_GSTREAMER) += gstreamer # # Paths and names # -GSTREAMER_VERSION := 0.10.25 +GSTREAMER_VERSION := 0.10.29 GSTREAMER := gstreamer-$(GSTREAMER_VERSION) GSTREAMER_SUFFIX := tar.bz2 GSTREAMER_URL := http://gstreamer.freedesktop.org/src/gstreamer/$(GSTREAMER).$(GSTREAMER_SUFFIX) @@ -41,6 +41,7 @@ $(GSTREAMER_SOURCE): GSTREAMER_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --disable-nls \ + --disable-rpath \ --disable-trace \ --disable-alloc-trace \ --enable-registry \ @@ -53,15 +54,14 @@ GSTREAMER_AUTOCONF := \ --disable-tests \ --disable-failing-tests \ --disable-poisoning \ - --disable-docbook \ - --disable-gtk-doc \ - --without-libiconv-prefix \ - --without-libintl-prefix \ --enable-largefile \ --disable-introspection \ + --disable-docbook \ + --disable-gtk-doc \ + --disable-gobject-cast-checks \ --disable-check \ - --enable-shave - + --without-libiconv-prefix \ + --without-libintl-prefix ifdef PTXCONF_GSTREAMER__DEBUG GSTREAMER_AUTOCONF += --enable-gst-debug @@ -93,6 +93,8 @@ endif # Target-Install # ---------------------------------------------------------------------------- +GSTREAMER_LIB_VERSION := 0.25.0 + $(STATEDIR)/gstreamer.targetinstall: @$(call targetinfo) @@ -131,30 +133,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.22.0) + /usr/lib/libgstnet-0.10.so.$(GSTREAMER_LIB_VERSION)) @$(call install_link, gstreamer, \ - libgstnet-0.10.so.0.22.0, \ + libgstnet-0.10.so.$(GSTREAMER_LIB_VERSION), \ /usr/lib/libgstnet-0.10.so.0) @$(call install_link, gstreamer, \ - libgstnet-0.10.so.0.22.0, \ + libgstnet-0.10.so.$(GSTREAMER_LIB_VERSION), \ /usr/lib/libgstnet-0.10.so) endif @$(call install_copy, gstreamer, 0, 0, 0644, -, \ - /usr/lib/libgstcontroller-0.10.so.0.22.0) + /usr/lib/libgstcontroller-0.10.so.$(GSTREAMER_LIB_VERSION)) @$(call install_link, gstreamer, \ - libgstcontroller-0.10.so.0.22.0, \ + libgstcontroller-0.10.so.$(GSTREAMER_LIB_VERSION), \ /usr/lib/libgstcontroller-0.10.so.0) @$(call install_link, gstreamer, \ - libgstcontroller-0.10.so.0.22.0, \ + libgstcontroller-0.10.so.$(GSTREAMER_LIB_VERSION), \ /usr/lib/libgstcontroller-0.10.so) @$(call install_copy, gstreamer, 0, 0, 0644, -, \ - /usr/lib/libgstreamer-0.10.so.0.22.0) + /usr/lib/libgstreamer-0.10.so.$(GSTREAMER_LIB_VERSION)) @$(call install_link, gstreamer, \ - libgstreamer-0.10.so.0.22.0, \ + libgstreamer-0.10.so.$(GSTREAMER_LIB_VERSION), \ /usr/lib/libgstreamer-0.10.so.0) @$(call install_link, gstreamer, \ - libgstreamer-0.10.so.0.22.0, \ + libgstreamer-0.10.so.$(GSTREAMER_LIB_VERSION), \ /usr/lib/libgstreamer-0.10.so) @$(call install_copy, gstreamer, 0, 0, 0644, -, \ @@ -164,21 +166,21 @@ endif /usr/lib/gstreamer-0.10/libgstcoreindexers.so) @$(call install_copy, gstreamer, 0, 0, 0644, -, \ - /usr/lib/libgstdataprotocol-0.10.so.0.22.0) + /usr/lib/libgstdataprotocol-0.10.so.$(GSTREAMER_LIB_VERSION)) @$(call install_link, gstreamer, \ - libgstdataprotocol-0.10.so.0.22.0, \ + libgstdataprotocol-0.10.so.$(GSTREAMER_LIB_VERSION), \ /usr/lib/libgstdataprotocol-0.10.so.0) @$(call install_link, gstreamer, \ - libgstdataprotocol-0.10.so.0.22.0, \ + libgstdataprotocol-0.10.so.$(GSTREAMER_LIB_VERSION), \ /usr/lib/libgstdataprotocol-0.10.so) @$(call install_copy, gstreamer, 0, 0, 0644, -, \ - /usr/lib/libgstbase-0.10.so.0.22.0) + /usr/lib/libgstbase-0.10.so.$(GSTREAMER_LIB_VERSION)) @$(call install_link, gstreamer, \ - libgstbase-0.10.so.0.22.0, \ + libgstbase-0.10.so.$(GSTREAMER_LIB_VERSION), \ /usr/lib/libgstbase-0.10.so.0) @$(call install_link, gstreamer, \ - libgstbase-0.10.so.0.22.0, \ + libgstbase-0.10.so.$(GSTREAMER_LIB_VERSION), \ /usr/lib/libgstbase-0.10.so) ifdef PTXCONF_PRELINK -- 1.7.1 -- ptxdist mailing list [email protected]
