[SCM] python-pyo/master: fix patches.

tiago at users.alioth.debian.org tiago at users.alioth.debian.org
Wed May 10 00:35:54 UTC 2017


The following commit has been merged in the master branch:
commit a002b61bd9f35c6998481d6d64d5be387f3490e8
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Tue May 9 20:35:49 2017 -0400

    fix patches.

diff --git a/debian/patches/series b/debian/patches/series
index 96b96c0..9abefab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-ePyo_paths.patch
 setup.patch
+ePyo_paths.patch
diff --git a/debian/patches/setup.patch b/debian/patches/setup.patch
index bc2921f..34c7b8f 100644
--- a/debian/patches/setup.patch
+++ b/debian/patches/setup.patch
@@ -1,15 +1,15 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -23,7 +23,7 @@
- import os, sys, py_compile
+@@ -44,7 +44,7 @@
+         return "JACK_NEW_API"
  
- pyo_version = "0.8.4"
+ pyo_version = "0.8.6"
 -build_with_jack_support = False
 +build_with_jack_support = True
  compile_externals = False
  
  macros = []
-@@ -31,12 +31,12 @@
+@@ -52,12 +52,13 @@
  main_modules = ['pyo']
  extra_macros_per_extension = [[]]
  
@@ -25,22 +25,25 @@
 +extension_names.append('_pyo64')
 +main_modules.append('pyo64')
 +extra_macros_per_extension.append([('USE_DOUBLE',None)])
++
  
  if '--only-double' in sys.argv:
      sys.argv.remove('--only-double') 
-@@ -92,11 +92,11 @@
-     libraries += ["lo"]
+@@ -116,12 +117,12 @@
+         libraries += ["lo"]
  
  # Optional Audio / Midi drivers
 -if '--use-jack' in sys.argv: 
 -    sys.argv.remove('--use-jack') 
 -    build_with_jack_support = True
--    macros.append(('USE_JACK',None))
+-    macros.append(('USE_JACK', None))
+-    macros.append((get_jack_api(), None))
 -    ad_files.append("ad_jack.c")
 +#if '--use-jack' in sys.argv: 
 +#    sys.argv.remove('--use-jack') 
 +build_with_jack_support = True
 +macros.append(('USE_JACK',None))
++macros.append((get_jack_api(), None))
 +ad_files.append("ad_jack.c")
  
  if '--use-coreaudio' in sys.argv: 

-- 
python-pyo packaging



More information about the pkg-multimedia-commits mailing list