rpms/vdr-dxr3/F-8 vdr-dxr3-0.2.7-new-ffmpeg.patch, NONE, 1.1 vdr-dxr3.conf, NONE, 1.1 vdr-dxr3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Thorsten Leemhuis]

Author: thl

Update of /cvs/free/rpms/vdr-dxr3/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27372

Modified Files:
	.cvsignore sources 
Added Files:
	vdr-dxr3-0.2.7-new-ffmpeg.patch vdr-dxr3.conf vdr-dxr3.spec 
Log Message:
initial import from livna

vdr-dxr3-0.2.7-new-ffmpeg.patch:

--- NEW FILE vdr-dxr3-0.2.7-new-ffmpeg.patch ---
Index: dxr3ffmpeg.c
===================================================================
RCS file: /cvsroot/dxr3plugin/dxr3/dxr3ffmpeg.c,v
retrieving revision 1.2.2.10
retrieving revision 1.2.2.12
diff -u -r1.2.2.10 -r1.2.2.12
--- dxr3ffmpeg.c	7 Jan 2007 21:59:01 -0000	1.2.2.10
+++ dxr3ffmpeg.c	13 Aug 2007 08:10:04 -0000	1.2.2.12
@@ -28,8 +28,10 @@
 cDxr3Ffmpeg::cDxr3Ffmpeg()
 {
     avcodec_init();
-    // Register only codec(s) we'll need.
-    register_avcodec(&mp2_decoder);
+    // Only the MP2 decoder would be needed, but individual registration of
+    // codecs bundled with ffmpeg itself does not appear to be really supported
+    // as of ffmpeg 2007-07-xx and later.
+    avcodec_register_all();
 }
 
 // ==================================


--- NEW FILE vdr-dxr3.conf ---
# Configuration snippet for vdr-dxr3                                 -*- sh -*-
#
# Add command line options to pass to the dxr3 plugin to PLUGIN_OPTIONS.

PLUGIN_OPTIONS=""

# If your system does not initialize the DXR3 elsewhere before launching
# VDR, you can do it here (make sure your modprobe.conf is properly set up):

#/sbin/modprobe em8300 || :


--- NEW FILE vdr-dxr3.spec ---
%define pname     dxr3
%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)

Name:           vdr-%{pname}
Version:        0.2.7
Release:        3%{?dist}
Summary:        Hollywood+/DXR3 output plugin for VDR

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://sourceforge.net/projects/dxr3plugin
#Source0:        http://download.sf.net/dxr3plugin/%{name}-%{version}.tgz
Source0:        http://cachalot.mine.nu/src/dxr3/%{name}-%{version}.tgz
Source1:        %{name}.conf
Patch0:         %{name}-0.2.7-new-ffmpeg.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  vdr-devel >= 1.3.47
BuildRequires:  em8300-devel
BuildRequires:  ffmpeg-devel
Requires:       vdr(abi) = %{apiver}
Requires:       em8300-kmod >= 0.15.2

%description
This plugin allows using a Hollywood+/DXR3 MPEG decoder card as VDR's
primary output device.


%prep
%setup -q -n %{pname}-%{version}
%patch0
for f in CONTRIBUTORS HISTORY TROUBLESHOOTING ; do
  iconv -f iso-8859-1 -t utf-8 $f > $f.utf-8 ; mv $f.utf-8 $f
done
%if 0%{?_without_xine_scaler:1}
sed -i -e /-DUSE_XINE_SCALER/d Makefile
%endif


%build
make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr \
  FFMDIR=%{_includedir}/ffmpeg


%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{plugindir}
install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
install -Dpm 644 %{SOURCE1} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CONTRIBUTORS COPYING HISTORY README TROUBLESHOOTING
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
%{plugindir}/libvdr-%{pname}.so.%{apiver}


%changelog
* Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.2.7-3
- rebuild

* Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.2.7-2
- BuildRequires: gawk for extracting APIVERSION.
- Fix build with > ~2007-07 ffmpeg.
- License: GPLv2+

* Sat May 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.2.7-1
- 0.2.7.

* Sun Jan  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.2.6-7
- Rebuild for VDR 1.4.5.

* Sat Nov  4 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.6-6
- Rebuild for VDR 1.4.4.

* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.2.6-5
- rebuilt for unwind info generation, broken in gcc-4.1.1-21

* Sat Sep 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.6-4
- Rebuild for VDR 1.4.3.

* Sun Aug  6 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.6-3
- Require em8300-kmod, not kmod-em8300.
- Add "--with ac3" rpmbuild option for building with the AC3 patch applied.

* Sun Jun 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.6-2
- Rebuild for VDR 1.4.1.

* Sun Apr 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.6-1
- 0.2.6, build for VDR 1.4.0.

* Mon Apr 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-10
- Rebuild/adjust for VDR 1.3.47, require versioned vdr(abi).
- Trim pre-RLO %%changelog entries.

* Sun Mar 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-9
- Rebuild for VDR 1.3.45.

* Sat Mar 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-8
- Don't use %%bcond_without (#814).

* Sat Mar 18 2006 Thorsten Leemhuis <fedora at leemhuis.info> - 0.2.5-7
- drop 0.lvn from release

* Wed Mar  1 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.lvn.7
- Rebuild for VDR 1.3.44.

* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist

* Sun Feb 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.lvn.6
- Rebuild for VDR 1.3.43.

* Sun Feb  5 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.lvn.5
- Rebuild/patch for VDR 1.3.42.

* Sun Jan 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.lvn.4
- Rebuild for VDR 1.3.40.

* Tue Jan 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.lvn.3
- Remove unneeded jpeglib.h inclusion (#733).

* Sun Jan 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.lvn.2
- Rebuild for VDR 1.3.39.

* Tue Jan 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.lvn.1
- 0.2.5.
- Rebuild for VDR 1.3.38.
- Make build with Xine scaler optional (default to on).

* Thu Jan  5 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.8
- Rebuild against new ffmpeg.

* Thu Nov 24 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.7
- Adjust firmware location for em8300 >= 0.15.2, require it.

* Sun Nov  6 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.6
- Rebuild for VDR 1.3.36.

* Tue Nov  1 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.5
- Rebuild for VDR 1.3.35.

* Mon Oct  3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.4
- Rebuild for VDR 1.3.34.

* Sun Sep 25 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.3
- Rebuild for VDR 1.3.33.

* Sun Sep 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.2
- Rebuild for VDR 1.3.32.

* Sat Aug 27 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.1
- 0.2.4.
- Rebuild for VDR 1.3.31.

* Sun Aug 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.3-1.lvn.4
- Rebuild for VDR 1.3.30.

* Fri Aug 19 2005 Dams <anvil[AT]livna.org> - 0.2.3-1.lvn.3
- Bumped release (rebuild against new ffmpeg)

* Tue Aug 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.3-1.lvn.2
- Try to avoid build system problems by not using %%expand with vdr-config.

* Fri Aug 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.3-1.lvn.1
- Convert docs to UTF-8.
- Improve description.


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vdr-dxr3/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Jul 2008 16:56:20 -0000	1.1
+++ .cvsignore	4 Aug 2008 19:50:00 -0000	1.2
@@ -0,0 +1 @@
+vdr-dxr3-0.2.7.tgz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-dxr3/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Jul 2008 16:56:20 -0000	1.1
+++ sources	4 Aug 2008 19:50:00 -0000	1.2
@@ -0,0 +1 @@
+2444e0fc5ac7912119df09327b185c47  vdr-dxr3-0.2.7.tgz