diff options
| author |   Felix Domke <felix.domke@multimedia-labs.de> | 2009-08-17 23:35:19 +0200 |
|---|---|---|
| committer | Felix Domke <felix.domke@multimedia-labs.de> | 2009-08-17 23:35:19 +0200 |
| commit | 25c8bb45fddd0b34930433f8440b621f4348176d (patch) | |
| tree | 3eb0ce0da416800cae4118b0917e6031d5328479 | |
| parent | d2fd5f61e63c33624d24af1be853e737af4d9fab (diff) | |
| parent | 6ebd5d5704913a1f5c9a16864e9f8009dd6ab18d (diff) | |
| download | openembedded-25c8bb45fddd0b34930433f8440b621f4348176d.tar.gz | |
Merge branch 'org.openembedded.dreambox' of git://git.opendreambox.org/git/ghost/opendreambox-1.5 into org.openembedded.dreambox
| -rw-r--r-- | packages/enigma/enigma/fix_xml_defaults.diff | 47 | ||||
| -rw-r--r-- | packages/enigma/enigma_cvs.bb | 5 |
2 files changed, 50 insertions, 2 deletions
diff --git a/packages/enigma/enigma/fix_xml_defaults.diff b/packages/enigma/enigma/fix_xml_defaults.diff new file mode 100644 index 0000000000..68769b89da --- /dev/null +++ b/packages/enigma/enigma/fix_xml_defaults.diff @@ -0,0 +1,47 @@ +--------------------- +PatchSet 4404 +Date: 2009/08/18 00:32:30 +Author: ghostrider +Branch: HEAD +Tag: (none) +Log: +fix defaults for current terrestrial.xml + +Members: + lib/dvb/dvb.cpp:1.84->1.85 + +--- enigma-org/lib/dvb/dvb.cpp:1.84 Mon May 19 19:39:56 2008 ++++ enigma/lib/dvb/dvb.cpp Mon Aug 17 22:32:30 2009 +@@ -655,7 +655,7 @@ + if (!apolarisation) + continue; + if (!afec_inner) +- continue; ++ afec_inner="0"; + if (!ainversion) + ainversion="2"; + int frequency=atoi(afrequency), symbol_rate=atoi(asymbol_rate), +@@ -680,17 +680,17 @@ + if (!abandwidth) + continue; + if (!aconstellation) +- continue; ++ aconstellation="3"; + if (!ahierarchy_information) +- continue; ++ ahierarchy_information="4"; + if (!acode_rate_hp) +- continue; ++ acode_rate_hp="5"; + if (!acode_rate_lp) +- continue; ++ acode_rate_lp="5"; + if (!aguard_interval) +- continue; ++ aguard_interval="4"; + if (!atransmission_mode) +- continue; ++ atransmission_mode="3"; + if (!ainversion) + ainversion="2"; + int centre_frequency=atoi(acentre_frequency), diff --git a/packages/enigma/enigma_cvs.bb b/packages/enigma/enigma_cvs.bb index f349ab8931..e86897afb4 100644 --- a/packages/enigma/enigma_cvs.bb +++ b/packages/enigma/enigma_cvs.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" SRCDATE = "20070615" PV = "cvs-${SRCDATE}" PN = "enigma" -PR = "r7" +PR = "r8" SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/cvs/tuxbox;module=apps/tuxbox/enigma;method=ext \ file://enigma.sh \ @@ -24,7 +24,8 @@ SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/cvs/tuxbox;module=apps/tuxbox/enigma;met file://duplicate_tsid_onid_cable_terrestrial_fix_backport.diff;patch=1;pnum=1 \ file://capmt_namespace_fix.diff;patch=1;pnum=1 \ file://longer_sdt_timeout.diff;patch=1;pnum=1 \ - file://dish_network_tv_service_types_hack.diff;patch=1;pnum=1" + file://dish_network_tv_service_types_hack.diff;patch=1;pnum=1 \ + file://fix_xml_defaults.diff;patch=1;pnum=1" # dm600pvr and dm500plus don't have a FP, so they can't really switch of. Show a shutdown pic instead. SRC_URI_append_dm600pvr = " http://sources.dreamboxupdate.com/download/opendreambox/enigma/showshutdownpic-${MACHINE} \ |