From owner-freebsd-ports Sat Feb 8 17:38:54 2003 Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AAC5B37B401; Sat, 8 Feb 2003 17:38:51 -0800 (PST) Received: from creme-brulee.marcuscom.com (rdu57-17-158.nc.rr.com [66.57.17.158]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA4E343F93; Sat, 8 Feb 2003 17:38:50 -0800 (PST) (envelope-from marcus@FreeBSD.org) Received: from [192.168.1.4] (shumai.marcuscom.com [192.168.1.4]) by creme-brulee.marcuscom.com (8.12.6/8.12.6) with ESMTP id h191cfRA009854; Sat, 8 Feb 2003 20:38:41 -0500 (EST) (envelope-from marcus@FreeBSD.org) Subject: Calling all cdparanoia users trying to build gnomevfs2.... From: Joe Marcus Clarke To: gnome@FreeBSD.org Cc: ports@FreeBSD.org Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-ltvy/NlIGuWcaH11MTo5" Organization: FreeBSD, Inc. Message-Id: <1044754726.66333.31.camel@shumai.marcuscom.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.2 Date: 08 Feb 2003 20:38:46 -0500 X-Spam-Status: No, hits=-1.1 required=5.0 tests=AWL,NOSPAM_INC,PGP_SIGNATURE_2,SPAM_PHRASE_00_01 version=2.44 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org --=-ltvy/NlIGuWcaH11MTo5 Content-Type: multipart/mixed; boundary="=-o0d0e3LC5QXDp3uXkyf/" --=-o0d0e3LC5QXDp3uXkyf/ Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Attached is a patch that should fix the build problems people are encountering when trying to build gnomevfs2 with cdparanoia installed.=20 Can you let me know if it works? Stick the attached patch in /usr/ports/devel/gnomevfs2/files, then try to build gnomevfs2. Thanks. Joe --=20 Joe Marcus Clarke FreeBSD GNOME Team :: marcus@FreeBSD.org http://www.FreeBSD.org/gnome --=-o0d0e3LC5QXDp3uXkyf/ Content-Disposition: attachment; filename=patch-modules_cdda-method.c Content-Transfer-Encoding: quoted-printable Content-Type: text/x-c; name=patch-modules_cdda-method.c; charset=ISO-8859-1 --- modules/cdda-method.c.orig Sat Feb 8 20:20:03 2003 +++ modules/cdda-method.c Sat Feb 8 20:30:50 2003 @@ -623,7 +623,11 @@ // Check and see if we already have opened and stashed this drive if (!use_base) { if (global_context !=3D NULL) { +#ifdef __FreeBSD__ + if (strcmp (drive->dev->device_path, global_context->drive->dev->de= vice_path) =3D=3D 0) { +#else if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device= _name) =3D=3D 0) { +#endif use_cache =3D TRUE; cdda_close (drive); gnome_vfs_file_info_copy (file_info, global_context->file_info); @@ -709,7 +713,11 @@ if (!use_base) { // Check for cache if (global_context !=3D NULL) { +#ifdef __FreeBSD__ + if (strcmp (drive->dev->device_path, global_context->drive->dev->d= evice_path) !=3D 0) { +#else if (strcmp (drive->cdda_device_name, global_context->drive->cdda_devic= e_name) !=3D 0) { +#endif // Clear old cache cdda_context_free (global_context); global_context =3D cdda_context_new (drive, uri); --=-o0d0e3LC5QXDp3uXkyf/-- --=-ltvy/NlIGuWcaH11MTo5 Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQA+RbEmb2iPiv4Uz4cRArjBAJ455g4J/RHMSHsg9Oqw9utqpOjCOgCbB5GW 5Go88wdxqbNOIeqqRKRqs4w= =v7bM -----END PGP SIGNATURE----- --=-ltvy/NlIGuWcaH11MTo5-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message