Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cc-2666: try separating compononents

Browse source 
-moved python-virtualenv install to separate install file,
 so each component can install virtualenv
This commit is contained in:
martin 2011-08-23 12:31:27 -04:00
parent 078aa1d05d
commit 4fe3baf591
7 changed files with 2 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
python_apps/python-virtualenv/3rd_party/distribute-0.6.10.tar.gz vendored Normal file
View file

Binary file not shown.

BIN
python_apps/python-virtualenv/3rd_party/pip-1.0.2.tar.gz vendored Normal file
View file

Binary file not shown.

BIN
python_apps/python-virtualenv/3rd_party/setuptools-0.6c11-py2.6.egg vendored Normal file
View file

Binary file not shown.

BIN
python_apps/python-virtualenv/airtime_virtual_env.pybundle Normal file
View file

Binary file not shown.

35
python_apps/python-virtualenv/patches/mutagen/mutagen_patch1.patch Normal file
View file

@ -0,0 +1,35 @@
Index: /usr/lib/airtime/airtime_virtualenv/lib/python2.6/site-packages/mutagen/mp3.py
===================================================================
--- /usr/lib/airtime/airtime_virtualenv/lib/python2.6/site-packages/mutagen/mp3.py (revision 108)
+++ /usr/lib/airtime/airtime_virtualenv/lib/python2.6/site-packages/mutagen/mp3.py (working copy)
@@ -151,15 +151,16 @@
self.sample_rate = self.__RATES[self.version][sample_rate]
if self.layer == 1:
- frame_length = (12 * self.bitrate / self.sample_rate + padding) * 4
+ padding *= 4
frame_size = 384
elif self.version >= 2 and self.layer == 3:
- frame_length = 72 * self.bitrate / self.sample_rate + padding
frame_size = 576
else:
- frame_length = 144 * self.bitrate / self.sample_rate + padding
frame_size = 1152
+ frame_length = frame_size / 8 * \
+ self.bitrate / self.sample_rate + padding
+
if check_second:
possible = frame_1 + frame_length
if possible > len(data) + 4:
@@ -172,9 +173,7 @@
if frame_data & 0xFFE0 != 0xFFE0:
raise HeaderNotFoundError("can't sync to second MPEG frame")
- frame_count = real_size / float(frame_length)
- samples = frame_size * frame_count
- self.length = samples / self.sample_rate
+ self.length = 8 * real_size / float(self.bitrate)
# Try to find/parse the Xing header, which trumps the above length
# and bitrate calculation.

20
python_apps/python-virtualenv/patches/mutagen/mutagen_patch2.patch Normal file
View file

@ -0,0 +1,20 @@
Index: /usr/lib/airtime/airtime_virtualenv/lib/python2.6/site-packages/mutagen/mp3.py
===================================================================
--- /usr/lib/airtime/airtime_virtualenv/lib/python2.6/site-packages/mutagen/mp3.py (revision 108)
+++ /usr/lib/airtime/airtime_virtualenv/lib/python2.6/site-packages/mutagen/mp3.py (working copy)
@@ -209,15 +209,6 @@
bytes = struct.unpack('>I', data[xing + 12:xing + 16])[0]
self.bitrate = int((bytes * 8) // self.length)
- # If the bitrate * the length is nowhere near the file
- # length, recalculate using the bitrate and file length.
- # Don't do this for very small files.
- fileobj.seek(2, 0)
- size = fileobj.tell()
- expected = (self.bitrate / 8) * self.length
- if not (size / 2 < expected < size * 2) and size > 2**16:
- self.length = size / float(self.bitrate * 8)
-
def pprint(self):
s = "MPEG %s layer %d, %d bps, %s Hz, %.2f seconds" % (
self.version, self.layer, self.bitrate, self.sample_rate,