[Scummvm-git-logs] scummvm branch-2-0 -> bd9b83233af8cf272e6e0a6303d54383e7f5534d

criezy criezy at scummvm.org
Thu Nov 30 01:05:29 CET 2017


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

Summary:
830e9e6f32 RELEASE: This is 2.0.0pre
bd9b83233a BUILD: Disable cloud, sdlnet and libcurl


Commit: 830e9e6f32b55080e4c66ea737181ecd8c556038
    https://github.com/scummvm/scummvm/commit/830e9e6f32b55080e4c66ea737181ecd8c556038
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2017-11-29T23:50:22Z

Commit Message:
RELEASE: This is 2.0.0pre

Changed paths:
    backends/platform/psp/README.PSP
    base/internal_version.h
    dists/android/AndroidManifest.xml
    dists/gph/README-GPH
    dists/gph/scummvm.ini
    dists/ios7/Info.plist
    dists/iphone/Info.plist
    dists/irix/scummvm.spec
    dists/macosx/Info.plist
    dists/macosx/dockplugin/Info.plist
    dists/openpandora/PXML.xml
    dists/openpandora/README-OPENPANDORA
    dists/openpandora/README-PND.txt
    dists/openpandora/index.html
    dists/redhat/scummvm-tools.spec
    dists/redhat/scummvm.spec
    dists/riscos/!Boot,feb
    dists/scummvm.rc
    dists/slackware/scummvm.SlackBuild
    dists/wii/meta.xml
    snapcraft.yaml


diff --git a/backends/platform/psp/README.PSP b/backends/platform/psp/README.PSP
index b2f639a..0c661ab 100644
--- a/backends/platform/psp/README.PSP
+++ b/backends/platform/psp/README.PSP
@@ -1,4 +1,4 @@
-ScummVM-PSP 2.0.0git README
+ScummVM-PSP 2.0.0pre README
 ==============================================================================
 
 Installation
diff --git a/base/internal_version.h b/base/internal_version.h
index 63b63e5..b6dabaa 100644
--- a/base/internal_version.h
+++ b/base/internal_version.h
@@ -16,4 +16,4 @@
 #define SCUMMVM_REVISION
 #endif
 
-#define SCUMMVM_VERSION "2.0.0git" SCUMMVM_REVISION
+#define SCUMMVM_VERSION "2.0.0pre" SCUMMVM_REVISION
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index 3201fbe..27c3e4b 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -4,7 +4,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		package="org.scummvm.scummvm"
 		android:versionCode="@ANDROID_VERSIONCODE@"
-		android:versionName="2.0.0git"
+		android:versionName="2.0.0pre"
 		android:sharedUserId="org.scummvm.scummvm">
 
 	<uses-sdk android:minSdkVersion="3"
diff --git a/dists/gph/README-GPH b/dists/gph/README-GPH
index 55136e5..f0ce76e 100644
--- a/dists/gph/README-GPH
+++ b/dists/gph/README-GPH
@@ -1,4 +1,4 @@
-ScummVM 2.0.0git - GPH DEVICE SPECIFIC README
+ScummVM 2.0.0pre - GPH DEVICE SPECIFIC README
 
 ------------------------------------------------------------------------
 
diff --git a/dists/gph/scummvm.ini b/dists/gph/scummvm.ini
index 339554d..564c055 100644
--- a/dists/gph/scummvm.ini
+++ b/dists/gph/scummvm.ini
@@ -1,5 +1,5 @@
 [info]
-name="ScummVM 2.0.0git"
+name="ScummVM 2.0.0pre"
 path="/scummvm/scummvm.gpe"
 icon="/scummvm/scummvm.png"
 title="/scummvm/scummvmb.png"
diff --git a/dists/ios7/Info.plist b/dists/ios7/Info.plist
index 6cc5f6e..7d3a521 100644
--- a/dists/ios7/Info.plist
+++ b/dists/ios7/Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0git</string>
+	<string>2.0.0pre</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.0git</string>
+	<string>2.0.0pre</string>
 	<key>UIApplicationExitsOnSuspend</key>
 	<false/>
 	<key>UIDeviceFamily</key>
diff --git a/dists/iphone/Info.plist b/dists/iphone/Info.plist
index a757eb6..a18a54a 100644
--- a/dists/iphone/Info.plist
+++ b/dists/iphone/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0git</string>
+	<string>2.0.0pre</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.0git</string>
+	<string>2.0.0pre</string>
 	<key>CFBundleIconFile</key>
 	<string>icon.png</string>
 	<key>CFBundleIconFiles</key>
