From 7bb5046b96550e436682baec8db3f1acb88a65c5 Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 12 Mar 2005 08:08:21 +0000 Subject: Really re-enable the GNOME 2.8 BSD CD-ROM code. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3927 df743ca5-7f9a-e211-a948-0013205c9059 --- audio/gnome-media/files/patch-gnome-cd_Makefile.in | 21 +++++++++++++++++++-- audio/gnomemedia2/files/patch-gnome-cd_Makefile.in | 21 +++++++++++++++++++-- 2 files changed, 38 insertions(+), 4 deletions(-) (limited to 'audio') diff --git a/audio/gnome-media/files/patch-gnome-cd_Makefile.in b/audio/gnome-media/files/patch-gnome-cd_Makefile.in index 366f5ad71..b534f8fec 100644 --- a/audio/gnome-media/files/patch-gnome-cd_Makefile.in +++ b/audio/gnome-media/files/patch-gnome-cd_Makefile.in @@ -1,5 +1,5 @@ ---- gnome-cd/Makefile.in.orig Sat Mar 12 01:23:14 2005 -+++ gnome-cd/Makefile.in Sat Mar 12 01:23:41 2005 +--- gnome-cd/Makefile.in.orig Sat Mar 12 02:52:17 2005 ++++ gnome-cd/Makefile.in Sat Mar 12 03:03:20 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 @@ -11,3 +11,20 @@ @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = linux-cdrom.c linux-cdrom.h bin_PROGRAMS = gnome-cd +@@ -352,13 +352,13 @@ + solaris-cdrom.h gst-cdparanoia-cdrom.c bsd-cdrom.c bsd-cdrom.h \ + linux-cdrom.c linux-cdrom.h preferences.c preferences.h \ + cd-selection.c cd-selection.h theme.c +-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \ +-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@ bsd-cdrom.$(OBJEXT) ++@CDROM_HOST_BSD_TRUE@am__objects_2 = \ ++@CDROM_HOST_BSD_TRUE@ bsd-cdrom.$(OBJEXT) + @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \ + @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@ linux-cdrom.$(OBJEXT) + @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \ + @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@ solaris-cdrom.$(OBJEXT) +-@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT) ++#@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT) + am_gnome_cd_OBJECTS = eggtrayicon.$(OBJEXT) gnome-cd.$(OBJEXT) \ + callbacks.$(OBJEXT) cddb.$(OBJEXT) cdrom.$(OBJEXT) \ + display.$(OBJEXT) $(am__objects_2) preferences.$(OBJEXT) \ diff --git a/audio/gnomemedia2/files/patch-gnome-cd_Makefile.in b/audio/gnomemedia2/files/patch-gnome-cd_Makefile.in index 366f5ad71..b534f8fec 100644 --- a/audio/gnomemedia2/files/patch-gnome-cd_Makefile.in +++ b/audio/gnomemedia2/files/patch-gnome-cd_Makefile.in @@ -1,5 +1,5 @@ ---- gnome-cd/Makefile.in.orig Sat Mar 12 01:23:14 2005 -+++ gnome-cd/Makefile.in Sat Mar 12 01:23:41 2005 +--- gnome-cd/Makefile.in.orig Sat Mar 12 02:52:17 2005 ++++ gnome-cd/Makefile.in Sat Mar 12 03:03:20 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 @@ -11,3 +11,20 @@ @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = linux-cdrom.c linux-cdrom.h bin_PROGRAMS = gnome-cd +@@ -352,13 +352,13 @@ + solaris-cdrom.h gst-cdparanoia-cdrom.c bsd-cdrom.c bsd-cdrom.h \ + linux-cdrom.c linux-cdrom.h preferences.c preferences.h \ + cd-selection.c cd-selection.h theme.c +-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \ +-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@ bsd-cdrom.$(OBJEXT) ++@CDROM_HOST_BSD_TRUE@am__objects_2 = \ ++@CDROM_HOST_BSD_TRUE@ bsd-cdrom.$(OBJEXT) + @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \ + @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@ linux-cdrom.$(OBJEXT) + @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \ + @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@ solaris-cdrom.$(OBJEXT) +-@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT) ++#@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT) + am_gnome_cd_OBJECTS = eggtrayicon.$(OBJEXT) gnome-cd.$(OBJEXT) \ + callbacks.$(OBJEXT) cddb.$(OBJEXT) cdrom.$(OBJEXT) \ + display.$(OBJEXT) $(am__objects_2) preferences.$(OBJEXT) \ -- cgit v1.2.3