rpms/vdr-subtitles/F-8 vdr-subtitles-0.5.0-includes.patch, NONE, 1.1 vdr-subtitles.spec, 1.6, 1.7

Ville Skytta (scop) fedora-extras-commits at redhat.com
Mon Apr 7 21:05:37 UTC 2008


Author: scop

Update of /cvs/pkgs/rpms/vdr-subtitles/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2492

Modified Files:
	vdr-subtitles.spec 
Added Files:
	vdr-subtitles-0.5.0-includes.patch 
Log Message:
Sync with devel.

vdr-subtitles-0.5.0-includes.patch:

--- NEW FILE vdr-subtitles-0.5.0-includes.patch ---
diff -up subtitles-0.5.0/dec.c~ subtitles-0.5.0/dec.c
--- subtitles-0.5.0/dec.c~	2005-02-15 12:08:00.000000000 +0200
+++ subtitles-0.5.0/dec.c	2008-01-03 23:40:20.000000000 +0200
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <netinet/in.h>
+#include <cstring>
 #include "clut.h"
 #include "object.h"
 #include "region.h"


Index: vdr-subtitles.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-subtitles/F-8/vdr-subtitles.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vdr-subtitles.spec	27 Aug 2007 20:50:03 -0000	1.6
+++ vdr-subtitles.spec	7 Apr 2008 21:04:50 -0000	1.7
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        DVB subtitles plugin for VDR
 
 Group:          Applications/Multimedia
@@ -14,6 +14,7 @@
 Source0:        http://virtanen.org/vdr/subtitles/files/%{name}-%{version}.tgz
 Source1:        %{name}.conf
 Patch0:         http://zap.tartarus.org/~ds/debian/dists/stable/main/source/vdr-plugin-subtitles_0.4.0-3.ds.diff.gz
+Patch1:         %{name}-0.5.0-includes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vdr-devel >= 1.3.48
@@ -38,6 +39,7 @@
 sed -i -e 's/"0.4.0"/"0.5.0"/' debian/patches/03_constness.dpatch
 %{__patch} -i debian/patches/03_constness.dpatch
 %{__patch} -i debian/patches/99_transparency_percentage.dpatch
+%patch1 -p1
 sed -i -e '/^DVBDIR/d' -e 's|-I$(DVBDIR)/include||' Makefile
 
 
@@ -68,6 +70,9 @@
 
 
 %changelog
+* Thu Jan  3 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.5.0-4
+- Fix build with gcc 4.3's cleaned up C++ headers.
+
 * Mon Aug 27 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.5.0-3
 - Update URL to Darren's patchset.
 




More information about the fedora-extras-commits mailing list