SPECS (DEVEL): mythplugins.spec - mmx hack no longer needed - bcon...

glen glen at pld-linux.org
Fri Feb 3 12:29:06 CET 2006


Author: glen                         Date: Fri Feb  3 11:29:06 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- mmx hack no longer needed
- bcond known BR-s
- cleanup patches

---- Files affected:
SPECS:
   mythplugins.spec (1.12.2.24 -> 1.12.2.25) 

---- Diffs:

================================================================
Index: SPECS/mythplugins.spec
diff -u SPECS/mythplugins.spec:1.12.2.24 SPECS/mythplugins.spec:1.12.2.25
--- SPECS/mythplugins.spec:1.12.2.24	Fri Feb  3 11:39:24 2006
+++ SPECS/mythplugins.spec	Fri Feb  3 12:29:00 2006
@@ -1,9 +1,4 @@
-<<<<<<< mythplugins.spec
 # $Revision$, $Date$
-#
-=======
-# $Revision$, $Date$
->>>>>>> 1.12.2.23
 # Conditional build:
 %bcond_without	binary		# skip building binary plugins (build only mythweb)
 %bcond_without	mythbrowser	# disable building mythbrowser plugin
@@ -48,27 +43,27 @@
 Source0:	%{name}-%{_snap}.%{_rev}.tar.bz2
 # Source0-md5:	05de971282d1ab353ec0ee751550983b
 Source1:	mythweb.conf
-#Patch0:		%{name}-configure.patch
-#Patch1:		%{name}-libversion.patch
-Patch2:		%{name}-lib64.patch
-Patch3:		%{name}-paths.patch
-Patch4:		mythweb-config.patch
+Patch0:		%{name}-lib64.patch
+Patch1:		%{name}-paths.patch
+Patch2:		mythweb-config.patch
 URL:		http://www.mythtv.org/
 %if %{with binary}
+%if %{with mythgallery} || %{with myhtmusic}
 BuildRequires:	OpenGL-devel
+%endif
 BuildRequires:	SDL-devel
 BuildRequires:	XFree86-devel
 BuildRequires:	a52dec-libs-devel
 BuildRequires:	cdparanoia-III-devel
 BuildRequires:	faad2-devel >= 2.0-5.2
-BuildRequires:	fftw-devel >= 2.1.3
+%{?with_mythmusic:BuildRequires:	fftw-devel >= 2.1.3}
 BuildRequires:	flac-devel >= 1.0.4
 BuildRequires:	freetype-devel
 BuildRequires:	kdelibs-devel
 BuildRequires:	libcdaudio-devel
 BuildRequires:	libdvdcss-devel >= 1.2.7
 BuildRequires:	libdvdread-devel >= 0.9.4
-BuildRequires:	libexif-devel >= 1:0.6.9
+%{?with_mythgallery:BuildRequires:	libexif-devel >= 1:0.6.9}
 BuildRequires:	libfame-devel >= 0.9.0
 BuildRequires:	libid3tag-devel
 BuildRequires:	libmad-devel
@@ -80,7 +75,7 @@
 BuildRequires:	nasm
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	sed >= 4.0
-BuildRequires:	transcode >= 0.6.8
+%{?with_mythdvd:BuildRequires:	transcode >= 0.6.8}
 BuildRequires:	xvid-devel >= 1:0.9.1
 BuildRequires:	zlib-devel
 %endif
@@ -302,24 +297,15 @@
 
 %prep
 %setup -q %{?_snap:-n %{name}}
-#%patch0 -p1
-#%patch1 -p1
 %if %{_lib} != "lib"
-%patch2 -p1
+%patch0 -p1
 %endif
-%patch3 -p1
-%patch4 -p1
+%patch1 -p1
+%patch2 -p1
 
 # make it visible
 mv mythweb/{.,}htaccess
 
-%if %{with binary}
-%ifarch %{x8664}
-	# mmx asm isn't x86_64 compatible in mythmusic
-	echo 'DEFINES -= HAVE_MMX' >> settings.pro
-%endif
-%endif
-
 # lib64 fix - enable to update patch
 %if %{_lib} != "lib" && 0
 find '(' -name '*.[ch]' -o -name '*.cpp' -o -name '*.pro' ')' | \
@@ -672,6 +658,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12.2.25  2006/02/03 11:29:00  glen
+- mmx hack no longer needed
+- bcond known BR-s
+- cleanup patches
+
 Revision 1.12.2.24  2006/02/03 10:39:24  qboosh
 - pl for mythflix and mythcontrols
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mythplugins.spec?r1=1.12.2.24&r2=1.12.2.25&f=u



More information about the pld-cvs-commit mailing list