rpms/vdr/devel vdr-1.6.0-gcc44.patch,NONE,1.1 vdr.spec,1.41,1.42

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1855

Modified Files:
	vdr.spec 
Added Files:
	vdr-1.6.0-gcc44.patch 
Log Message:
Add ugly workarounds to "fix" build with gcc 4.4 and current DVB headers.

vdr-1.6.0-gcc44.patch:

--- NEW FILE vdr-1.6.0-gcc44.patch ---
diff -up vdr-1.6.0/Makefile~ vdr-1.6.0/Makefile
--- vdr-1.6.0/Makefile~	2008-02-29 23:43:03.000000000 +0200
+++ vdr-1.6.0/Makefile	2009-04-14 19:10:22.000000000 +0300
@@ -82,6 +82,10 @@ all: vdr i18n
 %.o: %.c
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
+recording.o: CXXFLAGS += -fpermissive
+svdrp.o: CXXFLAGS += -fpermissive
+videodir.o: CXXFLAGS += -fpermissive
+
 # Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- vdr.spec	14 Apr 2009 15:27:39 -0000	1.41
+++ vdr.spec	14 Apr 2009 16:42:16 -0000	1.42
@@ -82,6 +82,7 @@
 Patch21:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-subtitles-button.patch.gz
 Patch22:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-cap_sys_nice.patch.gz
 Patch23:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-ionice.patch.gz
+Patch24:        %{name}-1.6.0-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -202,6 +203,9 @@
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%if "%(g++ -dumpversion)" >= "4.4"
+%patch24 -p1
+%endif
 
 for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 README.timer-info ; do
   iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
@@ -250,6 +254,9 @@
 ifdef PLUGIN
   CFLAGS    += -fPIC
   CXXFLAGS  += -fPIC
+else
+  # https://bugzilla.redhat.com/483644
+  CXXFLAGS  += -D__KERNEL_STRICT_NAMES
 endif
 
 MANDIR       = %{_mandir}
@@ -525,6 +532,7 @@
 
 %changelog
 * Tue Apr 14 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-20
+- Add ugly workarounds to "fix" build with gcc 4.4 and current DVB headers.
 - Use useradd -N instead of -n in scriptlets (#495731).
 - Include Rolf Ahrenberg's sys_nice and ionice patches.
 - Update liemikuutio patch to 1.25.