[Scummvm-git-logs] scummvm master -> 404657d80d9e21c31771bdeec9b58317ec3fd938
csnover
csnover at users.noreply.github.com
Thu Nov 23 21:04:05 CET 2017
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2dfa1fa71e DEVTOOLS: Add Snap manifest to update-version.pl
583c7cf622 ANDROID: Clean up AndroidManifest.xml
404657d80d ANDROID: Remove unnecessary additional activity
Commit: 2dfa1fa71e07385e5bcc1e5da6cb34d88561dc7c
https://github.com/scummvm/scummvm/commit/2dfa1fa71e07385e5bcc1e5da6cb34d88561dc7c
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-11-23T14:02:55-06:00
Commit Message:
DEVTOOLS: Add Snap manifest to update-version.pl
Changed paths:
A snapcraft.yaml.in
devtools/update-version.pl
snapcraft.yaml
diff --git a/devtools/update-version.pl b/devtools/update-version.pl
index 0e2879f..75f6f0e 100755
--- a/devtools/update-version.pl
+++ b/devtools/update-version.pl
@@ -51,6 +51,7 @@ my @subs_files = qw(
dists/gph/scummvm.ini
dists/riscos/!Boot,feb
backends/platform/psp/README.PSP
+ snapcraft.yaml
);
my %subs = (
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 178a323..eee5e6a 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
name: scummvm
-version: "1.9.0git"
+version: "2.0.0git"
summary: ScummVM
description: |
ScummVM is a program which allows you to run certain classic graphical
diff --git a/snapcraft.yaml.in b/snapcraft.yaml.in
new file mode 100644
index 0000000..a954777
--- /dev/null
+++ b/snapcraft.yaml.in
@@ -0,0 +1,63 @@
+name: scummvm
+version: "@VERSION@"
+summary: ScummVM
+description: |
+ ScummVM is a program which allows you to run certain classic graphical
+ point-and-click adventure games, provided you already have their data
+ files. The clever part about this: ScummVM just replaces the executables
+ shipped with the game, allowing you to play them on systems for which
+ they were never designed!
+confinement: strict
+
+apps:
+ scummvm:
+ command: scummvm
+ plugs: [x11, home, pulseaudio, unity7, opengl]
+
+parts:
+ scummvm:
+ source: .
+ plugin: autotools
+# Quick test build
+# configflags:
+# - --disable-all-engines
+# - --enable-engine=scumm
+ build-packages:
+ - g++
+ - make
+ - libsdl2-dev
+ - libjpeg62-dev
+ - libmpeg2-4-dev
+ - libogg-dev
+ - libvorbis-dev
+ - libflac-dev
+ - libmad0-dev
+ - libpng12-dev
+ - libtheora-dev
+ - libfaad-dev
+ - libfluidsynth-dev
+ - libfreetype6-dev
+ - zlib1g-dev
+ - libunity-dev
+ stage-packages:
+ - libicu55
+ - libasound2
+ - libc6
+ - libfaad2
+ - libflac8
+ - libfluidsynth1
+ - libgl1-mesa-dri
+ - libgl1-mesa-glx
+ - libjpeg62
+ - libjpeg8
+ - libmad0
+ - libmpeg2-4
+ - libogg0
+ - libpng12-0
+ - libsdl2-2.0-0
+ - libsndio6.1
+ - libstdc++6
+ - libtheora0
+ - libvorbis0a
+ - libvorbisfile3
+ - zlib1g
Commit: 583c7cf622db1a6d168c7498ed0aef8c2162d26c
https://github.com/scummvm/scummvm/commit/583c7cf622db1a6d168c7498ed0aef8c2162d26c
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-11-23T14:02:55-06:00
Commit Message:
ANDROID: Clean up AndroidManifest.xml
Keep uses-flags at the top to avoid them getting buried below
the activities, update target SDK to the minimum supported by
current Android SDKs, make Wi-Fi optional, and add screenSize
configuration change recommended by the Android documentation since
orientation is already supported.
Changed paths:
dists/android/AndroidManifest.xml
dists/android/AndroidManifest.xml.in
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index d4c40a8..d49cd51 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -1,16 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- NB: android:versionCode needs to be bumped for formal releases -->
+<!-- NB: android:versionCode needs to be bumped for formal releases -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.scummvm.scummvm"
android:versionCode="@ANDROID_VERSIONCODE@"
android:versionName="2.0.0git"
android:sharedUserId="org.scummvm.scummvm">
- <!-- This version works on Android 1.5 (SDK 3) and newer, but we
- want Android 2.2 (SDK 8) defaults and features. -->
<uses-sdk android:minSdkVersion="3"
- android:targetSdkVersion="8"/>
+ android:targetSdkVersion="14"/>
+
+ <uses-permission
+ android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+ <uses-permission
+ android:name="android.permission.ACCESS_WIFI_STATE"/>
+
+ <uses-feature
+ android:name="android.hardware.wifi"
+ android:required="false"/>
+
+ <uses-feature
+ android:name="android.hardware.screen.landscape"
+ android:required="false"/>
+
+ <uses-feature
+ android:name="android.hardware.touchscreen"
+ android:required="false"/>
+
+ <uses-feature
+ android:name="android.software.leanback"
+ android:required="false"/>
<application
android:label="@string/app_name"
@@ -20,7 +40,7 @@
<activity android:name=".ScummVMActivity"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:screenOrientation="landscape"
- android:configChanges="orientation|keyboardHidden"
+ android:configChanges="orientation|keyboardHidden|screenSize"
android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -37,18 +57,4 @@
</intent-filter>
</activity>
</application>
-
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" android:required="true"/>
-
- <uses-feature android:name="android.hardware.screen.landscape"
- android:required="false" />
-
- <uses-feature android:name="android.hardware.touchscreen"
- android:required="false" />
-
- <uses-feature android:name="android.software.leanback"
- android:required="false" />
-
</manifest>
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
index 9601425..957ec12 100644
--- a/dists/android/AndroidManifest.xml.in
+++ b/dists/android/AndroidManifest.xml.in
@@ -1,16 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- NB: android:versionCode needs to be bumped for formal releases -->
+<!-- NB: android:versionCode needs to be bumped for formal releases -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.scummvm.scummvm"
android:versionCode="@ANDROID_VERSIONCODE@"
android:versionName="@VERSION@"
android:sharedUserId="org.scummvm.scummvm">
- <!-- This version works on Android 1.5 (SDK 3) and newer, but we
- want Android 2.2 (SDK 8) defaults and features. -->
<uses-sdk android:minSdkVersion="3"
- android:targetSdkVersion="8"/>
+ android:targetSdkVersion="14"/>
+
+ <uses-permission
+ android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+ <uses-permission
+ android:name="android.permission.ACCESS_WIFI_STATE"/>
+
+ <uses-feature
+ android:name="android.hardware.wifi"
+ android:required="false"/>
+
+ <uses-feature
+ android:name="android.hardware.screen.landscape"
+ android:required="false"/>
+
+ <uses-feature
+ android:name="android.hardware.touchscreen"
+ android:required="false"/>
+
+ <uses-feature
+ android:name="android.software.leanback"
+ android:required="false"/>
<application
android:label="@string/app_name"
@@ -20,7 +40,7 @@
<activity android:name=".ScummVMActivity"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:screenOrientation="landscape"
- android:configChanges="orientation|keyboardHidden"
+ android:configChanges="orientation|keyboardHidden|screenSize"
android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -37,18 +57,4 @@
</intent-filter>
</activity>
</application>
-
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" android:required="true"/>
-
- <uses-feature android:name="android.hardware.screen.landscape"
- android:required="false" />
-
- <uses-feature android:name="android.hardware.touchscreen"
- android:required="false" />
-
- <uses-feature android:name="android.software.leanback"
- android:required="false" />
-
</manifest>
Commit: 404657d80d9e21c31771bdeec9b58317ec3fd938
https://github.com/scummvm/scummvm/commit/404657d80d9e21c31771bdeec9b58317ec3fd938
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-11-23T14:02:55-06:00
Commit Message:
ANDROID: Remove unnecessary additional activity
For an unknown reason, having a second activity for Android TV
(Leanback) caused ScummVM to be broken on some Android devices.
According to Android documentation, TV can be supported in the same
activity as everything else, so merge the two together.
Fixes Trac#10024.
Changed paths:
dists/android/AndroidManifest.xml
dists/android/AndroidManifest.xml.in
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index d49cd51..3201fbe 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -39,6 +39,7 @@
android:icon="@drawable/scummvm">
<activity android:name=".ScummVMActivity"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+ android:banner="@drawable/leanback_icon"
android:screenOrientation="landscape"
android:configChanges="orientation|keyboardHidden|screenSize"
android:windowSoftInputMode="adjustResize">
@@ -46,15 +47,8 @@
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
<category android:name="tv.ouya.intent.category.GAME"/>
- </intent-filter>
- </activity>
- <activity android:name=".ScummVMActivity"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
- android:banner="@drawable/leanback_icon">
- <intent-filter>
- <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
- </intent-filter>
+ </intent-filter>
</activity>
</application>
</manifest>
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
index 957ec12..6cd7601 100644
--- a/dists/android/AndroidManifest.xml.in
+++ b/dists/android/AndroidManifest.xml.in
@@ -39,6 +39,7 @@
android:icon="@drawable/scummvm">
<activity android:name=".ScummVMActivity"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+ android:banner="@drawable/leanback_icon"
android:screenOrientation="landscape"
android:configChanges="orientation|keyboardHidden|screenSize"
android:windowSoftInputMode="adjustResize">
@@ -46,15 +47,8 @@
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
<category android:name="tv.ouya.intent.category.GAME"/>
- </intent-filter>
- </activity>
- <activity android:name=".ScummVMActivity"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
- android:banner="@drawable/leanback_icon">
- <intent-filter>
- <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
- </intent-filter>
+ </intent-filter>
</activity>
</application>
</manifest>
More information about the Scummvm-git-logs
mailing list