Merge branch 'obi/master'

18 files changed, 60 insertions, 70 deletions

diff --git a/lib/driver/rcsdl.cpp b/lib/driver/rcsdl.cpp
index a907b80a..145b23ce 100644
--- a/lib/driver/rcsdl.cpp
+++ b/lib/driver/rcsdl.cpp
@@ -33,6 +33,10 @@ void eSDLInputDevice::handleCode(long arg)
 	if (km == eRCInput::kmNone) {
 		code = translateKey(key->sym);
 	} else {
+		// ASCII keys should only generate key press events
+		if (flags == eRCKey::flagBreak)
+			return;
+
 		eDebug("unicode=%04x scancode=%02x", m_unicode, key->scancode);
 		if (m_unicode & 0xff80) {
 			eDebug("SDL: skipping unicode character");
diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 6c353c34..c2ddb409 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -110,7 +110,7 @@ eDVBResourceManager::eDVBResourceManager()
 			m_boxtype = DM8000;
 	}
 
-	eDebug("found %d adapter, %d frontends(%d sim) and %d demux, boxtype %d",
+	eDebug("found %zd adapter, %zd frontends(%zd sim) and %zd demux, boxtype %d",
 		m_adapter.size(), m_frontend.size(), m_simulate_frontend.size(), m_demux.size(), m_boxtype);
 
 	eDVBCAService::registerChannelCallback(this);
@@ -336,7 +336,7 @@ PyObject *eDVBResourceManager::setFrontendSlotInformations(ePyObject list)
 	}
 	if (assigned != m_frontend.size()) {
 		char blasel[256];
-		sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations .. assigned %d socket informations, but %d registered frontends!",
+		sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations .. assigned %zd socket informations, but %d registered frontends!",
 			m_frontend.size(), assigned);
 		PyErr_SetString(PyExc_StandardError, blasel);
 		return NULL;
@@ -1490,7 +1490,7 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 				size = max;
 			else
 				size = aligned_end - current_offset;
-			eDebug("HIT, %lld < %lld < %lld, size: %d", i->first, current_offset, i->second, size);
+			eDebug("HIT, %lld < %lld < %lld, size: %zd", i->first, current_offset, i->second, size);
 			return;
 		}
 		if (current_offset < aligned_start)
@@ -1531,10 +1531,10 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 					len = aligned_end - aligned_start;
 
 				start = aligned_end - len;
-				eDebug("skipping to %llx, %d", start, len);
+				eDebug("skipping to %llx, %zd", start, len);
 			}
 
-			eDebug("result: %llx, %x (%llx %llx)", start, size, aligned_start, aligned_end);
+			eDebug("result: %llx, %zx (%llx %llx)", start, size, aligned_start, aligned_end);
 			return;
 		}
 	}
