rpms/vdr/devel vdr-1.6.0-const.diff, NONE, 1.1 vdr-1.6.0-hlcutter-gcc44.patch, NONE, 1.1 vdr.spec, 1.44, 1.45 vdr-1.6.0-gcc44.patch, 1.1, NONE

[Ville Skyttä]

Author: scop

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

Modified Files:
	vdr.spec 
Added Files:
	vdr-1.6.0-const.diff vdr-1.6.0-hlcutter-gcc44.patch 
Removed Files:
	vdr-1.6.0-gcc44.patch 
Log Message:
* Tue Jun  9 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-23
- Apply gcc 4.4 build fix from openSUSE and upstream, hlcutter still needs work.
- Drop no longer needed DVB header workaround.


vdr-1.6.0-const.diff:

--- NEW FILE vdr-1.6.0-const.diff ---
Index: vdr-1.6.0/recording.c
===================================================================
--- vdr-1.6.0.orig/recording.c
+++ vdr-1.6.0/recording.c
@@ -509,8 +509,8 @@ cRecording::cRecording(cTimer *Timer, co
      Utf8Strn0Cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH);
      Subtitle = SubtitleBuffer;
      }
-  char *macroTITLE   = strstr(Timer->File(), TIMERMACRO_TITLE);
-  char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
+  const char *macroTITLE   = strstr(Timer->File(), TIMERMACRO_TITLE);
+  const char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
   if (macroTITLE || macroEPISODE) {
      name = strdup(Timer->File());
      name = strreplace(name, TIMERMACRO_TITLE, Title);
@@ -551,7 +551,7 @@ cRecording::cRecording(const char *FileN
   sortBuffer = NULL;
   fileName = strdup(FileName);
   FileName += strlen(VideoDirectory) + 1;
-  char *p = strrchr(FileName, '/');
+  const char *p = strrchr(FileName, '/');
 
   name = NULL;
   info = new cRecordingInfo;
@@ -1022,7 +1022,8 @@ void cRecordings::DelByName(const char *
   if (recording) {
      cThreadLock DeletedRecordingsLock(&DeletedRecordings);
      Del(recording, false);
-     char *ext = strrchr(recording->FileName(), '.');
+     // wtf?
+     char *ext = strrchr(const_cast<char*>(recording->FileName()), '.');
      if (ext) {
         strncpy(ext, DELEXT, strlen(ext));
         recording->fileSizeMB = DirSizeMB(recording->FileName());
Index: vdr-1.6.0/svdrp.c
===================================================================
--- vdr-1.6.0.orig/svdrp.c
+++ vdr-1.6.0/svdrp.c
@@ -736,7 +736,7 @@ void cSVDRP::CmdGRAB(const char *Option)
      char *strtok_next;
      FileName = strtok_r(p, delim, &strtok_next);
      // image type:
-     char *Extension = strrchr(FileName, '.');
+     const char *Extension = strrchr(FileName, '.');
      if (Extension) {
         if (strcasecmp(Extension, ".jpg") == 0 || strcasecmp(Extension, ".jpeg") == 0)
            Jpeg = true;
@@ -795,16 +795,17 @@ void cSVDRP::CmdGRAB(const char *Option)
      char RealFileName[PATH_MAX];
      if (FileName) {
         if (grabImageDir) {
-           cString s;
-           char *slash = strrchr(FileName, '/');
+           cString s(FileName);
+           FileName = s;
+           const char *slash = strrchr(FileName, '/');
            if (!slash) {
               s = AddDirectory(grabImageDir, FileName);
               FileName = s;
               }
            slash = strrchr(FileName, '/'); // there definitely is one
-           *slash = 0;
-           char *r = realpath(FileName, RealFileName);
-           *slash = '/';
+           cString t(s);
+           t.Truncate(slash - FileName);
+           char *r = realpath(t, RealFileName);
            if (!r) {
               LOG_ERROR_STR(FileName);
               Reply(501, "Invalid file name \"%s\"", FileName);

vdr-1.6.0-hlcutter-gcc44.patch:

--- NEW FILE vdr-1.6.0-hlcutter-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,8 @@ all: vdr i18n
 %.o: %.c
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
+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.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- vdr.spec	28 May 2009 20:25:18 -0000	1.44
+++ vdr.spec	9 Jun 2009 17:30:32 -0000	1.45
@@ -27,7 +27,7 @@
 
 Name:           vdr
 Version:        1.6.0
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -85,9 +85,12 @@ Patch20:        %{name}-1.6.0-remove-dvb
 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
+# From openSUSE's 1.6.0-60.1, to fix build with gcc 4.4:
+# http://download.opensuse.org/repositories/vdr/
+Patch24:        %{name}-1.6.0-const.diff
 Patch25:        http://toms-cafe.de/vdr/download/vdr-jumpplay-1.0-1.6.0.diff
 Patch26:        %{name}-jumpplay-1.0-1.6.0-finnish.patch
+Patch27:        %{name}-1.6.0-hlcutter-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -205,11 +208,10 @@ sed \
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
-%if "%(g++ -dumpversion)" >= "4.4"
 %patch24 -p1
-%endif
 %patch25 -p1 -F 2
 %patch26 -p1
+%patch27 -p1
 
 for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 README.{jumpplay,timer-info} ; do
   iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
@@ -258,9 +260,6 @@ endif
 ifdef PLUGIN
   CFLAGS    += -fPIC
   CXXFLAGS  += -fPIC
-else
-  # https://bugzilla.redhat.com/483644
-  CXXFLAGS  += -D__KERNEL_STRICT_NAMES
 endif
 
 MANDIR       = %{_mandir}
@@ -535,6 +534,10 @@ fi
 %endif # plugins
 
 %changelog
+* Tue Jun  9 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-23
+- Apply gcc 4.4 build fix from openSUSE and upstream, hlcutter still needs work.
+- Drop no longer needed DVB header workaround.
+
 * Tue May 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-22
 - Quiet usermod, avoid possible extra -v inserted to /etc/sysconfig/vdr on
   upgrades from earlier releases that used to default to /srv/vdr for video.


--- vdr-1.6.0-gcc44.patch DELETED ---