diff --git a/dists/irix/scummvm.spec b/dists/irix/scummvm.spec
index 3e121d8..e74649e 100644
--- a/dists/irix/scummvm.spec
+++ b/dists/irix/scummvm.spec
@@ -1,5 +1,5 @@
 product scummvm
-    id "ScummVM 2.0.0git"
+    id "ScummVM 2.0.0pre"
     image sw
         id "software"
         version 18
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index ffeb9dd..4a1a12e 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>scummvm</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.0.0git, Copyright 2001-2017 The ScummVM Team</string>
+	<string>2.0.0pre, Copyright 2001-2017 The ScummVM Team</string>
 	<key>CFBundleIconFile</key>
 	<string>scummvm.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -45,9 +45,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0git</string>
+	<string>2.0.0pre</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.0git</string>
+	<string>2.0.0pre</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright 2001-2017 The ScummVM Team</string>
 	<key>NSPrincipalClass</key>
diff --git a/dists/macosx/dockplugin/Info.plist b/dists/macosx/dockplugin/Info.plist
index 7f51ef4..2548bff 100644
--- a/dists/macosx/dockplugin/Info.plist
+++ b/dists/macosx/dockplugin/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0git</string>
+	<string>2.0.0pre</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.0git</string>
+	<string>2.0.0pre</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright 2001-2017 The ScummVM Team</string>
 	<key>NSPrincipalClass</key>
diff --git a/dists/openpandora/PXML.xml b/dists/openpandora/PXML.xml
index b728e92..87d9ec6 100644
--- a/dists/openpandora/PXML.xml
+++ b/dists/openpandora/PXML.xml
@@ -6,9 +6,9 @@
         <!-- version type can be alpha, beta or release, set to release in branch -->
         <version major="2" minor="0" release="0" build="1" type="release"/>
         <!-- Both title and titles are needed -->
-        <title lang="en_US">ScummVM 2.0.0git</title>
+        <title lang="en_US">ScummVM 2.0.0pre</title>
         <titles>
-            <title lang="en_US">ScummVM 2.0.0git</title>
+            <title lang="en_US">ScummVM 2.0.0pre</title>
         </titles>
         <descriptions>
             <description lang="en_US">
diff --git a/dists/openpandora/README-OPENPANDORA b/dists/openpandora/README-OPENPANDORA
index daa3197..0e2a9d4 100644
--- a/dists/openpandora/README-OPENPANDORA
+++ b/dists/openpandora/README-OPENPANDORA
@@ -1,4 +1,4 @@
-ScummVM 2.0.0git - OPENPANDORA SPECIFIC README
+ScummVM 2.0.0pre - OPENPANDORA SPECIFIC README
 ------------------------------------------------------------------------
 Please refer to the:
 
diff --git a/dists/openpandora/README-PND.txt b/dists/openpandora/README-PND.txt
index 0a1f443..0fc2b26 100644
--- a/dists/openpandora/README-PND.txt
+++ b/dists/openpandora/README-PND.txt
@@ -1,4 +1,4 @@
-ScummVM 2.0.0git - OPENPANDORA README - HOW TO INSTALL
+ScummVM 2.0.0pre - OPENPANDORA README - HOW TO INSTALL
 ------------------------------------------------------------------------
 
 Please refer to the:
diff --git a/dists/openpandora/index.html b/dists/openpandora/index.html
index 6c241bd..8c7f5eb 100644
--- a/dists/openpandora/index.html
+++ b/dists/openpandora/index.html
@@ -5,7 +5,7 @@
 </h3>
 
 <h4>
-  <p>ScummVM 2.0.0git: OpenPandora Specific Documentation</p>
+  <p>ScummVM 2.0.0pre: OpenPandora Specific Documentation</p>
 </h4>
 
 <A href="docs/README-OPENPANDORA">ScummVM OpenPandora README</a><br/>
@@ -13,7 +13,7 @@
 <A href="http://wiki.scummvm.org/index.php/OpenPandora">ScummVM OpenPandora WiKi</a><br/>
 
 <h4>
-  <p>ScummVM 2.0.0git: General Documentation</p>
+  <p>ScummVM 2.0.0pre: General Documentation</p>
 </h4>
 
 <A href="http://www.scummvm.org/">ScummVM website</a><br/>
diff --git a/dists/redhat/scummvm-tools.spec b/dists/redhat/scummvm-tools.spec
index 8a87b95..d9a339e 100644
--- a/dists/redhat/scummvm-tools.spec
+++ b/dists/redhat/scummvm-tools.spec
@@ -7,7 +7,7 @@
 #   Prologue information
 #------------------------------------------------------------------------------
 Name		: scummvm-tools
