[gentoo-commits] gentoo-x86 commit in games-engines/renpy/files: renpy-6.14.1-remove-AVFormatParameters.patch renpy-6.14.1-av_close_input_stream.patch renpy-6.14.1-multiple-abi.patch

[Julian Ospald (hasufell)]

hasufell    13/02/27 00:20:20

  Added:                renpy-6.14.1-remove-AVFormatParameters.patch
                        renpy-6.14.1-av_close_input_stream.patch
                        renpy-6.14.1-multiple-abi.patch
  Log:
  initial import wrt #301324
  
  (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

Revision  Changes    Path
1.1                  games-engines/renpy/files/renpy-6.14.1-remove-AVFormatParameters.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/renpy/files/renpy-6.14.1-remove-AVFormatParameters.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/renpy/files/renpy-6.14.1-remove-AVFormatParameters.patch?rev=1.1&content-type=text/plain

Index: renpy-6.14.1-remove-AVFormatParameters.patch
===================================================================
---  module/ffdecode.c
+++  module/ffdecode.c
@@ -1152,7 +1152,6 @@
     AVFormatContext *ic;
     int err, i, ret, video_index, audio_index;
     AVPacket pkt1, *pkt = &pkt1;
-    AVFormatParameters params, *ap = &params;
     int codecs_locked = 0;
     
     // url_set_interrupt_cb(decode_interrupt_cb);
@@ -1162,8 +1161,6 @@
     is->video_stream = -1;
     is->audio_stream = -1;
 
-    memset(ap, 0, sizeof(*ap));
-
     is->io_context = rwops_open(is->rwops);
 
     codecs_locked = 1;



1.1                  games-engines/renpy/files/renpy-6.14.1-av_close_input_stream.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/renpy/files/renpy-6.14.1-av_close_input_stream.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/renpy/files/renpy-6.14.1-av_close_input_stream.patch?rev=1.1&content-type=text/plain

Index: renpy-6.14.1-av_close_input_stream.patch
===================================================================
--- module/ffdecode.c
+++ module/ffdecode.c
@@ -1356,7 +1356,7 @@
     if (is->video_stream >= 0)
         stream_component_close(is, is->video_stream);
     if (is->ic) {
-        av_close_input_stream(is->ic);
+        av_close_input_file(is->ic);
         is->ic = NULL;
     }
         



1.1                  games-engines/renpy/files/renpy-6.14.1-multiple-abi.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/renpy/files/renpy-6.14.1-multiple-abi.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/renpy/files/renpy-6.14.1-multiple-abi.patch?rev=1.1&content-type=text/plain

Index: renpy-6.14.1-multiple-abi.patch
===================================================================
From: Julian Ospald <hasufell@g.o>
Date: Mon Feb 25 21:35:31 UTC 2013
Subject: fix multiple abi support

--- /dev/null
+++ renpy-6.14.1-source/renpy/common.py
@@ -0,0 +1,83 @@
+# Copyright 2004-2012 Tom Rothamel <pytom@××××××××.us>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import os
+import sys
+import warnings
+from distutils.sysconfig import get_python_lib
+
+# Functions to be customized by distributors. ################################
+
+# Given the Ren'Py base directory (usually the directory containing
+# this file), this is expected to return the path to the common directory.
+def path_to_common(renpy_base):
+    return renpy_base + "/common"
+
+# Given a directory holding a Ren'Py game, this is expected to return
+# the path to a directory that will hold save files.
+def path_to_saves(gamedir):
+    import renpy #@UnresolvedImport
+    
+    if not renpy.config.save_directory:
+        return gamedir + "/saves"
+
+    # Search the path above Ren'Py for a directory named "Ren'Py Data".
+    # If it exists, then use that for our save directory.
+    path = renpy.config.renpy_base
+
+    while True:
+        if os.path.isdir(path + "/Ren'Py Data"):
+            return path + "/Ren'Py Data/" + renpy.config.save_directory
+
+        newpath = os.path.dirname(path)
+        if path == newpath:
+            break
+        path = newpath
+
+    # Otherwise, put the saves in a platform-specific location.
+    if renpy.android:
+        return gamedir + "/saves"
+
+    elif renpy.macintosh:
+        rv = "~/Library/RenPy/" + renpy.config.save_directory
+        return os.path.expanduser(rv)
+
+    elif renpy.windows:
+        if 'APPDATA' in os.environ:
+            return os.environ['APPDATA'] + "/RenPy/" + renpy.config.save_directory
+        else:
+            rv = "~/RenPy/" + renpy.config.save_directory
+            return os.path.expanduser(rv)
+
+    else:
+        rv = "~/.renpy/" + renpy.config.save_directory
+        return os.path.expanduser(rv)
+
+        
+# Returns the path to the Ren'Py base directory (containing common and
+# the launcher, usually.)
+def path_to_renpy_base():
+    renpy_base = os.path.dirname(sys.argv[0])
+    renpy_base = get_python_lib() + "/renpy@SLOT@"
+    renpy_base = os.environ.get('RENPY_BASE', renpy_base)
+    renpy_base = os.path.abspath(renpy_base)
+
+    return renpy_base
--- renpy-6.14.1-source/renpy.py
+++ renpy-6.14.1-source/renpy.py
@@ -24,65 +24,9 @@
 import os
 import sys
 import warnings
-
-# Functions to be customized by distributors. ################################
-
-# Given the Ren'Py base directory (usually the directory containing
-# this file), this is expected to return the path to the common directory.
-def path_to_common(renpy_base):
-    return renpy_base + "/common"
-
-# Given a directory holding a Ren'Py game, this is expected to return
-# the path to a directory that will hold save files.
-def path_to_saves(gamedir):
-    import renpy #@UnresolvedImport
-    
-    if not renpy.config.save_directory:
-        return gamedir + "/saves"
-
-    # Search the path above Ren'Py for a directory named "Ren'Py Data".
-    # If it exists, then use that for our save directory.
-    path = renpy.config.renpy_base
-
-    while True:
-        if os.path.isdir(path + "/Ren'Py Data"):
-            return path + "/Ren'Py Data/" + renpy.config.save_directory
-
-        newpath = os.path.dirname(path)
-        if path == newpath:
-            break
-        path = newpath
-
-    # Otherwise, put the saves in a platform-specific location.
-    if renpy.android:
-        return gamedir + "/saves"
-
-    elif renpy.macintosh:
-        rv = "~/Library/RenPy/" + renpy.config.save_directory
-        return os.path.expanduser(rv)
-
-    elif renpy.windows:
-        if 'APPDATA' in os.environ:
-            return os.environ['APPDATA'] + "/RenPy/" + renpy.config.save_directory
-        else:
-            rv = "~/RenPy/" + renpy.config.save_directory
-            return os.path.expanduser(rv)
-
-    else:
-        rv = "~/.renpy/" + renpy.config.save_directory
-        return os.path.expanduser(rv)
-
-        
-# Returns the path to the Ren'Py base directory (containing common and
-# the launcher, usually.)
-def path_to_renpy_base():
-    renpy_base = os.path.dirname(sys.argv[0])
-    renpy_base = os.environ.get('RENPY_BASE', renpy_base)
-    renpy_base = os.path.abspath(renpy_base)
-
-    return renpy_base
-
-##############################################################################
+from distutils.sysconfig import get_python_lib
+sys.path.append(get_python_lib() + "/renpy@SLOT@")
+import renpy.common as common
 
 # The version of the Mac Launcher and py4renpy that we require.
 macos_version = (6, 14, 0)
@@ -97,21 +41,9 @@
     print "Ren'Py requires at least python 2.6."
     sys.exit(0)
 
-android = ("ANDROID_PRIVATE" in os.environ)
-
-# Android requires us to add code to the main module, and to command some
-# renderers.
-if android:
-    __main__ = sys.modules["__main__"]
-    __main__.path_to_renpy_base = path_to_renpy_base
-    __main__.path_to_common = path_to_common
-    __main__.path_to_saves = path_to_saves
-    os.environ["RENPY_RENDERER"] = "gl"
-    os.environ["RENPY_GL_ENVIRON"] = "limited"
-    
 def main():
     
-    renpy_base = path_to_renpy_base()
+    renpy_base = common.path_to_renpy_base()
 
     # Add paths.
     if os.path.exists(renpy_base + "/module"):
@@ -133,14 +65,9 @@
         print >>sys.stderr, "Could not import renpy.bootstrap. Please ensure you decompressed Ren'Py"
         print >>sys.stderr, "correctly, preserving the directory structure."
         raise
-
-    if android:
-        renpy.linux = False
-        renpy.android = True
     
     renpy.bootstrap.bootstrap(renpy_base)
 
-if __name__ == "__main__":
-    main()
 
-    
+if __name__ == "__main__":
+    main()
--- renpy-6.14.1-source/renpy/main.py
+++ renpy-6.14.1-source/renpy/main.py
@@ -27,7 +27,7 @@
 import zipfile
 import subprocess
 from cPickle import loads, dumps
-import __main__
+import renpy.common as common
 
 
 def save_persistent():
@@ -172,7 +172,7 @@
     renpy.config.searchpath = [ renpy.config.gamedir ]
 
     # Find the common directory.
-    commondir = __main__.path_to_common(renpy.config.renpy_base) # E1101 @UndefinedVariable
+    commondir = common.path_to_common(renpy.config.renpy_base) # E1101 @UndefinedVariable
 
     if os.path.isdir(commondir):
         renpy.config.searchpath.append(commondir)
@@ -227,7 +227,7 @@
 
     # Find the save directory.
     if renpy.config.savedir is None:
-        renpy.config.savedir = __main__.path_to_saves(renpy.config.gamedir) # E1101 @UndefinedVariable
+        renpy.config.savedir = common.path_to_saves(renpy.config.gamedir) # E1101 @UndefinedVariable
 
     if renpy.game.args.savedir: #@UndefinedVariable
         renpy.config.savedir = renpy.game.args.savedir #@UndefinedVariable