# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1320282158 0
# Node ID 6de39b76edc691e33ee212ebde3825691c7b2d1e
# Parent  fbc93a88a1a162a1f70f73751fdf716ded7fba16
Up: gst-plugins-base to 0.10.35.

diff -r fbc93a88a1a1 -r 6de39b76edc6 gst-plugins-base-dev/receipt
--- a/gst-plugins-base-dev/receipt	Thu Nov 03 01:00:45 2011 +0000
+++ b/gst-plugins-base-dev/receipt	Thu Nov 03 01:02:38 2011 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="gst-plugins-base-dev"
-VERSION="0.10.34"
+VERSION="0.10.35"
 SERIES="0.10"
 CATEGORY="development"
 SHORT_DESC="gst-pluginds-base devel files"
@@ -13,7 +13,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib $fs/usr/lib/gstreamer-$SERIES/
+	mkdir -p $fs/usr/lib $fs/usr/lib/gstreamer-$SERIES/ $fs/usr/share
 	cp -a $_pkg/usr/include $fs/usr
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib/
diff -r fbc93a88a1a1 -r 6de39b76edc6 gst-plugins-base/receipt
--- a/gst-plugins-base/receipt	Thu Nov 03 01:00:45 2011 +0000
+++ b/gst-plugins-base/receipt	Thu Nov 03 01:02:38 2011 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="gst-plugins-base"
-VERSION="0.10.34"
+VERSION="0.10.35"
 CATEGORY="multimedia"
 SHORT_DESC="GStreamer Base Plugins"
 MAINTAINER="jozee@slitaz.org"
@@ -22,6 +22,8 @@
 compile_rules()
 {
 	cd $src
+	patch -Np1 -i $stuff/oggstream-fix-crashes-with-0-byte-vorbis-packets.patch
+	patch -Np1 -i $stuff/theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
diff -r fbc93a88a1a1 -r 6de39b76edc6 gst-plugins-base/stuff/oggstream-fix-crashes-with-0-byte-vorbis-packets.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gst-plugins-base/stuff/oggstream-fix-crashes-with-0-byte-vorbis-packets.patch	Thu Nov 03 01:02:38 2011 +0000
@@ -0,0 +1,22 @@
+From 8bd3bdaf3768b3fb6adc85b3bc681fdce07b786e Mon Sep 17 00:00:00 2001
+From: Jonathan Liu <net147@gmail.com>
+Date: Wed, 03 Aug 2011 08:18:29 +0000
+Subject: oggstream: Fix crashes with 0-byte vorbis packets
+
+Fixes bug #655574.
+---
+diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c
+index e843f48..77f39d4 100644
+--- a/ext/ogg/gstoggstream.c
++++ b/ext/ogg/gstoggstream.c
+@@ -792,7 +792,7 @@ packet_duration_vorbis (GstOggStream * pad, ogg_packet * packet)
+   int size;
+   int duration;
+ 
+-  if (packet->packet[0] & 1)
++  if (packet->bytes == 0 || packet->packet[0] & 1)
+     return 0;
+ 
+   mode = (packet->packet[0] >> 1) & ((1 << pad->vorbis_log2_num_modes) - 1);
+--
+cgit v0.8.3-6-g21f6
diff -r fbc93a88a1a1 -r 6de39b76edc6 gst-plugins-base/stuff/theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gst-plugins-base/stuff/theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch	Thu Nov 03 01:02:38 2011 +0000
@@ -0,0 +1,21 @@
+From 7d22d91fca6b9f24ca205eef98031f1ed6a44d33 Mon Sep 17 00:00:00 2001
+From: Philip Jägenstedt <philipj@opera.com>
+Date: Tue, 26 Jul 2011 14:10:17 +0000
+Subject: theoradec: segfault on 0-byte ogg_packet in _chain_reverse
+
+---
+diff --git a/ext/theora/gsttheoradec.c b/ext/theora/gsttheoradec.c
+index 96e12ee..25d68db 100644
+--- a/ext/theora/gsttheoradec.c
++++ b/ext/theora/gsttheoradec.c
+@@ -1440,7 +1440,7 @@ theora_dec_chain_reverse (GstTheoraDec * dec, gboolean discont, GstBuffer * buf)
+ 
+       /* if we copied a keyframe, flush and decode the decode queue */
+       data = GST_BUFFER_DATA (gbuf);
+-      if ((data[0] & 0x40) == 0) {
++      if (data && (data[0] & 0x40) == 0) {
+         GST_DEBUG_OBJECT (dec, "copied keyframe");
+         res = theora_dec_flush_decode (dec);
+       }
+--
+cgit v0.8.3-6-g21f6