Skip to content

Commit

Permalink
Update for recent changes like mediaserver and merging mythvideo into…
Browse files Browse the repository at this point in the history 
… the frontend
  • Loading branch information
@ex-nerd
ex-nerd committed Jun 9, 2011
1 parent e6241cb commit 08c3f00
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 82 deletions.
1 change: 0 additions & 1 deletion rpm/build_myth.sh
View file
Expand Up @@ -167,7 +167,6 @@ EOF
/usr/src/redhat/RPMS/x86_64/mythmusic-$GITVER-0.1.git.$GITREV.*.rpm \
/usr/src/redhat/RPMS/x86_64/mythbrowser-$GITVER-0.1.git.$GITREV.*.rpm \
/usr/src/redhat/RPMS/x86_64/mythnetvision-$GITVER-0.1.git.$GITREV.*.rpm \
/usr/src/redhat/RPMS/x86_64/mythvideo-$GITVER-0.1.git.$GITREV.*.rpm \
/usr/src/redhat/RPMS/x86_64/mythweather-$GITVER-0.1.git.$GITREV.*.rpm \
/usr/src/redhat/RPMS/x86_64/mythtv-debuginfo-$GITVER-0.1.git.$GITREV.*.rpm
#/usr/src/redhat/RPMS/x86_64/mythtv-themes-$GITVER-0.1.git.$GITREV.*.rpm \
Expand Down
114 changes: 33 additions & 81 deletions rpm/mythtv.spec
View file
Expand Up @@ -31,7 +31,7 @@
#
# The following options are disabled by default. Use these options to enable:
#
# --with directfb Enable directfb support
# * currently no disabled options *
#
# The following options are enabled by default. Use these options to disable:
#
Expand Down Expand Up @@ -65,10 +65,10 @@
%define desktop_vendor xris

# MythTV Version string -- preferably the output from git --describe
%define vers_string v0.25pre-1924-g83e79b6
%define vers_string v0.25pre-2256-g4d4eaa8

# Git Revision number and branch ID
%define _gitrev 1924.g83e79b6
%define _gitrev 2256.g4d4eaa8
%define branch master

#
Expand Down Expand Up @@ -111,9 +111,6 @@ License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or LGPLv2+
%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}

# 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}
Expand All @@ -122,7 +119,6 @@ License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or LGPLv2+
%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_mythzoneminder %{?_without_mythzoneminder: 0} %{!?_without_mythzoneminder: 1}
%define with_mythnetvision %{?_without_mythnetvision: 0} %{!?_without_mythnetvision: 1}
Expand Down Expand Up @@ -212,6 +208,9 @@ BuildRequires: jack-audio-connection-kit-devel
BuildRequires: pulseaudio-libs-devel
%endif

# Video support, formerly MythVideo
Requires: perl(XML::Simple)

# Need dvb headers to build in dvb support
BuildRequires: kernel-headers

Expand All @@ -220,10 +219,6 @@ BuildRequires: libavc1394-devel
BuildRequires: libiec61883-devel
BuildRequires: libraw1394-devel

%if %{with_directfb}
BuildRequires: directfb-devel
%endif

%if %{with_vdpau}
BuildRequires: libvdpau-devel
%endif
Expand Down Expand Up @@ -280,10 +275,6 @@ BuildRequires: SDL-devel

BuildRequires: ncurses-devel

%if %{with_mythvideo}
Requires: perl(XML::Simple)
%endif

%if %{with_mythweather}
Requires: mythweather >= %{version}
BuildRequires: perl(XML::Simple)
Expand Down Expand Up @@ -452,10 +443,6 @@ Requires: libavc1394-devel
Requires: libiec61883-devel
Requires: libraw1394-devel

%if %{with_directfb}
Requires: directfb-devel
%endif

%if %{with_vdpau}
Requires: libvdpau-devel
%endif
Expand Down Expand Up @@ -493,8 +480,12 @@ Requires: freetype, lame
Requires: mythtv-common = %{version}-%{release}
Requires: mythtv-base-themes = %{version}
Provides: mythtv-frontend-api = %{mythfeapiver}
Obsoletes: mythcontrols < %{version}-%{release}
Provides: mythcontrols = %{version}-%{release}
Requires: mplayer
Requires: python-imdb
Requires: python-MythTV = %{version}-%{release}
Obsoletes: mythcontrols
Obsoletes: mythvideo
Obsoletes: mythdvd

%description frontend
MythTV provides a unified graphical interface for recording and viewing
Expand Down Expand Up @@ -634,7 +625,6 @@ Summary: Main MythTV plugins
Group: Applications/Multimedia

