[PATCH] vdr-dxr3: fix compilation with current gcc/FFmpeg (was Re: multimedia stack update)

[Dominik 'Rathann' Mierzejewski]

Hi,
it seems I'm not in the ACLs for vdr-dxr3. Ville, will you please commit
the attached patches?

Regards,
Dominik

-- 
Fedora http://fedoraproject.org/wiki/User:Rathann
RPMFusion http://rpmfusion.org | MPlayer http://mplayerhq.hu
"Faith manages."
        -- Delenn to Lennier in Babylon 5:"Confessions and Lamentations"
-------------- next part --------------
diff -up dxr3-0.2.10/Makefile.ffmpeg dxr3-0.2.10/Makefile
--- dxr3-0.2.10/Makefile.ffmpeg	2008-12-29 22:14:18.000000000 +0100
+++ dxr3-0.2.10/Makefile	2011-08-13 23:33:58.000000000 +0200
@@ -69,6 +69,10 @@ all: libvdr-$(PLUGIN).so i18n
 
 ### Implicit rules:
 
+LAVOBJS = dxr3.o dxr3audiodecoder.o dxr3demuxdevice.o dxr3device.o dxr3ffmpeg.o \
+	dxr3outputthread.o dxr3syncbuffer.o
+$(LAVOBJS): CXXFLAGS += -D__STDC_CONSTANT_MACROS
+
 %.o: %.c
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
-------------- next part --------------
Index: vdr-dxr3.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-dxr3/F-14/vdr-dxr3.spec,v
retrieving revision 1.6
diff -u -r1.6 vdr-dxr3.spec
--- vdr-dxr3.spec	22 Apr 2010 18:50:12 -0000	1.6
+++ vdr-dxr3.spec	14 Aug 2011 11:49:00 -0000
@@ -4,7 +4,7 @@
 
 Name:           vdr-%{pname}
 Version:        0.2.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Hollywood+/DXR3 output plugin for VDR
 
 Group:          Applications/Multimedia
@@ -12,6 +12,7 @@
 URL:            http://sourceforge.net/projects/dxr3plugin
 Source0:        http://downloads.sourceforge.net/dxr3plugin/%{name}-%{version}.tgz
 Source1:        %{name}.conf
+Patch0:         %{name}-ffmpeg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vdr-devel >= 1.6.0
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1 -b .ffmpeg
 %if 0%{?_without_xine_scaler:1}
 sed -i -e /-DUSE_XINE_SCALER/d Makefile
 %endif
@@ -65,6 +67,9 @@
 
 
 %changelog
+* Sat Aug 13 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.2.10-4
+- fix complation against current ffmpeg
+
 * Mon Jan  4 2010 Ville Skytt? <ville.skytta at iki.fi> - 0.2.10-3
 - Use ISA qualified dependency to vdr(abi).
 - Filter out autoprovided libvdr-*.so.* (if %%filter_setup is available).