rpms/avidemux/devel avidemux-2.4.2-pulseaudio-default.patch, NONE, 1.1 avidemux-2.4.2-x264-2pass.patch, NONE, 1.1 avidemux-gtk.desktop, NONE, 1.1 avidemux-qt.desktop, NONE, 1.1 avidemux.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32353
Modified Files:
.cvsignore sources
Added Files:
avidemux-2.4.2-pulseaudio-default.patch
avidemux-2.4.2-x264-2pass.patch avidemux-gtk.desktop
avidemux-qt.desktop avidemux.spec
Log Message:
initial import from livna
avidemux-2.4.2-pulseaudio-default.patch:
--- NEW FILE avidemux-2.4.2-pulseaudio-default.patch ---
--- prefs.in.old 2008-06-22 15:24:53.000000000 -0400
+++ prefs.in 2008-07-19 21:08:03.000000000 -0400
@@ -55,7 +55,7 @@
#else
device.audiodevice, STRING, ALSA
#endif
-device.audio.alsa_device, STRING, "dmix"
+device.audio.alsa_device, STRING, "pulse"
device.videodevice, UINT, 0, 0, 10
# Posproc
default.postproc_type, UINT, 3, 0, 7
avidemux-2.4.2-x264-2pass.patch:
--- NEW FILE avidemux-2.4.2-x264-2pass.patch ---
--- avidemux_2.4.1/avidemux/ADM_encoder/adm_encx264.cpp-orig 2008-06-30 20:30:09.000000000 +0200
+++ avidemux_2.4.1/avidemux/ADM_encoder/adm_encx264.cpp 2008-07-10 17:27:51.000000000 +0200
@@ -271,6 +271,7 @@
{
uint32_t bitrate;
+ _delayed = 0;
ADM_assert (_state == enc_Pass1);
printf ("\n[x264] Starting pass 2 (%d x %d)\n", _w, _h);
--- NEW FILE avidemux-gtk.desktop ---
[Desktop Entry]
Name=Avidemux Video Editor (GTK)
Comment=Graphical video editing tool
Icon=gnome-multimedia
Exec=avidemux2_gtk
Terminal=false
Type=Application
Categories=AudioVideo;
--- NEW FILE avidemux-qt.desktop ---
[Desktop Entry]
Name=Avidemux Video Editor (QT)
Comment=Graphical video editing tool
Icon=gnome-multimedia
Exec=avidemux2_qt4
Terminal=false
Type=Application
Categories=AudioVideo;
--- NEW FILE avidemux.spec ---
%define with_gtk 1
%define with_qt 1
#define svndate 20080521
Name: avidemux
Version: 2.4.2
Release: 2%{?dist}
Summary: Graphical video editing tool
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.avidemux.org/
Source0: http://download.berlios.de/avidemux/avidemux_%{version}.tar.gz
Source1: %{name}-gtk.desktop
Source2: %{name}-qt.desktop
Patch0: avidemux-2.4.2-pulseaudio-default.patch
#http://bugs.gentoo.org/attachment.cgi?id=160132&action=view
Patch1: avidemux-2.4.2-x264-2pass.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# GTK interface is what people are used to, let's use that be default.
Requires: %{name}-gtk
# Compiling
BuildRequires: libtool >= 1.5.6
BuildRequires: gettext-devel
BuildRequires: autoconf
# Libraries
BuildRequires: nasm >= 0.98.38
BuildRequires: libxml2-devel >= 2.6.8
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel
BuildRequires: js-devel
BuildRequires: libXv-devel
BuildRequires: libXmu-devel
# Required by gtk: libXi-devel, libXext-devel, libX11-devel
# Required by qt: libXt-devel, libXext-devel, libX11-devel
# Sound out
BuildRequires: alsa-lib-devel >= 1.0.3
BuildRequires: esound-devel >= 0.2.0
# Video out
BuildRequires: SDL-devel >= 1.2.7
# Audio Codecs
BuildRequires: a52dec-devel >= 0.7.4
BuildRequires: faac-devel >= 1.24
BuildRequires: faad2-devel >= 2.0
BuildRequires: lame-devel >= 3.96.1
# BuildRequires: libdca-devel
# needs libdts/dts_internal.h; but that's not shipped by libdca-devel because
# it's an internal lib. Someone needs to report that upstream to get fixed
BuildRequires: libmad-devel >= 0.15.1
BuildRequires: libogg-devel >= 1.1
BuildRequires: libvorbis-devel >= 1.0.1
# Video Codecs
BuildRequires: xvidcore-devel >= 1.0.2
BuildRequires: x264-devel
BuildRequires: ffmpeg-devel
# Finally...
BuildRequires: desktop-file-utils
%description
Avidemux is a free video editor designed for simple cutting, filtering and
encoding tasks. It supports many file types, including AVI, DVD compatible
MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated
using projects, job queue and powerful scripting capabilities.
%if %{with_gtk}
%package gtk
Summary: GTK GUI for %{name}
Group: Applications/Multimedia
BuildRequires: gtk2-devel >= 2.8.0
BuildRequires: cairo-devel
Provides: %{name}-gui = %{version}-%{release}.1
%description gtk
This package provides the GTK interface for %{name}
%endif
%if %{with_qt}
%package qt
Summary: QT GUI for %{name}
Group: Applications/Multimedia
BuildRequires: qt4-devel
Provides: %{name}-gui = %{version}-%{release}
%description qt
This package provides the QT interface for %{name}
%endif
%prep
%setup -q -n avidemux_%{version}
pushd avidemux
%patch0 -b .pulse
popd
%patch1 -p1 -b .x264_2pass
%build
make -f Makefile.dist
# doesn't seem to fix ppc :/
#--with-newfaad \
%configure \
--with-jsapi-include=%{_includedir} \
--with-qt-include=%{_includedir} \
--with-qt-lib=%{_libdir}/qt4 \
--with-qt-dir=%{_libdir}/qt4 \
%ifarch ppc ppc64
--enable-altivec \
%endif
# Weird... %%{?_smp_mflags} works locally, but not on the buildsys?
make
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%if %{with_gtk}
desktop-file-install --vendor livna \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
%endif
%if %{with_qt}
desktop-file-install --vendor livna \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE2}
%endif
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog History README TODO
%{_bindir}/avidemux2_cli
%if %{with_gtk}
%files gtk
%defattr(-,root,root,-)
%{_bindir}/avidemux2_gtk
%{_datadir}/applications/*gtk*.desktop
%endif
%if %{with_qt}
%files qt
%defattr(-,root,root,-)
%{_bindir}/avidemux2_qt4
%{_datadir}/applications/*qt*.desktop
%endif
%changelog
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.4.2-2
- rebuild
* Sat Jul 19 2008 Thorsten Leemhuis <s.adam at diffingo.com> - 2.4.2-1
- Update to 2.4.2
* Wed May 21 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4.1-3.20080521svn
- Disable --new-faad
- 20080521 subversion snapshot
* Sat Mar 15 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4.1-2
- Disable %%{?_smp_mflags}
* Sat Mar 15 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4.1-1
- Update to 2.4.1
- Don't list the bin files twice, revisited
- Default to GTK frontend
* Wed Feb 20 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-6.20080126svn
- Make pulseaudio default for sound out
- Don't list the bin files twice
- Don't build with arts support
* Fri Feb 15 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-5.20080126svn
- Don't list the .desktop files twice (bz#1870)
- Oops, we should have %%{svndate}svn in release tag!
* Sat Feb 2 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-4
- F-8/F-7 x86_64 does seem to need --with-newfaad
* Fri Feb 1 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-3
- Update to version 2.4 (20080126svn) and include fixes from devel branch
* Mon Jan 14 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-2
- Fix many copy/paste errors and desktop file's Exec field
* Sun Jan 13 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-1
- Update to 2.4 final
- Split up desktop files and make them pass desktop-file-validate
- Add structure to split into gtk and qt pacakges
- Disable qt4 for now, doesn't compile
* Sun Oct 7 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info>3- 2.3.0-4.3
- move js-include to a place where it is honored
* Sun Oct 7 2007 Stewart Adam <s.adam AT diffingo DOT com> - 2.3.0-4.2
- Fix macro problem
- Fix changelog date
- Rebuild with faad, but don't pass --newfaad
* Sun Oct 7 2007 Stewart Adam <s.adam AT diffingo DOT com> - 2.3.0-4.1
- Rebuild with no faad
* Sat Oct 6 2007 Stewart Adam <s.adam AT diffingo DOT com> - 2.3.0-4
- Rebuild for ffmpeg dependency problems
- Update License: tag per Fedora guidelines
* Sat Jan 13 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.3.0-3
- more features with new BR's: x264-devel libXv-devel
- make a note regarding the libdca-devel problem
- remove the "0:" from the versioned BR's
* Thu Jan 04 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.3.0-2
- don't use smp_mflags during make for now
* Sat Dec 23 2006 kwizart < kwizart at gmail.com > - 2.3.0-1
- Update to 2.3.0 Final
- Use find_lang
* Mon Apr 03 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.1.2-1
- Update to 2.1.2
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Wed Jan 04 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.1.0-0.lvn.1
- Update to 2.1.0
- Drop epoch
- gtk 2.6 now, so drop FC3 support
* Sat Aug 27 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.42-0.lvn.3
- Remove bogus BR ffmpeg-devel (#555)
* Thu Jul 09 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.42-0.lvn.2
- Add missing BR desktop-file-utils (thanks to ixs)
* Thu Jul 07 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.42-0.lvn.1
- Update to 2.0.42
* Sat Jan 22 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.36-0.lvn.1
- Update to 2.0.34
- Rename package to avidemux -- no need for avidemux2 afaics
* Sun Nov 21 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.34-0.lvn.1.test1
- Update to 2.0.34-test1
- BR gettext, libtool
* Tue Oct 18 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.30-0.lvn.1
- Initial RPM release.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:48:14 -0000 1.1
+++ .cvsignore 3 Aug 2008 16:47:38 -0000 1.2
@@ -0,0 +1 @@
+avidemux_2.4.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:48:14 -0000 1.1
+++ sources 3 Aug 2008 16:47:38 -0000 1.2
@@ -0,0 +1 @@
+6c86fcfa491491b83e1291112fe3a3be avidemux_2.4.2.tar.gz
16 years, 3 months
- 1
- 0
rpms/ufoai-data/devel ufoai-data.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/ufoai-data/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30574
Modified Files:
.cvsignore sources
Added Files:
ufoai-data.spec
Log Message:
initial import from livna
--- NEW FILE ufoai-data.spec ---
%define game_name ufoai
Name: ufoai-data
Version: 2.2.1
Release: 2
Summary: UFO: Alien Invasion data files
Group: Amusements/Games
License: GPLv2+
URL: http://ufoai.sourceforge.net/
Source: http://downloads.sourceforge.net/%{game_name}/%{game_name}-%{version}-dat...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
%description
UFO: ALIEN INVASION is a strategy game featuring tactical combat
against hostile alien forces which are about to infiltrate earth at
this very moment.
This package contains the data files needed to run the game.
%prep
%setup -c -q
%build
# this section left intentionally empty
%install
rm -rf %{buildroot}
mkdir -p -m 0755 %{buildroot}%{_datadir}/%{game_name}
cp -pr base %{buildroot}%{_datadir}/%{game_name}/
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_datadir}/%{game_name}/
%changelog
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.2.1-2
- rebuild
* Mon Jun 09 2008 Karel Volny <kvolny(a)redhat.com> 2.2.1-1
- Version bump
- Fixes Livna bug #1931
* Sat Feb 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 2.2-2
- remove disttag
* Tue Jan 22 2008 Karel Volny <kvolny(a)redhat.com> 2.2-1
- Version bump
* Mon Jan 07 2008 Karel Volny <kvolny(a)redhat.com> 2.1.1-3
- Removed "-n %%{name}-%%{version}" from %%setup
* Mon Dec 17 2007 Karel Volny <kvolny(a)redhat.com> 2.1.1-2
- added empty build section to better comply with rules
* Thu Dec 06 2007 Karel Volny <kvolny(a)redhat.com> 2.1.1-1
- Initial release for Fedora 8, split data from the ufoai package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ufoai-data/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:55:40 -0000 1.1
+++ .cvsignore 3 Aug 2008 16:15:55 -0000 1.2
@@ -0,0 +1 @@
+ufoai-2.2.1-data.tar
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ufoai-data/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:55:40 -0000 1.1
+++ sources 3 Aug 2008 16:15:55 -0000 1.2
@@ -0,0 +1 @@
+02a582c9e845f264e8fd21a623651ce7 ufoai-2.2.1-data.tar
16 years, 3 months
- 1
- 0
rpms/a52dec/F-8 a52dec.spec,1.2,1.3
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/a52dec/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29147
Modified Files:
a52dec.spec
Log Message:
* Sun Aug 03 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.7.4-13
- integrate a fix from livna that got lost on the way
Index: a52dec.spec
===================================================================
RCS file: /cvs/free/rpms/a52dec/F-8/a52dec.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- a52dec.spec 24 Jul 2008 11:41:48 -0000 1.2
+++ a52dec.spec 3 Aug 2008 15:52:35 -0000 1.3
@@ -1,7 +1,7 @@
Summary: A free ATSC A/52 stream decoder
Name: a52dec
Version: 0.7.4
-Release: 12%{?dist}
+Release: 13%{?dist}
License: GPLv2
Group: System Environment/Libraries
URL: http://liba52.sourceforge.net/
@@ -15,7 +15,6 @@
Summary: Development files needed for a52dec
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: djbfft-devel
#---------------------------------------------------------------------
@@ -81,9 +80,15 @@
#---------------------------------------------------------------------
%changelog
+* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.7.4-13
+- integrate a fix from livna that got lost
+
* Thu Jul 24 2008 David Juran <david(a)juran.se> - 0.7.4-12
- Bump Release for RpmFusion
+* Sun Nov 11 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 0.7.4-11.1
+- Really drop djbfft
+
* Mon Oct 1 2007 David Juran <david(a)juran.se> - 0.7.4-11
- Fix Licence tag to be GPLv2
- Drop %makeinstall macro
16 years, 3 months
- 1
- 0
rpms/a52dec/F-9 a52dec.spec,1.1,1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/a52dec/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29047
Modified Files:
a52dec.spec
Log Message:
* Sun Aug 03 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.7.4-13
- integrate a fix from livna that got lost on the way
Index: a52dec.spec
===================================================================
RCS file: /cvs/free/rpms/a52dec/F-9/a52dec.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- a52dec.spec 24 Jul 2008 11:47:45 -0000 1.1
+++ a52dec.spec 3 Aug 2008 15:51:58 -0000 1.2
@@ -1,7 +1,7 @@
Summary: A free ATSC A/52 stream decoder
Name: a52dec
Version: 0.7.4
-Release: 12%{?dist}
+Release: 13%{?dist}
License: GPLv2
Group: System Environment/Libraries
URL: http://liba52.sourceforge.net/
@@ -15,7 +15,6 @@
Summary: Development files needed for a52dec
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: djbfft-devel
#---------------------------------------------------------------------
@@ -81,9 +80,15 @@
#---------------------------------------------------------------------
%changelog
+* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.7.4-13
+- integrate a fix from livna that got lost
+
* Thu Jul 24 2008 David Juran <david(a)juran.se> - 0.7.4-12
- Bump Release for RpmFusion
+* Sun Nov 11 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 0.7.4-11.1
+- Really drop djbfft
+
* Mon Oct 1 2007 David Juran <david(a)juran.se> - 0.7.4-11
- Fix Licence tag to be GPLv2
- Drop %makeinstall macro
16 years, 3 months
- 1
- 0
rpms/a52dec/devel a52dec.spec,1.2,1.3
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/a52dec/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28926
Modified Files:
a52dec.spec
Log Message:
fix changelog
Index: a52dec.spec
===================================================================
RCS file: /cvs/free/rpms/a52dec/devel/a52dec.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- a52dec.spec 3 Aug 2008 15:50:12 -0000 1.2
+++ a52dec.spec 3 Aug 2008 15:50:48 -0000 1.3
@@ -80,7 +80,7 @@
#---------------------------------------------------------------------
%changelog
-* Sun Aug 03 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.7.4-12
+* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.7.4-12
- integrate a fix from livna that got lost
* Thu Jul 24 2008 David Juran <david(a)juran.se> - 0.7.4-12
16 years, 3 months
- 1
- 0
rpms/a52dec/devel a52dec.spec,1.1,1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/a52dec/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28833
Modified Files:
a52dec.spec
Log Message:
* Sun Aug 03 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.7.4-12
- integrate a fix from livna that got lost on the way
Index: a52dec.spec
===================================================================
RCS file: /cvs/free/rpms/a52dec/devel/a52dec.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- a52dec.spec 24 Jul 2008 11:48:34 -0000 1.1
+++ a52dec.spec 3 Aug 2008 15:50:12 -0000 1.2
@@ -1,7 +1,7 @@
Summary: A free ATSC A/52 stream decoder
Name: a52dec
Version: 0.7.4
-Release: 12%{?dist}
+Release: 13%{?dist}
License: GPLv2
Group: System Environment/Libraries
URL: http://liba52.sourceforge.net/
@@ -15,7 +15,6 @@
Summary: Development files needed for a52dec
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: djbfft-devel
#---------------------------------------------------------------------
@@ -81,9 +80,15 @@
#---------------------------------------------------------------------
%changelog
+* Sun Aug 03 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.7.4-12
+- integrate a fix from livna that got lost
+
* Thu Jul 24 2008 David Juran <david(a)juran.se> - 0.7.4-12
- Bump Release for RpmFusion
+* Sun Nov 11 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 0.7.4-11.1
+- Really drop djbfft
+
* Mon Oct 1 2007 David Juran <david(a)juran.se> - 0.7.4-11
- Fix Licence tag to be GPLv2
- Drop %makeinstall macro
16 years, 3 months
- 1
- 0
rpms/mythtv-themes/devel myththemes-0.21-svnfixes.patch, NONE, 1.1 mythtv-themes.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/mythtv-themes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27212
Modified Files:
.cvsignore sources
Added Files:
myththemes-0.21-svnfixes.patch mythtv-themes.spec
Log Message:
initial import from livna
myththemes-0.21-svnfixes.patch:
--- NEW FILE myththemes-0.21-svnfixes.patch ---
Index: myththemes/MythCenter/ui.xml
===================================================================
--- myththemes/MythCenter/ui.xml (revision 16468)
+++ myththemes/MythCenter/ui.xml (working copy)
@@ -1872,7 +1872,7 @@
<fcnfont name="active" function="selected"></fcnfont>
<fcnfont name="enabled_state_0_font" function="enabled_state_0"></fcnfont>
<columnpadding>1</columnpadding>
- <column number="1" width="745" context="-1"></column>
+ <column number="1" width="715" context="-1"></column>
<items>8</items>
<image function="selectionbar" filename="rk-selectbar.png" location="-8,3"></image>
<image function="uparrow" filename="uparrow.png" location="755,15"></image>
Index: myththemes/myththemes.pro
===================================================================
--- myththemes/myththemes.pro (revision 16468)
+++ myththemes/myththemes.pro (working copy)
@@ -8,6 +8,7 @@
CONFIG -= moc qt
!macx:QMAKE_COPY_DIR = sh ./cpsvndir
+win32:QMAKE_INSTALL_DIR = sh ./cpsvndir
themes.path = $${PREFIX}/share/mythtv/themes/
themes.files = Iulius Iulius-OSD Minimalist-wide Titivillus Titivillus-OSD isthmus MythCenter MythCenter-wide Gray-OSD Retro Retro-OSD
Index: myththemes/Retro/ui.xml
===================================================================
--- myththemes/Retro/ui.xml (revision 16468)
+++ myththemes/Retro/ui.xml (working copy)
@@ -1872,7 +1872,7 @@
<fcnfont name="active" function="selected"></fcnfont>
<fcnfont name="enabled_state_0_font" function="enabled_state_0"></fcnfont>
<columnpadding>1</columnpadding>
- <column number="1" width="745" context="-1"></column>
+ <column number="1" width="715" context="-1"></column>
<items>8</items>
<image function="selectionbar" filename="rk-selectbar.png" location="-8,3"></image>
<image function="uparrow" filename="uparrow.png" location="755,15"></image>
Index: myththemes/Titivillus/ui.xml
===================================================================
--- myththemes/Titivillus/ui.xml (revision 16468)
+++ myththemes/Titivillus/ui.xml (working copy)
@@ -1619,7 +1619,7 @@
<fcnfont name="list-selected" function="selected"></fcnfont>
<fcnfont name="enabled_state_0_font" function="enabled_state_0"></fcnfont>
<columnpadding>1</columnpadding>
- <column number="1" width="745" context="-1"></column>
+ <column number="1" width="715" context="-1"></column>
<items>8</items>
<image function="selectionbar" filename="conflict/tit-cr-selectbar.png" location="-10,-5"></image>
<image function="uparrow" filename="shared/up_arrow.png" location="755,15"></image>
Index: myththemes/Iulius/ui.xml
===================================================================
--- myththemes/Iulius/ui.xml (revision 16468)
+++ myththemes/Iulius/ui.xml (working copy)
@@ -1869,7 +1869,7 @@
<fcnfont name="active" function="selected"></fcnfont>
<fcnfont name="enabled_state_0_font" function="enabled_state_0"></fcnfont>
<columnpadding>1</columnpadding>
- <column number="1" width="745" context="-1"></column>
+ <column number="1" width="715" context="-1"></column>
<items>8</items>
<image function="selectionbar" filename="rk-selectbar.png" location="-8,3"></image>
<image function="uparrow" filename="uparrow.png" location="755,15"></image>
--- NEW FILE mythtv-themes.spec ---
Name: mythtv-themes
Version: 0.21
Release: 3
Summary: Additional User Interface themes for MythTV
Group: Applications/Multimedia
License: GPLv2
URL: http://www.mythtv.org/
Source0: http://www.mythtv.org/mc/myththemes-%{version}.tar.bz2
# created from svn rev 17859:
# http://svn.mythtv.org/var/lib/svn/branches/release-0-21-fixes/themes
Source1: themes-%{version}.tar.bz2
# Upstream url dead, extracted from mythbuntu packages
Source2: glass-wide-20071107.tar.gz
Patch0: myththemes-0.21-svnfixes.patch
BuildRequires: libmyth-devel = %{version}
Requires: mythtv-themes = %{version}
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
MythTV provides a unified graphical interface for recording and viewing
television programs. Refer to the mythtv-docs package for more information.
This package contains themes for the mythtv user interface.
%prep
%setup -q -c -a 1 -a 2
cd myththemes-%{version}
%patch0 -p1
cd ..
%build
cd myththemes-%{version}
%configure
cd ..
cd themes-%{version}
%configure
cd ..
%install
rm -rf %{buildroot}
cd myththemes-%{version}
make install INSTALL_ROOT=%{buildroot}
cd ..
cd themes-%{version}
make install INSTALL_ROOT=%{buildroot}
cd ..
cp -rp glass-wide %{buildroot}%{_datadir}/mythtv/themes/
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_datadir}/mythtv/themes/*
%changelog
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.21-3
- rebuild
* Fri Jul 18 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-2
- Drop %%dist tag, this is noarch
- Patch in changes from release-0-21-fixes svn branch
- Add glass-wide
* Sun Mar 09 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-1
- Initial package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:54:12 -0000 1.1
+++ .cvsignore 3 Aug 2008 15:28:34 -0000 1.2
@@ -0,0 +1,3 @@
+glass-wide-20071107.tar.gz
+myththemes-0.21.tar.bz2
+themes-0.21.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:54:12 -0000 1.1
+++ sources 3 Aug 2008 15:28:34 -0000 1.2
@@ -0,0 +1,3 @@
+7cdec1649d3a94a8dbf96d129421cdac glass-wide-20071107.tar.gz
+9a569ab5561f348fdbf82cdc46a1df9b myththemes-0.21.tar.bz2
+8a036cbbb8cf29c5512931e1f6f5445f themes-0.21.tar.bz2
16 years, 3 months
- 1
- 0
rpms/xvidcore/devel xvidcore-noexecstack.patch, NONE, 1.1 xvidcore.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/xvidcore/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26713
Modified Files:
.cvsignore sources
Added Files:
xvidcore-noexecstack.patch xvidcore.spec
Log Message:
initial import from livna
xvidcore-noexecstack.patch:
--- NEW FILE xvidcore-noexecstack.patch ---
--- xvidcore-1.1.2/src/bitstream/x86_asm/cbp_3dne.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/bitstream/x86_asm/cbp_3dne.asm 2007-02-15 09:57:50.000000000 +0100
@@ -123,3 +123,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/bitstream/x86_asm/cbp_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/bitstream/x86_asm/cbp_mmx.asm 2007-02-15 09:57:50.000000000 +0100
@@ -148,3 +148,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/bitstream/x86_asm/cbp_sse2.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/bitstream/x86_asm/cbp_sse2.asm 2007-02-15 09:57:50.000000000 +0100
@@ -140,3 +140,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/dct/x86_64_asm/fdct_mmx_skal.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/dct/x86_64_asm/fdct_mmx_skal.asm 2007-02-15 09:57:50.000000000 +0100
@@ -461,3 +461,8 @@
;-----------------------------------------------------------------------------
MAKE_FDCT_FUNC fdct_skal_x86_64, fMTX_MULT_XMM
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/dct/x86_64_asm/idct_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/dct/x86_64_asm/idct_mmx.asm 2007-02-15 09:57:50.000000000 +0100
@@ -523,3 +523,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/dct/x86_asm/fdct_mmx_ffmpeg.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/dct/x86_asm/fdct_mmx_ffmpeg.asm 2007-02-15 09:57:50.000000000 +0100
@@ -422,3 +422,8 @@
;-----------------------------------------------------------------------------
MAKE_FDCT_FUNC fdct_xmm_ffmpeg, FDCT_ROW_XMM
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/dct/x86_asm/fdct_mmx_skal.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/dct/x86_asm/fdct_mmx_skal.asm 2007-02-15 09:57:50.000000000 +0100
@@ -523,3 +523,8 @@
;-----------------------------------------------------------------------------
MAKE_FDCT_FUNC fdct_xmm_skal, fMTX_MULT_XMM
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/dct/x86_asm/fdct_sse2_skal.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/dct/x86_asm/fdct_sse2_skal.asm 2007-02-15 09:57:50.000000000 +0100
@@ -620,3 +620,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/dct/x86_asm/idct_3dne.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/dct/x86_asm/idct_3dne.asm 2007-02-15 09:57:50.000000000 +0100
@@ -720,3 +720,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/dct/x86_asm/idct_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/dct/x86_asm/idct_mmx.asm 2007-02-15 09:57:50.000000000 +0100
@@ -630,3 +630,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/dct/x86_asm/idct_sse2_dmitry.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/dct/x86_asm/idct_sse2_dmitry.asm 2007-02-15 09:57:50.000000000 +0100
@@ -345,3 +345,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/dct/x86_asm/simple_idct_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/dct/x86_asm/simple_idct_mmx.asm 2007-02-15 09:57:50.000000000 +0100
@@ -1254,3 +1254,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/image/x86_64_asm/interpolate8x8_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/image/x86_64_asm/interpolate8x8_mmx.asm 2007-02-15 09:57:50.000000000 +0100
@@ -706,4 +706,8 @@
pop rbx
ret
-.endfunc
\ No newline at end of file
+.endfunc
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/image/x86_64_asm/interpolate8x8_xmm.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/image/x86_64_asm/interpolate8x8_xmm.asm 2007-02-15 09:57:50.000000000 +0100
@@ -704,3 +704,8 @@
EPILOG
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/image/x86_64_asm/qpel_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/image/x86_64_asm/qpel_mmx.asm 2007-02-15 09:57:50.000000000 +0100
@@ -1152,3 +1152,8 @@
.endfunc
;//////////////////////////////////////////////////////////////////////
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/image/x86_asm/colorspace_rgb_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/image/x86_asm/colorspace_rgb_mmx.asm 2007-02-15 09:57:50.000000000 +0100
@@ -429,3 +429,8 @@
MAKE_COLORSPACE yv12_to_bgr_mmx,48, 3,8,2, YV12_TO_BGR, 3, -1
MAKE_COLORSPACE yv12_to_bgra_mmx,48, 4,8,2, YV12_TO_BGR, 4, -1
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/image/x86_asm/colorspace_yuv_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/image/x86_asm/colorspace_yuv_mmx.asm 2007-02-15 09:57:50.000000000 +0100
@@ -279,3 +279,8 @@
MAKE_YV12_TO_YV12 yv12_to_yv12_mmx, 0
MAKE_YV12_TO_YV12 yv12_to_yv12_xmm, 1
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/image/x86_asm/colorspace_yuyv_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/image/x86_asm/colorspace_yuyv_mmx.asm 2007-02-15 09:57:50.000000000 +0100
@@ -329,3 +329,8 @@
MAKE_COLORSPACE yv12_to_yuyvi_mmx,0, 2,8,4, YV12_TO_YUYVI, 0, -1
MAKE_COLORSPACE yv12_to_uyvyi_mmx,0, 2,8,4, YV12_TO_YUYVI, 1, -1
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/image/x86_asm/interpolate8x8_3dn.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/image/x86_asm/interpolate8x8_3dn.asm 2007-02-15 09:57:50.000000000 +0100
@@ -485,3 +485,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/image/x86_asm/interpolate8x8_3dne.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/image/x86_asm/interpolate8x8_3dne.asm 2007-02-15 09:57:50.000000000 +0100
@@ -579,3 +579,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/image/x86_asm/interpolate8x8_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/image/x86_asm/interpolate8x8_mmx.asm 2007-02-15 09:57:50.000000000 +0100
@@ -1367,3 +1367,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/image/x86_asm/interpolate8x8_xmm.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/image/x86_asm/interpolate8x8_xmm.asm 2007-02-15 09:57:50.000000000 +0100
@@ -841,3 +841,8 @@
EPILOG
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/image/x86_asm/postprocessing_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/image/x86_asm/postprocessing_mmx.asm 2007-02-15 09:57:50.000000000 +0100
@@ -124,3 +124,8 @@
ret
.endfunc
;//////////////////////////////////////////////////////////////////////
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/image/x86_asm/postprocessing_sse2.asm~ 2007-02-15 09:57:50.000000000 +0100
+++ xvidcore-1.1.2/src/image/x86_asm/postprocessing_sse2.asm 2007-02-15 09:57:50.000000000 +0100
@@ -140,3 +140,8 @@
ret
.endfunc
;//////////////////////////////////////////////////////////////////////
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/image/x86_asm/qpel_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/image/x86_asm/qpel_mmx.asm 2007-02-15 09:57:51.000000000 +0100
@@ -1060,3 +1060,8 @@
.endfunc
;//////////////////////////////////////////////////////////////////////
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/image/x86_asm/reduced_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/image/x86_asm/reduced_mmx.asm 2007-02-15 09:57:51.000000000 +0100
@@ -1002,3 +1002,8 @@
; pfeewwww... Never Do That On Stage Again. :)
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/motion/x86_64_asm/sad_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/motion/x86_64_asm/sad_mmx.asm 2007-02-15 09:57:51.000000000 +0100
@@ -162,4 +162,8 @@
;; All done
ret
-.endfunc
\ No newline at end of file
+.endfunc
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/motion/x86_64_asm/sad_xmm.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/motion/x86_64_asm/sad_xmm.asm 2007-02-15 09:57:51.000000000 +0100
@@ -439,4 +439,8 @@
movd eax, mm7
pop rbx
ret
-.endfunc
\ No newline at end of file
+.endfunc
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/motion/x86_asm/sad_3dn.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/motion/x86_asm/sad_3dn.asm 2007-02-15 09:57:51.000000000 +0100
@@ -228,3 +228,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/motion/x86_asm/sad_3dne.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/motion/x86_asm/sad_3dne.asm 2007-02-15 09:57:51.000000000 +0100
@@ -502,3 +502,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/motion/x86_asm/sad_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/motion/x86_asm/sad_mmx.asm 2007-02-15 09:57:51.000000000 +0100
@@ -747,3 +747,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/motion/x86_asm/sad_sse2.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/motion/x86_asm/sad_sse2.asm 2007-02-15 09:57:51.000000000 +0100
@@ -170,3 +170,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/motion/x86_asm/sad_xmm.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/motion/x86_asm/sad_xmm.asm 2007-02-15 09:57:51.000000000 +0100
@@ -444,3 +444,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/quant/x86_64_asm/quantize_h263_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/quant/x86_64_asm/quantize_h263_mmx.asm 2007-02-15 09:57:51.000000000 +0100
@@ -505,3 +505,8 @@
xor rax, rax
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/quant/x86_64_asm/quantize_mpeg_xmm.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/quant/x86_64_asm/quantize_mpeg_xmm.asm 2007-02-15 09:57:51.000000000 +0100
@@ -807,4 +807,8 @@
xor rax, rax
ret
-.endfunc
\ No newline at end of file
+.endfunc
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/quant/x86_asm/quantize_h263_3dne.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/quant/x86_asm/quantize_h263_3dne.asm 2007-02-15 09:57:51.000000000 +0100
@@ -784,3 +784,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/quant/x86_asm/quantize_h263_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/quant/x86_asm/quantize_h263_mmx.asm 2007-02-15 09:57:51.000000000 +0100
@@ -1039,3 +1039,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/quant/x86_asm/quantize_mpeg_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/quant/x86_asm/quantize_mpeg_mmx.asm 2007-02-15 09:57:51.000000000 +0100
@@ -750,3 +750,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/quant/x86_asm/quantize_mpeg_xmm.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/quant/x86_asm/quantize_mpeg_xmm.asm 2007-02-15 09:57:51.000000000 +0100
@@ -815,3 +815,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/utils/x86_64_asm/cpuid.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/utils/x86_64_asm/cpuid.asm 2007-02-15 09:57:51.000000000 +0100
@@ -216,3 +216,8 @@
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/utils/x86_64_asm/interlacing_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/utils/x86_64_asm/interlacing_mmx.asm 2007-02-15 09:57:51.000000000 +0100
@@ -212,3 +212,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/utils/x86_64_asm/mem_transfer_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/utils/x86_64_asm/mem_transfer_mmx.asm 2007-02-15 09:57:51.000000000 +0100
@@ -434,3 +434,8 @@
COPY_8_TO_8
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/utils/x86_asm/cpuid.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/utils/x86_asm/cpuid.asm 2007-02-15 09:57:51.000000000 +0100
@@ -226,3 +226,8 @@
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/utils/x86_asm/interlacing_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/utils/x86_asm/interlacing_mmx.asm 2007-02-15 09:57:51.000000000 +0100
@@ -217,3 +217,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/utils/x86_asm/mem_transfer_3dne.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/utils/x86_asm/mem_transfer_3dne.asm 2007-02-15 09:57:51.000000000 +0100
@@ -459,3 +459,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- xvidcore-1.1.2/src/utils/x86_asm/mem_transfer_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100
+++ xvidcore-1.1.2/src/utils/x86_asm/mem_transfer_mmx.asm 2007-02-15 09:57:51.000000000 +0100
@@ -568,3 +568,8 @@
ret
.endfunc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+
--- NEW FILE xvidcore.spec ---
Name: xvidcore
Version: 1.1.3
Release: 4%{?dist}
Summary: Free reimplementation of the OpenDivX video codec
Group: System Environment/Libraries
License: XVID (GPL with specific restrictions)
URL: http://www.xvid.org/
Source0: http://downloads.xvid.org/downloads/xvidcore-%{version}.tar.bz2
Patch0: %{name}-noexecstack.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%ifarch %{ix86} x86_64
BuildRequires: yasm
%endif
%description
Free reimplementation of the OpenDivX video codec. You can play OpenDivX
and DivX4 videos with it, as well as encode compatible files.
%package devel
Summary: Development files for the XviD video codec
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
This package contains header files, static library and API
documentation for the XviD video codec.
%prep
%setup -q
%patch0 -p1 -b .noexec
chmod -x examples/*.pl
f=AUTHORS ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
# Yes, we want to see the build output.
%{__perl} -pi -e 's/^\t@(?!echo\b)/\t/' build/generic/Makefile
%build
cd build/generic
export CFLAGS="$RPM_OPT_FLAGS -ffast-math"
%configure
make %{?_smp_mflags}
cd -
%install
rm -rf $RPM_BUILD_ROOT
make -C build/generic install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/libxvidcore.a
cd $RPM_BUILD_ROOT%{_libdir}
chmod 755 libxvidcore.so*
/sbin/ldconfig -n .
ln -s libxvidcore.so.? libxvidcore.so
cd -
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc LICENSE README AUTHORS ChangeLog TODO
%{_libdir}/libxvidcore.so.*
%files devel
%defattr(-,root,root,-)
%doc CodingStyle examples/
%{_includedir}/xvid.h
%{_libdir}/libxvidcore.so
%changelog
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.1.3-4
- rebuild
* Tue Nov 13 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.1.3-3
- Merge freshrpms spec into livna spec for rpmfusion:
- Set release to 3 to be higher as both livna and freshrpms latest release
- Add -ffast-math to CFLAGS
* Sat Jun 30 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.1.3-1
- 1.1.3, security bugfix release, fixes CVE-2007-3329 (#1563)
* Sun Mar 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.1.2-2
- fix SElinux noexec stack issue (patch by Hans de Goede)
* Sat Nov 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.2-1
- 1.1.2.
- Convert docs to UTF-8.
- Use make install DESTDIR=... instead of %%makeinstall.
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.1.0-4
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Tue Sep 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.0-3
- Use yasm to build, enable asm code on x86_64.
- Drop no longer needed Obsoletes.
- Specfile cleanups.
* Sat May 20 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.0-2
- Fix library permissions and symlink.
- Don't ship static library.
- Avoid -devel dependency on perl.
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Wed Jan 18 2006 Adrian Reber <adrian(a)lisas.de> - 1.1.0-0.lvn.1
- Updated to 1.10
- Droped now unnecessary patch
- Droped Epoch
* Sun Feb 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.3-0.lvn.1
- 1.0.3.
* Wed Sep 29 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.2-0.lvn.1
- Update to 1.0.2.
* Tue Jun 8 2004 Dams <anvil[AT]livna.org> 0:1.0.1-0.lvn.1
- Updated to 1.0.1
* Mon May 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.0-0.lvn.1
- Updated to 1.0.0.
- Patch to show build output.
* Mon May 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.0-0.lvn.0.2.rc4
- Updated to 1.0.0-rc4.
* Mon Mar 29 2004 Dams <anvil[AT]livna.org> 0:1.0.0-0.lvn.0.2.rc3
- Updated to rc3
* Sat Jan 10 2004 Dams <anvil[AT]livna.org> 0:1.0.0-0.lvn.0.1.beta3
- Updated to 1.0.0-beta3
- Small spec file cleanup
* Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:0.9.2-0.fdr.1.0.94
- Removed comment after scriptlets
* Fri Aug 15 2003 Marius L. Johndal <mariuslj at ifi.uio.no> 0:0.9.2-0.fdr.1
- Updated to 0.9.2.
- Updated according to current SPEC template.
- Changed to properly versioned .so-files.
* Tue Apr 8 2003 Marius Johndal <mariuslj at ifi.uio.no> 0:0.9.1-0.fdr.3
- Cleaned up the documentation.
* Fri Apr 4 2003 Marius Johndal <mariuslj at ifi.uio.no> 0:0.9.1-0.fdr.2
- Added epoch and release number to requires.
* Wed Apr 2 2003 Marius Johndal <mariuslj at ifi.uio.no> 0:0.9.1-0.fdr.1
- Updated to 0.9.1.
* Wed Apr 2 2003 Marius Johndal <mariuslj at ifi.uio.no> 0:0.9.0-0.fdr.1
- Initial fedora RPM release.
- Changed -static back to -devel as that seems more logic.
* Mon Mar 31 2003 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
- Rebuilt for Red Hat Linux 9.
* Wed Jan 29 2003 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
- Fixed the location of the .h files... doh!
* Sun Jan 12 2003 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
- Remove the decore.h and encore2.h inks as divx4linux 5.01 will provide them.
- Rename -devel to -static as it seems more logic.
* Fri Dec 27 2002 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
- Initial RPM release.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xvidcore/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:57:40 -0000 1.1
+++ .cvsignore 3 Aug 2008 15:23:52 -0000 1.2
@@ -0,0 +1 @@
+xvidcore-1.1.3.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xvidcore/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:57:40 -0000 1.1
+++ sources 3 Aug 2008 15:23:52 -0000 1.2
@@ -0,0 +1 @@
+29c60d4d991ac18f687a8fd13cfe64b7 xvidcore-1.1.3.tar.bz2
16 years, 3 months
- 1
- 0
rpms/xv/devel DISTRIBUTE.txt, NONE, 1.1 xv-jumbo-20070520-imc.patch, NONE, 1.1 xv-jumbo-20070520-makefile.patch, NONE, 1.1 xv.desktop, NONE, 1.1 xv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/xv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26396
Modified Files:
.cvsignore sources
Added Files:
DISTRIBUTE.txt xv-jumbo-20070520-imc.patch
xv-jumbo-20070520-makefile.patch xv.desktop xv.spec
Log Message:
initial import from livna
--- NEW FILE DISTRIBUTE.txt ---
From: John Bradley <bradley(a)trilon.com>
To: "L. Gabriel Somlo" <somlo(a)cmu.edu>
Subject: RE: May I submit xv + jumbo patches to Livna ?
Date: Tue, 11 Dec 2007 15:49:55 -0500
Glad to hear that xv is still of use to someone. :)
One of the nice features of "never updated" software is that
(eventually) all the more obvious bugs get patched -- and the program,
while primitive by today's standards, probably *screams*. (It ran pretty
well on computers that were 10-100 times slower than today's hardware.)
New features? Pah! Who needs 'em?!? :D
Yes, please, go ahead, patch it as needed and distribute it anywhere you
think is appropriate. (I no longer follow the Unix/Linux 'scene', so I
defer to your judgement on that.)
--jhb
------------------------------------------------------------------
Enjoy the moderately-entertaining and never-updated World of XV:
http://www.trilon.com/xv
------------------------------------------------------------------
> -----Original Message-----
> From: L. Gabriel Somlo [mailto:somlo@cmu.edu]
> Sent: Sunday, December 09, 2007 10:10 PM
> To: bradley(a)cis.upenn.edu
> Cc: xv(a)trilon.com; kirchh(a)trilon.com; newt(a)pobox.com
> Subject: May I submit xv + jumbo patches to Livna ?
>
>
> Mr. Bradley,
>
> I am a huge fan of your xv program, and have been using
> it on my home Linux box to view images such as family
> photos for over 10 years.
>
> I adamantly refuse to use other alternatives included by
> default with with my linux distribution (Fedora), mainly
> because of the nice and intuitive interface that xv offers.
>
> I am writing to you because I would like to submit xv to
> the Livna repository (soon to merge with RPMfusion).
> Livna (rpm.livna.org) is a repository of packages built for
> Fedora, but which could not be directly included into Fedora
> for various reasons (such as a non-opensource license).
>
> I believe adding xv to Livna would be mostly consistent with
> the spirit of your license: non-commercial distribution, not
> bundled with any other product (Livna is a repository of
> various software packages for Fedora, and does not sell or
> otherwise distribute CDs containing multiple packages).
>
> The only potential issue is that I would like to apply
> Greg Roelofs' jumbo patches available from
>
> http://sonic.net/~roelofs/greg_xv.html
>
> making the resulting build a "modified" version according
> to a strict interpretation of the license.
>
> I would like to have your blessing to proceed with this
> endeavor. I believe the end result to be in everyone's
> mutual interest, as a wider-scale distribution of xv will
> generate a wider pool of users who might potentially
> purchase a commercial license.
>
> Sincerely,
>
> Gabriel Somlo
>
> PS. The not-yet-submitted source RPM file can be found at
> http://www.contrib.andrew.cmu.edu/~somlo/
> for your perusal.
xv-jumbo-20070520-imc.patch:
--- NEW FILE xv-jumbo-20070520-imc.patch ---
diff -NarU5 xv-3.10a.orig/xvdir.c xv-3.10a/xvdir.c
--- xv-3.10a.orig/xvdir.c 2007-12-09 13:31:39.000000000 -0500
+++ xv-3.10a/xvdir.c 2008-01-18 14:50:30.000000000 -0500
@@ -538,11 +538,12 @@
if (i >= 0) changedDirMB(i);
return -1;
}
/* handle clicks inside the filename box */
- if (x > 80 &&
+ if (enPos > stPos &&
+ x > 80 &&
y > dList.y + (int) dList.h + 30 &&
x < 80 + DNAMWIDE+6 &&
y < dList.y + (int) dList.h + 30 + LINEHIGH+5) {
int tx;
int dx;
diff -NarU5 xv-3.10a.orig/xvmisc.c xv-3.10a/xvmisc.c
--- xv-3.10a.orig/xvmisc.c 2007-12-09 13:31:39.000000000 -0500
+++ xv-3.10a/xvmisc.c 2008-01-18 14:37:25.000000000 -0500
@@ -559,14 +559,10 @@
#ifdef HAVE_MGCSFX
if (mgcsfxW) XDestroyWindow(theDisp, mgcsfxW);
#endif
-#ifdef HAVE_PNG
- if (pngW) XDestroyWindow(theDisp, pngW);
-#endif
-
/* if NOT using stdcmap for images, free stdcmap */
if (colorMapMode != CM_STDCMAP) {
int j;
for (j=0; j<stdnfcols; j++)
xvFreeColors(theDisp, theCmap, &stdfreecols[j], 1, 0L);
xv-jumbo-20070520-makefile.patch:
--- NEW FILE xv-jumbo-20070520-makefile.patch ---
diff -NarU5 xv-3.10a.orig/Makefile xv-3.10a/Makefile
--- xv-3.10a.orig/Makefile 2007-12-09 13:31:39.000000000 -0500
+++ xv-3.10a/Makefile 2007-12-14 22:36:46.000000000 -0500
@@ -16,11 +16,11 @@
# -Wstrict-prototypes -Waggregate-return -Wconversion \
# -Wpointer-arith -Wcomment -Wformat -Wchar-subscripts \
# -Wuninitialized -Wparentheses
-CCOPTS = -O
+CCOPTS = $(RPM_OPT_FLAGS)
#
# these are the usual optimization and warning options for gcc; all such
# warnings but one (mktemp() use) have been eliminated (at least on Linux):
#CCOPTS = -O3 -Wall
#
@@ -54,11 +54,11 @@
### Installation locations
### NOTE: Users of old K&R compilers (i.e., any version not supporting C89
### string concatenation, such as "fub" "ar" => "fubar") should update
### xvtext.c:1831 (or thereabouts) if either PREFIX or DOCDIR changes:
-PREFIX = /usr/local
+PREFIX = /usr
BINDIR = $(PREFIX)/bin
MANDIR = $(PREFIX)/share/man/man1
MANSUF = 1
DOCDIR = $(PREFIX)/share/doc/xv
LIBDIR = $(PREFIX)/lib/xv
@@ -177,17 +177,17 @@
### to compile on your machine, *COMMENT OUT* the following lines
###
JP2K = -DDOJP2K
###
#JP2KDIR = ../../jasper
-JP2KDIR = /usr/local/lib
+JP2KDIR = /usr/lib
###
#JP2KINC = -I$(JP2KDIR)
-JP2KINC = -I/usr/local/include
+#JP2KINC = -I/usr/local/include
###
-#JP2KLIB = -L$(JP2KDIR) -ljasper
-JP2KLIB = $(JP2KDIR)/libjasper.a
+JP2KLIB = -L$(JP2KDIR) -ljasper
+#JP2KLIB = $(JP2KDIR)/libjasper.a
###
### if, for whatever reason, you're unable to get the PDS/VICAR support
### to compile (xvpds.c, and vdcomp.c), *COMMENT OUT* the following line,
@@ -415,14 +415,14 @@
$(DESTDIR)$(MANDIR)/bggen.$(MANSUF) \
$(DESTDIR)$(MANDIR)/xcmap.$(MANSUF) \
$(DESTDIR)$(MANDIR)/xvpictoppm.$(MANSUF) \
$(DESTDIR)$(MANDIR)/vdcomp.$(MANSUF)
#
- $(MKDIR) $(DESTDIR)$(DOCDIR) # or $(DESTDIR)$(LIBDIR)
- cp README.jumbo docs/xvdocs.pdf docs/xvdocs.ps $(DESTDIR)$(DOCDIR)/.
- chmod 644 $(DESTDIR)$(DOCDIR)/README.jumbo \
- $(DESTDIR)$(DOCDIR)/xvdocs.pdf $(DESTDIR)$(DOCDIR)/xvdocs.ps
+# $(MKDIR) $(DESTDIR)$(DOCDIR) # or $(DESTDIR)$(LIBDIR)
+# cp README.jumbo docs/xvdocs.pdf docs/xvdocs.ps $(DESTDIR)$(DOCDIR)/.
+# chmod 644 $(DESTDIR)$(DOCDIR)/README.jumbo \
+# $(DESTDIR)$(DOCDIR)/xvdocs.pdf $(DESTDIR)$(DOCDIR)/xvdocs.ps
#
#$(MKDIR) $(DESTDIR)$(SYSCONFDIR)
#cp xv_mgcsfx.sample $(DESTDIR)$(SYSCONFDIR)/xv_mgcsfx
#chmod 644 $(DESTDIR)$(SYSCONFDIR)/xv_mgcsfx
diff -NarU5 xv-3.10a.orig/Makefile.std xv-3.10a/Makefile.std
--- xv-3.10a.orig/Makefile.std 2007-12-09 13:31:39.000000000 -0500
+++ xv-3.10a/Makefile.std 2007-12-14 22:34:22.000000000 -0500
@@ -16,11 +16,11 @@
# -Wstrict-prototypes -Waggregate-return -Wconversion \
# -Wpointer-arith -Wcomment -Wformat -Wchar-subscripts \
# -Wuninitialized -Wparentheses
-CCOPTS = -O
+CCOPTS = $(RPM_OPT_FLAGS)
#
# these are the usual optimization and warning options for gcc; all such
# warnings but one (mktemp() use) have been eliminated (at least on Linux):
#CCOPTS = -O3 -Wall
#
@@ -54,11 +54,11 @@
### Installation locations
### NOTE: Users of old K&R compilers (i.e., any version not supporting C89
### string concatenation, such as "fub" "ar" => "fubar") should update
### xvtext.c:1831 (or thereabouts) if either PREFIX or DOCDIR changes:
-PREFIX = /usr/local
+PREFIX = /usr
BINDIR = $(PREFIX)/bin
MANDIR = $(PREFIX)/share/man/man1
MANSUF = 1
DOCDIR = $(PREFIX)/share/doc/xv
LIBDIR = $(PREFIX)/lib/xv
@@ -177,17 +177,17 @@
### to compile on your machine, *COMMENT OUT* the following lines
###
JP2K = -DDOJP2K
###
#JP2KDIR = ../../jasper
-JP2KDIR = /usr/local/lib
+JP2KDIR = /usr/lib
###
#JP2KINC = -I$(JP2KDIR)
-JP2KINC = -I/usr/local/include
+#JP2KINC = -I/usr/local/include
###
-#JP2KLIB = -L$(JP2KDIR) -ljasper
-JP2KLIB = $(JP2KDIR)/libjasper.a
+JP2KLIB = -L$(JP2KDIR) -ljasper
+#JP2KLIB = $(JP2KDIR)/libjasper.a
###
### if, for whatever reason, you're unable to get the PDS/VICAR support
### to compile (xvpds.c, and vdcomp.c), *COMMENT OUT* the following line,
@@ -415,14 +415,14 @@
$(DESTDIR)$(MANDIR)/bggen.$(MANSUF) \
$(DESTDIR)$(MANDIR)/xcmap.$(MANSUF) \
$(DESTDIR)$(MANDIR)/xvpictoppm.$(MANSUF) \
$(DESTDIR)$(MANDIR)/vdcomp.$(MANSUF)
#
- $(MKDIR) $(DESTDIR)$(DOCDIR) # or $(DESTDIR)$(LIBDIR)
- cp README.jumbo docs/xvdocs.pdf docs/xvdocs.ps $(DESTDIR)$(DOCDIR)/.
- chmod 644 $(DESTDIR)$(DOCDIR)/README.jumbo \
- $(DESTDIR)$(DOCDIR)/xvdocs.pdf $(DESTDIR)$(DOCDIR)/xvdocs.ps
+# $(MKDIR) $(DESTDIR)$(DOCDIR) # or $(DESTDIR)$(LIBDIR)
+# cp README.jumbo docs/xvdocs.pdf docs/xvdocs.ps $(DESTDIR)$(DOCDIR)/.
+# chmod 644 $(DESTDIR)$(DOCDIR)/README.jumbo \
+# $(DESTDIR)$(DOCDIR)/xvdocs.pdf $(DESTDIR)$(DOCDIR)/xvdocs.ps
#
#$(MKDIR) $(DESTDIR)$(SYSCONFDIR)
#cp xv_mgcsfx.sample $(DESTDIR)$(SYSCONFDIR)/xv_mgcsfx
#chmod 644 $(DESTDIR)$(SYSCONFDIR)/xv_mgcsfx
--- NEW FILE xv.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xv
GenericName=XV Image Viewer
Comment=XV Image Viewer
Exec=xv
Icon=xv
Terminal=false
Type=Application
Categories=Graphics;Utility;2DGraphics;Viewer;
--- NEW FILE xv.spec ---
%define vprog 3.10a
%define vjumbo 20070520
Name: xv
Version: %{vprog}.jumbopatch.%{vjumbo}
Release: 6%{?dist}
Summary: Interactive image display program for X
License: Shareware
Group: Applications/Multimedia
URL: http://www.trilon.com/xv/xv.html
Source0: ftp://ftp.cis.upenn.edu/pub/xv/%{name}-%{vprog}.tar.gz
Source1: http://downloads.sourceforge.net/png-mng/%{name}-%{vprog}-jumbo-patches-%...
Source2: DISTRIBUTE.txt
Source3: %{name}.desktop
Source4: %{name}.png
Patch0: xv-jumbo-20070520-makefile.patch
Patch1: xv-jumbo-20070520-imc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtiff-devel libpng-devel jasper-devel libXt-devel desktop-file-utils
%package doc
Summary: Documentation files for xv image viewer
Group: Documentation
%description
A shareware program for displaying, grabbing, converting,
and otherwise manipulating graphic image files
%description doc
Documentation files for xv image viewer
%prep
%setup -q -n %{name}-%{vprog}
%setup -q -T -D -b 1 -n %{name}-%{vprog}
%{__patch} -p1 < ../%{name}-%{vprog}-jumbo-fix-enh-patch-%{vjumbo}.txt
%patch0 -p1
%patch1 -p1
%{__install} -m 0644 %{SOURCE2} .
# make doc files utf8-clean:
for F in README.jumbo copyright.h; do
iconv -f iso88591 -t utf8 ${F} -o ${F}.utf8 && %{__mv} -f ${F}.utf8 ${F}
done
%build
#configure
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}
desktop-file-install --vendor=livna --dir=%{buildroot}/%{_datadir}/applications %{SOURCE3}
%{__install} -D -m 0644 %{SOURCE4} %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
# get rid of reduntant doc files:
%{__rm} -f docs/xvdocs.ps docs/xvtitle.ps docs/*.5 docs/*.man
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root)
%doc DISTRIBUTE.txt copyright.h README README.jumbo
%{_bindir}/*
%{_mandir}/man1/*
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/48x48/apps/*
%files doc
%defattr(-,root,root)
%doc BUGS CHANGELOG docs IDEAS README.pcd
%changelog
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 3.10a.jumbopatch.20070520-6
- rebuild
* Fri Jan 18 2008 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-5
- fix window destroy, file dialog bugs (thanks to <Ian.Collier(a)comlab.ox.ac.uk>)
* Sun Dec 17 2007 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-4
- added icon
* Fri Dec 14 2007 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-3
- move utf8 cleanup to prep section
- remove redundant BuildRequires
- remove redundant manpages from doc directory
- added desktop file
- split out documentation into separate subpackage
* Wed Dec 12 2007 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-2
- spec file cleanup
- remove redundant doc files, make the rest of them utf8-clean
* Tue Dec 11 2007 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-1
- added DISTRIBUTE.txt - permission to distribute from John Bradley
* Sun Dec 09 2007 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-0
- initial package combining xv with Greg Roelofs' jumbo patches
- patch to adjust makefile: jasper location, prefix, and -g cflag for debuginfo
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:57:32 -0000 1.1
+++ .cvsignore 3 Aug 2008 15:20:18 -0000 1.2
@@ -0,0 +1,3 @@
+xv-3.10a-jumbo-patches-20070520.tar.gz
+xv-3.10a.tar.gz
+xv.png
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:57:32 -0000 1.1
+++ sources 3 Aug 2008 15:20:18 -0000 1.2
@@ -0,0 +1,3 @@
+9fb2d0ec320498105cafeba38a588472 xv-3.10a-jumbo-patches-20070520.tar.gz
+2d4fbeec1561304362781cc8e2f7f72d xv-3.10a.tar.gz
+99d45922a3e31929a822edd6aee25bc9 xv.png
16 years, 3 months
- 1
- 0
rpms/mythtv/devel PACKAGE-LICENSING, NONE, 1.1 mysql.txt, NONE, 1.1 mythbackend.init.in, NONE, 1.1 mythbackend.logrotate.in, NONE, 1.1 mythbackend.sysconfig.in, NONE, 1.1 mythfrontend.desktop, NONE, 1.1 mythplugins-0.21-svnfixes.patch, NONE, 1.1 mythtv-0.20-mythstreammenu.diff, NONE, 1.1 mythtv-0.21-svnfixes.patch, NONE, 1.1 mythtv-setup.desktop, NONE, 1.1 mythtv.spec, NONE, 1.1 mythweb.conf, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26036
Added Files:
PACKAGE-LICENSING mysql.txt mythbackend.init.in
mythbackend.logrotate.in mythbackend.sysconfig.in
mythfrontend.desktop mythplugins-0.21-svnfixes.patch
mythtv-0.20-mythstreammenu.diff mythtv-0.21-svnfixes.patch
mythtv-setup.desktop mythtv.spec mythweb.conf
Log Message:
import (2)
--- NEW FILE PACKAGE-LICENSING ---
The mythtv sources are all distributed under the GNU General Public License as
published by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version, with the following exceptions:
GPLv2 or QPL:
-------------
mythtv/libs/libmyth/mythwizard.*
LGPLv2:
-------
mythtv/libs/libmyth/qmdcodec.*
GPLv2+ or LGPLv2+:
----------------
mythtv/libs/libswscale/*.{c,h}
LGPLv2+:
--------
mythtv/libs/libavcodec/*
mythtv/libs/libavformat/*
mythtv/libs/libavutil/*
mythtv/libs/libmyth/bio2jack.*
mythtv/libs/libmythlivemedia/*
mythtv/libs/libmythsoundtouch/*
--- NEW FILE mysql.txt ---
DBHostName=localhost
# By default, Myth tries to ping the DB host to see if it exists.
# If your DB host or network doesn't accept pings, set this to no:
#
#DBHostPing=no
DBUserName=mythtv
DBPassword=mythtv
DBName=mythconverg
DBType=QMYSQL3
# Set the following if you want to use something other than this
# machine's real hostname for identifying settings in the database.
# This is useful if your hostname changes often, as otherwise you
# will need to reconfigure mythtv (or futz with the DB) every time.
# TWO HOSTS MUST NOT USE THE SAME VALUE
#
#LocalHostName=my-unique-identifier-goes-here
# If you want your frontend to be able to wake your MySQL server
# using WakeOnLan, have a look at the following settings:
#
#
# The time the frontend waits (in seconds) between reconnect tries.
# This should be the rough time your MySQL server needs for startup
#
#WOLsqlReconnectWaitTime=0
#
#
# This is the number of retries to wake the MySQL server
# until the frontend gives up
#
#WOLsqlConnectRetry=5
#
#
# This is the command executed to wake your MySQL server.
#
#WOLsqlCommand=echo 'WOLsqlServerCommand not set'
--- NEW FILE mythbackend.init.in ---
#!/bin/bash
#
# Startup script for mythbackend
#
# chkconfig: - 86 14
# description: mythbackend.
# processname: mythbackend
# pidfile: @rundir(a)/mythbackend.pid
# config:
# Source function library.
. @initdir@/functions
if [ -f @sysconfigdir@/mythbackend ]; then
. @sysconfigdir@/mythbackend
fi
## Defaults, override them in @sysconfigdir@/mythbackend
: ${MYTHTV_HOME=@sysconfdir@/mythtv}
binary=@bindir@/mythbackend
prog=mythbackend
RETVAL=0
OPTIONS="$OPTIONS --daemon --logfile @logdir(a)/mythtv/$prog.log --pidfile @rundir(a)/$prog.pid"
start() {
echo -n $"Starting $prog: "
touch @rundir(a)/mythbackend.pid; chown mythtv:mythtv @rundir(a)/mythbackend.pid
export MYTHCONFDIR="$MYTHTV_HOME"
export HOME="$MYTHTV_HOME"
daemon $binary $OPTIONS
RETVAL=$?
echo
[ $RETVAL = 0 ] && touch @subsysdir@/$prog
return $RETVAL
}
stop() {
echo -n $"Stopping $prog: "
killproc $binary
RETVAL=$?
echo
[ $RETVAL = 0 ] && rm -f @subsysdir@/$prog @rundir(a)/$prog.pid
}
# See how we were called.
case "$1" in
start)
start
;;
stop)
stop
;;
reload|restart)
stop
start
;;
status)
status $prog
;;
*)
echo $"Usage: $prog {start|stop|status|restart}"
exit 1
esac
exit $RETVAL
--- NEW FILE mythbackend.logrotate.in ---
@logdir(a)/mythtv/mythbackend.log {
notifempty
missingok
compress
compresscmd /usr/bin/bzip2
uncompresscmd /usr/bin/bunzip2
compressext .bz2
weekly
rotate 4
size 10M
postrotate
/bin/kill -HUP `cat /var/run/mythbackend.pid 2>/dev/null` 2> /dev/null || true
endscript
}
--- NEW FILE mythbackend.sysconfig.in ---
#MYTHTV_HOME=@sysconfdir@/mythtv
#OPTIONS=
--- NEW FILE mythfrontend.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=mythTV frontend
Comment=Record, playback and watch TV.
Icon=mythfrontend.png
Exec=mythfrontend
Terminal=false
Type=Application
mythplugins-0.21-svnfixes.patch:
--- NEW FILE mythplugins-0.21-svnfixes.patch ---
Index: mythplugins/mythweb/modules/_shared/lang/German.lang
===================================================================
--- mythplugins/mythweb/modules/_shared/lang/German.lang (revision 16468)
+++ mythplugins/mythweb/modules/_shared/lang/German.lang (working copy)
@@ -17,6 +17,7 @@
"$1 hrs"
$1 Std.
"$1 is not responding."
+ $1 antwortet nicht
"$1 KB"
$1 kB
"$1 MB"
@@ -34,6 +35,7 @@
"$1 recordings"
$1 Aufnahmen
"$1 requests pending."
+ $1 Anfragen zu bearbeiten
"$1 Search"
$1 Suche
"$1 TB"
@@ -41,35 +43,50 @@
"$1 to $2"
$1 bis $2
"$1 wasted"
+ $1 verschwendet
"$1 year"
"$1 years"
+ $1 Jahre
"%s Song (%s)"
+ %s Lied (%s)
"%s Songs"
+ %s Lieder
"%s Songs (%s)"
+ %s Lieder (%s)
"°C"
"°F"
"Aborted"
+ abgebrochen
"Aborting"
+ breche ab
"Action"
Aktion
"Activate"
Aktivieren
"Active Screens"
"Add"
+ hinzufügen
"Add Album to Current Playlist"
+ zur Wiedergabelsite hinzufügen
"Add Mix"
+ Mix hinzufügen
"Add Song to Current Playlist"
+ Lied hinzufügen
"add string"
+ hinzufügen
"Add this Playlist as a Subplaylist"
"Add To Active Screens"
"Additional Tables"
zus. Tabellen
"Admin Key"
"Advanced"
+ erweitert
"Advanced Options"
Erweiterte Optionen
"Advanced Search"
+ Erweiterte Suche
"airdate"
+ Sendezeit
"Airdate"
Sendezeit
"Airtime"
@@ -77,11 +94,16 @@
"Album Listing"
"Album Tracks"
"Albums"
+ Alben
"Albums with songs by %s"
+ Alben, die %s enthalten
"All"
+ Alles
"All Albums"
+ Alle Alben
"All Categories"
"All Fields"
+ Alles
"All Genres"
"All groups"
Alle Gruppen
@@ -94,6 +116,7 @@
"ALLOCINETYPE"
"An error occured while adding your playlist."
"and"
+ und
"Any"
Jeder
"Any Category"
@@ -103,18 +126,23 @@
"Any Program Type"
Jeder Programmtyp
"Append"
+ anhängen
"Append to Current Playlist"
+ an Wiedergabeliste anhängen
"Are you sure you want to delete the following show?"
Diese Aufnahme wirklich löschen?
"Are you sure you want to DELETE THIS SAVED PLAYLIST?"
"Artist Listing"
"Artists"
+ Künstler
"Artists Beginning with %s"
+ Künstler mit Anfangsbuchstabe %s
"ASX Stream"
"Audio Bitrate"
"Audio for Hearing Impaired"
"Audio for Visually Impaired"
"Auto Expire"
+
"Auto-expire recordings"
Aufnahmen autom. löschen
"Auto-flag commercials"
@@ -135,17 +163,25 @@
Backend Status
"Backspace"
"Begin a New Search"
+ neue Suche
"brightness"
Helligkeit
"Browse"
+ Stöbern
"Browse = no"
"Browse = yes"
"Browse all"
+ Stöbere überall
"Browse All Albums"
+ Stöbere in allen Alben
"Browse Music"
+ Stöbern
"Browse the Music Database"
+ Musikdatenbank durchstöbern
"By Artist Beginning With"
+ Anfangsbuchstabe
"By Genre"
+ Genre
"callsign"
Kurzname
"Cancel"
@@ -153,6 +189,7 @@
Aufnahme abbrechen
"Cancelled"
"Caps Lock"
+ Feststellt.
"Cast"
Besetzung
"category"
@@ -164,8 +201,11 @@
"CC"
CC
"Chan. Callsign"
+ Sender-'Callsign'
"Chan. Name"
+ Sendername
"Chan. Number"
+ Sendernummer
"Channel"
Sender
"channel"
@@ -175,26 +215,36 @@
"Channel Detail"
Details zum Sender
"Channel Info"
+ Senderinformationen
"Channels"
+ Sender
"channum"
Sender
"Check for duplicates in"
Nach Wdhgn. suchen in
"Childrens Movies"
+ Kinderfilme
"Choose Genre.."
"Choose Type"
+ auswählen
"Click to disable Auto Expire"
+ autom. Ablaufen ausschalten
"Click to enable Auto Expire"
+ autom. Ablaufen einschalten
"Click to View Playlist"
+ Wiedergabeliste anschauen
"Closed Captioning"
+ Untertitel
"colour"
Farbe
"Commands"
Optionen
"Commercials Flagged"
+ Werbung markiert
"commfree"
Werbefrei
"Conflict"
[...11890 lines suppressed...]
+ <translation>Anna päivitysväli käyttäen nuolinäppäimiä. Pienin arvo on 30 minuuttia.</translation>
</message>
<message>
<source>Press Escape or Menu to exit.</source>
- <translation type="unfinished"></translation>
+ <translation>Paina Escape tai Menu poistuaksesi.</translation>
</message>
</context>
<context>
@@ -101,17 +101,18 @@
<name>QObject</name>
<message>
<source>MythNews</source>
- <translation type="unfinished"></translation>
+ <translation>MythUutiset</translation>
</message>
<message>
<source>Are you sure you want to delete this news site
%1</source>
- <translation type="unfinished"></translation>
+ <translation>Poistetaanko varmasti tämä uutislähde
+%1</translation>
</message>
<message>
<source>Downloading media...</source>
- <translation type="unfinished"></translation>
+ <translation>Ladataan uutisia...</translation>
</message>
</context>
<context>
Index: mythplugins/mythnews/i18n/mythnews_nl.qm
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: mythplugins/mythnews/i18n/mythnews_fi.qm
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: mythplugins/mythnews/i18n/mythnews_nl.ts
===================================================================
--- mythplugins/mythnews/i18n/mythnews_nl.ts (revision 16468)
+++ mythplugins/mythnews/i18n/mythnews_nl.ts (working copy)
@@ -1,51 +1,65 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="1.1" language="nl">
+<defaultcodec></defaultcodec>
<context>
<name>MythNews</name>
<message>
+ <location filename="../mythnews/mythnews.cpp" line="516"/>
<source>Updated</source>
<translation>Ververst</translation>
</message>
<message>
+ <location filename="../mythnews/mythnews.cpp" line="523"/>
<source>Unknown</source>
<translation>Onbekend</translation>
</message>
<message>
+ <location filename="../mythnews/mythnews.cpp" line="998"/>
<source>Edit Site Details</source>
<translation>Bewerk Site Details</translation>
</message>
<message>
+ <location filename="../mythnews/mythnews.cpp" line="1000"/>
<source>Enter Site Details</source>
<translation>Geef Site Details</translation>
</message>
<message>
+ <location filename="../mythnews/mythnews.cpp" line="1016"/>
<source>Name:</source>
<translation>Naam:</translation>
</message>
<message>
+ <location filename="../mythnews/mythnews.cpp" line="1028"/>
<source>URL:</source>
<translation>URL:</translation>
</message>
<message>
+ <location filename="../mythnews/mythnews.cpp" line="1039"/>
<source>Icon:</source>
<translation>Icoon:</translation>
</message>
<message>
+ <location filename="../mythnews/mythnews.cpp" line="1051"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
+ <location filename="../mythnews/mythnews.cpp" line="1093"/>
<source>Cancel</source>
<translation>Annuleer</translation>
</message>
<message>
+ <location filename="../mythnews/mythnews.cpp" line="1090"/>
<source>Edit News Site</source>
<translation>Bewerk Nieuws Site</translation>
</message>
<message>
+ <location filename="../mythnews/mythnews.cpp" line="1091"/>
<source>Add News Site</source>
<translation>Voeg Nieuws Site Toe</translation>
</message>
<message>
+ <location filename="../mythnews/mythnews.cpp" line="1092"/>
<source>Delete News Site</source>
<translation>Verwijder Nieuws Site</translation>
</message>
@@ -53,47 +67,57 @@
<context>
<name>MythNewsConfig</name>
<message>
+ <location filename="../mythnews/mythnewsconfig.cpp" line="259"/>
<source>Press MENU to set the update frequency.</source>
<translation>MENU kiezen om verversingsfrequentie aan te passen</translation>
</message>
<message>
+ <location filename="" line="7471221"/>
<source>Set update frequency by using the up/down arrows.
The minimum allowed value is 30 Minutes.</source>
<translation type="obsolete">Verversingsfrequentie kiezen met pijltoetsen.
De minimumwaarde is 30 minuten.</translation>
</message>
<message>
+ <location filename="" line="7471221"/>
<source>Press MENU to return to feed selection.</source>
<translation type="obsolete">MENU kiezen om terug te keren.</translation>
</message>
<message>
+ <location filename="../mythnews/mythnewsconfig.cpp" line="308"/>
<source>Set update frequency by using the up/down arrows.Minimum value is 30 Minutes.</source>
- <translation type="unfinished"></translation>
+ <translation>Verversingsfrequentie kiezen met pijltoetsen. De minimumwaarde is 30 minuten.</translation>
</message>
<message>
+ <location filename="../mythnews/mythnewsconfig.cpp" line="313"/>
<source>Press Escape or Menu to exit.</source>
- <translation type="unfinished"></translation>
+ <translation>Gebruik escape of menu om af te sluiten.</translation>
</message>
</context>
<context>
<name>NewsSite</name>
<message>
+ <location filename="../mythnews/newsengine.cpp" line="217"/>
<source>Failed to retrieve news</source>
<translation>Kon berichten niet ophalen</translation>
</message>
<message>
+ <location filename="../mythnews/newsengine.cpp" line="197"/>
<source>Retrieve Failed. </source>
<translation>Ophalen mislukt. </translation>
</message>
<message>
+ <location filename="../mythnews/newsengine.cpp" line="206"/>
<source>No Cached News</source>
<translation>Geen nieuws in geheugen</translation>
</message>
<message>
+ <location filename="../mythnews/newsengine.cpp" line="219"/>
<source>Failed to read downloaded file</source>
<translation>Ka opgehaalde bestand niet lezen</translation>
</message>
<message>
+ <location filename="../mythnews/newsengine.cpp" line="225"/>
<source>Showing Cached News</source>
<translation>Nieuws in geheugen wordt getoond</translation>
</message>
@@ -101,10 +125,12 @@
<context>
<name>QObject</name>
<message>
+ <location filename="../mythnews/mythnews.cpp" line="1134"/>
<source>MythNews</source>
<translation>MythNieuws</translation>
</message>
<message>
+ <location filename="../mythnews/mythnews.cpp" line="1136"/>
<source>Are you sure you want to delete this news site
%1</source>
@@ -113,13 +139,15 @@
%1</translation>
</message>
<message>
+ <location filename="../mythnews/mythnews.cpp" line="843"/>
<source>Downloading media...</source>
- <translation type="unfinished"></translation>
+ <translation>Media aan het downloaden...</translation>
</message>
</context>
<context>
<name>ThemeUI</name>
<message>
+ <location filename="themestrings.h" line="2"/>
<source>Minutes</source>
<translation>Minuten</translation>
</message>
mythtv-0.20-mythstreammenu.diff:
--- NEW FILE mythtv-0.20-mythstreammenu.diff ---
--- themes/blue/theme.xml~ 2006-03-27 16:13:40.000000000 +0100
+++ themes/blue/theme.xml 2006-03-27 16:13:40.000000000 +0100
@@ -745,6 +745,11 @@
<image>setup.png</image>
<offset>22,10</offset>
</buttondef>
+
+ <buttondef name="STREAM">
+ <image>stream.png</image>
+ <offset>60,30</offset>
+ </buttondef>
</myththeme>
--- programs/mythfrontend/library.xml~ 2006-03-27 16:12:24.000000000 +0100
+++ programs/mythfrontend/library.xml 2006-03-27 16:12:24.000000000 +0100
@@ -139,5 +139,12 @@
<action>PLUGIN mythgame</action>
<depends>mythgame</depends>
</button>
+
+ <button>
+ <type>STREAM</type>
+ <text>Internet streams</text>
+ <action>PLUGIN mythstream</action>
+ <depends>mythstream</depends>
+ </button>
</mythmenu>
--- programs/mythfrontend/media_settings.xml~ 2006-03-27 16:13:09.000000000 +0100
+++ programs/mythfrontend/media_settings.xml 2006-03-27 16:13:09.000000000 +0100
@@ -141,4 +141,11 @@
<depends>mythburn</depends>
</button>
+ <button>
+ <type>STREAM</type>
+ <text>Stream settings</text>
+ <action>CONFIGPLUGIN mythstream</action>
+ <depends>mythstream</depends>
+ </button>
+
</mythmenu>
mythtv-0.21-svnfixes.patch:
--- NEW FILE mythtv-0.21-svnfixes.patch ---
Index: mythtv/i18n/mythfrontend_nb.ts
===================================================================
--- mythtv/i18n/mythfrontend_nb.ts (revision 16468)
+++ mythtv/i18n/mythfrontend_nb.ts (working copy)
@@ -151,7 +151,7 @@
</message>
<message>
<source>Use channel scanner to find channels for this input.</source>
- <translation>Bruk kanalsøkeren for å finne kanaler fro denne inndatakilden.</translation>
+ <translation>Bruk kanalsøkeren for å finne kanaler for denne inndatakilden.</translation>
</message>
<message>
<source>This uses the listings data source to provide the channels for this input.</source>
@@ -391,7 +391,7 @@
</message>
<message>
<source>Anytime on a specific day of the week</source>
- <translation>Nårr som helst på en bestemt ukedag</translation>
+ <translation>Når som helst på en bestemt ukedag</translation>
</message>
<message>
<source>Only on weekdays (Monday through Friday)</source>
@@ -1165,7 +1165,7 @@
</message>
<message>
<source>The connection to the master backend server has gone away for some reason.. Is it running?</source>
- <translation>Tilkoblingen til hovedtjeneren har av en eller anenn grunn forsvunnet. Kjører den?</translation>
+ <translation>Tilkoblingen til hovedtjeneren har av en eller annen grunn forsvunnet. Kjører den?</translation>
</message>
<message>
<source>There are also other clients using this database. They should be shut down first.</source>
@@ -1216,7 +1216,7 @@
<source>The theme you are using is missing the 'file_browser_background' element.
Returning to the previous menu.</source>
- <translation>Temaet som brukes mangler elementet «file_borwsser_background».
+ <translation>Temaet som brukes mangler elementet «file_browser_background».
Går tilbake til forrige meny.</translation>
</message>
@@ -1224,7 +1224,7 @@
<source>The theme you are using is missing the 'file_browser' element.
Returning to the previous menu.</source>
- <translation>Temaet som brukes mangler elementet «file_borwser».
+ <translation>Temaet som brukes mangler elementet «file_browser».
Går tilbake til forrige meny.</translation>
</message>
@@ -1559,7 +1559,7 @@
</message>
<message>
<source>Commercials are flagged</source>
- <translation>Reklamer blir markert</translation>
+ <translation>Reklamer er markert</translation>
</message>
<message>
<source>An editing cutlist is present</source>
@@ -1949,7 +1949,7 @@
</message>
<message>
<source>Reverse Time</source>
- <translation>Omvendt kronoligisk rekkefølge</translation>
+ <translation>Omvendt kronologisk rekkefølge</translation>
</message>
<message>
<source>Sort by Title</source>
@@ -2388,7 +2388,7 @@
</message>
<message>
<source>If this frontend's host name changes often, check this box and provide a network-unique name to identify it. If unchecked, the frontend machine's local host name will be used to save preferences in the database.</source>
- <translation>Hvis klientens vertsnavn enders ofte, kryss av denne boksen og oppgi et unikt nettverksnavn for å identifisere den. Er dette ikke avkrysset, vil klientens lokale vertsnavn bli brukt for å lagre innstillinger i databasen.</translation>
+ <translation>Hvis klientens vertsnavn endres ofte, kryss av denne boksen og oppgi et unikt nettverksnavn for å identifisere den. Er dette ikke avkrysset, vil klientens lokale vertsnavn bli brukt for å lagre innstillinger i databasen.</translation>
</message>
<message>
<source>Custom identifier</source>
@@ -3163,7 +3163,7 @@
</message>
<message>
<source>This showing will be recorded.</source>
- <translation>Denne sendingen vil bil tatt opp.</translation>
+ <translation>Denne sendingen vil bli tatt opp.</translation>
</message>
<message>
<source>This showing is being recorded.</source>
@@ -3183,7 +3183,7 @@
</message>
<message>
<source>This showing was not recorded because </source>
- <translation>Denne sendingen vil ikke bli tatt opp fordi </translation>
+ <translation>Denne sendingen ble ikke tatt opp fordi </translation>
</message>
<message>
<source>it was manually set to not record.</source>
@@ -3818,7 +3818,7 @@
</message>
<message>
<source>Match duplicates using subtitle</source>
- <translation>Finn duplisering ved hejlp av undertittel</translation>
+ <translation>Finn duplisering ved hjelp av undertittel</translation>
</message>
<message>
<source>Match duplicates using description</source>
@@ -3850,7 +3850,7 @@
</message>
<message>
<source>Allow auto expire</source>
- <translation>Tillatt automatisk utløing</translation>
+ <translation>Tillat automatisk utløping</translation>
</message>
<message>
<source>Don't allow auto expire</source>
@@ -3866,11 +3866,11 @@
</message>
<message>
<source>Delete oldest if this would exceed the max episodes</source>
- <translation>Slett den eldste hvis denne overstiger tillate episoder</translation>
+ <translation>Slett den eldste hvis denne overstiger antall tillatte episoder</translation>
</message>
<message>
<source>Don't record if this would exceed the max episodes</source>
- <translation>Ikke ta opp hvis denne overstiger tillate episoder</translation>
+ <translation>Ikke ta opp hvis denne overstiger antall tillatte episoder</translation>
</message>
<message>
<source>No episode limit</source>
@@ -3956,7 +3956,7 @@
<source>You MUST run 'mythfilldatabase --manual the first time,
instead of just 'mythfilldatabase'.
Your grabber does not provide channel numbers, so you have to set them manually.</source>
- <translation>Første gangen MÅ «mythfilldatabase --manual» kjøres i stedet for bare «mythfilldatabase». Henteren tildeler ikke kanalnumbre, så disse må angis manuelt.</translation>
+ <translation>Første gangen MÅ «mythfilldatabase --manual» kjøres i stedet for bare «mythfilldatabase». Henteren tildeler ikke kanalnummer, så disse må angis manuelt.</translation>
</message>
<message>
<source>Video source setup</source>
@@ -4242,7 +4242,7 @@
</message>
<message>
<source>Enable this setting if MythTV is playing "crackly" audio and you are using hardware encoding. This setting will have no effect on MPEG-4 or RTJPEG video. MythTV will keep extra audio data in its internal buffers to workaround this bug.</source>
- <translation>Slå på denne innstillingen hvis MythTV spiller hakkete lyd og det brukes maskinvarekoding. Innstillingen har ingen effekt på MPEG-4- eller RTJPEG-video. Hakkingen fjernes ved at MythTV beholde ekstra lyddata i dets interne hurtigminne.</translation>
+ <translation>Slå på denne innstillingen hvis MythTV spiller hakkete lyd og det brukes maskinvarekoding. Innstillingen har ingen effekt på MPEG-4- eller RTJPEG-video. Hakkingen fjernes ved at MythTV beholder ekstra lyddata i dets interne hurtigminne.</translation>
</message>
<message>
<source>PIP Video Location</source>
@@ -4410,7 +4410,7 @@
</message>
<message>
<source>New Recording Free Disk Space Threshold (in Megabytes)</source>
- <translation>MInimum ledig diskplass for å ta opp (i MB)</translation>
+ <translation type="unfinished">Minimum ledig diskplass for å ta opp (i MB)</translation>
</message>
<message>
<source>MythTV will stop scheduling new recordings on a backend when its free disk space falls below this value.</source>
@@ -4418,7 +4418,7 @@
</message>
<message>
<source>Time to record before start of show (in seconds)</source>
- <translation>TId å ta opp før programstart (i sekunder)</translation>
+ <translation type="unfinished">Tid å ta opp før programstart (i sekunder)</translation>
</message>
<message>
<source>This global setting allows the recorder to start before the scheduled start time. It does not affect the scheduler. It is ignored when two shows have been scheduled without enough time in between.</source>
@@ -4430,7 +4430,7 @@
</message>
<message>
<source>This global setting allows the recorder to record beyond the scheduled end time. It does not affect the scheduler. It is ignored when two shows have been scheduled without enough time in between.</source>
- <translation>Denne globale innstillingen tillater opptakeren å ta opp etter den planlagte sluttiden. Dette påvirker ikke planlaggeren, og ignoreres når to opptak er planlagt uten nok tid mellom dem.</translation>
+ <translation>Denne globale innstillingen tillater opptakeren å ta opp etter den planlagte sluttiden. Dette påvirker ikke planleggeren, og ignoreres når to opptak er planlagt uten nok tid mellom dem.</translation>
</message>
<message>
<source>List Newest Recording First</source>
@@ -4470,7 +4470,7 @@
</message>
<message>
<source>If enabled, pressing the sticky rewind key in fast forward mode switches to rewind mode, and vice versa. If disabled, it will decrease the current speed or switch to play mode if the speed can't be decreased further.</source>
- <translation>Hvis på vil et trykk på den treige spole tilbake-knappen i framoverspillingsmodues bytte til bakoverspoling, og omvendt. Hvis av vil den nevnte handlingen senke farten eller bytte til avspillingsmodues hvis farten ikke kan reduseres mer.</translation>
+ <translation>Hvis på vil et trykk på den treige spole tilbake-knappen i framoverspillingsmodus bytte til bakoverspoling, og omvendt. Hvis av vil den nevnte handlingen senke farten eller bytte til avspillingsmodus hvis farten ikke kan reduseres mer.</translation>
</message>
<message>
<source>Menu theme</source>
@@ -4578,7 +4578,7 @@
</message>
<message>
<source>UDP Notify Port</source>
- <translation>UPD-notifiseringsport</translation>
+ <translation>UDP-notifiseringsport</translation>
</message>
<message>
<source>During playback, MythTV will listen for connections from the "mythtvosd" or "mythudprelay" programs on this port. See the README in contrib/mythnotify/ for additional information.</source>
@@ -4662,7 +4662,7 @@
</message>
<message>
<source>"Fill" is the quickest shading method. "Image" is somewhat slow, but has a higher visual quality. No shading will be the fastest.</source>
- <translation>«Fyll» er den raskeste skyggeleggingsmetoden, mens «Bilde» er treigere men ser bedre ut. Ingen skyggelegging er raskest.</translation>
+ <translation>«Fyll» er den raskeste skyggeleggingsmetoden, mens «Bilde» er treigere, men ser bedre ut. Ingen skyggelegging er raskest.</translation>
</message>
<message>
<source>System Exit key</source>
@@ -4690,7 +4690,7 @@
[...23978 lines suppressed...]
+ *
Index: mythtv/contrib/Win32/run/mythfrontend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythfrontend.cmd (revision 0)
+++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 17338)
@@ -0,0 +1,57 @@
+@Echo off
+::
+:: Script to run mythfrontend through gdb (easily?)
+:: There is likely a more efficient way of doing this,
+:: but we have to start somewhere.
+::
+Echo COMMENTS: --------------------------------------
+Echo COMMENTS: This script is used for gathering backtraces using gdb
+Echo COMMENTS: See: http://www.mythtv.org/docs/mythtv-HOWTO-22.html#ss22.2
+Echo COMMENTS: See: http://www.mythtv.org/wiki/index.php/Windows_Port
+Echo COMMENTS: --------------------------------------
+Echo.
+::
+:gdbcommands
+::
+:: Check for and Create if needed the .\gdbcommands.txt
+::
+:: syntax taken from [ http://www.mythtv.org/docs/mythtv-HOWTO.html#toc22.2 ]
+::
+if not exist ./gdbcommands.txt (
+ echo handle SIGPIPE nostop noprint > .\gdbcommands.txt
+ echo handle SIG33 nostop noprint >> .\gdbcommands.txt
+ echo set logging on >> .\gdbcommands.txt
+ echo set pagination off >> .\gdbcommands.txt
+ echo set args -l myth.log -d -v all >> .\gdbcommands.txt
+ echo run >> .\gdbcommands.txt
+ echo thread apply all bt full >> .\gdbcommands.txt
+ echo set logging off >> .\gdbcommands.txt )
+@Echo off
+
+Echo COMMENTS: --------------------------------------
+Echo COMMENTS: Clearing old gdb.txt before running gdb again.
+Echo COMMENTS: --------------------------------------
+Echo.
+::
+:: add current data/time to gdb.txt
+:: will this be a bad idea? who knows? =)
+::
+date /t > .\gdb.txt
+time /t >> .\gdb.txt
+
+:gdb
+::
+:: gdb should be in the path.
+::
+Echo COMMENTS: --------------------------------------
+Echo COMMENTS: If you need to add any switches to mythfrontend edit gdbcommands.txt
+Echo COMMENTS: see: "mythfrontend.exe --help" for options
+Echo COMMENTS: --------------------------------------
+Echo.
+Echo COMMENTS: --------------------------------------
+Echo COMMENTS: Starting: gdb
+Echo COMMENTS: --------------------------------------
+gdb .\mythfrontend.exe -x .\gdbcommands.txt
+Echo.
+Echo The backtrace can be found in .\gdb.txt
+Echo.
Index: mythtv/contrib/Win32/run/mythbackend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythbackend.cmd (revision 0)
+++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 17338)
@@ -0,0 +1,58 @@
+@Echo off
+::
+:: Script to run mythbackend through gdb (easily?)
+:: There is likely a more efficient way of doing this,
+:: but we have to start somewhere.
+::
+Echo COMMENTS: --------------------------------------
+Echo COMMENTS: This script is used for gathering backtraces using gdb
+Echo COMMENTS: See: http://www.mythtv.org/docs/mythtv-HOWTO-22.html#ss22.2
+Echo COMMENTS: See: http://www.mythtv.org/wiki/index.php/Windows_Port
+Echo COMMENTS: --------------------------------------
+Echo.
+::
+:gdbcommands
+::
+:: Check for and Create if needed the .\gdbcommands.txt
+::
+:: syntax taken from [ http://www.mythtv.org/docs/mythtv-HOWTO.html#toc22.2 ]
+::
+if not exist ./gdbcommands.txt (
+ echo handle SIGPIPE nostop noprint > .\gdbcommands.txt
+ echo handle SIG33 nostop noprint >> .\gdbcommands.txt
+ echo set logging on >> .\gdbcommands.txt
+ echo set pagination off >> .\gdbcommands.txt
+ echo set args -l myth.log --noupnp --nosched --nojobqueue --nohousekeeper --noautoexpire -v all >> .\gdbcommands.txt
+ echo run >> .\gdbcommands.txt
+ echo thread apply all bt full >> .\gdbcommands.txt
+ echo set logging off >> .\gdbcommands.txt )
+@Echo off
+
+Echo COMMENTS: --------------------------------------
+Echo COMMENTS: Clearing old gdb.txt before running gdb again.
+Echo COMMENTS: --------------------------------------
+Echo.
+::
+:: add current data/time to gdb.txt
+:: will this be a bad idea? who knows? =)
+::
+date /t > .\gdb.txt
+time /t >> .\gdb.txt
+
+:gdb
+::
+:: gdb should be in the path.
+::
+Echo COMMENTS: --------------------------------------
+Echo COMMENTS: If you need to add any switches to mythbackend edit gdbcommands.txt
+Echo COMMENTS: see: "mythbackend.exe --help" for options
+Echo COMMENTS: --------------------------------------
+Echo.
+Echo COMMENTS: --------------------------------------
+Echo COMMENTS: Starting: gdb
+Echo COMMENTS: --------------------------------------
+gdb .\mythbackend.exe -x .\gdbcommands.txt
+
+Echo.
+Echo The backtrace can be found in .\gdb.txt
+Echo.
Index: mythtv/contrib/OSX/osx-packager.pl
===================================================================
--- mythtv/contrib/OSX/osx-packager.pl (revision 16468)
+++ mythtv/contrib/OSX/osx-packager.pl (working copy)
@@ -1041,6 +1041,13 @@
if ( $OPT{'verbose'} )
{ push @bundler, '--verbose' }
+### Framework that has a screwed up link dependency path
+my $AVCfw = '/Developer/FireWireSDK*/Examples/' .
+ 'Framework/AVCVideoServices.framework';
+my @AVCfw = split / /, `ls -d $AVCfw`;
+my $AVCfw = pop @AVCfw;
+chop $AVCfw;
+
### Create each package.
### Note that this is a bit of a waste of disk space,
### because there are now multiple copies of each library.
@@ -1072,6 +1079,9 @@
# Remove copy of binary
unlink "$SCRIPTDIR/$target" or die;
+ if ( $AVCfw )
+ { &RecursiveCopy($AVCfw, "$finalTarget/Contents/Frameworks") }
+
if ( $target eq "MythFrontend" or $target =~ m/^MythTV/ )
{
my $res = "$finalTarget/Contents/Resources";
Index: mythtv/contrib/channel_changers/6200ch.c
===================================================================
--- mythtv/contrib/channel_changers/6200ch.c (revision 16468)
+++ mythtv/contrib/channel_changers/6200ch.c (working copy)
@@ -76,13 +76,14 @@
#define DCT6416_VENDOR_ID2 0x00001a66
#define DCT6416_MODEL_ID1 0x0000646b
-#define AVC1394_SUBUNIT_TYPE_6200 (9 << 19) /* uses a reserved subunit type */
+#define PACE_VENDOR_ID1 0x00005094 /* 550 & 779 */
+#define PACE550_MODEL_ID1 0x00010551
+#define PACE779_MODEL_ID1 0x00010755
-#define AVC1394_6200_COMMAND_CHANNEL 0x000007C00 /* 6200 subunit command */
#define AVC1394_6200_OPERAND_SET 0x20 /* 6200 subunit command operand */
-#define CTL_CMD0 AVC1394_CTYPE_CONTROL | AVC1394_SUBUNIT_TYPE_6200 | \
- AVC1394_SUBUNIT_ID_0 | AVC1394_6200_COMMAND_CHANNEL | \
+#define CTL_CMD0 AVC1394_CTYPE_CONTROL | AVC1394_SUBUNIT_TYPE_PANEL | \
+ AVC1394_SUBUNIT_ID_0 | AVC1394_PANEL_COMMAND_PASS_THROUGH | \
AVC1394_6200_OPERAND_SET
#define STARTING_NODE 1 /* skip 1394 nodes to avoid error msgs */
@@ -240,7 +241,8 @@
(dir.vendor_id == DCT6412_VENDOR_ID1) ||
(dir.vendor_id == DCT6412_VENDOR_ID2) ||
(dir.vendor_id == DCT6416_VENDOR_ID1) ||
- (dir.vendor_id == DCT6416_VENDOR_ID2)) &&
+ (dir.vendor_id == DCT6416_VENDOR_ID2) ||
+ (dir.vendor_id == PACE_VENDOR_ID1)) &&
((dir.model_id == DCH3200_MODEL_ID1) ||
(dir.model_id == DCT3412_MODEL_ID1) ||
(dir.model_id == DCT3416_MODEL_ID1) ||
@@ -250,7 +252,10 @@
(dir.model_id == DCT6200_MODEL_ID2) ||
(dir.model_id == DCT6412_MODEL_ID1) ||
(dir.model_id == DCT6412_MODEL_ID2) ||
- (dir.model_id == DCT6416_MODEL_ID1)) ) {
+ (dir.model_id == DCT6416_MODEL_ID1) ||
+ (dir.model_id == PACE550_MODEL_ID1) ||
+ (dir.model_id == PACE779_MODEL_ID1)) )
+ {
if (dir.unit_spec_id != DCT6200_SPEC_ID)
fprintf(stderr, "Warning: Unit Spec ID different.\n");
if (dir.unit_sw_version != DCT6200_SW_VERSION)
--- NEW FILE mythtv-setup.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=mythTV setup
Comment=Setup for mythTV.
Icon=mythtv-setup.png
Exec=mythtv-setup
Terminal=false
Type=Application
--- NEW FILE mythtv.spec ---
# svn revision number
%define _svnver r17859
%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}
%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]')}
Summary: A digital video recorder (DVR) application
Name: mythtv
Version: 0.21
%if "%{branch}" == "trunk"
Release: 0.2.%{_svnver}%{?dist}
%else
Release: 7%{?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
Source101: mythbackend.sysconfig.in
Source102: mythbackend.init.in
Source103: mythbackend.logrotate.in
Source106: mythfrontend.png
Source107: mythfrontend.desktop
Source108: mythtv-setup.png
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
BuildRequires: qt3-devel, mysql-devel >= 5
# Audio framework support
BuildRequires: alsa-lib-devel, arts-devel
BuildRequires: jack-audio-connection-kit-devel
# Need dvb headers to build in dvb support
BuildRequires: kernel-headers
# Remote control support
BuildRequires: lirc-devel
# X, Xv, and XvMC video support
BuildRequires: libXxf86vm-devel, libXmu-devel
BuildRequires: libXvMC-devel, libXv-devel
BuildRequires: xorg-x11-proto-devel
%ifarch %{ix86} x86_64
BuildRequires: xorg-x11-drv-i810-devel, xorg-x11-drv-openchrome-devel
%endif
%if %with_xvmcnvidia
BuildRequires: xorg-x11-drv-nvidia-devel
%endif
# OpenGL video output and vsync support
BuildRequires: libGL-devel, libGLU-devel
# DirectFB (disabled by default)
%if %with_directfb
BuildRequires: directfb-devel
%endif
# FireWire cable box support
BuildRequires: libiec61883-devel, libraw1394-devel, libavc1394-devel
#
BuildRequires: desktop-file-utils
BuildRequires: lm_sensors-devel
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(DBD::mysql), perl(Date::Manip), perl(HTTP::Request)
BuildRequires: perl(LWP::UserAgent)
BuildRequires: python-devel
# Misc A/V format support
BuildRequires: lame-devel
BuildRequires: libogg-devel, libvorbis-devel, libtheora-devel
BuildRequires: faad2-devel
BuildRequires: faac-devel
BuildRequires: x264-devel
BuildRequires: xvidcore-devel
BuildRequires: a52dec-devel
BuildRequires: libdca-devel
BuildRequires: gsm-devel
# mythmusic
BuildRequires: libmad-devel, taglib-devel >= 1.4
BuildRequires: libvorbis-devel >= 1.0, flac-devel >= 1.0.4
BuildRequires: libcdaudio-devel >= 0.99.6, cdparanoia-devel
BuildRequires: fftw2-devel >= 2.1.3, fftw2-devel < 3
BuildRequires: lame-devel
BuildRequires: libGL-devel
BuildRequires: SDL-devel
BuildRequires: faad2-devel
BuildRequires: libvisual-devel
# mythgallery
BuildRequires: libtiff-devel
BuildRequires: libexif-devel >= 0.6.9
# mythgame
BuildRequires: zlib-devel
# mythvideo (nb: mythdvd and mythvideo merged)
BuildRequires: libdvdnav-devel
BuildRequires: libdvdread-devel >= 0.9.4, nasm
BuildRequires: mjpegtools-devel >= 1.6.1, xvidcore-devel >= 0.9.1
BuildRequires: libfame-devel >= 0.9.0
BuildRequires: transcode >= 0.6.8
BuildRequires: libdvdcss-devel >= 1.2.7
# mythbrowser
BuildRequires: kdelibs3-devel
# mythphone
%if 0%{?fedora} >= 9
BuildRequires: ncurses-devel
%else
BuildRequires: libtermcap-devel
%endif
%if %with_festival
BuildRequires: festival-devel
%endif
#
# Requirements for the mythtv meta-package
Requires: mythtv-backend = %{version}-%{release}
Requires: mythtv-frontend = %{version}-%{release}
Requires: mythtv-setup = %{version}-%{release}
Requires: mythplugins = %{version}-%{release}
Requires: mythtv-base-themes = %{version}-%{release}
Requires: mythtv-themes = %{version}
Requires: mythtv-docs
Requires: perl-MythTV, python-MythTV
Requires: mysql-server, mysql
# Not yet packaged for rpmfusion
#Requires: xmltv
Requires: wget >= 1.9.1
# faad2-devel.ppc64 no available, so:
ExcludeArch: ppc64
%define mythfeapiver %(echo %{version} | awk -F. '{print $1 "." $2}')
%description
MythTV provides a unified graphical interface for recording and viewing
television programs. Refer to the mythtv package for more information.
There are also several add-ons and themes available. In order to faciliate
installations with smart/apt-get/yum and other related package
resolvers this meta-package can be used to install all in one sweep.
MythTV implements the following PVR features, and more, with a
unified graphical interface:
- Basic 'live-tv' functionality. Pause/Fast Forward/Rewind "live" TV.
- Video compression using RTjpeg or MPEG-4
- Program listing retrieval using XMLTV
- Themable, semi-transparent on-screen display
- Electronic program guide
- Scheduled recording of TV programs
- Resolution of conflicts between scheduled recordings
- Basic video editing
%package docs
Summary: MythTV documentation
Group: Documentation
%description docs
The MythTV documentation, contrib files, database initialization file
and miscellaneous other bits and pieces.
%package -n libmyth
Summary: Library providing mythtv support
Group: System Environment/Libraries
Requires: lame, qt3
Requires: qt3-MySQL
%description -n libmyth
Common library code for MythTV and add-on modules (development)
MythTV provides a unified graphical interface for recording and viewing
television programs. Refer to the mythtv package for more information.
%package -n libmyth-devel
Summary: Development files for libmyth
Group: Development/Libraries
Requires: libmyth = %{version}-%{release}
Requires: freetype-devel >= 2, lame-devel, qt3-devel,
Requires: mysql-devel
Requires: alsa-lib-devel, arts-devel
Requires: libGL-devel, libGLU-devel
Requires: kernel-headers
Requires: lirc-devel
Requires: xorg-x11-proto-devel
Requires: libXxf86vm-devel, libXmu-devel
Requires: libXvMC-devel, libXv-devel
Requires: libGL-devel, libGLU-devel
Requires: libiec61883-devel, libraw1394-devel, libavc1394-devel
Requires: alsa-lib-devel, arts-devel
Requires: jack-audio-connection-kit-devel
%if %with_directfb
Requires: directfb-devel
%endif
%description -n libmyth-devel
This package contains the header files and libraries for developing
add-ons for mythtv.
%package base-themes
Summary: Core user interface themes for mythtv
Group: Applications/Multimedia
%description base-themes
MythTV provides a unified graphical interface for recording and viewing
television programs. Refer to the mythtv-docs package for more information.
This package contains the base themes for the mythtv user interface.
%package frontend
Summary: Client component of mythtv (a PVR)
Group: Applications/Multimedia
Requires: freetype, lame
Requires: mythtv-common = %{version}-%{release}
Requires: mythtv-base-themes = %{version}
Provides: mythtv-frontend-api = %{mythfeapiver}
%description frontend
MythTV provides a unified graphical interface for recording and viewing
television programs. Refer to the mythtv package for more information.
This package contains only the client software, which provides a
front-end for playback and configuration. It requires access to a
mythtv-backend installation, either on the same system or one
reachable via the network.
%package backend
Summary: Server component of mythtv (a PVR)
Group: Applications/Multimedia
Requires: lame
Requires: mythtv-common = %{version}-%{release}
Conflicts: xmltv-grabbers < 0.5.37
%description backend
MythTV provides a unified graphical interface for recording and viewing
television programs. Refer to the mythtv package for more information.
This package contains only the server software, which provides video
and audio capture and encoding services. In order to be useful, it
requires a mythtv-frontend installation, either on the same system or
one reachable via the network.
%package setup
Summary: Setup the mythtv backend
Group: Applications/Multimedia
Requires: freetype
Requires: mythtv-backend = %{version}-%{release}
Requires: mythtv-base-themes = %{version}
%description setup
MythTV provides a unified graphical interface for recording and viewing
television programs. Refer to the mythtv package for more information.
This package contains only the setup software for configuring the
mythtv backend.
%package common
Summary: Common components needed by multiple other MythTV components
Group: Applications/Multimedia
%description common
MythTV provides a unified graphical interface for recording and viewing
television programs. Refer to the mythtv package for more information.
This package contains components needed by multiple other MythTV components.
%package -n mythplugins
Summary: Main MythTV plugins
Group: Applications/Multimedia
Requires: mythmusic = %{version}-%{release}, mythvideo = %{version}-%{release}
Requires: mythweather = %{version}-%{release}, mythgallery = %{version}-%{release}
Requires: mythgame = %{version}-%{release}, mythnews = %{version}-%{release}
Requires: mythbrowser = %{version}-%{release}, mythphone = %{version}-%{release}
Requires: mythcontrols = %{version}-%{release}, mythflix = %{version}-%{release}
Requires: mytharchive = %{version}-%{release}, mythzoneminder = %{version}-%{release}
Requires: mythmovies = %{version}-%{release}
Requires: mythweb = %{version}-%{release}
%description -n mythplugins
This is a consolidation of all the official MythTV plugins that used to be
distributed as separate downloads from mythtv.org.
%package -n mythmovies
Summary: A module for MythTV for providing local show times and cinema listings
Group: Applications/Multimedia
Requires: mythtv-frontend-api = %{mythfeapiver}
%description -n mythmovies
MythZoneMinder is a plugin to provide show times and cinema listings
based on Zip/Post code and a given radius. It uses external scripts to
grab times and so can be used in any country so long as a script is
written for a local data source. It ships with a grabber for the USA
which uses the ignyte website.
%package -n mythmusic
Summary: The music player add-on module for MythTV
Group: Applications/Multimedia
Requires: mythtv-frontend-api = %{mythfeapiver}
%description -n mythmusic
Music add-on for mythtv.
%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
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.
%package -n mythweather
Summary: A MythTV module that displays a weather forcast
Group: Applications/Multimedia
Requires: mythtv-frontend-api = %{mythfeapiver}
%description -n mythweather
A MythTV module that displays a weather forcast.
%package -n mythgallery
Summary: A gallery/slideshow module for MythTV
Group: Applications/Multimedia
Requires: mythtv-frontend-api = %{mythfeapiver}
%description -n mythgallery
A gallery/slideshow module for MythTV.
%package -n mythgame
Summary: A game frontend (xmame, nes, snes, pc) for MythTV
Group: Applications/Multimedia
Requires: mythtv-frontend-api = %{mythfeapiver}
%description -n mythgame
A game frontend (xmame, nes, snes, pc) for MythTV.
%package -n mythgame-emulators
Summary: Meta-package requiring emulators for game types mythgame knows about
Group: Applications/Multimedia
Requires: mythgame = %{version}-%{release}
# Multi Arcade Machine Emulator, Amiga, Atari 2600
Requires: sdlmame, e-uae, stella
# Nintendo, Super Nintendo, Nintendo 64
Requires: fceultra, zsnes, mupen64, mupen64-ricevideo
# Sega Genesis, Sega Master System, Game Gear
Requires: gens, dega-sdl, osmose
# TurboGraphx 16 (and others)
Requires: mednafen
%description -n mythgame-emulators
Meta-package requiring emulators for game types mythgame knows about.
%package -n mythnews
Summary: An RSS news feed plugin for MythTV
Group: Applications/Multimedia
Requires: mythtv-frontend-api = %{mythfeapiver}
%description -n mythnews
An RSS news feed reader plugin for MythTV.
%package -n mythbrowser
Summary: A small web browser module for MythTV
Group: Applications/Multimedia
Requires: mythtv-frontend-api = %{mythfeapiver}
%description -n mythbrowser
MythBrowser is a full fledged web-browser (multiple tabs) to display
webpages in full-screen mode. Simple page navigation is
possible. Starting with version 0.13 it also has full support for
mouse driven navigation (right mouse opens and clos es the popup
menu).
MythBrowser also contains a BookmarkManager to manage the website
links in a simple mythplugin.
%package -n mythphone
Summary: A video conferencing module for MythTV
Group: Applications/Multimedia
Requires: mythtv-frontend-api = %{mythfeapiver}
%description -n mythphone
Mythphone is a phone and videophone capability on MYTH using the
standard SIP protocol. It is compatible with Microsoft XP Messenger
and with SIP Service Providers such as Free World Dialup
(fwd.pulver.com).
%package -n mythcontrols
Summary: A key bindings editor for MythTV
Group: Applications/Multimedia
Requires: mythtv-frontend-api = %{mythfeapiver}
%description -n mythcontrols
MythControls is a key bindings editor for MythTV.
%package -n mythflix
Summary: A NetFlix module for MythTV
Group: Applications/Multimedia
Requires: mythtv-frontend-api = %{mythfeapiver}
%description -n mythflix
MythFlix is a NetFlix queue manager for MythTV.
%package -n mytharchive
Summary: A module for MythTV for creating and burning DVDs
Group: Applications/Multimedia
Requires: mythtv-frontend-api = %{mythfeapiver}
Requires: python >= 2.3, MySQL-python, python-imaging
Requires: mjpegtools >= 1.6.2, dvdauthor >= 0.6.11
Requires: ffmpeg >= 0.4.9, dvd+rw-tools >= 5.21.4.10.8
Requires: cdrecord >= 2.01, mkisofs >= 2.01
Requires: transcode >= 1.0.2
%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 system.
%package -n mythzoneminder
Summary: A module for MythTV for camera security and surveillance
Group: Applications/Multimedia
Requires: mythtv-frontend-api = %{mythfeapiver}
%description -n mythzoneminder
MythZoneMinder is a plugin to interface to some of the features of
ZoneMinder. You can use it to view a status window similar to the
console window in ZM. Also there are screens to view live camera shots
and replay recorded events.
%package -n mythweb
Summary: The web interface to MythTV
Group: Applications/Multimedia
Requires: httpd >= 1.3.26, php >= 4.2.2, php-mysql >= 4.2.2
%description -n mythweb
The web interface to MythTV.
%package -n perl-MythTV
Summary: MythTV perl bindings
Group: System Environment/Libraries
%description -n perl-MythTV
MythTV perl bindings.
%package -n python-MythTV
Summary: MythTV python bindings
Group: System Environment/Libraries
Requires: MySQL-python
%description -n python-MythTV
MythTV python bindings.
%prep
%setup -q -c -a 1
cd mythtv-%{version}
%patch100 -p1 -b .svnfixes
#patch101 -p0 -b .mythstreammenu
#patch102 -p1 -b .settings
# Drop execute permissions on contrib bits, since they'll be %doc
find contrib/ -type f -exec chmod -x "{}" \;
# Nuke Windows and Mac OS X build scripts
rm -rf contrib/Win32 contrib/OSX
# Put perl bits in the right place and set opt flags
sed -i -e 's#perl Makefile.PL#%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"#' \
bindings/perl/perl.pro
cp -a %{SOURCE10} %{SOURCE101} %{SOURCE102} %{SOURCE103} .
for file in mythbackend.init \
mythbackend.sysconfig \
mythbackend.logrotate; do
sed -e's|@logdir@|%{_localstatedir}/log|g' \
-e's|@rundir@|%{_localstatedir}/run|g' \
-e's|@sysconfdir@|%{_sysconfdir}|g' \
-e's|@sysconfigdir@|%{_sysconfdir}/sysconfig|g' \
-e's|@initdir(a)|%{_sysconfdir}/init.d|g' \
-e's|@bindir@|%{_bindir}|g' \
-e's|@sbindir@|%{_sbindir}|g' \
-e's|@subsysdir@|%{_localstatedir}/lock/subsys|g' \
-e's|@varlibdir@|%{_localstatedir}/lib|g' \
-e's|@varcachedir@|%{_localstatedir}/cache|g' \
-e's|@logrotatedir(a)|%{_sysconfdir}/logrotate.d|g' \
< $file.in > $file
done
cp -a %{SOURCE106} %{SOURCE107} %{SOURCE108} %{SOURCE109} .
cd ..
temp=`pwd`/temp
cd mythplugins-%{version}
%patch200 -p1 -b .svnfixes
#patch201 -p1 -b .settings
mv mytharchive/mythburn/themes/Simple\ -\ Autoplay \
mytharchive/mythburn/themes/Simple_-_Autoplay
mv mytharchive/mythburn/themes/MythCenter\ -\ Autoplay \
mytharchive/mythburn/themes/MythCenter_-_Autoplay
find . -name \*.pro |\
xargs perl -pi -e's,\$\${PREFIX}/include/mythtv,'$temp%{_includedir}/mythtv,
cat >> settings.pro << EOF
INCLUDEPATH += $temp%{_includedir}
LIBS *= -L$temp%{_libdir}
EOF
cd mythmusic
# Fix /mnt/store -> /var/lib/mythmusic
perl -pi -e's|/mnt/store/music|%{_localstatedir}/lib/mythmusic|' mythmusic/globalsettings.cpp
cd ..
cd mythvideo
# Fix /mnt/store -> /var/lib/mythmusic
perl -pi -e's|/share/Movies/dvd|%{_localstatedir}/lib/mythvideo|' mythvideo/globalsettings.cpp
cd ..
cd mythweb
# Fix up permissions
chmod -R g-w ./*
cd ..
echo "QMAKE_PROJECT_DEPTH = 0" >> settings.pro
cd ..
%build
cd mythtv-%{version}
./configure \
%if %with_debug
--compile-type=debug \
%else
--compile-type=release \
%endif
--enable-debug \
%ifarch ppc
--extra-cflags="%{optflags} -maltivec -fomit-frame-pointer" \
--extra-cxxflags="%{optflags} -maltivec -fomit-frame-pointer" \
%else
--extra-cflags="%{optflags} -fomit-frame-pointer" \
--extra-cxxflags="%{optflags} -fomit-frame-pointer" \
%endif
%ifarch %{ix86}
--cpu=i686 --tune=i686 --enable-mmx \
%endif
--prefix=%{_prefix} \
--libdir-name=%{_lib} \
--enable-pthreads --enable-ffmpeg-pthreads \
--enable-joystick-menu \
--enable-lirc \
--enable-ivtv \
--enable-firewire \
--enable-dvb \
--enable-audio-oss --enable-audio-alsa --enable-audio-arts \
--enable-audio-jack \
--enable-xvmc --enable-xvmcw \
%if %with_xvmcnvidia
--xvmc-lib=XvMCNVIDIA_dynamic --enable-xvmc-opengl \
%else
%ifarch %{ix86} x86_64
--enable-xvmc-vld --enable-xvmc-pro \
%endif
%endif
--enable-x11 --x11-path=%{_includedir} \
--enable-xrandr \
--enable-xv \
--enable-opengl-video --enable-opengl-vsync \
%if %with_directfb
--enable-directfb \
%else
--disable-directfb \
%endif
--enable-liba52 --enable-libmp3lame \
--enable-libfaac --enable-libfaad \
--enable-libtheora --enable-libvorbis \
--enable-libx264 --enable-libxvid \
--with-bindings="perl, python"
echo "QMAKE_PROJECT_DEPTH = 0" >> settings.pro
qmake mythtv.pro
# Insert rpm version-release for mythbackend --version output
find . -name version.pro | xargs perl -pi -e 's|svnversion \$\${SVNTREEDIR}|echo "%{version}-%{release}"|g'
make %{?_smp_mflags}
cd ..
mkdir temp
temp=`pwd`/temp
make -C mythtv-%{version} install INSTALL_ROOT=$temp
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$temp%{_libdir}
cd mythplugins-%{version}
./configure \
--prefix=${temp}%{_prefix} \
--libdir-name=%{_lib} \
--enable-opengl \
--enable-mytharchive \
--enable-create-dvd \
--enable-create-archive \
--enable-mythbrowser \
--enable-mythcontrols \
--enable-mythflix \
--enable-mythgallery \
--enable-exif \
--enable-new-exif \
--enable-mythgame \
--enable-mythmovies \
--enable-mythmusic \
--enable-libvisual \
--enable-fftw \
--enable-sdl \
--enable-aac \
--enable-mythnews \
--enable-mythphone \
%if %with_festival
--enable-festival \
%endif
--enable-mythvideo \
--enable-mythweather \
--enable-mythzoneminder
qmake mythplugins.pro
make %{?_smp_mflags}
cd ..
%install
rm -rf %{buildroot}
cd mythtv-%{version}
make install INSTALL_ROOT=%{buildroot}
ln -s mythtv-setup %{buildroot}%{_bindir}/mythtvsetup
mkdir -p %{buildroot}%{_localstatedir}/lib/mythtv
mkdir -p %{buildroot}%{_localstatedir}/cache/mythtv
mkdir -p %{buildroot}%{_localstatedir}/log/mythtv
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
mkdir -p %{buildroot}%{_sysconfdir}/init.d
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
mkdir -p %{buildroot}%{_sysconfdir}/mythtv
# Fix permissions on executable python bindings
chmod +x %{buildroot}%{python_sitelib}/MythTV/Myth{DB,TV}.py
install -m 644 %{SOURCE110} %{buildroot}%{_sysconfdir}/mythtv/
echo "# to be filled in by mythtv-setup" > %{buildroot}%{_sysconfdir}/mythtv/config.xml
install -p -m 755 mythbackend.init %{buildroot}%{_sysconfdir}/init.d/mythbackend
install -p -m 644 mythbackend.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/mythbackend
install -p -m 644 mythbackend.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/mythbackend
# Desktop entries
mkdir -p %{buildroot}%{_datadir}/pixmaps
mkdir -p %{buildroot}%{_datadir}/applications
for file in %{desktop_applications}; do
install -p $file.png %{buildroot}%{_datadir}/pixmaps/$file.png
desktop-file-install --vendor %{desktop_vendor} \
--dir %{buildroot}%{_datadir}/applications \
--add-category X-Fedora-Extra \
--add-category Application \
--add-category AudioVideo \
$file.desktop
done
mkdir -p %{buildroot}%{_libdir}/mythtv/plugins
mkdir -p %{buildroot}%{_datadir}/mythtv/build/
install -p -m 644 settings.pro %{buildroot}%{_datadir}/mythtv/build/
cd ..
cd mythplugins-%{version}
make install INSTALL_ROOT=%{buildroot}
mkdir -p %{buildroot}%{_localstatedir}/lib/mythmusic
mkdir -p %{buildroot}%{_localstatedir}/lib/mythvideo
mkdir -p %{buildroot}%{_localstatedir}/lib/pictures
mkdir -p %{buildroot}%{_datadir}/mythtv/games/nes/{roms,screens}
mkdir -p %{buildroot}%{_datadir}/mythtv/games/snes/{roms,screens}
#mkdir -p %{buildroot}%{_datadir}/mythtv/games/mame/{roms,screens,flyers,cabs}
mkdir -p %{buildroot}%{_datadir}/mythtv/games/PC/screens
mkdir -p %{buildroot}%{_datadir}/mame
ln -s ../../mame %{buildroot}%{_datadir}/mythtv/games/xmame
mkdir -p %{buildroot}%{_datadir}/mame/flyers
ln -s snap %{buildroot}%{_datadir}/mythtv/games/xmame/screens
mkdir -p %{buildroot}%{_sysconfdir}/mythgame
cp -a mythgame/gamelist.xml %{buildroot}%{_sysconfdir}/mythgame/
ln -s ../../../../../%{_sysconfdir}/mythgame/ \
%{buildroot}%{_datadir}/mythtv/games/PC/gamelist.xml
cd mythweb
mkdir -p %{buildroot}%{_datadir}/mythweb
cp -a * %{buildroot}%{_datadir}/mythweb/
mkdir -p %{buildroot}%{_datadir}/mythweb/{image_cache,php_sessions}
# fix up permissions
chmod -R g-x %{buildroot}%{_datadir}/mythweb
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
cp %{SOURCE401} %{buildroot}%{_sysconfdir}/httpd/conf.d/
# drop .htaccess file, settings handled in the above
rm -f %{buildroot}%{_datadir}/mythweb/data/.htaccess
cd ..
cd ..
%clean
rm -rf %{buildroot}
%pre backend
# Add the "mythtv" user
/usr/sbin/useradd -c "mythtvbackend User" \
-s /sbin/nologin -r -d %{_localstatedir}/lib/mythtv mythtv 2> /dev/null || :
%post -n libmyth -p /sbin/ldconfig
%postun -n libmyth -p /sbin/ldconfig
%post backend
/sbin/chkconfig --add mythbackend
%preun backend
if [ $1 = 0 ]; then
/sbin/service mythbackend stop > /dev/null 2>&1
/sbin/chkconfig --del mythbackend
fi
%files
%defattr(-,root,root,-)
%files docs
%defattr(-,root,root,-)
%doc mythtv-%{version}/README* mythtv-%{version}/UPGRADING
%doc mythtv-%{version}/AUTHORS mythtv-%{version}/COPYING mythtv-%{version}/FAQ
%doc mythtv-%{version}/database mythtv-%{version}/keys.txt
%doc mythtv-%{version}/docs/*.html mythtv-%{version}/docs/*.png
%doc mythtv-%{version}/docs/*.txt mythtv-%{version}/contrib
%doc mythtv-%{version}/PACKAGE-LICENSING
%files common
%defattr(-,root,root,-)
%dir %{_sysconfdir}/mythtv
%config(noreplace) %{_sysconfdir}/mythtv/mysql.txt
%config(noreplace) %{_sysconfdir}/mythtv/config.xml
%{_bindir}/mythcommflag
%{_bindir}/mythtranscode
%files backend
%defattr(-,root,root,-)
%{_bindir}/mythbackend
%{_bindir}/mythfilldatabase
%{_bindir}/mythjobqueue
%{_bindir}/mythreplex
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/cache/mythtv
%{_sysconfdir}/init.d/mythbackend
%config(noreplace) %{_sysconfdir}/sysconfig/mythbackend
%config(noreplace) %{_sysconfdir}/logrotate.d/mythbackend
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/log/mythtv
%files setup
%defattr(-,root,root,-)
%{_bindir}/mythtv-setup
%{_bindir}/mythtvsetup
%{_datadir}/mythtv/setup.xml
%{_datadir}/applications/*mythtv-setup.desktop
%files frontend
%defattr(-,root,root,-)
%{_datadir}/mythtv/devicemaster.xml
%{_datadir}/mythtv/deviceslave.xml
%{_datadir}/mythtv/CDS_scpd.xml
%{_datadir}/mythtv/CMGR_scpd.xml
%{_datadir}/mythtv/MSRR_scpd.xml
%{_datadir}/mythtv/info_menu.xml
%{_datadir}/mythtv/info_settings.xml
%{_datadir}/mythtv/library.xml
%{_datadir}/mythtv/main_settings.xml
%{_datadir}/mythtv/mainmenu.xml
%{_datadir}/mythtv/manage_recordings.xml
%{_datadir}/mythtv/media_settings.xml
%{_datadir}/mythtv/optical_menu.xml
%{_datadir}/mythtv/recpriorities_settings.xml
%{_datadir}/mythtv/setup.xml
%{_datadir}/mythtv/tv_lists.xml
%{_datadir}/mythtv/tv_schedule.xml
%{_datadir}/mythtv/tv_search.xml
%{_datadir}/mythtv/tv_settings.xml
%{_datadir}/mythtv/tvmenu.xml
%{_datadir}/mythtv/util_menu.xml
%{_bindir}/mythfrontend
%{_bindir}/mythtv
%{_bindir}/mythtvosd
%{_bindir}/mythlcdserver
%{_bindir}/mythshutdown
%{_bindir}/mythwelcome
%{_libdir}/mythtv/filters
%dir %{_libdir}/mythtv/plugins
%{_datadir}/mythtv/*.ttf
%dir %{_datadir}/mythtv/i18n
%{_datadir}/mythtv/i18n/mythfrontend_*.qm
%{_datadir}/applications/*mythfrontend.desktop
%{_datadir}/pixmaps/myth*.png
%files base-themes
%defattr(-,root,root,-)
%dir %{_datadir}/mythtv/themes
%{_datadir}/mythtv/themes/*
%files -n libmyth
%defattr(-,root,root,-)
%{_libdir}/*.so.*
%files -n libmyth-devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%exclude %{_libdir}/*.a
%{_datadir}/mythtv/build/settings.pro
%files -n mythplugins
%defattr(-,root,root,-)
%doc mythplugins-%{version}/COPYING
%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
%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/MXML_scpd.xml
%{_datadir}/mythtv/i18n/mythmusic_*.qm
%files -n mythvideo
%defattr(-,root,root,-)
%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
%files -n mythweather
%defattr(-,root,root,-)
%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
%files -n mythgallery
%defattr(-,root,root,-)
%doc mythplugins-%{version}/mythgallery/AUTHORS
%doc mythplugins-%{version}/mythgallery/COPYING
%doc mythplugins-%{version}/mythgallery/README
%{_libdir}/mythtv/plugins/libmythgallery.so
%{_datadir}/mythtv/i18n/mythgallery_*.qm
%{_localstatedir}/lib/pictures
%files -n mythgame
%defattr(-,root,root,-)
%dir %{_sysconfdir}/mythgame
%config(noreplace) %{_sysconfdir}/mythgame/gamelist.xml
%{_libdir}/mythtv/plugins/libmythgame.so
%{_datadir}/mythtv/games
%exclude %{_datadir}/mythtv/games/xmame
%{_datadir}/mythtv/game_settings.xml
%{_datadir}/mythtv/i18n/mythgame_*.qm
%files -n mythgame-emulators
%defattr(-,root,root,-)
%{_datadir}/mythtv/games/xmame
%{_datadir}/mame/screens
%{_datadir}/mame/flyers
%files -n mythnews
%defattr(-,root,root,-)
%doc mythplugins-%{version}/mythnews/AUTHORS
%doc mythplugins-%{version}/mythnews/COPYING
%doc mythplugins-%{version}/mythnews/README
%{_libdir}/mythtv/plugins/libmythnews.so
%{_datadir}/mythtv/mythnews
%{_datadir}/mythtv/i18n/mythnews_*.qm
%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
%files -n mythphone
%defattr(-,root,root,-)
%doc mythplugins-%{version}/mythphone/AUTHORS
%doc mythplugins-%{version}/mythphone/COPYING
%doc mythplugins-%{version}/mythphone/README
%doc mythplugins-%{version}/mythphone/TODO
%{_libdir}/mythtv/plugins/libmythphone.so
%{_datadir}/mythtv/i18n/mythphone_*.qm
%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
%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
%files -n mythzoneminder
%defattr(-,root,root,-)
%{_libdir}/mythtv/plugins/libmythzoneminder.so
%{_datadir}/mythtv/zonemindermenu.xml
%{_bindir}/mythzmserver
%files -n mythweb
%defattr(-,root,root,-)
%doc mythplugins-%{version}/mythweb/README
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf
%defattr(-,apache,apache,0775)
%dir %{_datadir}/mythweb
%{_datadir}/mythweb/*
%files -n perl-MythTV
%defattr(-,root,root,-)
%{perl_vendorlib}/MythTV.pm
%dir %{perl_vendorlib}/MythTV
%{perl_vendorlib}/MythTV/*.pm
%{perl_vendorlib}/IO/Socket/INET/MythTV.pm
%exclude %{perl_vendorarch}/auto/MythTV/.packlist
%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
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.21-7
- rebuild
* Sun Jul 20 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-7
- Disable XvMC VLD and Pro support on ppc due to lack of
openchrome driver.
* Sat Jul 19 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-6
- Fix spec typo
- Disable mythstream patch for now, too much fuzz, revisit later
* Fri Jul 18 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-5
- Update release-0-21-fixes patches (r17859)
- Don't use %%bcond, breaks on some older buildsystems
- Put several bits in -common sub-package, as both backend
and frontend may need them for one reason or another
* Fri May 16 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-4
- Add BR: xorg-x11-drv-i810-devel, xorg-x11-drv-openchrome-devel
- Make building with nVidia XvMC an available custom option, fix up
conflict between it and other XvMC implementations
- Update release-0-21-fixes patches (r17338)
* Sat Apr 05 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-3
- Fix up PACKAGE-LICENSING inclusion
* Sat Apr 05 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-2
- RPMFusion package review cleanups
- Put mythtv-setup.desktop in mythtv-setup package
- Fix up initscript to start properly
- Drop unused %%ghostattr define
- Attempt to clarify licensing
- Clean up assorted Requires and BuildRequires
- Update release-0-21-fixes patches (r16965)
* Sun Mar 09 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-1
- MythTV 0.21 (r16468)
- Add release-0-21-fixes for DVD menu display fix (r16486)
* Tue Mar 04 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.17.r16394
- Update to latest release-0-21-fixes pre-release branch code (16394).
* Fri Feb 29 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.16.r16316
- Update to latest release-0-21-fixes pre-release branch code (16316).
- Add mythgame-emulators meta-package that requires a bunch of
emulators for roms mythgame knows about.
- Account for python egg on f9+
- Enable gsm support by default
* Wed Feb 27 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.15.r16307
- Update to latest release-0-21-fixes pre-release branch code (16307).
- Try to fix up a bunch of rpmlint warnings and errors.
* Sat Feb 23 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.14.r16238
- Update to latest svn trunk (16238).
- Package up python bits.
* Thu Feb 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.13.r16019
- Update to latest svn trunk (16019).
* Mon Feb 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.12.r15914
- Update to latest svn trunk (15914).
- Turn on multi-threaded video decoding.
* Thu Jan 31 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.11.r15699
- More spec file overhauling, make it build in Fedora 9
* Thu Jan 31 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.10.r15699
- Update to latest svn trunk (15699).
- Misc spec reformatting.
* Sat Jan 26 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.9.r15614
- Update to latest svn trunk (15614).
* Tue Jan 01 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.8.r15281
- Update to latest svn trunk (15281).
- Fix up version-release insertion in mythbackend --version output
* Fri Dec 07 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.7.r15081
- Update to latest svn trunk (15081).
* Sat Nov 17 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14888
- Update to latest svn trunk (14888).
* Wed Oct 17 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14695
- Update to latest svn trunk (14695).
* Fri Oct 12 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14667
- Update to latest svn trunk (14667).
- Build dvb support against kernel-headers instead
- Drop unnecessary patches
- Tweak BR: to not use any file deps (I only care about recent distros)
- Rework mythweb bits to be compliant w/Fedora packaging guidelines
- Enable OpenGL video output support
- Make dvb and opengl bits non-conditional (always enabled)
* Wed Oct 10 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.5.r14658
- Update to latest svn trunk (14658).
- Tweak configure options a bit more
* Tue Oct 02 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.4.r14589
- Update to latest svn trunk (14589).
- Restructure how optflags are passed into build
- Nuke some extra non-standard macros
- Drop ancient dvb tarball, create with_dvb option, always using v4l-devel
* Wed Sep 12 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.4.r14488
- Update to latest svn trunk (14488).
* Tue Aug 28 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.3.r14346
- Update to latest svn trunk (14346).
* Mon Aug 27 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.3.r14337
- Update to latest svn trunk (14337).
* Tue May 22 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.2.r13492
- Update to latest svn trunk (13492).
- More non-standard macro nuking
* Mon May 21 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.1.r13487
- Update to latest svn trunk (13487).
- Reshuffle theme files
- Credit where credit is due: forking this off the current ATrpms spec
--- NEW FILE mythweb.conf ---
#
# Apache configuration directives for MythWeb. Please read INSTALL for setup
# requirements and troubleshooting, along with the comments in this file.
#
#
# CHANGE THIS PATH TO MATCH YOUR MYTHWEB INSTALLATION DIRECTORY! e.g.
#
# /var/www
# /home/www/htdocs
# /var/www/html/mythweb
# /srv/www/htdocs/mythweb
#
Alias /mythweb/ "/usr/share/mythweb/"
<Directory "/usr/share/mythweb">
############################################################################
# I *strongly* urge you to turn on authentication for MythWeb. It is disabled
# by default because it requires you to set up your own password file. Please
# see the man page for htdigest and then configure the folowing four directives
# to suit your authentication needs.
#
# AuthType Digest
# AuthName "MythWeb"
# AuthUserFile /etc/httpd/conf.d/mythweb-htdigest
# Require valid-user
# BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
# Order allow,deny
# Satisfy any
#
# * If you're running Apache earlier than 2.2, you will need to use
# the AuthDigestFile command instead of AuthUserFile (3rd line above).
#
############################################################################
# Some special instructions for the MythWeb controller files
#
<Files mythweb.*>
#
# Use the following environment settings to tell MythWeb where you want it to
# look to connect to the database, the name of the database to connect to, and
# the authentication info to use to connect. The defaults will usually work
# fine unless you've changed mythtv's mysql.txt file, or are running MythWeb on
# a different server from your main backend. Make sure you have mod_env enabled.
#
setenv db_server "localhost"
setenv db_name "mythconverg"
setenv db_login "mythtv"
setenv db_password "mythtv"
#
# By default, MythWeb uses the hostname program to look up the hostname of the
# machine it runs on. If this reports incorrect data, or you run MythWeb on a
# machine without the hostname program, set this to your current hostname.
#
# setenv hostname "my_mythbox"
#
# By default, php will always search the current directory for include files,
# but if you wish to install these directories outside of the current path
# (eg. for security reasons), set this variable to the directory that
# contains the directories like languages and templates. eg.
#
# setenv include_path "/usr/share/mythweb"
# If you want MythWeb to email php/database errors (and a backtrace) to you,
# uncomment and set the email address below.
#
# setenv error_email "mythweb_errors(a)example.com"
#
# If your local file system is something other than UTF-8, set this variable
# so that the music and video portions of MythWeb can provide proper links
# to your downloadable files.
#
# setenv fs_encoding "ISO-8859-1"
</Files>
############################################################################
# The following settings relate to PHP config.
#
<Files *.php>
# These settings are intended for apache 2.x. If your version of apache
# doesn't support php_value, or things like memory_limit aren't working
# as expected, then use these settings as examples for your own php.ini
# files.
php_value safe_mode 0
php_value memory_limit 32M
php_value register_globals 0
php_value magic_quotes_gpc 0
php_value file_uploads 0
php_value allow_url_fopen On
php_value zlib.output_handler Off
php_value output_handler NULL
# Note: php_flag does not work in older versions of php
php_flag output_handler "NULL"
</Files>
############################################################################
# The settings below relate specifically to mod_rewrite and the rewrite
# engine used to make the MythWeb user experience a little easier to deal
# with by simplifying the URLs needed to access the various sections. Do
# not touch these settings unless you really know what you're doing..
#
# Turn on the rewrite engine
RewriteEngine on
# If MythWeb is installed outside of the document root (eg. using Alias) then
# you will need to set this directive to the base URL that MythWeb is visible
# from externally. If you do not, the web server will return 'not found'.
RewriteBase /mythweb
# Skip out early if we've already been through rewrites,
# or if this is a /css/, /js/ or /cache/ directory request.
RewriteRule ^(css|data|images|js|themes|skins|[a-z_]+\.(php|pl))(/|$) - [L]
# Redirect /pl/ requests to the perl cgi handler.
RewriteRule ^(pl(/.*)?)$ mythweb.pl/$1 [QSA,L]
# Redirect most of the remaining URL requests to the main mythweb script.
# It will then handle any requests given to it.
RewriteRule ^(.+)$ mythweb.php/$1 [QSA,L]
# If you're experiencing trouble with the previous two lines in your copy of
# apache, you could instead use something like:
# RewriteRule ^(pl(/.*)?)$ mythweb.pl?PATH_INFO=/$1 [L,QSA]
# RewriteRule ^(.+)$ mythweb.php?PATH_INFO=/$1 [L,QSA]
# Catch anything else that comes through and send it to mythweb.php with no parameters.
RewriteRule ^(.*)$ mythweb.php [QSA,L]
############################################################################
# You really shouldn't need to edit anything below this line, so please
# don't unless you know what you're doing.
#
# Allow .htaccess to override whatever it wants from the server config.
AllowOverride All
# Allow browsers to follow symlinks that point outside of the web document
# tree. This is how we access music, videos, etc.
Options FollowSymLinks
# MythTV now uses the correct file suffix for mpeg files, so all .nuv files
# should actually be NuppleVideo. However, apache probably doesn't know what
# those are, so we should tell it.
AddType video/nuppelvideo .nuv
# Specify the MIME type for favicon.ico in case the server configuration
# doesn't or in case the server configuration uses the IANA-approved MIME type
# (image/vnd.microsoft.icon)--which most browsers won't recognize.
AddType image/x-icon .ico
# Enable mod_deflate. This works MUCH more reliably than PHP's built-in
# gzip/Zlib compressors. It is disabled here because many distros seem not
# to enable mod_deflate by default, but I strongly recommend that you
# enable this section.
#
BrowserMatch ^Mozilla/4 gzip-only-text/html
BrowserMatch ^Mozilla/4\.0[678] no-gzip
BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
#
AddOutputFilterByType DEFLATE text/html
AddOutputFilterByType DEFLATE text/css
AddOutputFilterByType DEFLATE application/x-javascript
# This is helpful for mod_deflate -- it prevents proxies from changing
# the user agent to/from this server, which can prevent compression from
# being enabled. It is disabled here because many distros seem not to
# enable mod_headers by default, but I recommend that you enable it.
#
Header append Vary User-Agent env=!dont-vary
# Set up the perl handler so we can stream properly.
#
# IMPORTANT!! Please see the note in INSTALL section 5.1 that explains why
# this may not always properly detect mod_perl.
#
<Files *.pl>
<IfModule mod_perl.c>
SetHandler perl-script
PerlResponseHandler ModPerl::Registry
PerlOptions +ParseHeaders
</IfModule>
<IfModule !mod_perl.c>
SetHandler cgi-script
</IfModule>
Options +ExecCGI
</Files>
</Directory>
<Directory "/usr/share/mythweb/data">
Options -All +FollowSymLinks +IncludesNoExec
</Directory>
# You will probably also want to uncomment the following rules, which
# disable authentication for MythWeb's download URLs so you can properly
# stream to media players that don't work with authenticated servers.
#
<LocationMatch .*/pl/stream/[0-9]+/[0-9]+>
Allow from all
</LocationMatch>
<LocationMatch .*/music/stream.php>
Allow from all
</LocationMatch>
16 years, 3 months
- 1
- 0