merge of 'db3553a557f70630b0299ead528cf8868b9d65fe'

     and 'febd6fbea9748c083f400f53d4ed18480207fd5a'

diff --cc packages/scummvm/scummvm.inc
index 127754f,509caea..b35e713
--- 1/packages/scummvm/scummvm.inc
--- 2/packages/scummvm/scummvm.inc
+++ b/packages/scummvm/scummvm.inc
@@@ -3,7 -3,7 +3,7 @@@ HOMEPAGE = "http://www.scummvm.org
  SECTION = "games"
  PRIORITY = "optional"
  LICENSE = "GPL"
- PR = "r3"
 -PR = "r2"
++PR = "r4"
  
  SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2"