rpms/vdr/F-11 vdr-1.6.0-const.diff, NONE, 1.1 vdr-1.6.0-epgsearch-exttimeredit-0.0.2.diff, NONE, 1.1 vdr-1.6.0-hlcutter-0.2.2-finnish.patch, NONE, 1.1 vdr-1.6.0-kernel-2.6.29.diff, NONE, 1.1 vdr-jumpplay-1.0-1.6.0-finnish.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 sources, 1.19, 1.20 vdr.spec, 1.43, 1.44 vdr-1.4.7-hlcutter-0.2.0-finnish.patch, 1.1, NONE vdr-1.5.18-hlcutter-0.2.0.diff, 1.2, NONE vdr-1.6.0-gcc44.patch, 1.1, NONE vdr-1.6.0-remove-dvb-abi-check.patch, 1.1, NONE
Ville Skyttä
scop at fedoraproject.org
Sun Aug 9 20:18:44 UTC 2009
- Previous message (by thread): rpms/vdr/devel vdr.spec,1.48,1.49
- Next message (by thread): rpms/tor/devel tor-0.2.1.19-geoippath.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 lastver, 1.8, 1.9 sources, 1.17, 1.18 tor.spec, 1.34, 1.35 tor-0.2.0.32-geoippath.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/vdr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6913
Modified Files:
.cvsignore sources vdr.spec
Added Files:
vdr-1.6.0-const.diff
vdr-1.6.0-epgsearch-exttimeredit-0.0.2.diff
vdr-1.6.0-hlcutter-0.2.2-finnish.patch
vdr-1.6.0-kernel-2.6.29.diff
vdr-jumpplay-1.0-1.6.0-finnish.patch
Removed Files:
vdr-1.4.7-hlcutter-0.2.0-finnish.patch
vdr-1.5.18-hlcutter-0.2.0.diff vdr-1.6.0-gcc44.patch
vdr-1.6.0-remove-dvb-abi-check.patch
Log Message:
* Sun Aug 9 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-27
- Make -docs noarch also when built on EL > 5.
* Sun Jul 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-26
- Provide ISA qualified vdr(abi). Plugins should depend on (versioned)
vdr(abi)%{?_isa} instead of just vdr(abi).
- Borrow build patch for recent (broken? #483644) DVB headers from openSUSE.
- Apply epgsearch timer integration patch.
- Use %global instead of %define.
* Mon Jun 22 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-25
- Make -docs noarch when built on Fedora > 9.
* Mon Jun 15 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-24
- Update hlcutter patch to 0.2.2, drop no longer needed gcc 4.4 workaround.
- Resurrect Finnish translation for hlcutter.
* 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.
- Add jumpplay patch 1.0 and a Finnish translation for it.
- Update liemikuutio patch to 1.27.
vdr-1.6.0-const.diff:
recording.c | 9 +++++----
svdrp.c | 13 +++++++------
2 files changed, 12 insertions(+), 10 deletions(-)
--- 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-epgsearch-exttimeredit-0.0.2.diff:
menu.c | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 42 insertions(+), 14 deletions(-)
--- NEW FILE vdr-1.6.0-epgsearch-exttimeredit-0.0.2.diff ---
diff -up vdr-1.6.0/menu.c~ vdr-1.6.0/menu.c
--- vdr-1.6.0/menu.c~ 2009-07-25 23:38:59.000000000 +0300
+++ vdr-1.6.0/menu.c 2009-07-25 23:43:54.000000000 +0300
@@ -811,6 +811,7 @@ class cMenuTimerItem : public cOsdItem {
private:
cTimer *timer;
char diskStatus;
+ void DoSet(void);
public:
cMenuTimerItem(cTimer *Timer);
void SetDiskStatus(char DiskStatus);
@@ -823,7 +824,7 @@ cMenuTimerItem::cMenuTimerItem(cTimer *T
{
timer = Timer;
diskStatus = ' ';
- Set();
+ DoSet();
}
int cMenuTimerItem::Compare(const cListObject &ListObject) const
@@ -833,6 +834,18 @@ int cMenuTimerItem::Compare(const cListO
void cMenuTimerItem::Set(void)
{
+ // check for deleted timer
+ for (cTimer *t = Timers.First(); ; t = Timers.Next(t)) {
+ if (t == timer)
+ break; // timer still there
+ if (t == NULL)
+ return; // no matching timer found
+ }
+ DoSet();
+}
+
+void cMenuTimerItem::DoSet(void)
+{
cString day, name("");
if (timer->WeekDays())
day = timer->PrintDay(0, timer->WeekDays(), false);
@@ -920,8 +933,7 @@ void cTimerEntry::SetDiskStatus(char Dis
class cMenuTimers : public cOsdMenu {
private:
int helpKeys;
- eOSState Edit(void);
- eOSState New(void);
+ eOSState Edit(bool New = false);
eOSState Delete(void);
eOSState OnOff(void);
eOSState Info(void);
@@ -998,19 +1010,30 @@ eOSState cMenuTimers::OnOff(void)
return osContinue;
}
-eOSState cMenuTimers::Edit(void)
+eOSState cMenuTimers::Edit(bool New)
{
- if (HasSubMenu() || Count() == 0)
+ if (HasSubMenu() || (Count() == 0 && !New))
return osContinue;
- isyslog("editing timer %s", *CurrentTimer()->ToDescr());
- return AddSubMenu(new cMenuEditTimer(CurrentTimer()));
-}
+ if (!New)
+ isyslog("editing timer %s", *CurrentTimer()->ToDescr());
-eOSState cMenuTimers::New(void)
-{
- if (HasSubMenu())
- return osContinue;
- return AddSubMenu(new cMenuEditTimer(new cTimer, true));
+ // Data structure for service "Epgsearch-exttimeredit-v1.0"
+ struct Epgsearch_exttimeredit_v1_0
+ {
+ // in
+ cTimer* timer; // pointer to the timer to edit
+ bool bNew; // flag that indicates, if this is a new timer or an existing one
+ const cEvent* event; // pointer to the event corresponding to this timer (may be NULL)
+ // out
+ cOsdMenu* pTimerMenu; // pointer to the menu of results
+ } exttimeredit;
+ exttimeredit.timer = New ? (new cTimer) : CurrentTimer();
+ exttimeredit.bNew = New;
+ exttimeredit.event = exttimeredit.timer->Event();
+ if (cPluginManager::CallFirstService("Epgsearch-exttimeredit-v1.0", &exttimeredit))
+ return AddSubMenu(exttimeredit.pTimerMenu);
+
+ return AddSubMenu(new cMenuEditTimer(exttimeredit.timer, New));
}
eOSState cMenuTimers::Delete(void)
@@ -1165,7 +1188,7 @@ eOSState cMenuTimers::ProcessKey(eKeys K
case kOk: return Edit();
case kRed: actualiseDiskStatus = true;
state = OnOff(); break; // must go through SetHelpKeys()!
- case kGreen: return New();
+ case kGreen: return Edit(true);
case kYellow: actualiseDiskStatus = true;
state = Delete(); break;
case kInfo:
@@ -1183,6 +1206,11 @@ eOSState cMenuTimers::ProcessKey(eKeys K
actualiseDiskStatus = true;
Display();
}
+ if (!HasSubMenu() && Timers.Count()<Count()) {
+ // timer was deleted
+ cOsdMenu::Del(Current());
+ Display();
+ }
if (Key != kNone)
SetHelpKeys();
return state;
vdr-1.6.0-hlcutter-0.2.2-finnish.patch:
README-HLCUTTER | 6 +++---
po/fi_FI.po | 6 ++++++
2 files changed, 9 insertions(+), 3 deletions(-)
--- NEW FILE vdr-1.6.0-hlcutter-0.2.2-finnish.patch ---
diff -up vdr-1.6.0/po/fi_FI.po~ vdr-1.6.0/po/fi_FI.po
--- vdr-1.6.0/po/fi_FI.po~ 2008-03-23 12:31:29.000000000 +0200
+++ vdr-1.6.0/po/fi_FI.po 2009-06-15 19:07:04.000000000 +0300
@@ -743,9 +743,15 @@ msgstr "Pikatallennuksen kesto (min)"
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Suurin tiedostokoko (Mt)"
+msgid "Setup.Recording$Max. recording size (GB)"
+msgstr "Suurin tallennekoko (Gt)"
+
msgid "Setup.Recording$Split edited files"
msgstr "Jaottele muokatut tallenteet"
+msgid "Setup.Recording$Hard Link Cutter"
+msgstr "Käytä kovia linkkejä muokkauksessa"
+
msgid "Replay"
msgstr "Toisto"
diff -up vdr-1.6.0/README-HLCUTTER~ vdr-1.6.0/README-HLCUTTER
--- vdr-1.6.0/README-HLCUTTER~ 2009-06-15 19:02:59.000000000 +0300
+++ vdr-1.6.0/README-HLCUTTER 2009-06-15 19:04:04.000000000 +0300
@@ -21,7 +21,7 @@ Nevertheless the patch is still in devel
The patch is EXPERIMENTAL for multiple /videoxx folders. The safety checks
should prevent data loss, but you should always carefully check the results.
-While editing a recording, the patch searches for any 00x.vdr files that dont
+While editing a recording, the patch searches for any 00x.vdr files that don't
contain editing marks and would normally be copied 1:1 unmodified to the edited
recording. In this case the current target 00x.vdr file will be aborted, and
the cutter process attempts to duplicate the source file as a hard link, so
@@ -72,7 +72,7 @@ disabled, the cutter process behaves ide
There's a //#define HARDLINK_TEST_ONLY in the videodir.c file that enables a
test-mode that hard-links 00x.vdr_ files only, and continues the classic
editing. The resulting 00x.vdr and 00x.vdr_ files should be identical. If you
-delete the un-edited recording, dont forget to delete the *.vdr_ files too,
+delete the un-edited recording, don't forget to delete the *.vdr_ files too,
they will now eat real disk space.
Note: 'du' displays the disk space of hard links only on first appearance, and
@@ -93,7 +93,7 @@ Version 0.1.4
Fix: Last edit mark is not a cut-out
Fix: Write error if link-copied file is smaller than allowed file size
Fix: Broken index/marks if cut-in is at the start of a new file
- Fix: Clear dangeling pointer to free'd cUnbufferedFile,
+ Fix: Clear dangling pointer to free'd cUnbufferedFile,
thx to Matthias Schwarzott
Version 0.1.0
vdr-1.6.0-kernel-2.6.29.diff:
dvbdevice.c | 3 ++-
dvbdevice.h | 3 ++-
vdr.c | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
--- NEW FILE vdr-1.6.0-kernel-2.6.29.diff ---
Index: vdr-1.6.0/dvbdevice.h
===================================================================
--- vdr-1.6.0.orig/dvbdevice.h
+++ vdr-1.6.0/dvbdevice.h
@@ -10,12 +10,13 @@
#ifndef __DVBDEVICE_H
#define __DVBDEVICE_H
+#include <linux/types.h>
#include <linux/dvb/frontend.h>
#include <linux/dvb/version.h>
#include "device.h"
#include "dvbspu.h"
-#if DVB_API_VERSION != 3
+#if DVB_API_VERSION != 3 && DVB_API_VERSION != 5
#error VDR requires Linux DVB driver API version 3!
#endif
Index: vdr-1.6.0/dvbdevice.c
===================================================================
--- vdr-1.6.0.orig/dvbdevice.c
+++ vdr-1.6.0/dvbdevice.c
@@ -7,9 +7,10 @@
* $Id: dvbdevice.c 1.170 2008/02/09 16:11:44 kls Exp $
*/
-#include "dvbdevice.h"
#include <errno.h>
#include <limits.h>
+#include <stdint.h>
+#include "dvbdevice.h"
#include <linux/videodev.h>
#include <linux/dvb/audio.h>
#include <linux/dvb/dmx.h>
Index: vdr-1.6.0/vdr.c
===================================================================
--- vdr-1.6.0.orig/vdr.c
+++ vdr-1.6.0/vdr.c
@@ -32,6 +32,7 @@
#include <pwd.h>
#include <signal.h>
#include <stdlib.h>
+#include <linux/types.h>
#include <sys/capability.h>
#include <sys/prctl.h>
#include <termios.h>
vdr-jumpplay-1.0-1.6.0-finnish.patch:
fi_FI.po | 12 ++++++++++++
1 file changed, 12 insertions(+)
--- NEW FILE vdr-jumpplay-1.0-1.6.0-finnish.patch ---
diff -up vdr-1.6.0/po/fi_FI.po~ vdr-1.6.0/po/fi_FI.po
--- vdr-1.6.0/po/fi_FI.po~ 2008-03-23 12:31:29.000000000 +0200
+++ vdr-1.6.0/po/fi_FI.po 2009-05-26 23:40:29.000000000 +0300
@@ -749,6 +749,18 @@ msgstr "Jaottele muokatut tallenteet"
msgid "Replay"
msgstr "Toisto"
+msgid "Setup.Replay$Jump&Play"
+msgstr "Jatka toistoa hypyn jälkeen"
+
+msgid "Setup.Replay$Play&Jump"
+msgstr "Ohita merkityt katkot"
+
+msgid "Setup.Replay$Pause at last mark"
+msgstr "Tauko viimeisessä merkinnässä"
+
+msgid "Setup.Replay$Reload marks"
+msgstr "Merkintöjen uudelleenlataus"
+
msgid "Setup.Replay$Multi speed mode"
msgstr "Käytä toiston moninopeustilaa"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore 14 Apr 2009 15:27:38 -0000 1.19
+++ .cvsignore 9 Aug 2009 20:18:43 -0000 1.20
@@ -7,6 +7,8 @@ vdr-1.6.0-2.diff
vdr-timer-info-0.5-1.5.15.diff
vdr-1.6.0-2-ttxtsubs.patch
vdr-1.6.0-subtitles-button.patch.gz
-vdr-1.6.0-liemikuutio-1.25.diff.gz
vdr-1.6.0-ionice.patch.gz
vdr-1.6.0-cap_sys_nice.patch.gz
+vdr-1.6.0-liemikuutio-1.27.diff.gz
+vdr-jumpplay-1.0-1.6.0.diff
+vdr-1.5.13-hlcutter-0.2.2.diff
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources 14 Apr 2009 15:27:38 -0000 1.19
+++ sources 9 Aug 2009 20:18:43 -0000 1.20
@@ -7,6 +7,8 @@ e9b82b88c1fa21b6fa9734ca240f6192 timerc
92ee6cdf60b795d9fbcf4fdcafe401b4 vdr-timer-info-0.5-1.5.15.diff
ded3dacb4be2958c03a50e3064164eb8 vdr-1.6.0-2-ttxtsubs.patch
bd3221bb080788a87b4560eb0f323f2b vdr-1.6.0-subtitles-button.patch.gz
-122b40baef4d0c9a3e31e91b1c877e5b vdr-1.6.0-liemikuutio-1.25.diff.gz
bc2dbfe11e0ddbc791ceb2f659081c8c vdr-1.6.0-ionice.patch.gz
32004893569e9a68f17d2b4b93410ed5 vdr-1.6.0-cap_sys_nice.patch.gz
+189117c22de7932bbfa770091f5d36e0 vdr-1.6.0-liemikuutio-1.27.diff.gz
+1ff8f1a90e02b11a42218ffba18b5f26 vdr-jumpplay-1.0-1.6.0.diff
+6c3dccda1910103449984677ed0bfcf4 vdr-1.5.13-hlcutter-0.2.2.diff
Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/F-11/vdr.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- vdr.spec 18 Apr 2009 09:07:26 -0000 1.43
+++ vdr.spec 9 Aug 2009 20:18:44 -0000 1.44
@@ -5,26 +5,29 @@
# - ACPI wakeup handling using "svdrpsend NEXT {ABS|REL}" output for cases
# where the VDR box is shut down without using the shutdown script (e.g.
# explicit shutdown/poweroff outside of VDR, power button press etc)
+# - pause patch (causes OSD placement issues at least with unrebuilt text2skin)
+# http://www.tolleri.net/vdr/vdr/vdr-1.6.0-2-pause-0.0.1.patch
+# http://thread.gmane.org/gmane.linux.vdr/40188
%bcond_with docs
%bcond_with plugins
-%define varbase %{_var}/lib/vdr
-%define videodir %{varbase}/video
-%define vardir %{varbase}/data
-%define plugindir %{_libdir}/vdr
-%define configdir %{_sysconfdir}/vdr
-%define datadir %{_datadir}/vdr
-%define cachedir %{_var}/cache/vdr
-%define rundir %{_var}/run/vdr
-%define vdr_user vdr
-%define vdr_group video
+%global varbase %{_var}/lib/vdr
+%global videodir %{varbase}/video
+%global vardir %{varbase}/data
+%global plugindir %{_libdir}/vdr
+%global configdir %{_sysconfdir}/vdr
+%global datadir %{_datadir}/vdr
+%global cachedir %{_var}/cache/vdr
+%global rundir %{_var}/run/vdr
+%global vdr_user vdr
+%global vdr_group video
# From APIVERSION in config.h
-%define apiver 1.6.0
+%global apiver 1.6.0
Name: vdr
Version: 1.6.0
-Release: 21%{?dist}
+Release: 27%{?dist}
Summary: Video Disk Recorder
Group: Applications/Multimedia
@@ -53,7 +56,7 @@ Source17: %{name}-halt.local.sh
Patch0: %{name}-channel+epg.patch
# TODO
Patch1: http://zap.tartarus.org/~ds/debian/dists/stable/main/source/vdr_1.4.5-2.ds.diff.gz
-Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-liemikuutio-1.25.diff.gz
+Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-liemikuutio-1.27.diff.gz
Patch3: %{name}-1.6.0-scriptnames.patch
Patch4: %{name}-1.6.0-paths.patch
Patch5: %{name}-1.5.18-use-pkgconfig.patch
@@ -62,11 +65,10 @@ Patch6: %{name}-1.5.18-syncearly
# http://projects.vdr-developer.org/repositories/entry/plg-ttxtsubs/patches/vdr-1.6.0-2-ttxtsubs.patch?format=raw
Patch7: %{name}-1.6.0-2-ttxtsubs.patch
Patch8: %{name}-1.6.0-man-section.patch
-# Patch9: http://www.udo-richter.de/vdr/files/vdr-1.5.13-hlcutter-0.2.0.diff
-# edited so that it applies on top of the liemikuutio patch (menu.c)
-Patch9: %{name}-1.5.18-hlcutter-0.2.0.diff
-# TODO
-Patch10: %{name}-1.4.7-hlcutter-0.2.0-finnish.patch
+# http://www.udo-richter.de/vdr/patches.en.html#hlcutter
+Patch9: http://www.udo-richter.de/vdr/files/vdr-1.5.13-hlcutter-0.2.2.diff
+# Sent to hlcutter upstream 2009-06-15
+Patch10: %{name}-1.6.0-hlcutter-0.2.2-finnish.patch
# mainmenuhooks, timercmd and progressbar-support from
# http://winni.vdr-developer.org/epgsearch/downloads/vdr-epgsearch-0.9.24.tgz
Patch11: MainMenuHooks-v1_0.patch
@@ -78,11 +80,19 @@ Patch16: %{name}-1.6.0-dxr3-subti
Patch17: http://toms-cafe.de/vdr/download/vdr-timer-info-0.5-1.5.15.diff
Patch18: ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.6.0-1.diff
Patch19: ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.6.0-2.diff
-Patch20: %{name}-1.6.0-remove-dvb-abi-check.patch
+# From openSUSE's vdr-1.6.0-62.3, fixes build with (broken? #483644) dvb headers
+Patch20: %{name}-1.6.0-kernel-2.6.29.diff
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 vdr-1.6.0-62.3, 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
+# http://projects.vdr-developer.org/git/?p=vdr-plugin-epgsearch.git;a=blob;f=patches/vdr.epgsearch-exttimeredit-0.0.2.diff
+# Modified so that it applies on top of our other patches
+Patch27: %{name}-1.6.0-epgsearch-exttimeredit-0.0.2.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel
@@ -102,7 +112,11 @@ Requires: udev >= 136-1
Requires(pre): shadow-utils >= 2:4.1.1
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
+Provides: vdr(abi)%{?_isa} = %{apiver}
+%if "%{?_isa}" != ""
+# Deprecated backwards compatibility, plugins should depend on vdr(abi)%{?_isa}
Provides: vdr(abi) = %{apiver}
+%endif
Obsoletes: vdr-subtitles <= 0.5.0
%description
@@ -123,6 +137,9 @@ Provides: vdr-devel(api) = %{apive
%package docs
Summary: Developer documentation for VDR
Group: Documentation
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch: noarch
+%endif
%description docs
%{summary}.
@@ -133,7 +150,7 @@ Group: Applications/Multimedia
%if %{with plugins}
BuildRequires: ncurses-devel
%endif # plugins
-Requires: vdr(abi) = %{apiver}
+Requires: vdr(abi)%{?_isa} = %{apiver}
%description skincurses
The skincurses plugin implements a VDR skin that works in a shell
@@ -142,7 +159,7 @@ window, using only plain text output.
%package sky
Summary: Sky Digibox plugin for VDR
Group: Applications/Multimedia
-Requires: vdr(abi) = %{apiver}
+Requires: vdr(abi)%{?_isa} = %{apiver}
Requires: wget
Requires: /usr/bin/logger
@@ -170,9 +187,6 @@ patch -F 0 -i debian/patches/10_livelock
patch -F 0 -i debian/patches/11_atsc.dpatch
echo "DEFINES += -DHAVE_ATSC" >> Makefile
patch -F 0 -i debian/patches/19_debian_osdbase_maxitems.dpatch
-# TODO: does not apply, check upstream for a 1.6.x version:
-# http://www.ktverkko.fi/~msmakela/software/vdr/
-#patch -F 0 -i debian/patches/opt-20_suspend.dpatch
%patch2 -p1
%patch3 -p1
sed \
@@ -186,28 +200,29 @@ sed \
%patch6 -p0
%patch7 -p1
%patch8 -p1
-patch -p0 -F 1 -i %{PATCH9}
-# TODO: does not apply
-#patch10 -p0
-patch -p1 -F 2 -i %{PATCH11}
+# fuzz=3 so it applies on top of liemikuutio patch (menu.c)
+%patch9 -p0 -F 3
+%patch10 -p1
+%patch11 -p1 -F 2
# timer-info patch needs to come before timercmd patch to avoid conflicts
%patch17 -p1
-patch -p1 -F 2 -i %{PATCH12}
+%patch12 -p1 -F 2
%patch13 -p1
-patch -p0 -F 2 -i %{PATCH14}
+%patch14 -p0 -F 2
%patch15 -p0
%patch16 -p0
%patch18 -p1
%patch19 -p1
-%patch20 -p0
+%patch20 -p1
%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.timer-info ; do
+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
done
@@ -254,9 +269,6 @@ endif
ifdef PLUGIN
CFLAGS += -fPIC
CXXFLAGS += -fPIC
-else
- # https://bugzilla.redhat.com/483644
- CXXFLAGS += -D__KERNEL_STRICT_NAMES
endif
MANDIR = %{_mandir}
@@ -427,7 +439,7 @@ if [ $1 -gt 1 -a -d /srv/vdr ] ; then
# Continue to use /srv/vdr as the video dir for old setups
f=%{_sysconfdir}/sysconfig/vdr
- if ! grep -q '^\s*VDR_OPTIONS.* -v' $f ; then
+ if ! grep -q '^\s*VDR_OPTIONS.*[( ]-v' $f ; then
sed -i -e 's|^\(\s*VDR_OPTIONS.*(\)\(.*\)|\1-v /srv/vdr \2|' $f
fi
@@ -437,7 +449,7 @@ if [ $1 -gt 1 -a -d /srv/vdr ] ; then
done
# Set new home dir
- usermod -d %{vardir} %{vdr_user}
+ usermod -d %{vardir} %{vdr_user} 2>/dev/null
fi
/sbin/chkconfig --add vdr || :
@@ -531,6 +543,33 @@ fi
%endif # plugins
%changelog
+* Sun Aug 9 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-27
+- Make -docs noarch also when built on EL > 5.
+
+* Sun Jul 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-26
+- Provide ISA qualified vdr(abi). Plugins should depend on (versioned)
+ vdr(abi)%%{?_isa} instead of just vdr(abi).
+- Borrow build patch for recent (broken? #483644) DVB headers from openSUSE.
+- Apply epgsearch timer integration patch.
+- Use %%global instead of %%define.
+
+* Mon Jun 22 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-25
+- Make -docs noarch when built on Fedora > 9.
+
+* Mon Jun 15 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-24
+- Update hlcutter patch to 0.2.2, drop no longer needed gcc 4.4 workaround.
+- Resurrect Finnish translation for hlcutter.
+
+* 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.
+- Add jumpplay patch 1.0 and a Finnish translation for it.
+- Update liemikuutio patch to 1.27.
+
* Sat Apr 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-21
- Use videodir from /etc/sysconfig/vdr if set in vdr-moveto.sh.
--- vdr-1.4.7-hlcutter-0.2.0-finnish.patch DELETED ---
--- vdr-1.5.18-hlcutter-0.2.0.diff DELETED ---
--- vdr-1.6.0-gcc44.patch DELETED ---
--- vdr-1.6.0-remove-dvb-abi-check.patch DELETED ---
- Previous message (by thread): rpms/vdr/devel vdr.spec,1.48,1.49
- Next message (by thread): rpms/tor/devel tor-0.2.1.19-geoippath.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 lastver, 1.8, 1.9 sources, 1.17, 1.18 tor.spec, 1.34, 1.35 tor-0.2.0.32-geoippath.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list