diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-03-12 14:28:03 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-03-12 14:28:03 +0800 |
commit | 05d3af7ae8f161f86fe3b5561eb848994f20d772 (patch) | |
tree | e88d5a78ca5163493190d04f1286c4f620a8c6a8 | |
parent | 0afc8907bb0d7742940551ae7228711a48c0cccf (diff) | |
download | marcuscom-ports-05d3af7ae8f161f86fe3b5561eb848994f20d772.tar marcuscom-ports-05d3af7ae8f161f86fe3b5561eb848994f20d772.tar.gz marcuscom-ports-05d3af7ae8f161f86fe3b5561eb848994f20d772.tar.bz2 marcuscom-ports-05d3af7ae8f161f86fe3b5561eb848994f20d772.tar.lz marcuscom-ports-05d3af7ae8f161f86fe3b5561eb848994f20d772.tar.xz marcuscom-ports-05d3af7ae8f161f86fe3b5561eb848994f20d772.tar.zst marcuscom-ports-05d3af7ae8f161f86fe3b5561eb848994f20d772.zip |
* Remove the cdrom.c patch as it isn't needed
* Disable cdparanoia support for now, and restore previous BSD CD-ROM
support
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3925 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r-- | audio/gnome-media/files/patch-gnome-cd_Makefile.in | 13 | ||||
-rw-r--r-- | audio/gnome-media/files/patch-gnome-cd_cdrom.c | 17 | ||||
-rw-r--r-- | audio/gnomemedia2/files/patch-gnome-cd_Makefile.in | 13 | ||||
-rw-r--r-- | audio/gnomemedia2/files/patch-gnome-cd_cdrom.c | 17 |
4 files changed, 26 insertions, 34 deletions
diff --git a/audio/gnome-media/files/patch-gnome-cd_Makefile.in b/audio/gnome-media/files/patch-gnome-cd_Makefile.in new file mode 100644 index 000000000..366f5ad71 --- /dev/null +++ b/audio/gnome-media/files/patch-gnome-cd_Makefile.in @@ -0,0 +1,13 @@ +--- gnome-cd/Makefile.in.orig Sat Mar 12 01:23:14 2005 ++++ gnome-cd/Makefile.in Sat Mar 12 01:23:41 2005 +@@ -282,8 +282,8 @@ + libgnomemedia_cddbslave2_la_SOURCES = $(IDL_GENERATED) + @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = solaris-cdrom.c solaris-cdrom.h + +-@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c +-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = bsd-cdrom.c bsd-cdrom.h ++#@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c ++@CDROM_HOST_BSD_TRUE@cd_sources = bsd-cdrom.c bsd-cdrom.h + @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = linux-cdrom.c linux-cdrom.h + + bin_PROGRAMS = gnome-cd diff --git a/audio/gnome-media/files/patch-gnome-cd_cdrom.c b/audio/gnome-media/files/patch-gnome-cd_cdrom.c deleted file mode 100644 index 65322e75f..000000000 --- a/audio/gnome-media/files/patch-gnome-cd_cdrom.c +++ /dev/null @@ -1,17 +0,0 @@ ---- gnome-cd/cdrom.c.orig Sat Mar 12 01:00:51 2005 -+++ gnome-cd/cdrom.c Sat Mar 12 01:02:57 2005 -@@ -358,9 +358,14 @@ cdrom_open_dev (GnomeCDRom *cdrom, - { - if (cdrom->priv->open_count++ == 0) { - cdrom->fd = open ( -+#if defined(__FreeBSD__) -+ cdrom->priv->device, O_RDONLY); -+#else - cdrom->priv->device, O_RDONLY | O_NONBLOCK); -+#endif - - if (cdrom->fd < 0) { -+ g_warning ("XXX: Failed to open %s: %s", cdrom->priv->device, strerror(errno)); - if (errno == EACCES && error != NULL) { - *error = g_error_new ( - GNOME_CDROM_ERROR, diff --git a/audio/gnomemedia2/files/patch-gnome-cd_Makefile.in b/audio/gnomemedia2/files/patch-gnome-cd_Makefile.in new file mode 100644 index 000000000..366f5ad71 --- /dev/null +++ b/audio/gnomemedia2/files/patch-gnome-cd_Makefile.in @@ -0,0 +1,13 @@ +--- gnome-cd/Makefile.in.orig Sat Mar 12 01:23:14 2005 ++++ gnome-cd/Makefile.in Sat Mar 12 01:23:41 2005 +@@ -282,8 +282,8 @@ + libgnomemedia_cddbslave2_la_SOURCES = $(IDL_GENERATED) + @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = solaris-cdrom.c solaris-cdrom.h + +-@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c +-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = bsd-cdrom.c bsd-cdrom.h ++#@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c ++@CDROM_HOST_BSD_TRUE@cd_sources = bsd-cdrom.c bsd-cdrom.h + @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = linux-cdrom.c linux-cdrom.h + + bin_PROGRAMS = gnome-cd diff --git a/audio/gnomemedia2/files/patch-gnome-cd_cdrom.c b/audio/gnomemedia2/files/patch-gnome-cd_cdrom.c deleted file mode 100644 index 65322e75f..000000000 --- a/audio/gnomemedia2/files/patch-gnome-cd_cdrom.c +++ /dev/null @@ -1,17 +0,0 @@ ---- gnome-cd/cdrom.c.orig Sat Mar 12 01:00:51 2005 -+++ gnome-cd/cdrom.c Sat Mar 12 01:02:57 2005 -@@ -358,9 +358,14 @@ cdrom_open_dev (GnomeCDRom *cdrom, - { - if (cdrom->priv->open_count++ == 0) { - cdrom->fd = open ( -+#if defined(__FreeBSD__) -+ cdrom->priv->device, O_RDONLY); -+#else - cdrom->priv->device, O_RDONLY | O_NONBLOCK); -+#endif - - if (cdrom->fd < 0) { -+ g_warning ("XXX: Failed to open %s: %s", cdrom->priv->device, strerror(errno)); - if (errno == EACCES && error != NULL) { - *error = g_error_new ( - GNOME_CDROM_ERROR, |