Date: Thu, 10 Jun 2004 19:34:01 +0100 From: Lewis Thompson <lewiz@fajita.org> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/67796: Update port: multimedia/mmpython from 0.4.2 to 0.4.3 Message-ID: <20040610183401.GA5119@fajita.org> In-Reply-To: <200406101420.i5AEKP8v063055@freefall.freebsd.org> References: <200406101418.i5AEIgMi034252@black.fajita.org> <200406101420.i5AEKP8v063055@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--OXfL5xGRrasGEqWY
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Please also include the following patch. This fixes mmpython so that it
properly detects DVDs, VCDs etc. This simply changes the seek
boundaries and will be sumitted to Freevo developers shortly. Patch is
as follows: patch-freebsd-dvd:
diff -ruN disc/discinfo.py disc/discinfo.py
--- disc/discinfo.py Thu Jun 10 19:22:00 2004
+++ disc/discinfo.py Thu Jun 10 19:22:59 2004
@@ -223,22 +223,10 @@
else:
f =3D open(device,'rb')
=20
- f.seek(0x0000832d)
- if os.uname()[0] =3D=3D 'FreeBSD':
- # why doesn't seeking to 0x0000832d+40 and reading 32 work?
- # no idea, do it this way
- label =3D f.read(72);
- label =3D label[40:72]
- else: =20
- id =3D f.read(16)
- f.seek(32808, 0)
- if os.uname()[0] =3D=3D 'FreeBSD':
- # why doesn't seeking to 32808 + 829 and reading 16 work?
- # no idea, do it this way
- id =3D f.read(829);
- id =3D id[813:829]
- else:
- label =3D f.read(32)
+ f.seek(32768)
+ id =3D f.read(829)
+ label =3D id[40:72]
+ id =3D id[813:829]
=20
if CREATE_MD5_ID:
id_md5 =3D md5.new()
diff -ruN disc/dvdinfo.py disc/dvdinfo.py
--- disc/dvdinfo.py Thu Jun 10 19:22:00 2004
+++ disc/dvdinfo.py Thu Jun 10 19:23:49 2004
@@ -115,8 +115,8 @@
=20
# brute force reading of the device to find out if it is a DVD
f =3D open(device,'rb')
- f.seek(32808, 0)
- buffer =3D f.read(50000)
+ f.seek(32768, 0)
+ buffer =3D f.read(50040)
=20
if buffer.find('UDF') =3D=3D -1:
f.close()
@@ -148,8 +148,8 @@
=20
def isDVDiso(self, f):
# brute force reading of the device to find out if it is a DVD
- f.seek(32808, 0)
- buffer =3D f.read(50000)
+ f.seek(32768, 0)
+ buffer =3D f.read(50040)
=20
if buffer.find('UDF') =3D=3D -1:
return 0
diff -ruN disc/lsdvd.py disc/lsdvd.py
--- disc/lsdvd.py Thu Jun 10 19:22:00 2004
+++ disc/lsdvd.py Thu Jun 10 19:24:01 2004
@@ -173,8 +173,8 @@
=20
# brute force reading of the device to find out if it is a DVD
f =3D open(device,'rb')
- f.seek(32808, 0)
- buffer =3D f.read(50000)
+ f.seek(32768, 0)
+ buffer =3D f.read(50040)
=20
if buffer.find('UDF') =3D=3D -1:
f.close()
diff -ruN disc/vcdinfo.py disc/vcdinfo.py
--- disc/vcdinfo.py Thu Jun 10 19:22:00 2004
+++ disc/vcdinfo.py Thu Jun 10 19:24:13 2004
@@ -62,8 +62,8 @@
=20
# brute force reading of the device to find out if it is a VCD
f =3D open(device,'rb')
- f.seek(32808, 0)
- buffer =3D f.read(50000)
+ f.seek(32768, 0)
+ buffer =3D f.read(50040)
f.close()
=20
if buffer.find('SVCD') > 0 and buffer.find('TRACKS.SVD') > 0 and \
diff -ruN video/vcdinfo.py video/vcdinfo.py
--- video/vcdinfo.py Thu Jun 10 19:22:00 2004
+++ video/vcdinfo.py Thu Jun 10 19:24:29 2004
@@ -85,8 +85,8 @@
=20
# brute force reading of the bin to find out if it is a VCD
f =3D open(bin,'rb')
- f.seek(32808, 0)
- buffer =3D f.read(50000)
+ f.seek(32768, 0)
+ buffer =3D f.read(50040)
f.close()
=20
if buffer.find('SVCD') > 0 and buffer.find('TRACKS.SVD') > 0 and \
-lewiz.
--=20
I was so much older then, I'm younger than that now. --Bob Dylan, 1964.
------------------------------------------------------------------------
-| msn:purple@lewiz.net | jabber:lewiz@jabber.org | url:www.lewiz.org |-
--OXfL5xGRrasGEqWY
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)
iD8DBQFAyKmZItq0KFQv7T8RAuFTAKCbLHOw4Cu3vp4AWwmb08pwsNdqxgCgmPTP
ybKjErLDQr/V3DhJ6cHohdM=
=v5va
-----END PGP SIGNATURE-----
--OXfL5xGRrasGEqWY--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040610183401.GA5119>