diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /media-libs/portmidi/files | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'media-libs/portmidi/files')
-rw-r--r-- | media-libs/portmidi/files/portmidi-217-python.patch | 25 | ||||
-rw-r--r-- | media-libs/portmidi/files/portmidi-217-r4-python.patch (renamed from media-libs/portmidi/files/portmidi-217-r3-python.patch) | 16 |
2 files changed, 7 insertions, 34 deletions
diff --git a/media-libs/portmidi/files/portmidi-217-python.patch b/media-libs/portmidi/files/portmidi-217-python.patch deleted file mode 100644 index 5682c3344358..000000000000 --- a/media-libs/portmidi/files/portmidi-217-python.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- portmidi/pm_python/setup.py -+++ portmidi/pm_python/setup.py -@@ -15,12 +15,10 @@ - - - DESCRIPTION = open('README_PYTHON.txt').read() --CHANGES = open('CHANGES.txt').read() --TODO = open('TODO.txt').read() - - EXTRAS = {} - --long_description = DESCRIPTION + CHANGES + TODO -+long_description = DESCRIPTION - #import sys - #if "checkdocs" in sys.argv: - # print long_description -@@ -173,7 +171,8 @@ - EXTENSION = dict( - ext_modules=[ - Extension("pyportmidi._pyportmidi", [os.path.join("pyportmidi", "_pyportmidi.pyx")], - library_dirs=["./linux"], -+ include_dirs=["../pm_common", "../porttime"], - libraries = ["portmidi", "asound", "pthread"] - ) - ] diff --git a/media-libs/portmidi/files/portmidi-217-r3-python.patch b/media-libs/portmidi/files/portmidi-217-r4-python.patch index d4024710fa39..23ef6c3add1e 100644 --- a/media-libs/portmidi/files/portmidi-217-r3-python.patch +++ b/media-libs/portmidi/files/portmidi-217-r4-python.patch @@ -1,8 +1,7 @@ -diff --git a/pm_python/setup.py b/pm_python/setup.py -index 14ab1c7..5b1e7c0 100644 ---- a/pm_python/setup.py -+++ b/pm_python/setup.py -@@ -15,12 +15,10 @@ except ImportError: +diff -Naur portmidi-a/pm_python/setup.py portmidi-b/pm_python/setup.py +--- portmidi-a/pm_python/setup.py 2010-09-26 15:32:44.000000000 -0400 ++++ portmidi-b/pm_python/setup.py 2020-03-19 12:34:34.398365103 -0400 +@@ -15,12 +15,10 @@ DESCRIPTION = open('README_PYTHON.txt').read() @@ -16,7 +15,7 @@ index 14ab1c7..5b1e7c0 100644 #import sys #if "checkdocs" in sys.argv: # print long_description -@@ -142,7 +140,7 @@ PACKAGEDATA.update(EXTRAS) +@@ -142,7 +140,7 @@ if sys.platform == 'win32': @@ -25,7 +24,7 @@ index 14ab1c7..5b1e7c0 100644 EXTENSION = dict( ext_modules=[ Extension("pyportmidi._pyportmidi", [os.path.join("pyportmidi", "_pyportmidi.pyx")], -@@ -154,7 +152,7 @@ if sys.platform == 'win32': +@@ -154,7 +152,7 @@ ] ) elif sys.platform == 'darwin': @@ -34,7 +33,7 @@ index 14ab1c7..5b1e7c0 100644 library_dirs = ["/usr/local/lib"] include_dirs = ["/usr/local/include"] EXTENSION = dict( -@@ -169,11 +167,12 @@ elif sys.platform == 'darwin': +@@ -169,11 +167,11 @@ ] ) else: @@ -44,7 +43,6 @@ index 14ab1c7..5b1e7c0 100644 ext_modules=[ Extension("pyportmidi._pyportmidi", [os.path.join("pyportmidi", "_pyportmidi.pyx")], - library_dirs=["./linux"], -+ library_dirs=["../../portmidi*build"], + include_dirs=["../pm_common", "../porttime"], libraries = ["portmidi", "asound", "pthread"] ) |