-Version		: 2.0.0git
+Version		: 2.0.0pre
 Release		: 1
 Summary		: ScummVM-related tools
 Group		: Interpreters
@@ -67,5 +67,9 @@ rm -Rf ${RPM_BUILD_ROOT}
 #   Change Log
 #------------------------------------------------------------------------------
 %changelog
+* Thu Nov 23 2017 (2.0.0)
+  - remove own libmad since this is now in Fedora itself
+* Sat Apr 03 2010 (1.2.0)
+  - include libmad
 * Sat Mar 26 2005 (0.7.1)
   - first tools package
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index eb84b6e..5ef3212 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -7,7 +7,7 @@
 #   Prologue information
 #------------------------------------------------------------------------------
 Name		: scummvm
-Version		: 2.0.0git
+Version		: 2.0.0pre
 Release		: 1
 Summary		: Graphic adventure game interpreter
 Group		: Interpreters
diff --git a/dists/riscos/!Boot,feb b/dists/riscos/!Boot,feb
index fc6cb78..3ea3026 100644
--- a/dists/riscos/!Boot,feb
+++ b/dists/riscos/!Boot,feb
@@ -5,4 +5,4 @@ Set ScummVM$Title "ScummVM"
 Set ScummVM$Description "Play certain classic graphical point-and-click adventure games"
 Set ScummVM$Publisher "ScummVM Developers"
 Set ScummVM$Web "http://www.scummvm.org/"
-Set ScummVM$Version "2.0.0git"
+Set ScummVM$Version "2.0.0pre"
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 89c1905..f681643 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -92,13 +92,13 @@ BEGIN
             VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
             VALUE "CompanyName", "scummvm.org\0"
             VALUE "FileDescription", "http://www.scummvm.org/\0"
-            VALUE "FileVersion", "2.0.0git\0"
+            VALUE "FileVersion", "2.0.0pre\0"
             VALUE "InternalName", "scummvm\0"
             VALUE "LegalCopyright", "Copyright © 2001-2017 The ScummVM Team\0"
             VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
             VALUE "OriginalFilename", "scummvm.exe\0"
             VALUE "ProductName", "ScummVM\0"
-            VALUE "ProductVersion", "2.0.0git\0"
+            VALUE "ProductVersion", "2.0.0pre\0"
         END
     END
 
diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild
index 4a20d01..3552980 100755
--- a/dists/slackware/scummvm.SlackBuild
+++ b/dists/slackware/scummvm.SlackBuild
@@ -9,7 +9,7 @@ if [ "$TMP" = "" ]; then
 fi
 PKG=$TMP/package-scummvm
 
-VERSION=2.0.0git
+VERSION=2.0.0pre
 ARCH=i486
 BUILD=1
 
diff --git a/dists/wii/meta.xml b/dists/wii/meta.xml
index e961fd1..f4d18e3 100644
--- a/dists/wii/meta.xml
+++ b/dists/wii/meta.xml
@@ -2,7 +2,7 @@
 <app version="1">
   <name>ScummVM</name>
   <coder>The ScummVM Team</coder>
-  <version>2.0.0git at REVISION@</version>
+  <version>2.0.0pre at REVISION@</version>
   <release_date>@TIMESTAMP@</release_date>
   <short_description>Point & Click Adventures</short_description>
   <long_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 games, allowing you to play them on systems for which they were never designed!
diff --git a/snapcraft.yaml b/snapcraft.yaml
index eee5e6a..7e727c3 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: scummvm
-version: "2.0.0git"
+version: "2.0.0pre"
 summary: ScummVM
 description: |
     ScummVM is a program which allows you to run certain classic graphical


Commit: bd9b83233af8cf272e6e0a6303d54383e7f5534d
    https://github.com/scummvm/scummvm/commit/bd9b83233af8cf272e6e0a6303d54383e7f5534d
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2017-11-30T00:03:41Z

Commit Message:
BUILD: Disable cloud, sdlnet and libcurl

Changed paths:
    configure


diff --git a/configure b/configure
index 01a5592..9589152 100755
--- a/configure
+++ b/configure
@@ -128,8 +128,8 @@ done
 # Default lib behavior yes/no/auto
 _ogg=auto
 _vorbis=auto
-_sdlnet=auto
-_libcurl=auto
+_sdlnet=no
+_libcurl=no
 _tremor=auto
 _tremolo=no
 _flac=auto
@@ -167,7 +167,7 @@ _enable_prof=no
 _global_constructors=no
 _no_undefined_var_template=no
 _bink=yes
-_cloud=auto
+_cloud=no
 # Default vkeybd/keymapper/eventrec options
 _vkeybd=no
 _keymapper=no





More information about the Scummvm-git-logs mailing list