Unverified Commit 46d2a458 authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

Merge pull request #263497 from amarshall/libretro-mame2015-2016 

libretro.mame2015 & libretro.mame2016: fix build
parents b3ce4bee 98dc4cfa

pkgs/applications/emulators/retroarch/cores.nix

+2 −0
Original line number Diff line number Diff line
@@ -568,6 +568,7 @@ in 


  mame2015 = mkLibretroCore {

    core = "mame2015";

    patches = [ ./patches/mame2015-python311.patch ];

    makeFlags = [ "PYTHON=python3" ];

    extraNativeBuildInputs = [ python3 ];

    extraBuildInputs = [ alsa-lib ];
@@ -581,6 +582,7 @@ in 


  mame2016 = mkLibretroCore {

    core = "mame2016";

    patches = [ ./patches/mame2016-python311.patch ];

    extraNativeBuildInputs = [ python3 ];

    extraBuildInputs = [ alsa-lib ];

    makeFlags = [ "PYTHON_EXECUTABLE=python3" ];

pkgs/applications/emulators/retroarch/patches/mame2015-python311.patch

0 → 100644
+61 −0
Original line number Diff line number Diff line 
diff --git a/src/emu/cpu/m6502/m6502make.py b/src/emu/cpu/m6502/m6502make.py

index da29fc722a..3de641dd69 100755

--- a/src/emu/cpu/m6502/m6502make.py

+++ b/src/emu/cpu/m6502/m6502make.py

@@ -16,7 +16,7 @@ def load_opcodes(fname):

     opcodes = []

     logging.info("load_opcodes: %s", fname)

     try:

-        f = open(fname, "rU")

+        f = open(fname, "r")

     except Exception:

         err = sys.exc_info()[1]

         logging.error("cannot read opcodes file %s [%s]", fname, err)

@@ -39,7 +39,7 @@ def load_disp(fname):

     logging.info("load_disp: %s", fname)

     states = []

     try:

-        f = open(fname, "rU")

+        f = open(fname, "r")

     except Exception:

         err = sys.exc_info()[1]

         logging.error("cannot read display file %s [%s]", fname, err)

diff --git a/src/emu/cpu/m6809/m6809make.py b/src/emu/cpu/m6809/m6809make.py

index c3d5b0f66e..79f6f90cdd 100644

--- a/src/emu/cpu/m6809/m6809make.py

+++ b/src/emu/cpu/m6809/m6809make.py

@@ -14,7 +14,7 @@ def load_file(fname, lines):

 	if path != "":

 		path += '/'

 	try:

-		f = open(fname, "rU")

+		f = open(fname, "r")

 	except Exception:

 		err = sys.exc_info()[1]

 		sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err))

diff --git a/src/emu/cpu/mcs96/mcs96make.py b/src/emu/cpu/mcs96/mcs96make.py

index ec5ec37a78..7ab806a653 100644

--- a/src/emu/cpu/mcs96/mcs96make.py

+++ b/src/emu/cpu/mcs96/mcs96make.py

@@ -71,7 +71,7 @@ def __init__(self, fname, is_196):

         self.ea = {}

         self.macros = {}

         try:

-            f = open(fname, "rU")

+            f = open(fname, "r")

         except Exception:

             err = sys.exc_info()[1]

             sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err))

diff --git a/src/emu/cpu/tms57002/tmsmake.py b/src/emu/cpu/tms57002/tmsmake.py

index 62092097d9..78f9fe43cd 100755

--- a/src/emu/cpu/tms57002/tmsmake.py

+++ b/src/emu/cpu/tms57002/tmsmake.py

@@ -326,7 +326,7 @@ def ins_cmp_dasm(a, b):

 def LoadLst(filename):

     instructions = []

     ins = None

-    for n, line in enumerate(open(filename, "rU")):

+    for n, line in enumerate(open(filename, "r")):

         line = line.rstrip()

         if not line and ins:

             # new lines separate intructions

pkgs/applications/emulators/retroarch/patches/mame2016-python311.patch

0 → 100644
+74 −0
Original line number Diff line number Diff line 
diff --git a/scripts/build/verinfo.py b/scripts/build/verinfo.py

index a73d8ad268..82a80c0984 100644

--- a/scripts/build/verinfo.py

+++ b/scripts/build/verinfo.py

@@ -63,7 +63,7 @@ def extract_version(input):

 build, outfmt, srcfile, dstfile = parse_args()

 

 try:

-    fp = open(srcfile, 'rU')

+    fp = open(srcfile, 'r')

 except IOError:

     sys.stderr.write("Unable to open source file '%s'\n" % srcfile)

     sys.exit(1)

diff --git a/src/devices/cpu/m6502/m6502make.py b/src/devices/cpu/m6502/m6502make.py

index 8bcd85f8e2..557b175966 100755

--- a/src/devices/cpu/m6502/m6502make.py

+++ b/src/devices/cpu/m6502/m6502make.py

@@ -18,7 +18,7 @@ def load_opcodes(fname):

     opcodes = []

     logging.info("load_opcodes: %s", fname)

     try:

-        f = open(fname, "rU")

+        f = open(fname, "r")

     except Exception:

         err = sys.exc_info()[1]

         logging.error("cannot read opcodes file %s [%s]", fname, err)

@@ -41,7 +41,7 @@ def load_disp(fname):

     logging.info("load_disp: %s", fname)

     states = []

     try:

-        f = open(fname, "rU")

+        f = open(fname, "r")

     except Exception:

         err = sys.exc_info()[1]

         logging.error("cannot read display file %s [%s]", fname, err)

diff --git a/src/devices/cpu/m6809/m6809make.py b/src/devices/cpu/m6809/m6809make.py

index 8838b96019..e1ea25db06 100644

--- a/src/devices/cpu/m6809/m6809make.py

+++ b/src/devices/cpu/m6809/m6809make.py

@@ -16,7 +16,7 @@ def load_file(fname, lines):

 	if path != "":

 		path += '/'

 	try:

-		f = open(fname, "rU")

+		f = open(fname, "r")

 	except Exception:

 		err = sys.exc_info()[1]

 		sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err))

diff --git a/src/devices/cpu/mcs96/mcs96make.py b/src/devices/cpu/mcs96/mcs96make.py

index b4844942e3..207208d2b6 100644

--- a/src/devices/cpu/mcs96/mcs96make.py

+++ b/src/devices/cpu/mcs96/mcs96make.py

@@ -73,7 +73,7 @@ def __init__(self, fname, is_196):

         self.ea = {}

         self.macros = {}

         try:

-            f = open(fname, "rU")

+            f = open(fname, "r")

         except Exception:

             err = sys.exc_info()[1]

             sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err))

diff --git a/src/devices/cpu/tms57002/tmsmake.py b/src/devices/cpu/tms57002/tmsmake.py

index e2e12b5a4b..942ec09537 100755

--- a/src/devices/cpu/tms57002/tmsmake.py

+++ b/src/devices/cpu/tms57002/tmsmake.py

@@ -323,7 +323,7 @@ def AddInfo(self, line):

 def LoadLst(filename):

     instructions = []

     ins = None

-    for n, line in enumerate(open(filename, "rU")):

+    for n, line in enumerate(open(filename, "r")):

         line = line.rstrip()

         if not line and ins:

             # new lines separate intructions