Author: jarod Update of /cvs/free/rpms/mythtv/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv26131 Modified Files: .cvsignore mythtv.spec sources Added Files: mythtv-0.22-enable-x86_64-fast_cmov-by-default.patch Removed Files: mythplugins-0.21-svnfixes.patch mythtv-0.21-enable-64bit-fast_cmov.patch mythtv-0.21-svnfixes.patch Log Message: Bump mythtv build to subversion trunk. Here's hoping 0.22 gets released by the time Fedora 11 does... Now using the spec file that Chris Petersen and I merged together from separate work we've both been doing over time. This spec is currently more or less in sync with what's in mythtv's packaging/rpm svn dir. * Mon Dec 15 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.1.svn.r19390 - MythTV svn trunk (pre-0.22), revision 19390 - Re-enable fast cmov on x86_64 by default - Add BR: yasm-devel to enable yasm-specific improvements mythtv-0.22-enable-x86_64-fast_cmov-by-default.patch: --- NEW FILE mythtv-0.22-enable-x86_64-fast_cmov-by-default.patch --- Index: mythtv/configure =================================================================== --- mythtv/configure (revision 19358) +++ mythtv/configure (working copy) @@ -1652,6 +1652,7 @@ x86_64|amd64) arch="x86_32" enable fast_unaligned + enable fast_cmov check_cc <<EOF && enable fast_64bit && arch="x86_64" int test[sizeof(char*) - 7]; EOF Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Aug 2008 15:17:17 -0000 1.2 +++ .cvsignore 18 Dec 2008 02:15:41 -0000 1.3 @@ -2,3 +2,5 @@ mythtv-setup.png mythplugins-0.21.tar.bz2 mythtv-0.21.tar.bz2 +mythtv-0.22.tar.bz2 +mythplugins-0.22.tar.bz2 View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.15 -r 1.16 mythtv.spec Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mythtv.spec 12 Dec 2008 04:52:21 -0000 1.15 +++ mythtv.spec 18 Dec 2008 02:15:42 -0000 1.16 @@ -1,37 +1,140 @@ -# svn revision number -%define _svnver r19344 -%define branch release-0-21-fixes -# Nb: base 0.21 svn rev is r16468 -#define branch trunk - -# disabled options -%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0} -%define with_directfb %{?_with_directfb: 1} %{?!_with_directfb: 0} -%define with_festival %{?_with_festival: 1} %{?!_with_festival: 0} -%define with_xvmcnvidia %{?_with_xvmcnvidia: 1} %{?!_with_xvmcnvidia: 0} +# +# Specfile for building MythTV and MythPlugins RPMs from a subversion checkout. +# +# by: Chris Petersen <rpm(a)forevermore.net&gt; +# Jarod Wilson <jarod(a)wilsonet.com&gt; +# +# Modified/Extended from the great (non-svn based) work of: +# Axel Thimm <Axel.Thimm(a)ATrpms.net&gt; +# David Bussenschutt <buzz(a)oska.com&gt; +# and others; see changelog at bottom for details. +# +# The latest version of this file can be found at: +# +# http://www.mythtv.org/wiki/index.php/Mythtv-svn-rpmbuild.spec +# +# Note: +# +# This spec relies upon several files included in the RPMFusion mythtv +# src.rpm file. Please install it into your build tree before trying to +# build anything with this spec. +# +# Explanation of options: +# +# --with proc_opt Enable MythTV's optimized processor detection code +# and override RPM's defaults. +# --with debug Enable debug mode +# +# The following options are disabled by default. Use these options to enable: +# +# --with directfb Enable directfb support +# +# The following options are enabled by default. Use these options to disable: +# +# --without xvmcnvidia Disable NVidia XvMC support +# --without perl Disable building of the perl bindings +# --without python Disable building of the python bindings +# +# # All plugins get built by default, but you can disable them as you wish: +# +# --without mytharchive +# --without mythbrowser +# --without mythcontrols +# --without mythflix +# --without mythgallery +# --without mythgame +# --without mythmovies +# --without mythmusic +# --without mythnews +# --without mythphone +# --without mythvideo +# --without mythweather +# --without mythzoneminder +# --without mythweb +# +# The following options are disabled by default. Use these options to enable: +# +# --with festival Enable festival/festvox support in MythPhone +# + +################################################################################ +# A list of which applications we want to put into the desktop menu system %define desktop_applications mythfrontend mythtv-setup -%define desktop_vendor RPMFusion -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]')} +# The vendor name we should attribute the aforementioned entries to +%define desktop_vendor RPMFusion + +# SVN Revision number and branch ID +%define _svnrev r19390 +%define branch trunk -Summary: A digital video recorder (DVR) application -Name: mythtv -Version: 0.21 +# +# Basic descriptive tags for this package: +# +Name: mythtv +Summary: A digital video recorder (DVR) application. +URL: http://www.mythtv.org/ +Group: Applications/Multimedia + +# Version/Release info +Version: 0.22 %if "%{branch}" == "trunk" -Release: 0.2.%{_svnver}%{?dist} +Release: 0.1.svn.%{_svnrev}%{?dist} %else -Release: 15%{?dist} +Release: 1%{?dist} %endif -URL: http://www.mythtv.org/ + # The primary license is GPLv2+, but bits are borrowed from a number of # projects... For a breakdown of the licensing, see PACKAGE-LICENSING. License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or LGPLv2+) -Group: Applications/Multimedia -Source0: http://www.mythtv.org/mc/mythtv-%{version}.tar.bz2 -Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2 -Source10: PACKAGE-LICENSING + +################################################################################ + +# Set "--with proc_opt" to let mythtv autodetect your CPU and run its +# processor-specific optimizations. It seems to cause compile problems on many +# systems (particularly x86_64), so it is classified by the MythTV developers +# as "use at your own risk." +%define with_proc_opt %{?_with_proc_opt: 1} %{!?_with_proc_opt: 0} + +# Set "--with debug" to enable MythTV debug compile mode +%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0} + +# The following options are enabled by default. Use --without to disable them +%define with_perl %{?_without_perl: 0} %{!?_without_perl: 1} +%define with_python %{?_without_python: 0} %{!?_without_python: 1} + +# 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} + +# All plugins get built by default, but you can disable them as you wish +%define with_plugins %{?_without_plugins: 0} %{!?_without_plugins: 1} +%define with_mytharchive %{?_without_mytharchive: 0} %{!?_without_mytharchive: 1} +%define with_mythbrowser %{?_without_mythbrowser: 0} %{!?_without_mythbrowser: 1} +%define with_mythcontrols %{?_without_mythcontrols: 0} %{!?_without_mythcontrols: 1} +%define with_mythflix %{?_without_mythflix: 0} %{!?_without_mythflix: 1} +%define with_mythgallery %{?_without_mythgallery: 0} %{!?_without_mythgallery: 1} +%define with_mythgame %{?_without_mythgame: 0} %{!?_without_mythgame: 1} +%define with_mythmovies %{?_without_mythmovies: 0} %{!?_without_mythmovies: 1} +%define with_mythmusic %{?_without_mythmusic: 0} %{!?_without_mythmusic: 1} +%define with_mythnews %{?_without_mythnews: 0} %{!?_without_mythnews: 1} +%define with_mythphone %{?_without_mythphone: 0} %{!?_without_mythphone: 1} +%define with_mythvideo %{?_without_mythvideo: 0} %{!?_without_mythvideo: 1} +%define with_mythweather %{?_without_mythweather: 0} %{!?_without_mythweather: 1} +%define with_mythweb %{?_without_mythweb: 0} %{!?_without_mythweb: 1} +%define with_mythzoneminder %{?_without_mythzoneminder: 0} %{!?_without_mythzoneminder: 1} + +# The following plugin options are disabled by default. Use --with to enable them + +# MythPhone +%define with_festival %{?_with_festival: 1} %{!?_with_festival: 0} + +################################################################################ + +Source0: http://www.mythtv.org/mc/mythtv-%{version}.tar.bz2 +Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2 +Source10: PACKAGE-LICENSING Source101: mythbackend.sysconfig.in Source102: mythbackend.init.in Source103: mythbackend.logrotate.in @@ -41,128 +144,200 @@ Source109: mythtv-setup.desktop Source110: mysql.txt Source401: mythweb.conf -# Patches -Patch100: mythtv-0.21-svnfixes.patch -Patch101: mythtv-0.20-mythstreammenu.diff -#Patch102: mythtv-0.21-fedora-settings.patch -Patch200: mythplugins-0.21-svnfixes.patch -#Patch201: mythplugins-0.21-fedora-settings.patch -# -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: freetype-devel >= 2 -%if 0%{?fedora} >= 9 -BuildRequires: qt3-devel -%else -BuildRequires: qt-devel >= 3 +Patch0: mythtv-0.22-enable-x86_64-fast_cmov-by-default.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +################################################################################ +# Python setup + +%if %{with_python} +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]')} [...1704 lines suppressed...] +%if %{with_mythgallery} %files -n mythgallery %defattr(-,root,root,-) %doc mythplugins-%{version}/mythgallery/AUTHORS @@ -911,7 +1445,9 @@ %{_libdir}/mythtv/plugins/libmythgallery.so %{_datadir}/mythtv/i18n/mythgallery_*.qm %{_localstatedir}/lib/pictures +%endif +%if %{with_mythgame} %files -n mythgame %defattr(-,root,root,-) %dir %{_sysconfdir}/mythgame @@ -921,14 +1457,39 @@ %exclude %{_datadir}/mythtv/games/xmame %{_datadir}/mythtv/game_settings.xml %{_datadir}/mythtv/i18n/mythgame_*.qm -%exclude %{_datadir}/mame/screens -#files -n mythgame-emulators -#defattr(-,root,root,-) -#{_datadir}/mythtv/games/xmame -#{_datadir}/mame/screens -#{_datadir}/mame/flyers +%files -n mythgame-emulators +%defattr(-,root,root,-) +%{_datadir}/mythtv/games/xmame +%{_datadir}/mame/screens +%{_datadir}/mame/flyers +%endif + +%if %{with_mythmovies} +%files -n mythmovies +%defattr(-,root,root,-) +%doc mythplugins-%{version}/mythmovies/COPYING +%doc mythplugins-%{version}/mythmovies/README +%doc mythplugins-%{version}/mythmovies/TODO +%{_bindir}/ignyte +%{_datadir}/mythtv/themes/default/movies-ui.xml +%{_libdir}/mythtv/plugins/libmythmovies.so +%endif + +%if %{with_mythmusic} +%files -n mythmusic +%defattr(-,root,root,-) +%doc mythplugins-%{version}/mythmusic/AUTHORS +%doc mythplugins-%{version}/mythmusic/COPYING +%doc mythplugins-%{version}/mythmusic/README +%{_libdir}/mythtv/plugins/libmythmusic.so +%{_localstatedir}/lib/mythmusic +%{_datadir}/mythtv/musicmenu.xml +%{_datadir}/mythtv/music_settings.xml +%{_datadir}/mythtv/i18n/mythmusic_*.qm +%endif +%if %{with_mythnews} %files -n mythnews %defattr(-,root,root,-) %doc mythplugins-%{version}/mythnews/AUTHORS @@ -937,16 +1498,9 @@ %{_libdir}/mythtv/plugins/libmythnews.so %{_datadir}/mythtv/mythnews %{_datadir}/mythtv/i18n/mythnews_*.qm +%endif -%files -n mythbrowser -%defattr(-,root,root,-) -%doc mythplugins-%{version}/mythbrowser/AUTHORS -%doc mythplugins-%{version}/mythbrowser/COPYING -%doc mythplugins-%{version}/mythbrowser/README -%{_bindir}/mythbrowser -%{_libdir}/mythtv/plugins/libmythbookmarkmanager.so -%{_datadir}/mythtv/i18n/mythbrowser_*.qm - +%if %{with_mythphone} %files -n mythphone %defattr(-,root,root,-) %doc mythplugins-%{version}/mythphone/AUTHORS @@ -955,47 +1509,35 @@ %doc mythplugins-%{version}/mythphone/TODO %{_libdir}/mythtv/plugins/libmythphone.so %{_datadir}/mythtv/i18n/mythphone_*.qm +%endif -%files -n mythcontrols -%defattr(-,root,root,-) -%doc mythplugins-%{version}/mythcontrols/AUTHORS -%doc mythplugins-%{version}/mythcontrols/COPYING -%doc mythplugins-%{version}/mythcontrols/README -%doc mythplugins-%{version}/mythcontrols/TODO -%{_libdir}/mythtv/plugins/libmythcontrols.so -%{_datadir}/mythtv/i18n/mythcontrols_*.qm - -%files -n mythflix -%defattr(-,root,root,-) -%doc mythplugins-%{version}/mythflix/AUTHORS -%doc mythplugins-%{version}/mythflix/COPYING -%doc mythplugins-%{version}/mythflix/README -%{_libdir}/mythtv/plugins/libmythflix.so -%{_datadir}/mythtv/mythflix -%{_datadir}/mythtv/i18n/mythflix_*.qm -%{_datadir}/mythtv/i18n/mythflix_*.ts -%{_datadir}/mythtv/netflix_menu.xml - -%files -n mytharchive +%if %{with_mythvideo} +%files -n mythvideo %defattr(-,root,root,-) -%doc mythplugins-%{version}/mytharchive/AUTHORS -%doc mythplugins-%{version}/mytharchive/COPYING -%doc mythplugins-%{version}/mytharchive/README -%doc mythplugins-%{version}/mytharchive/TODO -%{_bindir}/mytharchivehelper -%{_libdir}/mythtv/plugins/libmytharchive.so -%{_datadir}/mythtv/archiveformat.xml -%{_datadir}/mythtv/archivemenu.xml -%{_datadir}/mythtv/archiveutils.xml -%{_datadir}/mythtv/mytharchive -%{_datadir}/mythtv/i18n/mytharchive_*.qm +%doc mythplugins-%{version}/mythvideo/COPYING +%doc mythplugins-%{version}/mythvideo/README* +%{_libdir}/mythtv/plugins/libmythvideo.so +%{_datadir}/mythtv/mythvideo +%{_datadir}/mythtv/i18n/mythvideo_*.qm +%{_datadir}/mythtv/video_settings.xml +%{_datadir}/mythtv/videomenu.xml +%{_localstatedir}/lib/mythvideo +%{_bindir}/mtd +%endif -%files -n mythzoneminder +%if %{with_mythweather} +%files -n mythweather %defattr(-,root,root,-) -%{_libdir}/mythtv/plugins/libmythzoneminder.so -%{_datadir}/mythtv/zonemindermenu.xml -%{_bindir}/mythzmserver +%doc mythplugins-%{version}/mythweather/AUTHORS +%doc mythplugins-%{version}/mythweather/COPYING +%doc mythplugins-%{version}/mythweather/README +%{_libdir}/mythtv/plugins/libmythweather.so +%{_datadir}/mythtv/i18n/mythweather_*.qm +%{_datadir}/mythtv/weather_settings.xml +%{_datadir}/mythtv/mythweather +%endif +%if %{with_mythweb} %files -n mythweb %defattr(-,root,root,-) %doc mythplugins-%{version}/mythweb/README @@ -1003,26 +1545,33 @@ %defattr(-,apache,apache,0775) %dir %{_datadir}/mythweb %{_datadir}/mythweb/* +%endif -%files -n perl-MythTV +%if %{with_mythzoneminder} +%files -n mythzoneminder %defattr(-,root,root,-) -%{perl_vendorlib}/MythTV.pm -%dir %{perl_vendorlib}/MythTV -%{perl_vendorlib}/MythTV/*.pm -%dir %{perl_vendorlib}/IO/Socket -%dir %{perl_vendorlib}/IO/Socket/INET -%{perl_vendorlib}/IO/Socket/INET/MythTV.pm -%exclude %{perl_vendorarch}/auto/MythTV/.packlist +%{_libdir}/mythtv/plugins/libmythzoneminder.so +%{_datadir}/mythtv/zonemindermenu.xml +%{_bindir}/mythzmserver +%endif -%files -n python-MythTV -%defattr(-,root,root,-) -%dir %{python_sitelib}/MythTV/ -%{python_sitelib}/MythTV/* -%if 0%{?fedora} >= 9 -%{python_sitelib}/MythTV-*.egg-info %endif +################################################################################ + %changelog +* Mon Dec 15 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.1.svn.r19390 +- MythTV svn trunk (pre-0.22), revision 19390 +- Re-enable fast cmov on x86_64 by default +- Add BR: yasm-devel to enable yasm-specific improvements + +* Sat Dec 13 2008 Chris Petersen <rpm(a)forevermore.net&gt; 0.22-0.1.svn +- Update to compile for pre-0.22 svn trunk, including new files and qt4 deps +- Major cleanup and porting from my personal spec (which was a combination + of works from atrpms and some of Jarod's earlier works). +- Add a few more --with and --without options, including the ability to + disable specific mythplugins and/or all plugins. + * Thu Dec 11 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-15 - Update to release-0-21-fixes patches (r19344) - Includes critical fix for supporting use of FireWire cable Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Aug 2008 15:17:17 -0000 1.2 +++ sources 18 Dec 2008 02:15:42 -0000 1.3 @@ -1,4 +1,4 @@ be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png -6c08043227bef1384858deee12b5cdc3 mythplugins-0.21.tar.bz2 -49fc135e1cde90cd935c1229467fa37e mythtv-0.21.tar.bz2 +eaf125fe0679fb35dfdf2c207e50a73d mythtv-0.22.tar.bz2 +7b7df64d730e906f261327bff963685e mythplugins-0.22.tar.bz2 --- mythplugins-0.21-svnfixes.patch DELETED --- --- mythtv-0.21-enable-64bit-fast_cmov.patch DELETED --- --- mythtv-0.21-svnfixes.patch DELETED ---