[oe-commits] org.oe.dreambox enigma: update rotor_fix.diff

[tmbinc commit]

enigma: update rotor_fix.diff

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: 4fb48716c13e5beeeaffb914b183e919ee9c1b1c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4fb48716c13e5beeeaffb914b183e919ee9c1b1c
Files:
1
packages/enigma/enigma/rotor_fix.diff
packages/enigma/enigma_cvs.bb
Diffs:

#
# mt diff -r28bef9f11d7cc7ef00da3aaaa8f41d4350e265bd -r4fb48716c13e5beeeaffb914b183e919ee9c1b1c
#
# 
# 
# patch "packages/enigma/enigma/rotor_fix.diff"
#  from [3dcf32d9d822aa72254ba97ea04556b765a580fe]
#    to [0b8b634beb7a73100723465c4f7d45868e754d9e]
# 
# patch "packages/enigma/enigma_cvs.bb"
#  from [32585f61bb78c435f29c6d9e7aba5da9e62cae19]
#    to [5e67e1da47b0bec48e6055998ad6336375786241]
# 
============================================================
--- packages/enigma/enigma/rotor_fix.diff	3dcf32d9d822aa72254ba97ea04556b765a580fe
+++ packages/enigma/enigma/rotor_fix.diff	0b8b634beb7a73100723465c4f7d45868e754d9e
@@ -1,6 +1,6 @@
-diff -u -r1.36 frontend.h
---- a/include/lib/dvb/frontend.h	5 Aug 2005 15:03:40 -0000	1.36
-+++ b/include/lib/dvb/frontend.h	6 Nov 2005 09:42:02 -0000
+diff -Naur enigma/include/lib/dvb/frontend.h enigma_patched/include/lib/dvb/frontend.h
+--- enigma/include/lib/dvb/frontend.h	2006-08-29 00:17:58.000000000 +0200
++++ enigma_patched/include/lib/dvb/frontend.h	2006-08-29 00:27:09.000000000 +0200
 @@ -74,41 +74,43 @@
  class eFrontend: public Object
  {
@@ -63,9 +63,9 @@ diff -u -r1.36 frontend.h
  ///////////////////
  #if HAVE_DVB_API_VERSION < 3
  	FrontendParameters front;
-diff -u -r1.92 frontend.cpp
---- a/lib/dvb/frontend.cpp	3 Oct 2005 12:14:47 -0000	1.92
-+++ b/lib/dvb/frontend.cpp	6 Nov 2005 09:42:10 -0000
+diff -Naur enigma/lib/dvb/frontend.cpp enigma_patched/lib/dvb/frontend.cpp
+--- enigma/lib/dvb/frontend.cpp	2006-08-28 09:38:41.000000000 +0200
++++ enigma_patched/lib/dvb/frontend.cpp	2006-08-29 00:27:09.000000000 +0200
 @@ -28,6 +28,10 @@
  
  eFrontend* eFrontend::frontend;
@@ -87,7 +87,7 @@ diff -u -r1.92 frontend.cpp
  {
  	CONNECT(rotorTimer1.timeout, eFrontend::RotorStartLoop );
  	CONNECT(rotorTimer2.timeout, eFrontend::RotorRunningLoop );
-@@ -817,7 +822,10 @@
+@@ -831,7 +836,10 @@
  			seq.voltage=SEC_VOLTAGE_OFF;
  			break;
  	}
@@ -99,7 +99,7 @@ diff -u -r1.92 frontend.cpp
  }
  #else
  int eFrontend::SendSequence( const eSecCmdSequence &seq )
-@@ -1015,10 +1023,7 @@
+@@ -1032,10 +1040,7 @@
  	// send DiSEqC Sequence ( normal diseqc switches )
  	seq.continuousTone = eSecCmdSequence::TONE_OFF;
  	if ( SendSequence(seq) < 0 )
