Fix build of pango, gnomevfs, polypaudio and ogg plugins on 4.x

Submitted by:	pointyhat via kris
Approved by:	maintainer (implicit)
This commit is contained in:
Koop Mast 2005-09-10 20:03:48 +00:00
parent ed25ccd707
commit 9eb3db5fce
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=142379
2 changed files with 154 additions and 0 deletions

View File

@ -0,0 +1,77 @@
--- ext/polyp/polypsink.c.orig Sat Sep 10 19:39:39 2005
+++ ext/polyp/polypsink.c Sat Sep 10 19:40:17 2005
@@ -48,18 +48,6 @@
"width = (int) 16, "
"depth = (int) 16, "
"rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 16 ]"
-#if 0
- ";audio/x-raw-float, "
- "endianness = (int) { LITTLE_ENDIAN, BIG_ENDIAN }, "
- "width = (int) 32, "
- "rate = (int) [ 1, MAX ], "
- "channels = (int) [ 1, 16 ];"
- "audio/x-raw-int, "
- "signed = (boolean) FALSE, "
- "width = (int) 8, "
- "depth = (int) 8, "
- "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 16 ]"
-#endif
)
);
--- ext/pango/gsttextrender.c.orig Sat Sep 10 19:41:24 2005
+++ ext/pango/gsttextrender.c Sat Sep 10 19:41:58 2005
@@ -251,6 +251,7 @@
GstTextRender *overlay = GST_TEXT_RENDER (gst_pad_get_parent (pad));
guint size = GST_BUFFER_SIZE (buf);
guint8 *data = GST_BUFFER_DATA (buf);
+ gint n;
/* somehow pango barfs over "\0" buffers... */
while (size > 0 &&
@@ -274,7 +275,6 @@
gst_buffer_stamp (out, GST_BUFFER (buf));
// gst_buffer_stamp (out, buf);
data = GST_BUFFER_DATA (out);
- gint n;
for (n = 0; n < overlay->width * overlay->height; n++) {
data[n * 4] = 0;
--- ext/ogg/gstoggparse.c.orig Sat Sep 10 19:43:13 2005
+++ ext/ogg/gstoggparse.c Sat Sep 10 19:44:04 2005
@@ -365,6 +365,7 @@
guint32 serialno;
GstBuffer *pagebuffer;
GstClockTime buffertimestamp = GST_BUFFER_TIMESTAMP (buffer);
+ page_type type;
ogg = GST_OGG_PARSE (GST_OBJECT_PARENT (pad));
@@ -464,7 +465,7 @@
ogg->last_page_not_bos = TRUE;
- page_type type = gst_ogg_parse_is_header (ogg, stream, &page);
+ type = gst_ogg_parse_is_header (ogg, stream, &page);
if (type == PAGE_PENDING && ogg->in_headers) {
gst_buffer_ref (pagebuffer);
--- ext/gnomevfs/gstgnomevfssrc.c.orig Sat Sep 10 19:44:44 2005
+++ ext/gnomevfs/gstgnomevfssrc.c Sat Sep 10 19:45:15 2005
@@ -1114,6 +1114,7 @@
GstBuffer *buf;
GnomeVFSFileSize readbytes;
guint8 *data;
+ GstEvent *event;
g_return_val_if_fail (pad != NULL, NULL);
src = GST_GNOMEVFSSRC (gst_pad_get_parent (pad));
@@ -1132,7 +1133,7 @@
/* deal with tag list */
if (src->icy_taglist) {
gst_element_found_tags (GST_ELEMENT (src), src->icy_taglist);
- GstEvent *event = gst_event_new_tag (src->icy_taglist);
+ event = gst_event_new_tag (src->icy_taglist);
gst_object_ref (GST_OBJECT (src));
event->src = GST_OBJECT (src);

View File

@ -0,0 +1,77 @@
--- ext/polyp/polypsink.c.orig Sat Sep 10 19:39:39 2005
+++ ext/polyp/polypsink.c Sat Sep 10 19:40:17 2005
@@ -48,18 +48,6 @@
"width = (int) 16, "
"depth = (int) 16, "
"rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 16 ]"
-#if 0
- ";audio/x-raw-float, "
- "endianness = (int) { LITTLE_ENDIAN, BIG_ENDIAN }, "
- "width = (int) 32, "
- "rate = (int) [ 1, MAX ], "
- "channels = (int) [ 1, 16 ];"
- "audio/x-raw-int, "
- "signed = (boolean) FALSE, "
- "width = (int) 8, "
- "depth = (int) 8, "
- "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 16 ]"
-#endif
)
);
--- ext/pango/gsttextrender.c.orig Sat Sep 10 19:41:24 2005
+++ ext/pango/gsttextrender.c Sat Sep 10 19:41:58 2005
@@ -251,6 +251,7 @@
GstTextRender *overlay = GST_TEXT_RENDER (gst_pad_get_parent (pad));
guint size = GST_BUFFER_SIZE (buf);
guint8 *data = GST_BUFFER_DATA (buf);
+ gint n;
/* somehow pango barfs over "\0" buffers... */
while (size > 0 &&
@@ -274,7 +275,6 @@
gst_buffer_stamp (out, GST_BUFFER (buf));
// gst_buffer_stamp (out, buf);
data = GST_BUFFER_DATA (out);
- gint n;
for (n = 0; n < overlay->width * overlay->height; n++) {
data[n * 4] = 0;
--- ext/ogg/gstoggparse.c.orig Sat Sep 10 19:43:13 2005
+++ ext/ogg/gstoggparse.c Sat Sep 10 19:44:04 2005
@@ -365,6 +365,7 @@
guint32 serialno;
GstBuffer *pagebuffer;
GstClockTime buffertimestamp = GST_BUFFER_TIMESTAMP (buffer);
+ page_type type;
ogg = GST_OGG_PARSE (GST_OBJECT_PARENT (pad));
@@ -464,7 +465,7 @@
ogg->last_page_not_bos = TRUE;
- page_type type = gst_ogg_parse_is_header (ogg, stream, &page);
+ type = gst_ogg_parse_is_header (ogg, stream, &page);
if (type == PAGE_PENDING && ogg->in_headers) {
gst_buffer_ref (pagebuffer);
--- ext/gnomevfs/gstgnomevfssrc.c.orig Sat Sep 10 19:44:44 2005
+++ ext/gnomevfs/gstgnomevfssrc.c Sat Sep 10 19:45:15 2005
@@ -1114,6 +1114,7 @@
GstBuffer *buf;
GnomeVFSFileSize readbytes;
guint8 *data;
+ GstEvent *event;
g_return_val_if_fail (pad != NULL, NULL);
src = GST_GNOMEVFSSRC (gst_pad_get_parent (pad));
@@ -1132,7 +1133,7 @@
/* deal with tag list */
if (src->icy_taglist) {
gst_element_found_tags (GST_ELEMENT (src), src->icy_taglist);
- GstEvent *event = gst_event_new_tag (src->icy_taglist);
+ event = gst_event_new_tag (src->icy_taglist);
gst_object_ref (GST_OBJECT (src));
event->src = GST_OBJECT (src);