rpms/gstreamer-plugins-bad/F-11 gst-new-ass-api.patch, NONE, 1.1 gstreamer-plugins-bad.spec, 1.21, 1.22

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/free/rpms/gstreamer-plugins-bad/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21896

Modified Files:
	gstreamer-plugins-bad.spec 
Added Files:
	gst-new-ass-api.patch 
Log Message:
* Mon Sep 21 2009 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.13-7
- Rebuild for new libass


gst-new-ass-api.patch:

--- NEW FILE gst-new-ass-api.patch ---
diff -up gst-plugins-bad-0.10.13/ext/assrender/gstassrender.c.new-ass-api gst-plugins-bad-0.10.13/ext/assrender/gstassrender.c
--- gst-plugins-bad-0.10.13/ext/assrender/gstassrender.c.new-ass-api	2009-03-06 18:37:51.000000000 +0100
+++ gst-plugins-bad-0.10.13/ext/assrender/gstassrender.c	2009-08-10 13:08:56.000000000 +0200
@@ -297,13 +297,12 @@ gst_assrender_setcaps_video (GstPad * pa
       gst_structure_get_int (structure, "height", &render->height)) {
     ret = gst_pad_set_caps (render->srcpad, caps);
     ass_set_frame_size (render->ass_renderer, render->width, render->height);
-    /* FIXME: Does this expect aspect ratio or pixel aspect ratio? */
-    ass_set_aspect_ratio (render->ass_renderer,
+    ass_set_aspect_ratio (render->ass_renderer, 
+        ((gdouble) (render->width)) / ((gdouble) (render->height)),
         ((gdouble) par_n) / ((gdouble) par_d));
     ass_set_font_scale (render->ass_renderer, 1.0);
     ass_set_hinting (render->ass_renderer, ASS_HINTING_NATIVE);
-    ass_set_fonts (render->ass_renderer, "Arial", "sans-serif");
-    ass_set_fonts (render->ass_renderer, NULL, "Sans");
+    ass_set_fonts (render->ass_renderer, NULL, "Sans", 1, NULL, 1);
     ass_set_margins (render->ass_renderer, 0, 0, 0, 0);
     ass_set_use_margins (render->ass_renderer, 0);
 
@@ -383,7 +382,7 @@ gst_assrender_chain_video (GstPad * pad,
   gint64 start, stop, clip_start = 0, clip_stop = 0;
   double timestamp;
   double step;
-  ass_image_t *ass_image;
+  ASS_Image *ass_image;
 
   render = GST_ASSRENDER (GST_PAD_PARENT (pad));
 
diff -up gst-plugins-bad-0.10.13/ext/assrender/gstassrender.h.new-ass-api gst-plugins-bad-0.10.13/ext/assrender/gstassrender.h
--- gst-plugins-bad-0.10.13/ext/assrender/gstassrender.h.new-ass-api	2009-03-06 18:37:51.000000000 +0100
+++ gst-plugins-bad-0.10.13/ext/assrender/gstassrender.h	2009-08-10 12:56:09.000000000 +0200
@@ -44,9 +44,9 @@ struct _Gstassrender
 
   gint width, height;
 
-  ass_library_t *ass_library;
-  ass_renderer_t *ass_renderer;
-  ass_track_t *ass_track;
+  ASS_Library *ass_library;
+  ASS_Renderer *ass_renderer;
+  ASS_Track *ass_track;
 
   gboolean renderer_init_ok, track_init_ok, enable, embeddedfonts;
 };


Index: gstreamer-plugins-bad.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-bad/F-11/gstreamer-plugins-bad.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gstreamer-plugins-bad.spec	11 Aug 2009 20:55:16 -0000	1.21
+++ gstreamer-plugins-bad.spec	21 Sep 2009 07:59:42 -0000	1.22
@@ -7,12 +7,13 @@
 Summary: GStreamer streaming media framework "bad" plug-ins
 Name: gstreamer-plugins-bad
 Version: 0.10.13
-Release: 6%{?dist}
+Release: 7%{?dist}
 # The freeze and nfs plugins are LGPLv2 (only)
 License: LGPLv2+ and LGPLv2
 Group: Applications/Multimedia
 URL: http://gstreamer.freedesktop.org/
 Source: http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.bz2
+Patch0: gst-new-ass-api.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: %{gstreamer} >= %{gst_minver}
 BuildRequires: %{gstreamer}-devel >= %{gst_minver}
@@ -61,7 +62,7 @@
 BuildRequires: openssl-devel
 BuildRequires: twolame-devel
 BuildRequires: celt-devel
-BuildRequires: libass-devel
+BuildRequires: libass-devel >= 0.9.7
 BuildRequires: libmimic-devel
 
 %description
@@ -120,6 +121,7 @@
 
 %prep
 %setup -q -n gst-plugins-bad-%{version}
+%patch0 -p1
 
 
 %build
@@ -269,6 +271,9 @@
 
 
 %changelog
+* Mon Sep 21 2009 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.13-7
+- Rebuild for new libass
+
 * Tue Aug 11 2009 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.13-6
 - Enable mimic plugin now that we have libmimic in RPM Fusion