@@ -110,7 +110,7 @@ diff -u -r1.92 frontend.cpp
  	else if ( lnb->getDiSEqC().SeqRepeat )   // Sequence Repeat selected ?
  	{
  		usleep( 100000 ); // between seq repeats we wait 75ms
-@@ -1047,6 +1052,37 @@
+@@ -1064,6 +1069,37 @@
  	return 0;
  }
  
@@ -148,7 +148,7 @@ diff -u -r1.92 frontend.cpp
  int eFrontend::RotorUseInputPower(eSecCmdSequence& seq, eLNB *lnb )
  {
  #if HAVE_DVB_API_VERSION < 3
-@@ -1054,7 +1090,6 @@
+@@ -1071,7 +1107,6 @@
  #else
  	dvb_diseqc_master_cmd *commands = seq.commands;
  #endif
@@ -156,7 +156,7 @@ diff -u -r1.92 frontend.cpp
  	runningPowerInput=0;
  	int secTone = seq.continuousTone;
  
-@@ -1068,14 +1103,12 @@
+@@ -1085,14 +1120,12 @@
  
  	seq.continuousTone=SEC_TONE_OFF;
  	if ( SendSequence(seq) < 0 )
@@ -173,7 +173,7 @@ diff -u -r1.92 frontend.cpp
  	}
  
  	if ( lastLNB != lnb )
