From 0ab78b9be1efb410686b654ba26cb12e9230932ccf594107023f42a74ebd335e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 10 Sep 2012 11:50:18 +0000 Subject: [PATCH] Accepting request 133465 from GNOME:Next Update to 0.11.93 - patch mentioned in .changes OBS-URL: https://build.opensuse.org/request/show/133465 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/gstreamer-plugins-base?expand=0&rev=9 --- gst-plugins-base-0.11.92.tar.xz | 3 --- gst-plugins-base-0.11.93.tar.xz | 3 +++ gstreamer-plugins-base-fix.patch | 45 ++++++++++++++++++++++++++++++++ gstreamer-plugins-base.changes | 9 +++++++ gstreamer-plugins-base.spec | 13 +++++---- 5 files changed, 65 insertions(+), 8 deletions(-) delete mode 100644 gst-plugins-base-0.11.92.tar.xz create mode 100644 gst-plugins-base-0.11.93.tar.xz create mode 100644 gstreamer-plugins-base-fix.patch diff --git a/gst-plugins-base-0.11.92.tar.xz b/gst-plugins-base-0.11.92.tar.xz deleted file mode 100644 index 2bfdf35..0000000 --- a/gst-plugins-base-0.11.92.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:00ad53f405a57b8c812edfbb0978be6bf57d0c8ea91069e8024c4d1aacf60902 -size 2316404 diff --git a/gst-plugins-base-0.11.93.tar.xz b/gst-plugins-base-0.11.93.tar.xz new file mode 100644 index 0000000..c201b67 --- /dev/null +++ b/gst-plugins-base-0.11.93.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0cce74557a7815c0a9dae7ae9241eea6314478e0bfa3759dbac1b63bcff51d8 +size 2322608 diff --git a/gstreamer-plugins-base-fix.patch b/gstreamer-plugins-base-fix.patch new file mode 100644 index 0000000..06dc1dd --- /dev/null +++ b/gstreamer-plugins-base-fix.patch @@ -0,0 +1,45 @@ +From 7bdcb12b41780694019a4e65b9ac1addf2afabc8 Mon Sep 17 00:00:00 2001 +From: Sebastian Drö +Date: Wed, 08 Aug 2012 14:12:20 +0000 +Subject: gst: Set alignment at the correct place of GstAllocationParams + +--- +Index: gst-plugins-base-0.11.93/gst-libs/gst/video/gstvideofilter.c +=================================================================== +--- gst-plugins-base-0.11.93.orig/gst-libs/gst/video/gstvideofilter.c ++++ gst-plugins-base-0.11.93/gst-libs/gst/video/gstvideofilter.c +@@ -82,7 +82,7 @@ gst_video_filter_propose_allocation (Gst + if (gst_query_get_n_allocation_pools (query) == 0) { + GstStructure *structure; + GstAllocator *allocator = NULL; +- GstAllocationParams params = { 0, 0, 0, 15, }; ++ GstAllocationParams params = { 0, 15, 0, 0, }; + + if (gst_query_get_n_allocation_params (query) > 0) + gst_query_parse_nth_allocation_param (query, 0, &allocator, ¶ms); +Index: gst-plugins-base-0.11.93/sys/ximage/ximagesink.c +=================================================================== +--- gst-plugins-base-0.11.93.orig/sys/ximage/ximagesink.c ++++ gst-plugins-base-0.11.93/sys/ximage/ximagesink.c +@@ -1079,7 +1079,7 @@ gst_ximagesink_setcaps (GstBaseSink * bs + GstBufferPool *newpool, *oldpool; + const GValue *par; + gint size; +- static GstAllocationParams params = { 0, 0, 0, 15, }; ++ static GstAllocationParams params = { 0, 15, 0, 0, }; + + ximagesink = GST_XIMAGESINK (bsink); + +Index: gst-plugins-base-0.11.93/sys/xvimage/xvimagesink.c +=================================================================== +--- gst-plugins-base-0.11.93.orig/sys/xvimage/xvimagesink.c ++++ gst-plugins-base-0.11.93/sys/xvimage/xvimagesink.c +@@ -1555,7 +1555,7 @@ gst_xvimagesink_setcaps (GstBaseSink * b + gint display_par_n, display_par_d; /* display's PAR */ + guint num, den; + gint size; +- static GstAllocationParams params = { 0, 0, 0, 15, }; ++ static GstAllocationParams params = { 0, 15, 0, 0, }; + + xvimagesink = GST_XVIMAGESINK (bsink); + diff --git a/gstreamer-plugins-base.changes b/gstreamer-plugins-base.changes index 0c9ae32..9bcbfed 100644 --- a/gstreamer-plugins-base.changes +++ b/gstreamer-plugins-base.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Aug 13 07:44:21 UTC 2012 - dimstar@opensuse.org + +- Update to version 0.11.93: + + Bug fixes + + Sync with GStreamer changes. +- Add gstreamer-plugins-base-fix.patch: Fix build; taken from + upstream. + ------------------------------------------------------------------- Tue Jul 17 19:22:46 UTC 2012 - dimstar@opensuse.org diff --git a/gstreamer-plugins-base.spec b/gstreamer-plugins-base.spec index 97afe66..4bf068a 100644 --- a/gstreamer-plugins-base.spec +++ b/gstreamer-plugins-base.spec @@ -18,7 +18,7 @@ Name: gstreamer-plugins-base %define _name gst-plugins-base -Version: 0.11.92 +Version: 0.11.93 Release: 0 %define gst_branch 1.0 Url: http://gstreamer.freedesktop.org/ @@ -26,17 +26,19 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: GStreamer Streaming-Media Framework Plug-Ins License: GPL-2.0+ ; LGPL-2.1+ Group: Productivity/Multimedia/Other -Source: http://gstreamer.freedesktop.org/src/gst-plugins-base/%{_name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gst-plugins-base/0.11/%{_name}-%{version}.tar.xz Source2: baselibs.conf +# PATCH-FIX-UPSTREAM gstreamer-plugins-base-fix.patch dimstar@opensuse.org -- gst: Set alignment at the correct place of GstAllocationParams, taken from git +Patch0: gstreamer-plugins-base-fix.patch BuildRequires: cdparanoia-devel -BuildRequires: glib2-devel >= 2.31.14 -BuildRequires: gstreamer-devel >= 0.11.90 +BuildRequires: glib2-devel >= 2.32 +BuildRequires: gstreamer-devel >= 0.11.93 BuildRequires: gtk-doc BuildRequires: libICE-devel BuildRequires: libSM-devel BuildRequires: libXext-devel BuildRequires: libXv-devel -BuildRequires: orc >= 0.4.11 +BuildRequires: orc >= 0.4.16 BuildRequires: python-base BuildRequires: translation-update-upstream BuildRequires: update-desktop-files @@ -392,6 +394,7 @@ package. %lang_package %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 translation-update-upstream po gst-plugins-base-%{gst_branch} %build