@@ -1550,7 +1550,7 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 	{
 		start = current_offset;
 		size = max;
-		eDebug("NO CUESHEET. (%08llx, %d)", start, size);
+		eDebug("NO CUESHEET. (%08llx, %zd)", start, size);
 	} else
 	{
 		start = current_offset;
diff --git a/lib/dvb/esection.h b/lib/dvb/esection.h
index 2bb17a98..833cc93b 100644
--- a/lib/dvb/esection.h
+++ b/lib/dvb/esection.h
@@ -63,7 +63,7 @@ protected:
 			else
 				TABLE_eDebugNoNewLine("-");
 				
-		TABLE_eDebug(" %d/%d TID %02x", avail.size(), max, data[0]);
+		TABLE_eDebug(" %zd/%d TID %02x", avail.size(), max, data[0]);
 
 		if (avail.size() == max)
 		{
diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp
index d559614c..fb6f2048 100644
--- a/lib/dvb/scan.cpp
+++ b/lib/dvb/scan.cpp
@@ -193,9 +193,9 @@ RESULT eDVBScan::nextChannel()
 	if (m_ch_toScan.empty())
 	{
 		SCAN_eDebug("no channels left to scan.");
-		SCAN_eDebug("%d channels scanned, %d were unavailable.", 
+		SCAN_eDebug("%zd channels scanned, %zd were unavailable.",
 				m_ch_scanned.size(), m_ch_unavailable.size());
-		SCAN_eDebug("%d channels in database.", m_new_channels.size());
+		SCAN_eDebug("%zd channels in database.", m_new_channels.size());
 		m_event(evtFinish);
 		return -ENOENT;
 	}
diff --git a/lib/dvb_ci/dvbci.cpp b/lib/dvb_ci/dvbci.cpp
index 8a43e5b1..374672ae 100644
--- a/lib/dvb_ci/dvbci.cpp
+++ b/lib/dvb_ci/dvbci.cpp
@@ -739,7 +739,7 @@ PyObject *eDVBCIInterfaces::getDescrambleRules(int slotid)
 	if (!slot)
 	{
 		char tmp[255];
-		snprintf(tmp, 255, "eDVBCIInterfaces::getDescrambleRules try to get rules for CI Slot %d... but just %d slots are available", slotid, m_slots.size());
+		snprintf(tmp, 255, "eDVBCIInterfaces::getDescrambleRules try to get rules for CI Slot %d... but just %zd slots are available", slotid, m_slots.size());
 		PyErr_SetString(PyExc_StandardError, tmp);
 		return 0;
 	}
@@ -791,7 +791,7 @@ RESULT eDVBCIInterfaces::setDescrambleRules(int slotid, SWIG_PYOBJECT(ePyObject)
 	if (!slot)
 	{
 		char tmp[255];
-		snprintf(tmp, 255, "eDVBCIInterfaces::setDescrambleRules try to set rules for CI Slot %d... but just %d slots are available", slotid, m_slots.size());
+		snprintf(tmp, 255, "eDVBCIInterfaces::setDescrambleRules try to set rules for CI Slot %d... but just %zd slots are available", slotid, m_slots.size());
 		PyErr_SetString(PyExc_StandardError, tmp);
 		return -1;
 	}
@@ -862,7 +862,7 @@ RESULT eDVBCIInterfaces::setDescrambleRules(int slotid, SWIG_PYOBJECT(ePyObject)
 		if (PyTuple_Size(tuple) != 2)
 		{
 			char buf[255];
-			snprintf(buf, 255, "eDVBCIInterfaces::setDescrambleRules provider tuple has %d instead of 2 entries!!", PyTuple_Size(tuple));
+			snprintf(buf, 255, "eDVBCIInterfaces::setDescrambleRules provider tuple has %zd instead of 2 entries!!", PyTuple_Size(tuple));
 			PyErr_SetString(PyExc_StandardError, buf);
 			return -1;
 		}
@@ -914,7 +914,7 @@ PyObject *eDVBCIInterfaces::readCICaIds(int slotid)
 	if (!slot)
 	{
 		char tmp[255];
-		snprintf(tmp, 255, "eDVBCIInterfaces::readCICaIds try to get CAIds for CI Slot %d... but just %d slots are available", slotid, m_slots.size());
+		snprintf(tmp, 255, "eDVBCIInterfaces::readCICaIds try to get CAIds for CI Slot %d... but just %zd slots are available", slotid, m_slots.size());
 		PyErr_SetString(PyExc_StandardError, tmp);
 	}
 	else
diff --git a/lib/gdi/accel.cpp b/lib/gdi/accel.cpp
index 9450ecca..fc739e92 100644
--- a/lib/gdi/accel.cpp
+++ b/lib/gdi/accel.cpp
@@ -112,7 +112,7 @@ int gAccel::blit(gSurface *dst, const gSurface *src, const eRect &p, const eRect
 			pal_addr = src->stride * src->y;
 			unsigned long *pal = (unsigned long*)(((unsigned char*)src->data) + pal_addr);
 			pal_addr += src->data_phys;
-			for (i = 0; i < 256; ++i)
+			for (i = 0; i < src->clut.colors; ++i)
 				*pal++ = src->clut.data[i].argb() ^ 0xFF000000;
 		} else
 			return -1; /* unsupported source format */
diff --git a/lib/gdi/picexif.cpp b/lib/gdi/picexif.cpp
index f9e8055f..2daeeffd 100644
--- a/lib/gdi/picexif.cpp
+++ b/lib/gdi/picexif.cpp
@@ -428,7 +428,7 @@ bool Cexif::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase,
 			case 6:		strcpy(m_exifinfo->Orientation,"Right-Top"); break;
 			case 7:		strcpy(m_exifinfo->Orientation,"Right-Bottom"); break;
 			case 8:		strcpy(m_exifinfo->Orientation,"Left-Bottom"); break;
-			default:	strcpy(m_exifinfo->Orientation,"Undefined rotation value");
+			default:	strcpy(m_exifinfo->Orientation,"Undefined"); break;
 			}
 			break;
 		case TAG_EXIF_IMAGELENGTH:
diff --git a/lib/python/Components/DreamInfoHandler.py b/lib/python/Components/DreamInfoHandler.py
index 03d52157..8e9c29d1 100755
--- a/lib/python/Components/DreamInfoHandler.py
+++ b/lib/python/Components/DreamInfoHandler.py
@@ -397,7 +397,7 @@ class DreamInfoHandler:
 		
 	def installIPK(self, directory, name):
 		if self.blocking:
-			os.system("ipkg install " + directory + name)
+			os.system("opkg install " + directory + name)
 			self.installNext()
 		else:
 			self.ipkg = IpkgComponent()
diff --git a/lib/python/Components/Ipkg.py b/lib/python/Components/Ipkg.py
index 71447775..cc559657 100755
--- a/lib/python/Components/Ipkg.py
+++ b/lib/python/Components/Ipkg.py
@@ -19,9 +19,8 @@ class IpkgComponent:
 	CMD_UPDATE = 3
 	CMD_UPGRADE = 4
 	
-	def __init__(self, ipkg = '/usr/bin/ipkg'):
+	def __init__(self, ipkg = 'opkg'):
 		self.ipkg = ipkg
-		self.opkgAvail = fileExists('/usr/bin/opkg')
 		self.cmd = eConsoleAppContainer()
 		self.cache = None
 		self.callbackList = []
@@ -90,10 +89,7 @@ class IpkgComponent:
 			if data.find('Downloading') == 0:
 				self.callCallbacks(self.EVENT_DOWNLOAD, data.split(' ', 5)[1].strip())
 			elif data.find('Upgrading') == 0:
-				if self.opkgAvail:
-					self.callCallbacks(self.EVENT_UPGRADE, data.split(' ', 1)[1].split(' ')[0])
-				else:
-					self.callCallbacks(self.EVENT_UPGRADE, data.split('    ', 1)[1].split(' ')[0])
+				self.callCallbacks(self.EVENT_UPGRADE, data.split(' ', 1)[1].split(' ')[0])
 			elif data.find('Installing') == 0:
 				self.callCallbacks(self.EVENT_INSTALL, data.split(' ', 1)[1].split(' ')[0])
 			elif data.find('Removing') == 0:
diff --git a/lib/python/Plugins/Extensions/SocketMMI/src/socket_mmi.cpp b/lib/python/Plugins/Extensions/SocketMMI/src/socket_mmi.cpp
index 673b525c..9a69de37 100644
--- a/lib/python/Plugins/Extensions/SocketMMI/src/socket_mmi.cpp
+++ b/lib/python/Plugins/Extensions/SocketMMI/src/socket_mmi.cpp
@@ -118,11 +118,11 @@ eAutoInitP0<eSocket_UI> init_socketui(eAutoInitNumbers::rc, "Socket MMI");
 
 int eSocketMMIHandler::send_to_mmisock( void* buf, size_t len)
 {
-	int ret = write(connfd, buf, len);
+	ssize_t ret = write(connfd, buf, len);
 	if ( ret < 0 )
 		eDebug("[eSocketMMIHandler] write (%m)");
-	else if ( (uint)ret != len )
-		eDebug("[eSocketMMIHandler] only %d bytes sent.. %d bytes should be sent", ret, len );
+	else if ( (size_t)ret != len )
+		eDebug("[eSocketMMIHandler] only %zd bytes sent.. %zu bytes should be sent", ret, len );
 	else
 		return 0;
 	return ret;
diff --git a/lib/python/Plugins/SystemPlugins/CleanupWizard/CleanupWizard.py b/lib/python/Plugins/SystemPlugins/CleanupWizard/CleanupWizard.py
index d8de3544..797010c6 100755
--- a/lib/python/Plugins/SystemPlugins/CleanupWizard/CleanupWizard.py
+++ b/lib/python/Plugins/SystemPlugins/CleanupWizard/CleanupWizard.py
@@ -88,7 +88,7 @@ class CleanupWizard(WizardLanguage, Rc):
 		if self.NextStep is not 'end':
 			if not self.Console:
 				self.Console = Console()
-			cmd = "ipkg list_installed | grep enigma2"
+			cmd = "opkg list_installed | grep enigma2"
 			self.Console.ePopen(cmd, self.buildListInstalled_Finished)
 			self.buildListRef = self.session.openWithCallback(self.buildListfinishedCB, MessageBox, _("Please wait while searching for removable packages..."), type = MessageBox.TYPE_INFO, enable_input = False)
 		else:
diff --git a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
index c7216382..22e54369 100644
--- a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
@@ -10,7 +10,7 @@ from os import popen
 
 class Upgrade(Screen):
 	skin = """
-		<screen position="100,100" size="550,400" title="IPKG upgrade..." >
+		<screen position="100,100" size="550,400" title="opkg upgrade..." >
 			<widget name="text" position="0,0" size="550,400" font="Regular;15" />
 		</screen>"""
 		
@@ -39,7 +39,7 @@ class Upgrade(Screen):
 			self.close()
 	
 	def doUpdateDelay(self):
-		lines = popen("ipkg update && ipkg upgrade -force-defaults -force-overwrite", "r").readlines()
+		lines = popen("opkg update && opkg upgrade -force-defaults -force-overwrite", "r").readlines()
 		string = ""
 		for x in lines:
 			string += x
@@ -87,7 +87,7 @@ class PacketList(GUIComponent):
 
 class Ipkg(Screen):
 	skin = """
-		<screen position="100,100" size="550,400" title="IPKG upgrade..." >
+		<screen position="100,100" size="550,400" title="opkg upgrade..." >
 			<widget name="list" position="0,0" size="550,400" scrollbarMode="showOnDemand" />
 		</screen>"""
 		
@@ -109,13 +109,13 @@ class Ipkg(Screen):
 		
 
 	def fillPacketList(self):
-		lines = popen("ipkg list", "r").readlines()
+		lines = popen("opkg list", "r").readlines()
 		packetlist = []
 		for x in lines:
 			split = x.split(' - ')
 			packetlist.append([split[0].strip(), split[1].strip()])
 		
-		lines = popen("ipkg list_installed", "r").readlines()
+		lines = popen("opkg list_installed", "r").readlines()
 		
 		installedlist = {}
 		for x in lines:
@@ -138,7 +138,7 @@ class Ipkg(Screen):
 			self.close()
 	
 	def doUpdateDelay(self):
-		lines = popen("ipkg update && ipkg upgrade", "r").readlines()
+		lines = popen("opkg update && opkg upgrade", "r").readlines()
 		string = ""
 		for x in lines:
 			string += x
@@ -161,4 +161,4 @@ def IpkgMain(session, **kwargs):
 
 def Plugins(**kwargs):
 	return [PluginDescriptor(name="Old Softwareupdate", description="Updates your receiver's software", icon="update.png", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=UpgradeMain),
-			PluginDescriptor(name="IPKG", description="IPKG frontend", icon="update.png", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=IpkgMain)]
+			PluginDescriptor(name="opkg", description="opkg frontend", icon="update.png", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=IpkgMain)]
diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
index ee0bec74..8b8fc97c 100755
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
@@ -205,7 +205,7 @@ class SoftwareTools(DreamInfoHandler):
 		if self.list_updating:
 			if not self.UpdateConsole:
 				self.UpdateConsole = Console()
-			cmd = "ipkg list"
+			cmd = "opkg list"
 			self.UpdateConsole.ePopen(cmd, self.IpkgListAvailableCB, callback)
 
 	def IpkgListAvailableCB(self, result, retval, extra_args = None):
@@ -241,7 +241,7 @@ class SoftwareTools(DreamInfoHandler):
 			if self.NetworkConnectionAvailable == True:
 				if not self.UpdateConsole:
 					self.UpdateConsole = Console()
-				cmd = "ipkg install enigma2-meta enigma2-plugins-meta enigma2-skins-meta"
+				cmd = "opkg install enigma2-meta enigma2-plugins-meta enigma2-skins-meta"
 				self.UpdateConsole.ePopen(cmd, self.InstallMetaPackageCB, callback)
 			else:
 				self.InstallMetaPackageCB(True)
@@ -270,7 +270,7 @@ class SoftwareTools(DreamInfoHandler):
 		if self.list_updating:
 			if not self.UpdateConsole:
 				self.UpdateConsole = Console()
-			cmd = "ipkg list_installed"
+			cmd = "opkg list_installed"
 			self.UpdateConsole.ePopen(cmd, self.IpkgListInstalledCB, callback)
 
 	def IpkgListInstalledCB(self, result, retval, extra_args = None):
@@ -331,7 +331,7 @@ class SoftwareTools(DreamInfoHandler):
 	def startIpkgUpdate(self, callback = None):
 		if not self.Console:
 			self.Console = Console()
-		cmd = "ipkg update"
+		cmd = "opkg update"
 		self.Console.ePopen(cmd, self.IpkgUpdateCB, callback)
 
 	def IpkgUpdateCB(self, result, retval, extra_args = None):
@@ -366,4 +366,4 @@ class SoftwareTools(DreamInfoHandler):
 				return False
 		return True
 
-iSoftwareTools = SoftwareTools()
\ No newline at end of file
+iSoftwareTools = SoftwareTools()
diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
index 896d9f2c..480707d0 100755
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
@@ -1517,7 +1517,7 @@ class IPKGMenu(Screen):
 
 	def fill_list(self):
 		self.flist = []
-		self.path = '/etc/ipkg/'
+		self.path = '/etc/opkg/'
 		if (os_path.exists(self.path) == False):
 			self.entry = False
 			return
@@ -1708,7 +1708,6 @@ class PacketManager(Screen, NumericalTextInput):
 		self.cache_file = eEnv.resolve('${libdir}/enigma2/python/Plugins/SystemPlugins/SoftwareManager/packetmanager.cache') #Path to cache directory
 		self.oktext = _("\nAfter pressing OK, please wait!")
 		self.unwanted_extensions = ('-dbg', '-dev', '-doc', 'busybox')
-		self.opkgAvail = fileExists('/usr/bin/opkg')
 
 		self.ipkg = IpkgComponent()
 		self.ipkg.addCallback(self.ipkgCallback)
@@ -1862,7 +1861,7 @@ class PacketManager(Screen, NumericalTextInput):
 				self.list_updating = False
 				if not self.Console:
 					self.Console = Console()
-				cmd = "ipkg list"
+				cmd = "opkg list"
 				self.Console.ePopen(cmd, self.IpkgList_Finished)
 		#print event, "-", param
 		pass
@@ -1885,7 +1884,7 @@ class PacketManager(Screen, NumericalTextInput):
 
 		if not self.Console:
 			self.Console = Console()
-		cmd = "ipkg list_installed"
+		cmd = "opkg list_installed"
 		self.Console.ePopen(cmd, self.IpkgListInstalled_Finished)
 
 	def IpkgListInstalled_Finished(self, result, retval, extra_args = None):
@@ -1898,13 +1897,10 @@ class PacketManager(Screen, NumericalTextInput):
 					l = len(tokens)
 					version = l > 1 and tokens[1].strip() or ""
 					self.installed_packetlist[name] = version
-		if self.opkgAvail:
-			if not self.Console:
-				self.Console = Console()
-			cmd = "opkg list-upgradable"
-			self.Console.ePopen(cmd, self.OpkgListUpgradeable_Finished)
-		else:
-			self.buildPacketList()
+		if not self.Console:
+			self.Console = Console()
+		cmd = "opkg list-upgradable"
+		self.Console.ePopen(cmd, self.OpkgListUpgradeable_Finished)
 
 	def OpkgListUpgradeable_Finished(self, result, retval, extra_args = None):
 		if result:
@@ -1949,16 +1945,10 @@ class PacketManager(Screen, NumericalTextInput):
 			for x in self.packetlist:
 				status = ""
 				if self.installed_packetlist.has_key(x[0]):
-					if self.opkgAvail:
-						if self.upgradeable_packages.has_key(x[0]):
-							status = "upgradeable"
-						else:
-							status = "installed"
+					if self.upgradeable_packages.has_key(x[0]):
+						status = "upgradeable"
 					else:
-						if self.installed_packetlist[x[0]] == x[1]:
-							status = "installed"
-						else:
-							status = "upgradeable"
+						status = "installed"
 				else:
 					status = "installable"
 				self.list.append(self.buildEntryComponent(x[0], x[1], x[2], status))	
diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index 69bf80f7..359552eb 100755
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -155,9 +155,9 @@ class PluginDownloadBrowser(Screen):
 	def runInstall(self, val):
 		if val:
 			if self.type == self.DOWNLOAD:
-				self.session.openWithCallback(self.installFinished, Console, cmdlist = ["ipkg install " + "enigma2-plugin-" + self["list"].l.getCurrentSelection()[0].name])
+				self.session.openWithCallback(self.installFinished, Console, cmdlist = ["opkg install " + "enigma2-plugin-" + self["list"].l.getCurrentSelection()[0].name])
 			elif self.type == self.REMOVE:
-				self.session.openWithCallback(self.installFinished, Console, cmdlist = ["ipkg remove " + "enigma2-plugin-" + self["list"].l.getCurrentSelection()[0].name])
+				self.session.openWithCallback(self.installFinished, Console, cmdlist = ["opkg remove " + "enigma2-plugin-" + self["list"].l.getCurrentSelection()[0].name])
 
 	def setWindowTitle(self):
 		if self.type == self.DOWNLOAD:
@@ -166,17 +166,17 @@ class PluginDownloadBrowser(Screen):
 			self.setTitle(_("Remove plugins"))
 
 	def startIpkgListInstalled(self):
-		self.container.execute("ipkg list_installed enigma2-plugin-*")
+		self.container.execute("opkg list_installed enigma2-plugin-*")
 
 	def startIpkgListAvailable(self):
-		self.container.execute("ipkg list enigma2-plugin-*")
+		self.container.execute("opkg list enigma2-plugin-*")
 
 	def startRun(self):
 		self["list"].instance.hide()
 		if self.type == self.DOWNLOAD:
 			if not PluginDownloadBrowser.lastDownloadDate or (time() - PluginDownloadBrowser.lastDownloadDate) > 3600:
 				# Only update from internet once per hour
-				self.container.execute("ipkg update")
+				self.container.execute("opkg update")
 				PluginDownloadBrowser.lastDownloadDate = time()
 			else:
 				self.startIpkgListAvailable()
@@ -256,4 +256,4 @@ class PluginDownloadBrowser(Screen):
 		self.list = list
 		self["list"].l.setList(list)
 
-language.addCallback(languageChanged)
\ No newline at end of file
+language.addCallback(languageChanged)
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 3e580914..914d6bf1 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -2403,7 +2403,7 @@ void eDVBServicePlay::updateDecoder(bool sendSeekableStateChanged)
 		eDebug("getting program info failed.");
 	else
 	{
-		eDebugNoNewLine("have %d video stream(s)", program.videoStreams.size());
+		eDebugNoNewLine("have %zd video stream(s)", program.videoStreams.size());
 		if (!program.videoStreams.empty())
 		{
 			eDebugNoNewLine(" (");
@@ -2422,7 +2422,7 @@ void eDVBServicePlay::updateDecoder(bool sendSeekableStateChanged)
 			}
 			eDebugNoNewLine(")");
 		}
-		eDebugNoNewLine(", and %d audio stream(s)", program.audioStreams.size());
+		eDebugNoNewLine(", and %zd audio stream(s)", program.audioStreams.size());
 		if (!program.audioStreams.empty())
 		{
 			eDebugNoNewLine(" (");
@@ -2599,7 +2599,7 @@ void eDVBServicePlay::loadCuesheet()
 			m_cue_entries.insert(cueEntry(where, what));
 		}
 		fclose(f);
-		eDebug("%d entries", m_cue_entries.size());
+		eDebug("%zd entries", m_cue_entries.size());
 	} else
 		eDebug("cutfile not found!");
 	
diff --git a/lib/service/servicedvbrecord.cpp b/lib/service/servicedvbrecord.cpp
index 419c26ba..08cd2471 100644
--- a/lib/service/servicedvbrecord.cpp
+++ b/lib/service/servicedvbrecord.cpp
@@ -313,7 +313,7 @@ int eDVBServiceRecord::doRecord()
 
 			int timing_pid = -1, timing_pid_type = -1;
 
-			eDebugNoNewLine("RECORD: have %d video stream(s)", program.videoStreams.size());
+			eDebugNoNewLine("RECORD: have %zd video stream(s)", program.videoStreams.size());
 			if (!program.videoStreams.empty())
 			{
 				eDebugNoNewLine(" (");
@@ -335,7 +335,7 @@ int eDVBServiceRecord::doRecord()
 				}
 				eDebugNoNewLine(")");
 			}
-			eDebugNoNewLine(", and %d audio stream(s)", program.audioStreams.size());
+			eDebugNoNewLine(", and %zd audio stream(s)", program.audioStreams.size());
 			if (!program.audioStreams.empty())
 			{
 				eDebugNoNewLine(" (");
diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index b864a100..d54997a6 100644
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -167,7 +167,7 @@ public:
 		int bufferPercent;
 		int avgInRate;
 		int avgOutRate;
-		long long bufferingLeft;
+		int64_t bufferingLeft;
 		bufferInfo()
 			:bufferPercent(0), avgInRate(0), avgOutRate(0), bufferingLeft(-1)
 		{