SPECS: mythtv.spec - patch9 (-ffmpeg-API) disabled, as that are just some r...

[jajcus]

Author: jajcus                       Date: Wed Feb 25 14:34:09 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- patch9 (-ffmpeg-API) disabled, as that are just some random changes from the
  devel branch (including e.g. Qt4 compatibility), incompatible with this
  version. Why was this patch added?
- s/BuildRequires/BuildConflicts/ for ffmpeg-devel, so at least building with
  the included ffmpeg works
- Release: 6.1

---- Files affected:
SPECS:
   mythtv.spec (1.75 -> 1.76) 

---- Diffs:

================================================================
Index: SPECS/mythtv.spec
diff -u SPECS/mythtv.spec:1.75 SPECS/mythtv.spec:1.76
--- SPECS/mythtv.spec:1.75	Tue Oct 14 11:55:33 2008
+++ SPECS/mythtv.spec	Wed Feb 25 15:34:04 2009
@@ -4,6 +4,7 @@
 # - lcd? (app-misc/lcdproc)
 # - icons for desktop entries
 # - alpha, sparc, ppc arches?
+# - make it build with ffmpeg-devel installed
 #
 # Specfile for MythTV
 #
@@ -37,7 +38,7 @@
 Summary(pl.UTF-8):	Osobista aplikacja do nagrywania obrazu (PVR)
 Name:		mythtv
 Version:	0.21
-Release:	6
+Release:	6.1
 License:	GPL v2
 Group:		Applications/Multimedia
 Source0:	http://www.mythtv.org/mc/%{name}-%{version}.tar.bz2
@@ -56,13 +57,14 @@
 Patch6:		%{name}-dvdnav-shared.patch
 Patch7:		%{name}-libs.patch
 Patch8:		%{name}-fixes.patch
+# this is just some random changes from development snapshots, not compatible with this version
 Patch9:		%{name}-ffmpeg-API.patch
 URL:		http://www.mythtv.org/
 BuildRequires:	OpenGL-devel
 BuildRequires:	OpenGL-GLU-devel
 %{?with_alsa:BuildRequires:	alsa-lib-devel}
 %{?with_arts:BuildRequires:	arts-devel >= 13:0.9.5}
-BuildRequires:	ffmpeg-devel
+BuildConflicts:	ffmpeg-devel
 BuildRequires:	freetype-devel >= 1:2.0.0
 %{?with_jack:BuildRequires:	jack-audio-connection-kit-devel}
 BuildRequires:	lame-libs-devel
@@ -279,7 +281,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
+#%patch9 -p1
 
 rm -rf database/old # not supported in PLD
 
@@ -533,6 +535,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76  2009/02/25 14:34:04  jajcus
+- patch9 (-ffmpeg-API) disabled, as that are just some random changes from the
+  devel branch (including e.g. Qt4 compatibility), incompatible with this
+  version. Why was this patch added?
+- s/BuildRequires/BuildConflicts/ for ffmpeg-devel, so at least building with
+  the included ffmpeg works
+- Release: 6.1
+
 Revision 1.75  2008/10/14 09:55:33  hawk
 - release 6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mythtv.spec?r1=1.75&r2=1.76&f=u