Requires: mythmusic = %{version}-%{release}
Requires: mythvideo = %{version}-%{release}
Requires: mythweather = %{version}-%{release}
Requires: mythgallery = %{version}-%{release}
Requires: mythgame = %{version}-%{release}
Expand Down Expand Up @@ -668,7 +658,7 @@ Requires: python-imaging

%description -n mytharchive
MythArchive is a new plugin for MythTV that lets you create DVDs from
your recorded shows, MythVideo files and any video files available on
your recorded shows, video files and any video files available on
your system.

%endif
Expand Down Expand Up @@ -760,30 +750,6 @@ Requires: mythtv-frontend-api = %{mythfeapiver}
%description -n mythnews
An RSS news feed reader plugin for MythTV.

%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: 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.

%endif
################################################################################
%if %{with_mythweather}
Expand Down Expand Up @@ -884,6 +850,12 @@ EOF
# We also need Xv libs to build XvMCNVIDIA
sed -i -e 's,VENDOR_XVMC_LIBS="-lXvMCNVIDIA",VENDOR_XVMC_LIBS="-lXvMCNVIDIA -lXv",' configure

# Fix the default video directory so it points to something more standard
sed -i -e 's,/share/Movies/dvd,%{_localstatedir}/lib/mythtv/dvd,' libs/libmythmetadata/globals.cpp

# Add execute bits to the various python helper scripts
find programs/scripts/metadata -name '*.py' -exec chmod +x "{}" \;

# On to mythplugins
cd ..

Expand All @@ -897,14 +869,6 @@ cd mythplugins
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 ..

# Add execute bits to mythvideo python helper scripts
find mythvideo/mythvideo/scripts/ -name '*.py' -exec chmod +x "{}" \;

# And back to the compile root
cd ..

Expand Down Expand Up @@ -953,11 +917,6 @@ cd mythtv
%if !%{with_xvmc}
--disable-xvmcw \
%endif
%if %{with_directfb}
--enable-directfb \
%else
--disable-directfb \
%endif
%if !%{with_perl}
--without-bindings=perl \
%endif
Expand Down Expand Up @@ -1053,11 +1012,6 @@ cd mythplugins
%else
--disable-mythnews \
%endif
%if %{with_mythvideo}
--enable-mythvideo \
%else
--disable-mythvideo \
%endif
%if %{with_mythweather}
--enable-mythweather \
%else
Expand Down Expand Up @@ -1143,9 +1097,6 @@ cd mythplugins
%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
Expand Down Expand Up @@ -1229,6 +1180,7 @@ fi
%{_bindir}/mythbackend
%{_bindir}/mythfilldatabase
%{_bindir}/mythjobqueue
%{_bindir}/mythmediaserver
%{_bindir}/mythreplex
%{_datadir}/mythtv/MXML_scpd.xml
%{_datadir}/mythtv/backend-config/
Expand Down Expand Up @@ -1277,6 +1229,12 @@ fi
%{_datadir}/pixmaps/myth*.png
%dir %{_datadir}/mythtv/metadata
%{_datadir}/mythtv/metadata/*
#%doc mythplugins/mythvideo/COPYING
#%doc mythplugins/mythvideo/README*
#%{_datadir}/mythtv/i18n/mythvideo_*.qm
#%{_datadir}/mythtv/video_settings.xml
#%{_datadir}/mythtv/videomenu.xml
#%{_localstatedir}/lib/mythvideo

%files base-themes
%defattr(-,root,root,-)
Expand Down Expand Up @@ -1412,19 +1370,6 @@ fi
%{_datadir}/mythtv/i18n/mythnews_*.qm
%endif

%if %{with_mythvideo}
%files -n mythvideo
%defattr(-,root,root,-)
%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
%{_localstatedir}/lib/mythvideo
%endif

%if %{with_mythweather}
%files -n mythweather
%defattr(-,root,root,-)
Expand Down Expand Up @@ -1465,6 +1410,13 @@ fi
################################################################################

%changelog
* Wed Jun 08 2011 Chris Petersen <cpetersen@mythtv.org> 0.25-0.1.git
- Merge MythVideo into the frontend
- Add mythmediaserver to the backend package

* Wed May 30 2011 Chris Petersen <cpetersen@mythtv.org> 0.25-0.1.git
- remove directfb compile options

* Wed Apr 20 2011 Chris Petersen <cpetersen@mythtv.org> 0.25-0.1.git
- add backend-config directory

Expand Down

0 comments on commit 08c3f00

Please sign in to comment.