SPECS: mplayer.spec - jack patch merged with bio2jack patch.

[pluto]

Author: pluto                        Date: Thu Dec  1 17:30:32 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- jack patch merged with bio2jack patch.

---- Files affected:
SPECS:
   mplayer.spec (1.307 -> 1.308) 

---- Diffs:

================================================================
Index: SPECS/mplayer.spec
diff -u SPECS/mplayer.spec:1.307 SPECS/mplayer.spec:1.308
--- SPECS/mplayer.spec:1.307	Mon Nov 28 14:19:59 2005
+++ SPECS/mplayer.spec	Thu Dec  1 18:30:27 2005
@@ -108,7 +108,6 @@
 Patch12:	%{name}-x86_64-detection.patch
 Patch13:	%{name}-mythtv.patch
 Patch14:	%{name}-shared.patch
-Patch15:	%{name}-jack.patch
 URL:		http://www.mplayerhq.hu/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
 BuildRequires:	OpenGL-devel
@@ -292,7 +291,6 @@
 %if %{with shared}
 %patch14 -p1
 %endif
-%patch15 -p1
 
 # kill evil file, hackery not needed with llh
 echo > osdep/kerneltwosix.h
@@ -537,6 +535,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.308  2005/12/01 17:30:27  pluto
+- jack patch merged with bio2jack patch.
+
 Revision 1.307  2005/11/28 13:19:59  pluto
 - use bio2jack system header.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mplayer.spec?r1=1.307&r2=1.308&f=u