Date: Thu, 17 Jun 2004 15:24:49 +0100 From: Lewis Thompson <purple@lewiz.net> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/68025: UPDATE PORT: multimedia/mmpython Message-ID: <20040617142449.GA12347@fajita.org> In-Reply-To: <200406162340.i5GNeFaE013949@freefall.freebsd.org> References: <200406162338.i5GNcof6000106@majic.fajita.org> <200406162340.i5GNeFaE013949@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--bjuZg6miEcdLYP6q Content-Type: multipart/mixed; boundary="7gGkHNMELEOhSGF6" Content-Disposition: inline --7gGkHNMELEOhSGF6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I think I messed that patch up. Here's a proper one ;) -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 |- --7gGkHNMELEOhSGF6 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-mmpython Content-Transfer-Encoding: quoted-printable diff -ruN mmpython.orig/Makefile mmpython/Makefile --- mmpython.orig/Makefile Thu Jun 10 20:11:48 2004 +++ mmpython/Makefile Thu Jun 17 15:19:59 2004 @@ -7,6 +7,7 @@ =20 PORTNAME=3D mmpython PORTVERSION=3D 0.4.3 +PORTREVISION=3D 1 CATEGORIES=3D multimedia python MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=3D ${PORTNAME} @@ -27,5 +28,9 @@ #USE_BZIP2=3D yes USE_PYTHON=3D yes USE_PYDISTUTILS=3Dyes +USE_REINPLACE=3D yes + +post-patch: + @${REINPLACE_CMD} -e 's|gcc -ldvdread|gcc -L${LOCALBASE}/lib -ldvdread|' = ${WRKSRC}/setup.py =20 .include <bsd.port.mk> diff -ruN mmpython.orig/files/patch-disc_discinfo.py mmpython/files/patch-d= isc_discinfo.py --- mmpython.orig/files/patch-disc_discinfo.py Thu Jun 10 20:04:24 2004 +++ mmpython/files/patch-disc_discinfo.py Thu Jun 17 15:19:59 2004 @@ -1,9 +1,17 @@ - -$FreeBSD: ports/multimedia/mmpython/files/patch-disc_discinfo.py,v 1.1 200= 4/06/10 19:04:24 krion Exp $ - ---- disc/discinfo.py.orig Thu Jun 10 20:51:51 2004 -+++ disc/discinfo.py Thu Jun 10 20:52:32 2004 -@@ -223,22 +223,10 @@ +--- disc/discinfo.py Sun Feb 8 17:44:05 2004 ++++ disc/discinfo.py Thu Jun 17 00:04:48 2004 +@@ -191,7 +191,9 @@ + =20 + fd =3D open(device, 'rb') + try: +- fd.seek(0x0000832d) ++ fd.seek(32768) # 2048 multiple boundary for FreeBSD ++ # FreeBSD doesn't return IOError unless we try and read: ++ fd.read(1) + except IOError: + fd.close() + return 3 +@@ -223,22 +225,12 @@ else: f =3D open(device,'rb') =20 @@ -23,6 +31,8 @@ - id =3D id[813:829] - else: - label =3D f.read(32) ++ # FreeBSD can only seek to 2048 multiple boundaries. ++ # Below works on Linux and FreeBSD: + f.seek(32768) + id =3D f.read(829) + label =3D id[40:72] diff -ruN mmpython.orig/files/patch-disc_dvdinfo.py mmpython/files/patch-di= sc_dvdinfo.py --- mmpython.orig/files/patch-disc_dvdinfo.py Thu Jun 10 20:04:24 2004 +++ mmpython/files/patch-disc_dvdinfo.py Thu Jun 17 15:19:59 2004 @@ -9,8 +9,8 @@ f =3D open(device,'rb') - f.seek(32808, 0) - buffer =3D f.read(50000) -+ f.seek(32768, 0) -+ buffer =3D f.read(50040) ++ f.seek(32768, 0) # FreeBSD requires seeking to a 2048 multiple bo= undary. ++ buffer =3D f.read(50040) # Read 40 more to compensate for above s= eek. =20 if buffer.find('UDF') =3D=3D -1: f.close() @@ -20,8 +20,8 @@ # 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) ++ f.seek(32768, 0) # FreeBSD requires seeking to a 2048 multiple bo= undary. ++ buffer =3D f.read(50040) # Read 40 more to compensate for above s= eek. =20 if buffer.find('UDF') =3D=3D -1: return 0 diff -ruN mmpython.orig/files/patch-disc_lsdvd.py mmpython/files/patch-disc= _lsdvd.py --- mmpython.orig/files/patch-disc_lsdvd.py Thu Jun 10 20:04:24 2004 +++ mmpython/files/patch-disc_lsdvd.py Thu Jun 17 15:19:59 2004 @@ -9,8 +9,8 @@ f =3D open(device,'rb') - f.seek(32808, 0) - buffer =3D f.read(50000) -+ f.seek(32768, 0) -+ buffer =3D f.read(50040) ++ f.seek(32768, 0) # FreeBSD requires seeking to a 2048 multiple bo= undary. ++ buffer =3D f.read(50040) # Read 40 more to compensate for above s= eek. =20 if buffer.find('UDF') =3D=3D -1: f.close() diff -ruN mmpython.orig/files/patch-disc_vcdinfo.py mmpython/files/patch-di= sc_vcdinfo.py --- mmpython.orig/files/patch-disc_vcdinfo.py Thu Jun 10 20:04:24 2004 +++ mmpython/files/patch-disc_vcdinfo.py Thu Jun 17 15:19:59 2004 @@ -10,9 +10,9 @@ - f.seek(32808, 0) - buffer =3D f.read(50000) - f.close() -+ f.seek(32768, 0) -+ buffer =3D f.read(50040) -+ f.close() ++ f.seek(32768, 0) # FreeBSD requires seeking to a 2048 multiple bo= undary. ++ buffer =3D f.read(50040) # Read 40 more to compensate for above s= eek. ++ f.close() =20 if buffer.find('SVCD') > 0 and buffer.find('TRACKS.SVD') > 0 and \ buffer.find('ENTRIES.SVD') > 0: diff -ruN mmpython.orig/files/patch-video_vcdinfo.py mmpython/files/patch-v= ideo_vcdinfo.py --- mmpython.orig/files/patch-video_vcdinfo.py Thu Jun 10 20:04:24 2004 +++ mmpython/files/patch-video_vcdinfo.py Thu Jun 17 15:21:24 2004 @@ -10,9 +10,9 @@ - f.seek(32808, 0) - buffer =3D f.read(50000) - f.close() -+ f.seek(32768, 0) -+ buffer =3D f.read(50040) -+ f.close() ++ f.seek(32768, 0) # FreeBSD requires seeking to 2048 multiple boun= dary. ++ buffer =3D f.read(50040) # Read 40 more to compensate for above s= eek.) ++ f.close( =20 if buffer.find('SVCD') > 0 and buffer.find('TRACKS.SVD') > 0 and \ buffer.find('ENTRIES.SVD') > 0: diff -ruN mmpython.orig/pkg-plist mmpython/pkg-plist --- mmpython.orig/pkg-plist Thu Jun 10 15:16:10 2004 +++ mmpython/pkg-plist Thu Jun 17 15:19:59 2004 @@ -66,6 +66,7 @@ %%PYTHON_SITELIBDIR%%/mmpython/disc/dvdinfo.py %%PYTHON_SITELIBDIR%%/mmpython/disc/dvdinfo.pyc %%PYTHON_SITELIBDIR%%/mmpython/disc/dvdinfo.pyo +%%PYTHON_SITELIBDIR%%/mmpython/disc/ifoparser.so %%PYTHON_SITELIBDIR%%/mmpython/disc/lsdvd.py %%PYTHON_SITELIBDIR%%/mmpython/disc/lsdvd.pyc %%PYTHON_SITELIBDIR%%/mmpython/disc/lsdvd.pyo --7gGkHNMELEOhSGF6-- --bjuZg6miEcdLYP6q Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFA0amxItq0KFQv7T8RAv/FAJsEQpGIRaObTqoaL2JiaNe88r/j4QCeIntO 8gU7sv1BNXFdkz/8M6IgRdU= =aQnO -----END PGP SIGNATURE----- --bjuZg6miEcdLYP6q--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040617142449.GA12347>