diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-02-25 04:42:37 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-02-25 04:42:37 +0000 |
| commit | 1b66b40b9c1ad6ea5d420bee5f59169ffaaa900a (patch) | |
| tree | 0bc499c19a5350dbb5ba37102fab56b43bdf47bc | |
| parent | upgrade to 0.1.2 (diff) | |
Fix build with cdparanoia.
PR: 48618
Notes
Notes:
svn path=/head/; revision=76435
| -rw-r--r-- | devel/gnome-vfs1/files/patch-modules_cdda-method.c | 26 | ||||
| -rw-r--r-- | devel/gnomevfs/files/patch-modules_cdda-method.c | 26 |
2 files changed, 52 insertions, 0 deletions
diff --git a/devel/gnome-vfs1/files/patch-modules_cdda-method.c b/devel/gnome-vfs1/files/patch-modules_cdda-method.c new file mode 100644 index 000000000000..d1692cc03e47 --- /dev/null +++ b/devel/gnome-vfs1/files/patch-modules_cdda-method.c @@ -0,0 +1,26 @@ +--- modules/cdda-method.c.orig Wed Jan 22 13:54:31 2003 ++++ modules/cdda-method.c Wed Jan 22 13:54:33 2003 +@@ -623,7 +623,11 @@ + // Check and see if we already have opened and stashed this drive + if (!use_base) { + if (global_context != NULL) { ++#ifdef Linux + if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) { ++#elif defined(__FreeBSD__) ++ if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) == 0) { ++#endif + use_cache = 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 != NULL) { ++#ifdef Linux + if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) { ++#elif defined(__FreeBSD__) ++ if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) != 0) { ++#endif + // Clear old cache + cdda_context_free (global_context); + global_context = cdda_context_new (drive, uri); diff --git a/devel/gnomevfs/files/patch-modules_cdda-method.c b/devel/gnomevfs/files/patch-modules_cdda-method.c new file mode 100644 index 000000000000..d1692cc03e47 --- /dev/null +++ b/devel/gnomevfs/files/patch-modules_cdda-method.c @@ -0,0 +1,26 @@ +--- modules/cdda-method.c.orig Wed Jan 22 13:54:31 2003 ++++ modules/cdda-method.c Wed Jan 22 13:54:33 2003 +@@ -623,7 +623,11 @@ + // Check and see if we already have opened and stashed this drive + if (!use_base) { + if (global_context != NULL) { ++#ifdef Linux + if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) { ++#elif defined(__FreeBSD__) ++ if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) == 0) { ++#endif + use_cache = 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 != NULL) { ++#ifdef Linux + if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) { ++#elif defined(__FreeBSD__) ++ if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) != 0) { ++#endif + // Clear old cache + cdda_context_free (global_context); + global_context = cdda_context_new (drive, uri); |