-@@ -1085,15 +1118,48 @@
+@@ -1102,15 +1135,48 @@
  	}
  	else
  	{
@@ -229,7 +229,7 @@ diff -u -r1.92 frontend.cpp
  
  	// send DiSEqC Sequence (Rotor)
  	seq.commands=&commands[seq.numCommands];  // last command is rotor cmd... see above...
-@@ -1104,7 +1170,7 @@
+@@ -1121,7 +1187,7 @@
  	seq.continuousTone=secTone;
  	if ( SendSequence(seq) < 0 )
  	{
@@ -238,7 +238,7 @@ diff -u -r1.92 frontend.cpp
  		return -2;
  	}
  	// set rotor start timeout  // 2 sek..
-@@ -1129,11 +1195,14 @@
+@@ -1146,11 +1212,14 @@
  	{
  		runningPowerInput = readInputPower();
  		if ( runningPowerInput < 0 )
@@ -254,7 +254,7 @@ diff -u -r1.92 frontend.cpp
  		{
  			if ( (DeltaA & 0x200) == 0x200 )
  			{
-@@ -1164,17 +1233,44 @@
+@@ -1181,17 +1250,44 @@
  {
  	timeval now;
  	gettimeofday(&now,0);
@@ -300,17 +300,17 @@ diff -u -r1.92 frontend.cpp
  
  		if ( abs( idlePowerInput-runningPowerInput ) <= (DeltaA&0xFF) ) // rotor stoped ?
  		{
-@@ -1196,7 +1292,8 @@
- 
- void eFrontend::RotorFinish(bool tune)
+@@ -1215,7 +1311,8 @@
  {
+ 	if (type != eSystemInfo::feSatellite)
+ 		return;
 -	if ( eSystemInfo::getInstance()->canMeasureLNBCurrent() == 1 )
 +	setCurrentLimitingMode(DYNAMIC);
 +	if ( voltageState == eSecCmdSequence::VOLTAGE_18 )
  	{
  		if ( voltage != eSecCmdSequence::VOLTAGE_18 )
  #if HAVE_DVB_API_VERSION < 3
-@@ -1208,7 +1305,7 @@
+@@ -1227,7 +1324,7 @@
  		curVoltage = voltage;
  #endif
  	}
@@ -319,7 +319,7 @@ diff -u -r1.92 frontend.cpp
  	{
  		if ( voltage != eSecCmdSequence::VOLTAGE_13 )
  #if HAVE_DVB_API_VERSION < 3
-@@ -2000,16 +2097,10 @@
+@@ -2023,16 +2120,10 @@
  			commands[cmdCount-1].u.diseqc.params[1]);
  #endif
  
@@ -339,7 +339,7 @@ diff -u -r1.92 frontend.cpp
  			seq.voltage = voltage;
  
  		lastRotorCmd=RotorCmd;
-@@ -2040,14 +2131,12 @@
+@@ -2063,14 +2154,12 @@
  send:
  		seq.voltage=voltage;
  		if ( SendSequence(seq) < 0 )
@@ -356,7 +356,7 @@ diff -u -r1.92 frontend.cpp
  		}
  	}
  	else if ( lastcsw != csw )
-@@ -2177,10 +2266,7 @@
+@@ -2220,10 +2309,7 @@
  		seq.continuousTone = eSecCmdSequence::TONE_OFF;
  		seq.toneBurst = eSecCmdSequence::NONE;
  		if (SendSequence(seq) < 0 )
@@ -367,14 +367,10 @@ diff -u -r1.92 frontend.cpp
  	}
  	if ( ioctl(fd, FE_SET_POWER_STATE, FE_POWER_OFF) < 0 )
  		eDebug("FE_SET_POWER_STATE failed (%m)");
-Index: lib/system/info.cpp
-===================================================================
-RCS file: /cvs/tuxbox/apps/tuxbox/enigma/lib/system/info.cpp,v
-retrieving revision 1.33
-diff -u -r1.33 info.cpp
---- a/lib/system/info.cpp	21 Feb 2005 16:53:26 -0000	1.33
-+++ b/lib/system/info.cpp	6 Nov 2005 09:42:10 -0000
-@@ -172,19 +172,8 @@
+diff -Naur enigma/lib/system/info.cpp enigma_patched/lib/system/info.cpp
+--- enigma/lib/system/info.cpp	2006-08-29 00:17:59.000000000 +0200
++++ enigma_patched/lib/system/info.cpp	2006-08-29 00:27:09.000000000 +0200
+@@ -175,19 +175,8 @@
  					midstr="9";
  					modelstr="DM7020";
  					cpustr="STB04500, 252MHz";
============================================================
--- packages/enigma/enigma_cvs.bb	32585f61bb78c435f29c6d9e7aba5da9e62cae19
+++ packages/enigma/enigma_cvs.bb	5e67e1da47b0bec48e6055998ad6336375786241
@@ -1,9 +1,9 @@ LICENSE = "GPL"
 DEPENDS = "jpeg libungif libid3tag libmad libpng libsigc++-1.2 gettext-native tuxbox-libs tuxbox-plugins dreambox-dvbincludes mtd-utils freetype"
 DESCRIPTION = "Enigma is a framebuffer-based frontend for DVB functions"
 MAINTAINER = "Felix Domke <tmbinc at elitedvb.net>"
 LICENSE = "GPL"
 
-DEFAULT_PREFERENCE=-1
+SRCDATE = "20060829"
 PV = "cvs-${SRCDATE}"
 PN = "enigma"
 PR = "r0"
@@ -14,7 +14,9 @@ SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/
            file://userbouquet* \
            http://sources.dreamboxupdate.com/download/opendreambox/enigma/boot-${MACHINE} \
            file://enigma_enter_standby.sh \
-           file://enigma_leave_standby.sh"
+           file://enigma_leave_standby.sh \
+           file://rotor_fix.diff;patch=1;pnum=1 \
+           file://disable_boot.diff;patch=1;pnum=1"
 
 S = "${WORKDIR}/enigma"
 
@@ -24,7 +26,7 @@ inherit autotools pkgconfig
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--with-target=native --with-boxtype=${MACHINE} "
+EXTRA_OECONF = "--with-target=native --with-boxtype=${MACHINE} --with-webif=standard --with-epg=private --with-enigma-debug=yes --with-reiserfs=no"
 
 do_configure_prepend() {
 	mkdir -p m4