packages: vlc/vlc.spec, vlc/vlc-quickfix.patch (NEW), vlc/vlc-pic-mmx.patch...

[blues]

Author: blues                        Date: Mon Jul 20 10:31:55 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel.5 - quickfix patch that fixes sig11 on sdp file creation. Fixed
  mozilla bcond.

---- Files affected:
packages/vlc:
   vlc.spec (1.195 -> 1.196) , vlc-quickfix.patch (NONE -> 1.1)  (NEW), vlc-pic-mmx.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/vlc/vlc.spec
diff -u packages/vlc/vlc.spec:1.195 packages/vlc/vlc.spec:1.196
--- packages/vlc/vlc.spec:1.195	Sat Jul 18 20:46:20 2009
+++ packages/vlc/vlc.spec	Mon Jul 20 12:31:50 2009
@@ -33,7 +33,7 @@
 Summary(pl.UTF-8):	VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:		vlc
 Version:	1.0.0
-Release:	5
+Release:	6
 License:	GPL
 Group:		X11/Applications/Multimedia
 # use the bz2 src, its a 4mb difference
@@ -42,9 +42,9 @@
 Source1:	%{name}.desktop
 Patch0:		%{name}-buildflags.patch
 Patch1:		%{name}-defaultfont.patch
-Patch3:		%{name}-pic-mmx.patch
-Patch4:		%{name}-real_codecs_path.patch
-Patch5:		%{name}-osdmenu_path.patch
+Patch2:		%{name}-real_codecs_path.patch
+Patch3:		%{name}-osdmenu_path.patch
+Patch4:		%{name}-quickfix.patch
 URL:		http://www.videolan.org/vlc/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
 %{?with_galaktos:BuildRequires:	 OpenGL-GLU-devel}
@@ -251,10 +251,9 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-# check me
-#%patch3 -p1
+%patch2 -p1
+%patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.* .
@@ -361,9 +360,11 @@
 # needs fixed?
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{ckb,co,my,no,ps,tet}
 
+%if %{with mozilla}
 # mozilla compatible browser plugin
 install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
 cp -a projects/mozilla/.libs/libvlcplugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
+%endif
 
 %find_lang %{name}
 
@@ -723,7 +724,9 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/http
 %{_datadir}/%{name}/lua
+%if %{with mozilla}
 %{_datadir}/%{name}/mozilla
+%endif
 %{_datadir}/%{name}/osdmenu
 %dir %{_datadir}/%{name}/utils
 %attr(755,root,root) %{_datadir}/%{name}/utils/*.sh
@@ -785,9 +788,11 @@
 %attr(755,root,root) %{_libdir}/%{name}/audio_output/libalsa_plugin.so
 %endif
 
+%if %{with mozilla}
 %files -n browser-plugin-%{name}
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_browserpluginsdir}/libvlcplugin.so
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -795,6 +800,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.196  2009/07/20 10:31:50  blues
+- rel.5 - quickfix patch that fixes sig11 on sdp file creation. Fixed
+  mozilla bcond.
+
 Revision 1.195  2009/07/18 18:46:20  blues
 - rel.5 - vlc is linked with shared live555 libraries. rtsp works now.
 

================================================================
Index: packages/vlc/vlc-quickfix.patch
diff -u /dev/null packages/vlc/vlc-quickfix.patch:1.1
--- /dev/null	Mon Jul 20 12:31:55 2009
+++ packages/vlc/vlc-quickfix.patch	Mon Jul 20 12:31:50 2009
@@ -0,0 +1,11 @@
+--- ./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
+     {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc.spec?r1=1.195&r2=1.196&f=u