Author: jarod Update of /cvs/free/rpms/mythtv/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv11821 Modified Files: mythtv.spec sources Log Message: * Sun Oct 11 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.4.svn.r22366 - Update to pre-0.22 svn trunk revision 22366 - Disable faac by default, since its been deteremined to be non-free now Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- mythtv.spec 6 Oct 2009 15:27:34 -0000 1.53 +++ mythtv.spec 11 Oct 2009 21:50:33 -0000 1.54 @@ -65,7 +65,7 @@ %define desktop_vendor RPMFusion # SVN Revision number and branch ID -%define _svnrev r22270 +%define _svnrev r22366 %define branch trunk # @@ -109,6 +109,8 @@ # The following options are disabled by default. Use --with to enable them %define with_directfb %{?_with_directfb: 1} %{!?_with_directfb: 0} %define with_xvmcnvidia %{?_with_xvmcnvidia: 1} %{?!_with_xvmcnvidia: 0} +# FAAC is non-free, so we disable it by default +%define with_faac %{?_with_faac: 1} %{?!_with_faac: 0} # All plugins get built by default, but you can disable them as you wish %define with_plugins %{?_without_plugins: 0} %{!?_without_plugins: 1} @@ -181,7 +183,9 @@ BuildRequires: libGL-devel, libGLU-devel # Misc A/V format support +%if %{with_faac} BuildRequires: faac-devel +%endif BuildRequires: faad2-devel BuildRequires: fftw-devel >= 3 BuildRequires: flac-devel >= 1.0.4 @@ -385,7 +389,9 @@ Requires: libGL-devel, libGLU-devel # Misc A/V format support +%if %{with_faac} Requires: faac-devel +%endif Requires: faad2-devel Requires: fftw-devel >= 3 Requires: flac-devel >= 1.0.4 @@ -925,7 +931,9 @@ --enable-ivtv \ --enable-firewire \ --enable-dvb \ +%if %{with_faac} --enable-libfaac --enable-nonfree \ +%endif --enable-libfaad --enable-libfaadbin \ --enable-libmp3lame \ --enable-libtheora --enable-libvorbis \ @@ -1470,6 +1478,13 @@ ################################################################################ %changelog +* Sun Oct 11 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.4.svn.r22366 +- Update to pre-0.22 svn trunk revision 22366 +- Disable faac by default, since its been deteremined to be non-free now + +* Thu Oct 08 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.4.svn.r22304 +- Update to pre-0.22 svn trunk revision 22304 + * Tue Oct 06 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.4.svn.r22270 - Update to pre-0.22 svn trunk revision 22270 - Fix temp include path for building plugins Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 6 Oct 2009 15:27:34 -0000 1.31 +++ sources 11 Oct 2009 21:50:33 -0000 1.32 @@ -1,4 +1,4 @@ be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png -0eb7cca2a0c83cd018501df31b875d30 mythplugins-0.22.tar.bz2 -539f8b111b05910d8ffd7b6d88e8765a mythtv-0.22.tar.bz2 +cc0b531aa0346fc44f7024624a3373ec mythplugins-0.22.tar.bz2 +87f4f0722c8291a4fdf82ee859bf511f mythtv-0.22.tar.bz2