Hello community, here is the log from the commit of package vdr for openSUSE:Factory checked in at 2017-06-07 09:55:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vdr (Old) and /work/SRC/openSUSE:Factory/.vdr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vdr" Wed Jun 7 09:55:10 2017 rev:49 rq:500974 version:2.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/vdr/vdr.changes 2017-02-16 17:04:35.795704573 +0100 +++ /work/SRC/openSUSE:Factory/.vdr.new/vdr.changes 2017-06-07 09:55:10.500789218 +0200 @@ -1,0 +2,6 @@ +Sun Jun 4 12:56:52 UTC 2017 - [email protected] + +- add vdr-2.2.0-gcc7.diff to fix build (mostly "ambigouous abs()" + warnings / errors) with gcc 7 + +------------------------------------------------------------------- New: ---- vdr-2.2.0-gcc7.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vdr.spec ++++++ --- /var/tmp/diff_new_pack.EKNcwI/_old 2017-06-07 09:55:11.264681268 +0200 +++ /var/tmp/diff_new_pack.EKNcwI/_new 2017-06-07 09:55:11.264681268 +0200 @@ -65,6 +65,7 @@ Patch5: vdr-2.0.4-MainMenuHooks-v1_0_1.patch Patch6: vdr-2.0.6-wareagle-fix.patch Patch7: vdr-2.2.0-use-ncurses5.diff +Patch8: vdr-2.2.0-gcc7.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: vdr-devel @@ -120,6 +121,7 @@ if $NCURSES6 || [ "$TEXTDOMAIN" = quilt ]; then %patch7 -p1 fi +%patch8 -p1 #should be a patch, but anyway... %if 0%{?suse_version} >= 1330 ++++++ vdr-2.2.0-gcc7.diff ++++++ Index: b/dvbdevice.c =================================================================== --- a/dvbdevice.c +++ b/dvbdevice.c @@ -819,13 +819,13 @@ bool cDvbTuner::SetFrontend(void) SETCMD(DTV_DELIVERY_SYSTEM, frontendType); if (frontendType == SYS_DVBS || frontendType == SYS_DVBS2) { - unsigned int frequency = channel.Frequency(); + int frequency = channel.Frequency(); if (Setup.DiSEqC) { if (const cDiseqc *diseqc = Diseqcs.Get(device->CardIndex() + 1, channel.Source(), frequency, dtp.Polarization(), &scr)) { frequency -= diseqc->Lof(); if (diseqc != lastDiseqc || diseqc->IsScr() || diseqc->Position() >= 0 && channel.Source() != lastSource) { if (IsBondedMaster()) { - ExecuteDiseqc(diseqc, &frequency); + ExecuteDiseqc(diseqc, (unsigned int *)&frequency); if (frequency == 0) return false; } @@ -842,7 +842,7 @@ bool cDvbTuner::SetFrontend(void) } else { int tone = SEC_TONE_OFF; - if (frequency < (unsigned int)Setup.LnbSLOF) { + if (frequency < Setup.LnbSLOF) { frequency -= Setup.LnbFrequLo; tone = SEC_TONE_OFF; } Index: b/osdbase.c =================================================================== --- a/osdbase.c +++ b/osdbase.c @@ -506,7 +506,7 @@ eOSState cOsdMenu::HotKey(eKeys Key) const char *s = item->Text(); i = 0; item_nr = 0; - if (s && (s = skipspace(s)) != '\0' && '0' <= s[i] && s[i] <= '9') { + if (s && (s = skipspace(s))[0] != '\0' && '0' <= s[i] && s[i] <= '9') { do { item_nr = item_nr * 10 + (s[i] - '0'); } Index: b/remux.c =================================================================== --- a/remux.c +++ b/remux.c @@ -1552,11 +1552,11 @@ int cFrameDetector::Analyze(const uchar uint32_t Delta = ptsValues[0] / Div; // determine frame info: if (isVideo) { - if (abs(Delta - 3600) <= 1) + if (abs((int32_t)Delta - 3600) <= 1) framesPerSecond = 25.0; else if (Delta % 3003 == 0) framesPerSecond = 30.0 / 1.001; - else if (abs(Delta - 1800) <= 1) + else if (abs((int32_t)Delta - 1800) <= 1) framesPerSecond = 50.0; else if (Delta == 1501) framesPerSecond = 60.0 / 1.001;
