Changes in python/lib/moresetuptools.py [c7d444a:f77820d]

File:

• python/lib/moresetuptools.py (modified) (3 diffs)

python/lib/moresetuptools.py

@@ -5 +5 @@
 from .gen_external import generate_external, header, output_path
 
-def get_aubio_version():
-    # read from VERSION
-    this_file_dir = os.path.dirname(os.path.abspath(__file__))
-    version_file = os.path.join(this_file_dir, '..', '..', 'VERSION')
-
-    if not os.path.isfile(version_file):
-        raise SystemError("VERSION file not found.")
-
-    for l in open(version_file).readlines():
-        #exec (l.strip())
-        if l.startswith('AUBIO_MAJOR_VERSION'):
-            AUBIO_MAJOR_VERSION = int(l.split('=')[1])
-        if l.startswith('AUBIO_MINOR_VERSION'):
-            AUBIO_MINOR_VERSION = int(l.split('=')[1])
-        if l.startswith('AUBIO_PATCH_VERSION'):
-            AUBIO_PATCH_VERSION = int(l.split('=')[1])
-        if l.startswith('AUBIO_VERSION_STATUS'):
-            AUBIO_VERSION_STATUS = l.split('=')[1].strip()[1:-1]
-
-    if AUBIO_MAJOR_VERSION is None or AUBIO_MINOR_VERSION is None \
-            or AUBIO_PATCH_VERSION is None:
-        raise SystemError("Failed parsing VERSION file.")
-
-    verstr = '.'.join(map(str, [AUBIO_MAJOR_VERSION,
-                                     AUBIO_MINOR_VERSION,
-                                     AUBIO_PATCH_VERSION]))
-
-    if AUBIO_VERSION_STATUS is not None:
-        verstr += AUBIO_VERSION_STATUS
-    return verstr
-
-def get_aubio_pyversion():
-    # convert to version for python according to pep 440
-    # see https://www.python.org/dev/peps/pep-0440/
-    verstr = get_aubio_version()
-    if '~alpha' in verstr:
-        verstr = verstr.split('~')[0] + 'a1'
-    # TODO: add rc, .dev, and .post suffixes, add numbering
-    return verstr
+from this_version import get_aubio_version
 
 # inspired from https://gist.github.com/abergmeier/9488990
@@ -113 +75 @@
     # loof for additional packages
     print("Info: looking for *optional* additional packages")
-    packages = ['libavcodec', 'libavformat', 'libavutil',
-                'libswresample', 'libavresample',
+    packages = ['libavcodec', 'libavformat', 'libavutil', 'libavresample',
+                'jack',
+                'jack',
                 'sndfile',
                 #'fftw3f',
@@ -126 +89 @@
     if 'avcodec' in ext.libraries \
             and 'avformat' in ext.libraries \
-            and 'avutil' in ext.libraries:
-        if 'swresample' in ext.libraries:
-            ext.define_macros += [('HAVE_SWRESAMPLE', 1)]
-        elif 'avresample' in ext.libraries:
-            ext.define_macros += [('HAVE_AVRESAMPLE', 1)]
-        if 'swresample' in ext.libraries or 'avresample' in ext.libraries:
-            ext.define_macros += [('HAVE_LIBAV', 1)]
+            and 'avutil' in ext.libraries \
+            and 'avresample' in ext.libraries:
+        ext.define_macros += [('HAVE_LIBAV', 1)]
+    if 'jack' in ext.libraries:
+        ext.define_macros += [('HAVE_JACK', 1)]
     if 'sndfile' in ext.libraries:
         ext.define_macros += [('HAVE_SNDFILE', 1)]