Codebase list soundgrain / 85f47b1
Update & rename use-distutils.patch -> fix-install.patch Scott Talbert 4 years ago
3 changed file(s) with 57 addition(s) and 213 deletion(s). Raw diff Collapse all Expand all
+56
-0
debian/patches/fix-install.patch less more
0 Description: Fix installation to comply with Debian standards
1 I tried to patch it in a generic way, so I guess it'll be useful for upstream.
2 Once accepted this patch goes away.
3 Author: Tiago Bortoletto Vaz <tiago@debian.org>
4 Last-Update: 2012-07-14
5 --- a/setup.py
6 +++ b/setup.py
7 @@ -6,6 +6,8 @@ Usage:
8 """
9
10 from setuptools import setup
11 +import glob
12 +import os.path
13
14 APP = ['Soundgrain.py']
15 APP_NAME = 'Soundgrain'
16 @@ -16,9 +18,13 @@ OPTIONS = {'argv_emulation': False,
17 'includes': 'wx.adv,wx.html,wx.xml'}
18
19 setup(
20 - name=APP_NAME,
21 - app=APP,
22 - data_files=DATA_FILES,
23 - options={'py2app': OPTIONS},
24 - setup_requires=['py2app'],
25 + name="soundgrain",
26 + author="Olivier Belanger",
27 + author_email="belangeo@gmail.com",
28 + version="6.0.1",
29 + description="A graphical interface to control granular sound synthesis modules.",
30 + url="http://ajaxsoundstudio.com/software/soundgrain/",
31 + license="GPLv3",
32 + scripts=['SoundGrain.py'],
33 + data_files=[(os.path.dirname(f), [f])for f in glob.glob('Resources/**', recursive=True) if os.path.isfile(f)],
34 )
35 --- a/SoundGrain.py
36 +++ b/SoundGrain.py
37 @@ -20,6 +20,7 @@ along with SoundGrain. If not, see <htt
38 """
39 import sys
40 import wx
41 +sys.path.insert(0, '/usr/share/soundgrain')
42 from Resources.constants import *
43 from Resources.splash import SoundGrainSplashScreen
44 from Resources.MainFrame import MainFrame
45 --- a/Resources/constants.py
46 +++ b/Resources/constants.py
47 @@ -44,7 +44,7 @@ if '/SoundGrain.app' in os.getcwd():
48 spindex = currentw.index('/SoundGrain.app')
49 os.chdir(currentw[:spindex])
50 else:
51 - RESOURCES_PATH = os.path.join(os.getcwd(), 'Resources')
52 + RESOURCES_PATH = os.path.dirname(os.path.abspath(__file__))
53
54 if not os.path.isdir(RESOURCES_PATH) and sys.platform == "win32":
55 RESOURCES_PATH = os.path.join(os.getenv("ProgramFiles"), "SoundGrain", "Resources")
+1
-1
debian/patches/series less more
00 fix-pyo-imports.patch
1 use-distutils.patch
1 fix-install.patch
+0
-212
debian/patches/use-distutils.patch less more
0 Description: Use distutils to comply with Debian standards
1 I tried to patch it in a generic way, so I guess it'll be useful for upstream.
2 Once accepted this patch goes away.
3 Author: Tiago Bortoletto Vaz <tiago@debian.org>
4 Last-Update: 2012-07-14
5 --- a/setup.py
6 +++ b/setup.py
7 @@ -16,9 +16,18 @@ OPTIONS = {'argv_emulation': False,
8 'includes': 'wx.adv,wx.html,wx.xml'}
9
10 setup(
11 - name=APP_NAME,
12 - app=APP,
13 - data_files=DATA_FILES,
14 - options={'py2app': OPTIONS},
15 - setup_requires=['py2app'],
16 + name="soundgrain",
17 + author="Olivier Belanger",
18 + author_email="belangeo@gmail.com",
19 + version="6.0.1",
20 + description="A graphical interface to control granular sound synthesis modules.",
21 + url="http://ajaxsoundstudio.com/software/soundgrain/",
22 + license="GPLv3",
23 + package_dir={'soundgrain': ''},
24 + packages=['soundgrain.Resources'],
25 + py_modules=['soundgrain.__init__'], #workaround to have Resources under soundgrain dir
26 + scripts=['SoundGrain.py'],
27 + package_data={
28 + 'soundgrain.Resources': ['images/*', 'new_soundgrain_file.sg', 'SoundGrainDocIcon.icns', 'SoundGrainDocIcon.ico', 'SoundGrain.icns', 'SoundGrain.ico', 'SoundGrainSplash.png'],
29 + }
30 )
31 --- a/SoundGrain.py
32 +++ b/SoundGrain.py
33 @@ -20,9 +20,9 @@ along with SoundGrain. If not, see <htt
34 """
35 import sys
36 import wx
37 -from Resources.constants import *
38 -from Resources.splash import SoundGrainSplashScreen
39 -from Resources.MainFrame import MainFrame
40 +from soundgrain.Resources.constants import *
41 +from soundgrain.Resources.splash import SoundGrainSplashScreen
42 +from soundgrain.Resources.MainFrame import MainFrame
43
44 class SoundGrainApp(wx.App):
45 def __init__(self, *args, **kwargs):
46 --- a/Resources/MidiSettings.py
47 +++ b/Resources/MidiSettings.py
48 @@ -19,9 +19,9 @@ along with SoundGrain. If not, see <htt
49 """
50
51 import wx, sys
52 -from pyolib._wxwidgets import ControlSlider
53 -from .constants import BACKGROUND_COLOUR, ensureNFD
54 -from Resources.audio import checkForMidiDrivers
55 +from pyo.lib._wxwidgets import ControlSlider
56 +from soundgrain.Resources.constants import BACKGROUND_COLOUR, ensureNFD
57 +from soundgrain.Resources.audio import checkForMidiDrivers
58
59 class MidiSettings(wx.Frame):
60 def __init__(self, parent, surface, sg_audio, miDriver):
61 --- a/Resources/Trajectory.py
62 +++ b/Resources/Trajectory.py
63 @@ -20,7 +20,7 @@ along with SoundGrain. If not, see <htt
64 """
65 import wx
66 from math import sin, pi, sqrt, floor
67 -from Resources.Biquad_Filter import BiquadLP
68 +from soundgrain.Resources.Biquad_Filter import BiquadLP
69
70 def chooseColour(i, numlines=24):
71 def clip(x):
72 --- a/Resources/constants.py
73 +++ b/Resources/constants.py
74 @@ -17,7 +17,7 @@ You should have received a copy of the G
75 along with SoundGrain. If not, see <http://www.gnu.org/licenses/>.
76 """
77
78 -import os, sys, unicodedata
79 +import os, sys, unicodedata, soundgrain
80
81 if sys.version_info[0] < 3:
82 unicode_t = unicode
83 @@ -44,7 +44,7 @@ if '/SoundGrain.app' in os.getcwd():
84 spindex = currentw.index('/SoundGrain.app')
85 os.chdir(currentw[:spindex])
86 else:
87 - RESOURCES_PATH = os.path.join(os.getcwd(), 'Resources')
88 + RESOURCES_PATH = soundgrain.Resources.__path__[0]
89
90 if not os.path.isdir(RESOURCES_PATH) and sys.platform == "win32":
91 RESOURCES_PATH = os.path.join(os.getenv("ProgramFiles"), "SoundGrain", "Resources")
92 --- /dev/null
93 +++ b/__init__.py
94 @@ -0,0 +1,2 @@
95 +
96 +
97 --- a/Resources/CommandFrame.py
98 +++ b/Resources/CommandFrame.py
99 @@ -19,8 +19,8 @@ along with SoundGrain. If not, see <htt
100
101 import wx, os, markdown, webbrowser
102 import wx.html as html
103 -from Resources.constants import DOCUMENTATION_PATH
104 -from pyolib._wxwidgets import BACKGROUND_COLOUR
105 +from soundgrain.Resources.constants import DOCUMENTATION_PATH
106 +from pyo.lib._wxwidgets import BACKGROUND_COLOUR
107
108 class MyHtmlWindow(html.HtmlWindow):
109 def __init__(self, parent):
110 --- a/Resources/ControlPanel.py
111 +++ b/Resources/ControlPanel.py
112 @@ -18,10 +18,10 @@ along with SoundGrain. If not, see <htt
113 """
114 import os, math, random, wx
115 import wx.lib.scrolledpanel as scrolled
116 -from Resources.constants import *
117 -from Resources.audio import soundInfo
118 -from Resources.widgets import ControlKnob
119 -from pyolib._wxwidgets import ControlSlider, VuMeter, BACKGROUND_COLOUR
120 +from soundgrain.Resources.constants import *
121 +from soundgrain.Resources.audio import soundInfo
122 +from soundgrain.Resources.widgets import ControlKnob
123 +from pyo.lib._wxwidgets import ControlSlider, VuMeter, BACKGROUND_COLOUR
124
125 class ControlPanel(scrolled.ScrolledPanel):
126 def __init__(self, parent, surface):
127 --- a/Resources/DrawingSurface.py
128 +++ b/Resources/DrawingSurface.py
129 @@ -17,10 +17,10 @@ You should have received a copy of the G
130 along with SoundGrain. If not, see <http://www.gnu.org/licenses/>.
131 """
132 import wx, os, math
133 -from Resources.constants import *
134 -from Resources.FxBall import FxBall
135 -from Resources.Trajectory import Trajectory
136 -from pyolib._wxwidgets import BACKGROUND_COLOUR
137 +from soundgrain.Resources.constants import *
138 +from soundgrain.Resources.FxBall import FxBall
139 +from soundgrain.Resources.Trajectory import Trajectory
140 +from pyo.lib._wxwidgets import BACKGROUND_COLOUR
141
142 class MyFileDropTarget(wx.FileDropTarget):
143 def __init__(self, window):
144 --- a/Resources/MainFrame.py
145 +++ b/Resources/MainFrame.py
146 @@ -18,15 +18,15 @@ You should have received a copy of the G
147 along with SoundGrain. If not, see <http://www.gnu.org/licenses/>.
148 """
149 import os, wx, time
150 -from Resources.constants import *
151 -from Resources.audio import *
152 -from Resources.Modules import *
153 -from pyolib._wxwidgets import Grapher, BACKGROUND_COLOUR
154 -from Resources.Trajectory import Trajectory
155 -from Resources.MidiSettings import MidiSettings
156 -from Resources.CommandFrame import CommandFrame
157 -from Resources.DrawingSurface import DrawingSurface
158 -from Resources.ControlPanel import ControlPanel
159 +from soundgrain.Resources.constants import *
160 +from soundgrain.Resources.audio import *
161 +from soundgrain.Resources.Modules import *
162 +from pyo.lib._wxwidgets import Grapher, BACKGROUND_COLOUR
163 +from soundgrain.Resources.Trajectory import Trajectory
164 +from soundgrain.Resources.MidiSettings import MidiSettings
165 +from soundgrain.Resources.CommandFrame import CommandFrame
166 +from soundgrain.Resources.DrawingSurface import DrawingSurface
167 +from soundgrain.Resources.ControlPanel import ControlPanel
168
169 if sys.version_info[0] < 3:
170 import xmlrpclib
171 --- a/Resources/widgets.py
172 +++ b/Resources/widgets.py
173 @@ -1,7 +1,7 @@
174 import math, wx
175 from wx.lib.embeddedimage import PyEmbeddedImage
176 -from pyolib._wxwidgets import BACKGROUND_COLOUR
177 -from Resources.constants import *
178 +from pyo.lib._wxwidgets import BACKGROUND_COLOUR
179 +from soundgrain.Resources.constants import *
180
181 KNOB = PyEmbeddedImage(
182 "iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABHNCSVQICAgIfAhkiAAAAAlw"
183 --- a/Resources/Modules.py
184 +++ b/Resources/Modules.py
185 @@ -19,7 +19,7 @@ along with SoundGrain. If not, see <htt
186
187 import wx
188 from pyo import rescale
189 -from pyolib._wxwidgets import ControlSlider
190 +from pyo.lib._wxwidgets import ControlSlider
191 from .constants import BACKGROUND_COLOUR, PLATFORM
192
193 class SGControlSlider(ControlSlider):
194 --- a/Resources/FxBall.py
195 +++ b/Resources/FxBall.py
196 @@ -18,7 +18,7 @@ along with SoundGrain. If not, see <htt
197 """
198 import wx, math
199 from .constants import *
200 -from pyolib._wxwidgets import ControlSlider
201 +from pyo.lib._wxwidgets import ControlSlider
202
203 class FxBallControls(wx.Frame):
204 def __init__(self, parent, fxball, sg_audio, size=(270, 200)):
205 @@ -275,4 +275,4 @@ class FxBall():
206 self.controls.Show()
207
208 def hideControls(self):
209 - self.controls.Hide()
210 \ No newline at end of file
211 + self.controls.Hide()