Added TI patches, generated from commit 04f9d72 of the following tree:
[ubuntu-omap:gst-plugins-bad1-0.git] / debian / patches / 0038-08-12-dri2-and-drm-Pass-through-gst-indent.patch
1 From fa10cbb21941f22e300d0f93015e437b82786ff0 Mon Sep 17 00:00:00 2001
2 From: Thibault Saunier <thibault.saunier@collabora.com>
3 Date: Tue, 4 Sep 2012 20:29:49 -0300
4 Subject: [PATCH 038/100] [08/12] dri2 and drm: Pass through gst-indent
5
6 ---
7  gst-libs/gst/drm/gstdrmbufferpool.c |   24 +++++++++++-------------
8  1 file changed, 11 insertions(+), 13 deletions(-)
9
10 diff --git a/gst-libs/gst/drm/gstdrmbufferpool.c b/gst-libs/gst/drm/gstdrmbufferpool.c
11 index 9a4eb41..d4fec95 100644
12 --- a/gst-libs/gst/drm/gstdrmbufferpool.c
13 +++ b/gst-libs/gst/drm/gstdrmbufferpool.c
14 @@ -36,7 +36,7 @@
15  GST_DEBUG_CATEGORY (drmbufferpool_debug);
16  #define GST_CAT_DEFAULT drmbufferpool_debug
17  
18 -static GstDRMBuffer * gst_drm_buffer_new (GstDRMBufferPool * pool);
19 +static GstDRMBuffer *gst_drm_buffer_new (GstDRMBufferPool * pool);
20  static void gst_drm_buffer_set_pool (GstDRMBuffer * self,
21      GstDRMBufferPool * pool);
22  
23 @@ -44,16 +44,15 @@ static void gst_drm_buffer_set_pool (GstDRMBuffer * self,
24   * GstDRMBufferPool:
25   */
26  
27 -G_DEFINE_TYPE (GstDRMBufferPool, gst_drm_buffer_pool,
28 -    GST_TYPE_MINI_OBJECT);
29 +G_DEFINE_TYPE (GstDRMBufferPool, gst_drm_buffer_pool, GST_TYPE_MINI_OBJECT);
30  
31  void
32  gst_drm_buffer_pool_initialize (GstDRMBufferPool * self,
33      GstElement * element, int fd, GstCaps * caps, guint size)
34  {
35    self->element = gst_object_ref (element);
36 -  self->fd   = fd;
37 -  self->dev  = omap_device_new (fd);
38 +  self->fd = fd;
39 +  self->dev = omap_device_new (fd);
40    self->caps = NULL;
41    gst_drm_buffer_pool_set_caps (self, caps);
42    self->size = size;
43 @@ -70,7 +69,8 @@ gst_drm_buffer_pool_new (GstElement * element,
44    GstDRMBufferPool *self = (GstDRMBufferPool *)
45        gst_mini_object_new (GST_TYPE_DRM_BUFFER_POOL);
46  
47 -  GST_DEBUG_OBJECT (element, "Creating DRM buffer pool with caps %" GST_PTR_FORMAT, caps);
48 +  GST_DEBUG_OBJECT (element,
49 +      "Creating DRM buffer pool with caps %" GST_PTR_FORMAT, caps);
50  
51    gst_drm_buffer_pool_initialize (self, element, fd, caps, size);
52  
53 @@ -105,8 +105,7 @@ gst_drm_buffer_pool_set_caps (GstDRMBufferPool * self, GstCaps * caps)
54  }
55  
56  gboolean
57 -gst_drm_buffer_pool_check_caps (GstDRMBufferPool * self,
58 -    GstCaps * caps)
59 +gst_drm_buffer_pool_check_caps (GstDRMBufferPool * self, GstCaps * caps)
60  {
61    return gst_caps_is_strictly_equal (self->caps, caps);
62  }
63 @@ -233,8 +232,7 @@ gst_drm_buffer_pool_class_init (GstDRMBufferPoolClass * klass)
64        "DRM buffer pool");
65  
66    mini_object_class = GST_MINI_OBJECT_CLASS (klass);
67 -  klass->buffer_alloc =
68 -      GST_DEBUG_FUNCPTR (gst_drm_buffer_new);
69 +  klass->buffer_alloc = GST_DEBUG_FUNCPTR (gst_drm_buffer_new);
70    mini_object_class->finalize = (GstMiniObjectFinalizeFunction)
71        GST_DEBUG_FUNCPTR (gst_drm_buffer_pool_finalize);
72  }
73 @@ -252,7 +250,7 @@ G_DEFINE_TYPE (GstDRMBuffer, gst_drm_buffer, GST_TYPE_BUFFER);
74  
75  void
76  gst_drm_buffer_initialize (GstDRMBuffer * self,
77 -    GstDRMBufferPool * pool, struct omap_bo * bo)
78 +    GstDRMBufferPool * pool, struct omap_bo *bo)
79  {
80    GstDmaBuf *dmabuf;
81  
82 @@ -317,8 +315,8 @@ gst_drm_buffer_finalize (GstDRMBuffer * self)
83      return;
84  
85    if (GST_DRM_BUFFER_POOL_GET_CLASS (self->pool)->buffer_cleanup) {
86 -    GST_DRM_BUFFER_POOL_GET_CLASS (self->pool)->buffer_cleanup (
87 -        self->pool, self);
88 +    GST_DRM_BUFFER_POOL_GET_CLASS (self->pool)->buffer_cleanup (self->pool,
89 +        self);
90    }
91  
92    GST_BUFFER_DATA (self) = NULL;
93 -- 
94 1.7.9.5
95