10:29 p.m.
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25577
Modified Files:
mythtv.spec sources
Removed Files:
mythtv-0.24.2-fixes.patch mythtv-0.24.2-gcc47.patch
Log Message:
* Tue Mar 20 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-1
- Update to latest release 0.25.
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-15/mythtv.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- mythtv.spec 10 Apr 2012 18:34:55 -0000 1.88
+++ mythtv.spec 13 Apr 2012 22:29:37 -0000 1.89
@@ -30,15 +30,10 @@
# 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 vdpau Disable VDPAU support
# --without crystalhd Disable Crystal HD support
-# --without xvmc Disable XvMC support
# --without perl Disable building of the perl bindings
# --without python Disable building of the python bindings
#
@@ -51,7 +46,6 @@
# --without mythmusic
# --without mythnetvision
# --without mythnews
-# --without mythvideo
# --without mythweather
# --without mythzoneminder
# --without mythweb
@@ -70,13 +64,13 @@
%define _gitrev 40f3bae
# Mythtv and plugins from github.com
-%global githash1 g4627dc9
-%global githash2 c239b59
+%global githash1 g1f5962a
+%global githash2 9615da9
# Mythweb from github.com
-%global githash3 g946deb7
-%global githash4 28a6e31
+%global githash3 g1d056f7
+%global githash4 0fc49a5
-%define branch fixes/0.24
+%define branch fixes/0.25
#
# Basic descriptive tags for this package:
@@ -87,12 +81,12 @@
Group: Applications/Multimedia
# Version/Release info
-Version: 0.24.2
+Version: 0.25
%if "%{branch}" == "master"
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 2%{?dist}
+Release: 1%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -112,6 +106,7 @@
# The following options are enabled by default. Use --without to disable them
%define with_vdpau %{?_without_vdpau: 0} %{?!_without_vdpau: 1}
+%define with_vaapi %{?_without_vaapi: 0} %{?!_without_vaapi: 1}
%if 0%{?rhel}
%define with_crystalhd %{?_without_crystalhd: 1} %{?!_without_crystalhd: 0}
@@ -119,13 +114,11 @@
%define with_crystalhd %{?_without_crystalhd: 0} %{?!_without_crystalhd: 1}
%endif
-%define with_xvmc %{?_without_xvmc: 0} %{?!_without_xvmc: 1}
%define with_perl %{?_without_perl: 0} %{!?_without_perl: 1}
+%define with_php %{?_without_php: 0} %{!?_without_php: 1}
%define with_python %{?_without_python: 0} %{!?_without_python: 1}
%define with_pulseaudio %{?_without_pulseaudio: 0} %{!?_without_pulseaudio: 1}
-# The following options are disabled by default. Use --with to enable them
-%define with_directfb %{?_with_directfb: 1} %{!?_with_directfb: 0}
# FAAC is non-free, so we disable it by default
%define with_faac %{?_with_faac: 1} %{?!_with_faac: 0}
@@ -137,7 +130,6 @@
%define with_mythgame %{?_without_mythgame: 0} %{!?_without_mythgame:
1}
%define with_mythmusic %{?_without_mythmusic: 0} %{!?_without_mythmusic:
1}
%define with_mythnews %{?_without_mythnews: 0} %{!?_without_mythnews:
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}
@@ -145,11 +137,14 @@
################################################################################
+# https://github.com/MythTV/mythtv/tarball/v0.25
Source0: MythTV-%{name}-v%{version}-0-%{githash1}.tar.gz
+# https://github.com/MythTV/mythweb/tarball/v0.25
Source1: MythTV-mythweb-v%{version}-0-%{githash3}.tar.gz
-Patch0: mythtv-%{version}-fixes.patch
+
+Patch0: mythtv-0.25-fixes.patch
#Patch1: mythplugins-%{version}-fixes.patch
-Patch2: mythtv-0.24.2-gcc47.patch
+Patch2: mythtv_0.25_gcc_4.7.patch
Source10: PACKAGE-LICENSING
Source101: mythbackend.sysconfig
@@ -165,16 +160,6 @@
Source401: mythweb.conf
-################################################################################
-# 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]')}
-#%endif
-
-################################################################################
-
# Global MythTV and Shared Build Requirements
%if 0%{?fedora} >= 16
@@ -198,7 +183,7 @@
BuildRequires: gcc-c++
BuildRequires: mysql-devel >= 5
BuildRequires: qt-webkit-devel
-BuildRequires: qt-devel >= 4.4
+BuildRequires: qt-devel >= 4.6
BuildRequires: phonon-devel
BuildRequires: lm_sensors-devel
@@ -233,18 +218,19 @@
BuildRequires: libdvdread-devel >= 0.9.4
BuildRequires: libcdio-devel
# nb: libdvdcss will be dynamically loaded if installed
-BuildRequires: libfame-devel >= 0.9.0
+#BuildRequires: libfame-devel >= 0.9.0
BuildRequires: libogg-devel
BuildRequires: libtheora-devel
BuildRequires: libvorbis-devel >= 1.0
BuildRequires: mjpegtools-devel >= 1.6.1
-BuildRequires: taglib-devel >= 1.5
+BuildRequires: taglib-devel >= 1.6
# Is transcode really a BR?
#BuildRequires: transcode >= 0.6.8
BuildRequires: x264-devel
BuildRequires: xvidcore-devel >= 0.9.1
# Audio framework support
+BuildRequires: sox-devel
BuildRequires: alsa-lib-devel
BuildRequires: arts-devel
BuildRequires: jack-audio-connection-kit-devel
@@ -252,6 +238,13 @@
BuildRequires: pulseaudio-libs-devel
%endif
+# Bluray support
+BuildRequires: libxml2-devel
+#BuildRequires: libudf-devel
+
+# Subtitle support
+BuildRequires: libass-devel
+
# Need dvb headers to build in dvb support
BuildRequires: kernel-headers
@@ -260,14 +253,14 @@
BuildRequires: libiec61883-devel
BuildRequires: libraw1394-devel
-%if %{with_directfb}
-BuildRequires: directfb-devel
-%endif
-
%if %{with_vdpau}
BuildRequires: libvdpau-devel
%endif
+%if %{with_vaapi}
+BuildRequires: libva-devel
+%endif
+
%if %{with_crystalhd}
BuildRequires: libcrystalhd-devel
%endif
@@ -286,11 +279,18 @@
BuildRequires: perl(HTTP::Request)
BuildRequires: perl(Net::UPnP::QueryResponse)
BuildRequires: perl(Net::UPnP::ControlPoint)
+BuildRequires: perl(DBD::mysql)
+BuildRequires: perl(IO::Socket::INET6)
+%endif
+
+%if %{with_php}
+# No php specific requirements yet.
%endif
%if %{with_python}
BuildRequires: python-devel
BuildRequires: MySQL-python
+BuildRequires: python-urlgrabber
%endif
# Plugin Build Requirements
@@ -305,21 +305,11 @@
BuildRequires: zlib-devel
%endif
-%if %{with_mythmusic}
-BuildRequires: libcdaudio-devel >= 0.99.6
-BuildRequires: cdparanoia-devel
-BuildRequires: libvisual-devel
-BuildRequires: SDL-devel
-%endif
-
%if %{with_mythnews}
%endif
BuildRequires: ncurses-devel
-%if %{with_mythvideo}
-Requires: perl(XML::Simple)
-%endif
%if %{with_mythweather}
Requires: mythweather >= %{version}
@@ -416,7 +406,7 @@
Requires: freetype >= 2
Requires: lame
-Requires: qt4 >= 4.4
+Requires: qt4 >= 4.6
Requires: qt4-MySQL
%description libs
@@ -436,7 +426,7 @@
Requires: freetype-devel >= 2
Requires: mysql-devel >= 5
-Requires: qt4-devel >= 4.4
+Requires: qt4-devel >= 4.6
Requires: lm_sensors-devel
Requires: lirc-devel
@@ -488,14 +478,14 @@
Requires: libiec61883-devel
Requires: libraw1394-devel
-%if %{with_directfb}
-Requires: directfb-devel
-%endif
-
%if %{with_vdpau}
Requires: libvdpau-devel
%endif
+%if %{with_vaapi}
+Requires: libva-devel
+%endif
+
%if %{with_crystalhd}
Requires: libcrystalhd-devel
%endif
@@ -526,6 +516,7 @@
Summary: Client component of mythtv (a DVR)
Group: Applications/Multimedia
Requires: freetype, lame
+Requires: perl(XML::Simple)
Requires: mythtv-common = %{version}-%{release}
Requires: mythtv-base-themes = %{version}
Provides: mythtv-frontend-api = %{mythfeapiver}
@@ -548,7 +539,6 @@
Group: Applications/Multimedia
Requires: lame
Requires: mythtv-common = %{version}-%{release}
-Requires: wget
Requires(pre): shadow-utils
Conflicts: xmltv-grabbers < 0.5.37
@@ -569,7 +559,6 @@
Requires: freetype
Requires: mythtv-backend = %{version}-%{release}
Requires: mythtv-base-themes = %{version}
-Requires: wget
%description setup
MythTV provides a unified graphical interface for recording and viewing
@@ -621,6 +610,21 @@
################################################################################
+%if %{with_php}
+
+%package -n php-MythTV
+Summary: PHP bindings for MythTV
+Group: Development/Languages
+# Wish we could do this:
+#BuildArch: noarch
+
+%description -n php-MythTV
+Provides a PHP-based interface to interacting with MythTV.
+
+%endif
+
+################################################################################
+
%if %{with_python}
%package -n python-MythTV
@@ -648,7 +652,6 @@
Group: Applications/Multimedia
Requires: mythmusic = %{version}-%{release}
-Requires: mythvideo = %{version}-%{release}
Requires: mythweather = %{version}-%{release}
Requires: mythgallery = %{version}-%{release}
Requires: mythgame = %{version}-%{release}
@@ -756,32 +759,6 @@
%endif
################################################################################
-%if %{with_mythvideo}
-
-%package -n mythvideo
-Summary: A generic video player frontend module for MythTV
-Group: Applications/Multimedia
-Requires: mythtv-frontend-api = %{mythfeapiver}
-Requires: mplayer
-Requires: transcode >= 0.6.8
-Requires: python-imdb
-Requires: python-MythTV = %{version}-%{release}
-
-Provides: mythdvd = %{version}-%{release}
-Obsoletes: mythdvd < %{version}-%{release}
-
-%description -n mythvideo
-MythVideo is a MythTV module that allows you to play videos, DVDs and
-(optionally) VCDs. It can also be configured to let you rip DVDs and
-transcode their video and audio content to other (generally smaller)
-formats. The player can either use the MythTV internal software (which
-now supports DVD menus), or simply to invoke your favorite DVD/XVCD
-playing software (mplayer, ogle, xine, etc) as an external
-command. The transcoding is based on and derived from the excellent
-transcode package.
-
-%endif
-################################################################################
%if %{with_mythweather}
%package -n mythweather
@@ -902,7 +879,7 @@
# chmod 644 settings.pro
# We also need Xv libs to build XvMCNVIDIA
- sed -i -e
's,VENDOR_XVMC_LIBS="-lXvMCNVIDIA",VENDOR_XVMC_LIBS="-lXvMCNVIDIA
-lXv",' configure
+# sed -i -e
's,VENDOR_XVMC_LIBS="-lXvMCNVIDIA",VENDOR_XVMC_LIBS="-lXvMCNVIDIA
-lXv",' configure
# On to mythplugins
popd
@@ -911,20 +888,20 @@
##### MythPlugins
%if %{with_plugins}
-pushd mythplugins
+#pushd mythplugins
# Fix /mnt/store -> /var/lib/mythmusic
- cd mythmusic
- sed -i -e's,/mnt/store/music,%{_localstatedir}/lib/mythmusic,'
mythmusic/globalsettings.cpp
- cd ..
+# cd mythmusic
+# sed -i -e's,/mnt/store/music,%{_localstatedir}/lib/mythmusic,'
mythmusic/globalsettings.cpp
+# cd ..
# Fix /mnt/store -> /var/lib/mythvideo
- cd mythvideo
- sed -i -e 's,/share/Movies/dvd,%{_localstatedir}/lib/mythvideo,'
mythvideo/globalsettings.cpp
- cd ..
+# cd mythvideo
+# sed -i -e 's,/share/Movies/dvd,%{_localstatedir}/lib/mythvideo,'
mythvideo/globalsettings.cpp
+# cd ..
# And back to the compile root
-popd
+#popd
@@ -956,8 +933,7 @@
--enable-libfftw3 \
--enable-x11 --x11-path=%{_includedir} \
--enable-xv \
- --enable-xvmc-vld \
- --enable-opengl-video --enable-opengl-vsync \
+ --enable-opengl-video \
--enable-xrandr \
--enable-lirc \
--enable-ivtv \
@@ -967,25 +943,24 @@
--enable-libfaac --enable-nonfree \
%endif
--enable-libmp3lame \
+ --enable-libx264 \
--enable-libtheora --enable-libvorbis \
--enable-libxvid \
%if %{with_vdpau}
--enable-vdpau \
%endif
+%if %{with_vaapi}
+ --enable-vaapi \
+%endif
%if %{with_crystalhd}
--enable-crystalhd \
%endif
-%if !%{with_xvmc}
- --disable-xvmcw \
-%endif
-%if %{with_directfb}
- --enable-directfb \
-%else
- --disable-directfb \
-%endif
%if !%{with_perl}
--without-bindings=perl \
%endif
+%if !%{with_php}
+ --without-bindings=php \
+%endif
%if !%{with_python}
--without-bindings=python \
%endif
@@ -1013,10 +988,7 @@
echo 'SOURCE_VERSION="%{version}-%{release} (%_gitrev)"' >
VERSION
# Make
- #make %{?_smp_mflags}
-# Let's test for the DateTime module
- perl -e 'use DateTime::Format::ISO8601;'
- echo "DateTime found: $?"
+ make %{?_smp_mflags}
# Prepare to build the plugins
popd
@@ -1078,11 +1050,6 @@
%else
--disable-mythnews \
%endif
- %if %{with_mythvideo}
- --enable-mythvideo \
- %else
- --disable-mythvideo \
- %endif
%if %{with_mythweather}
--enable-mythweather \
%else
@@ -1099,9 +1066,8 @@
--disable-mythnetvision \
%endif
--enable-opengl \
- --enable-libvisual \
--enable-fftw \
- --enable-sdl
+# --enable-sdl
make %{?_smp_mflags}
@@ -1122,6 +1088,7 @@
ln -s mythtv-setup %{buildroot}%{_bindir}/mythtvsetup
mkdir -p %{buildroot}%{_localstatedir}/lib/mythtv
+ mkdir -p %{buildroot}%{_localstatedir}/lib/mythvideo
mkdir -p %{buildroot}%{_localstatedir}/cache/mythtv
mkdir -p %{buildroot}%{_localstatedir}/log/mythtv
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
@@ -1181,9 +1148,6 @@
%if %{with_mythmusic}
mkdir -p %{buildroot}%{_localstatedir}/lib/mythmusic
%endif
-%if %{with_mythvideo}
- mkdir -p %{buildroot}%{_localstatedir}/lib/mythvideo
-%endif
%if %{with_mythgallery}
mkdir -p %{buildroot}%{_localstatedir}/lib/pictures
%endif
@@ -1299,8 +1263,9 @@
%doc mythtv/COPYING
%doc mythtv/FAQ
%doc mythtv/database mythtv/keys.txt
-%doc mythtv/docs/*.html mythtv/docs/*.png
-%doc mythtv/docs/*.txt
+# Do we really need the API documentation?
+#%doc mythtv/docs/*.html mythtv/docs/*.png
+#%doc mythtv/docs/*.txt
%doc mythtv/PACKAGE-LICENSING
%doc mythtv/contrib
@@ -1309,20 +1274,27 @@
%dir %{_datadir}/mythtv
%config(noreplace) %{_sysconfdir}/mythtv/mysql.txt
%config(noreplace) %{_sysconfdir}/mythtv/config.xml
+%{_bindir}/mythccextractor
%{_bindir}/mythcommflag
+%{_bindir}/mythmetadatalookup
+%{_bindir}/mythutil
%{_bindir}/mythpreviewgen
%{_bindir}/mythtranscode
%{_bindir}/mythwikiscripts
%{_datadir}/mythtv/mythconverg*.pl
%{_datadir}/mythtv/locales/
+%{_datadir}/mythtv/metadata/
+%{_datadir}/mythtv/hardwareprofile/
%files backend
%{_bindir}/mythbackend
%{_bindir}/mythfilldatabase
%{_bindir}/mythjobqueue
+%{_bindir}/mythmediaserver
%{_bindir}/mythreplex
%{_bindir}/mythffmpeg
%{_datadir}/mythtv/MXML_scpd.xml
+%{_datadir}/mythtv/backend-config/
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/cache/mythtv
%if 0%{?fedora} >=16
@@ -1335,6 +1307,7 @@
%config(noreplace) %{_sysconfdir}/logrotate.d/mythbackend
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/log/mythtv
%{_datadir}/mythtv/internetcontent/
+%{_datadir}/mythtv/html/
%files setup
%{_bindir}/mythtv-setup
@@ -1343,7 +1316,6 @@
%{_datadir}/applications/*mythtv-setup.desktop
%files frontend
-%defattr(-,root,root,-)
%{_datadir}/mythtv/CDS_scpd.xml
%{_datadir}/mythtv/CMGR_scpd.xml
%{_datadir}/mythtv/MFEXML_scpd.xml
@@ -1353,11 +1325,10 @@
%{_datadir}/mythtv/setup.xml
%{_bindir}/mythavtest
%{_bindir}/mythfrontend
-%{_bindir}/mythtvosd
+#%%{_bindir}/mythmessage
%{_bindir}/mythlcdserver
%{_bindir}/mythshutdown
%{_bindir}/mythwelcome
-%{_bindir}/mythffplay
%dir %{_libdir}/mythtv
%dir %{_libdir}/mythtv/filters
%{_libdir}/mythtv/filters/*
@@ -1370,6 +1341,8 @@
%{_datadir}/applications/*mythfrontend.desktop
%{_datadir}/pixmaps/myth*.png
%{_datadir}/mythtv/metadata/
+# Myth Video is now Video Gallery
+%attr(-,mythtv,mythtv) %{_localstatedir}/lib/mythvideo
%files base-themes
%{_datadir}/mythtv/themes/
@@ -1395,6 +1368,11 @@
%exclude %{perl_vendorarch}/auto/MythTV/.packlist
%endif
+%if %{with_php}
+%files -n php-MythTV
+%{_datadir}/mythtv/bindings/php/*
+%endif
+
%if %{with_python}
%files -n python-MythTV
%{_bindir}/mythpython
@@ -1474,18 +1452,6 @@
%{_datadir}/mythtv/i18n/mythnews_*.qm
%endif
-%if %{with_mythvideo}
-%files -n mythvideo
-%doc mythplugins/mythvideo/COPYING
-%doc mythplugins/mythvideo/README*
-%{_libdir}/mythtv/plugins/libmythvideo.so
-%{_datadir}/mythtv/mythvideo
-%{_datadir}/mythtv/i18n/mythvideo_*.qm
-%{_datadir}/mythtv/video_settings.xml
-%{_datadir}/mythtv/videomenu.xml
-%attr(-,mythtv,mythtv) %{_localstatedir}/lib/mythvideo
-%endif
-
%if %{with_mythweather}
%files -n mythweather
%doc mythplugins/mythweather/AUTHORS
@@ -1532,6 +1498,9 @@
################################################################################
%changelog
+* Tue Mar 20 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-1
+- Update to latest release 0.25.
+
* Fri Mar 03 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.24.2-2
- Remove transcode as build requirement.
- Misc. spec file cleanup.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-15/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources 10 Feb 2012 16:41:09 -0000 1.52
+++ sources 13 Apr 2012 22:29:37 -0000 1.53
@@ -1,2 +1,2 @@
-89473db072e917ece75ead18666cd912 MythTV-mythtv-v0.24.2-0-g4627dc9.tar.gz
-25420e68e1b5d35fb8a53a4ffc8258b7 MythTV-mythweb-v0.24.2-0-g946deb7.tar.gz
+68928bcd22857d4905cc6141e3b7f7dc MythTV-mythtv-v0.25-0-g1f5962a.tar.gz
+370bf39a67c1d405d455e4ff74180cba MythTV-mythweb-v0.25-0-g1d056f7.tar.gz
--- mythtv-0.24.2-fixes.patch DELETED ---
--- mythtv-0.24.2-gcc47.patch DELETED ---