[Scummvm-cvs-logs] scummvm branch-1-4 -> d57a2fc5fbf0b3ce8952c8cbf1ca7ea5eba577a5

fuzzie fuzzie at fuzzie.org
Thu Oct 27 05:41:42 CEST 2011


This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
80a92cf3d3 ANDROID: Fix plugins on Android 3.1+.
7c04fbb8ca ANDROID: Add a shared user id.
18e646f887 ANDROID: Move from org.inodes.gus to org.scummvm.
5628bb6cd4 ANDROID: Point the default savepath to external storage.
d57a2fc5fb ANDROID: Match versions when checking for plugins.


Commit: 80a92cf3d304cb7f38504265507256f90e75443e
    https://github.com/scummvm/scummvm/commit/80a92cf3d304cb7f38504265507256f90e75443e
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-10-26T10:58:34-07:00

Commit Message:
ANDROID: Fix plugins on Android 3.1+.

Android 3.1 changed the default behaviour for broadcasts so that it
doens't wake up non-running receivers, so we need to override that.
(cherry picked from commit ff3f4d9493d66b034119f0ff15657c9e8cd1b1a8)

Changed paths:
    backends/platform/android/org/inodes/gus/scummvm/Unpacker.java




Commit: 7c04fbb8caf450ef13dc2aef227b6d43445f2be6
    https://github.com/scummvm/scummvm/commit/7c04fbb8caf450ef13dc2aef227b6d43445f2be6
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-10-26T10:59:52-07:00

Commit Message:
ANDROID: Add a shared user id.

Otherwise the plugins fail to run on modern Android because they're set
to run in-process but they're not allowed to do so.
(cherry picked from commit 456b950c527da116e4132ed9e3e260419ac34ff0)

Conflicts:

	dists/android/AndroidManifest.xml
	dists/android/plugin-manifest.xml

Changed paths:
    dists/android/AndroidManifest.xml
    dists/android/AndroidManifest.xml.in
    dists/android/plugin-manifest.xml
    dists/android/plugin-manifest.xml.in




Commit: 18e646f8871460057940c84cbb541fcbe1cf73e8
    https://github.com/scummvm/scummvm/commit/18e646f8871460057940c84cbb541fcbe1cf73e8
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-10-26T11:00:17-07:00

Commit Message:
ANDROID: Move from org.inodes.gus to org.scummvm.
(cherry picked from commit 44b7f3aed52b1213995f9e19e4395f4350997b01)

Changed paths:
  A backends/platform/android/org/scummvm/scummvm/EditableSurfaceView.java
  A backends/platform/android/org/scummvm/scummvm/PluginProvider.java
  A backends/platform/android/org/scummvm/scummvm/ScummVM.java
  A backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
  A backends/platform/android/org/scummvm/scummvm/ScummVMApplication.java
  A backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java
  A backends/platform/android/org/scummvm/scummvm/Unpacker.java
  R backends/platform/android/org/inodes/gus/scummvm/EditableSurfaceView.java
  R backends/platform/android/org/inodes/gus/scummvm/PluginProvider.java
  R backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
  R backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java
  R backends/platform/android/org/inodes/gus/scummvm/ScummVMApplication.java
  R backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java
  R backends/platform/android/org/inodes/gus/scummvm/Unpacker.java
    backends/platform/android/android.mk
    backends/platform/android/jni.cpp
    dists/android/AndroidManifest.xml
    dists/android/AndroidManifest.xml.in
    dists/android/plugin-manifest.xml
    dists/android/plugin-manifest.xml.in
    dists/android/res/layout/main.xml




Commit: 5628bb6cd4a81328aab301004132742e384687d4
    https://github.com/scummvm/scummvm/commit/5628bb6cd4a81328aab301004132742e384687d4
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-10-26T11:00:26-07:00

Commit Message:
ANDROID: Point the default savepath to external storage.

(If that fails, fall back to a readable app-specific directory.)
(cherry picked from commit 80e55c5e78a5161bda41b730892e1a853c872ccb)

Changed paths:
    backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java




Commit: d57a2fc5fbf0b3ce8952c8cbf1ca7ea5eba577a5
    https://github.com/scummvm/scummvm/commit/d57a2fc5fbf0b3ce8952c8cbf1ca7ea5eba577a5
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-10-26T11:00:39-07:00

Commit Message:
ANDROID: Match versions when checking for plugins.
(cherry picked from commit 764ffff578d9650621a82ddc5bd5c9530940c5ae)

Changed paths:
    backends/platform/android/org/scummvm/scummvm/PluginProvider.java
    backends/platform/android/org/scummvm/scummvm/ScummVMApplication.java
    backends/platform/android/org/scummvm/scummvm/Unpacker.java








More information about the Scummvm-git-logs mailing list