From caae39e1e7115be7883d2fdb3d9bbb0a9fa8878f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Pawe=C5=82=20Go=C5=82aszewski?= <blues@pld-linux.org>
Date: Tue, 21 Jul 2009 07:58:15 +0000
Subject: [PATCH] - rel.7 - official fix for #2981 (rtp_segv replaces quickfix
 patch)

Changed files:
    vlc-quickfix.patch -> 1.2
    vlc-rtp_segv.patch -> 1.1
    vlc.spec -> 1.197
---
 vlc-quickfix.patch | 11 -----------
 vlc-rtp_segv.patch | 12 ++++++++++++
 vlc.spec           |  6 +++---
 3 files changed, 15 insertions(+), 14 deletions(-)
 delete mode 100644 vlc-quickfix.patch
 create mode 100644 vlc-rtp_segv.patch

diff --git a/vlc-quickfix.patch b/vlc-quickfix.patch
deleted file mode 100644
index f444f71..0000000
--- a/vlc-quickfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./modules/stream_out/rtp.c.org	2009-06-25 12:20:31.000000000 +0200
-+++ ./modules/stream_out/rtp.c	2009-07-20 11:50:48.134443129 +0200
-@@ -668,7 +668,7 @@ static void SDPHandleUrl( sout_stream_t 
-         if( psz_url[0] == '/' && psz_url[1] == '/' )
-             psz_url += 2;
-         p_sys->psz_sdp_file = strdup( psz_url );
--        FileSetup( p_stream );
-+  //      FileSetup( p_stream );
-     }
-     else
-     {
diff --git a/vlc-rtp_segv.patch b/vlc-rtp_segv.patch
new file mode 100644
index 0000000..7d42ad0
--- /dev/null
+++ b/vlc-rtp_segv.patch
@@ -0,0 +1,12 @@
+--- ./modules/stream_out/rtp.c.org	2009-07-21 09:29:16.787252342 +0200
++++ ./modules/stream_out/rtp.c	2009-07-21 09:30:11.003199471 +0200
+@@ -1400,6 +1400,9 @@ static int FileSetup( sout_stream_t *p_s
+     sout_stream_sys_t *p_sys = p_stream->p_sys;
+     FILE            *f;
+ 
++    if( p_sys->psz_sdp == NULL )
++	    return VLC_EGENERIC; /* too early */
++
+     if( ( f = utf8_fopen( p_sys->psz_sdp_file, "wt" ) ) == NULL )
+     {
+         msg_Err( p_stream, "cannot open file '%s' (%m)",
diff --git a/vlc.spec b/vlc.spec
index 14d0973..6ed33b7 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -32,7 +32,7 @@ Summary:	VLC - a multimedia player and stream server
 Summary(pl.UTF-8):	VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:		vlc
 Version:	1.0.0
-Release:	6
+Release:	7
 License:	GPL
 Group:		X11/Applications/Multimedia
 # use the bz2 src, its a 4mb difference
@@ -43,10 +43,10 @@ Patch0:		%{name}-buildflags.patch
 Patch1:		%{name}-defaultfont.patch
 Patch2:		%{name}-real_codecs_path.patch
 Patch3:		%{name}-osdmenu_path.patch
-Patch4:		%{name}-quickfix.patch
+Patch4:		%{name}-rtp_segv.patch
 URL:		http://www.videolan.org/vlc/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
-%{?with_galaktos:BuildRequires:	 OpenGL-GLU-devel}
+%{?with_galaktos:BuildRequires:	OpenGL-GLU-devel}
 BuildRequires:	OpenGL-devel
 BuildRequires:	QtGui-devel >= 4.2.0
 BuildRequires:	SDL_image-devel >= 1.2
-- 
2.44.0