diff options
Diffstat (limited to 'audio')
-rw-r--r-- | audio/gnome-media/Makefile | 2 | ||||
-rw-r--r-- | audio/gnome-media/files/patch-gnome-cd_bsd-cdrom.c | 47 | ||||
-rw-r--r-- | audio/gnomemedia2/Makefile | 2 | ||||
-rw-r--r-- | audio/gnomemedia2/files/patch-gnome-cd_bsd-cdrom.c | 47 |
4 files changed, 96 insertions, 2 deletions
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 8abba2c41..d400015df 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomemedia2 PORTVERSION= 2.7.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-media/2.7 diff --git a/audio/gnome-media/files/patch-gnome-cd_bsd-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_bsd-cdrom.c new file mode 100644 index 000000000..2a97ef07b --- /dev/null +++ b/audio/gnome-media/files/patch-gnome-cd_bsd-cdrom.c @@ -0,0 +1,47 @@ +--- gnome-cd/bsd-cdrom.c.orig Mon Jan 5 23:12:49 2004 ++++ gnome-cd/bsd-cdrom.c Sun Aug 22 01:06:01 2004 +@@ -896,6 +896,8 @@ + + ASSIGN_MSF (realstatus->relative, blank_msf); + ASSIGN_MSF (realstatus->absolute, blank_msf); ++ ASSIGN_MSF (realstatus->length, blank_msf); ++ + realstatus->track = 1; + switch (subchnl.data->header.audio_status) { + case CD_AS_PLAY_IN_PROGRESS: +@@ -903,6 +905,11 @@ + ASSIGN_MSF (realstatus->relative, subchnl.data->what.position.reladdr.msf); + ASSIGN_MSF (realstatus->absolute, subchnl.data->what.position.absaddr.msf); + realstatus->track = subchnl.data->what.position.track_number; ++ if(priv && realstatus->track>0 && ++ realstatus->track<=priv->number_tracks){ ++ /* track_info may not be initialized */ ++ ASSIGN_MSF (realstatus->length, priv->track_info[realstatus->track-1].length); ++ } + break; + + case CD_AS_PLAY_PAUSED: +@@ -910,6 +917,11 @@ + ASSIGN_MSF (realstatus->relative, subchnl.data->what.position.reladdr.msf); + ASSIGN_MSF (realstatus->absolute, subchnl.data->what.position.absaddr.msf); + realstatus->track = subchnl.data->what.position.track_number; ++ if(priv && realstatus->track>0 && ++ realstatus->track<=priv->number_tracks){ ++ /* track_info may not be initialized */ ++ ASSIGN_MSF (realstatus->length, priv->track_info[realstatus->track-1].length); ++ } + break; + + case CD_AS_PLAY_COMPLETED: +@@ -917,6 +929,11 @@ + ASSIGN_MSF (realstatus->relative, subchnl.data->what.position.reladdr.msf); + ASSIGN_MSF (realstatus->absolute, subchnl.data->what.position.absaddr.msf); + realstatus->track = subchnl.data->what.position.track_number; ++ if(priv && realstatus->track>0 && ++ realstatus->track<=priv->number_tracks){ ++ /* track_info may not be initialized */ ++ ASSIGN_MSF (realstatus->length, priv->track_info[realstatus->track-1].length); ++ } + break; + + case CD_AS_AUDIO_INVALID: diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile index 8abba2c41..d400015df 100644 --- a/audio/gnomemedia2/Makefile +++ b/audio/gnomemedia2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomemedia2 PORTVERSION= 2.7.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-media/2.7 diff --git a/audio/gnomemedia2/files/patch-gnome-cd_bsd-cdrom.c b/audio/gnomemedia2/files/patch-gnome-cd_bsd-cdrom.c new file mode 100644 index 000000000..2a97ef07b --- /dev/null +++ b/audio/gnomemedia2/files/patch-gnome-cd_bsd-cdrom.c @@ -0,0 +1,47 @@ +--- gnome-cd/bsd-cdrom.c.orig Mon Jan 5 23:12:49 2004 ++++ gnome-cd/bsd-cdrom.c Sun Aug 22 01:06:01 2004 +@@ -896,6 +896,8 @@ + + ASSIGN_MSF (realstatus->relative, blank_msf); + ASSIGN_MSF (realstatus->absolute, blank_msf); ++ ASSIGN_MSF (realstatus->length, blank_msf); ++ + realstatus->track = 1; + switch (subchnl.data->header.audio_status) { + case CD_AS_PLAY_IN_PROGRESS: +@@ -903,6 +905,11 @@ + ASSIGN_MSF (realstatus->relative, subchnl.data->what.position.reladdr.msf); + ASSIGN_MSF (realstatus->absolute, subchnl.data->what.position.absaddr.msf); + realstatus->track = subchnl.data->what.position.track_number; ++ if(priv && realstatus->track>0 && ++ realstatus->track<=priv->number_tracks){ ++ /* track_info may not be initialized */ ++ ASSIGN_MSF (realstatus->length, priv->track_info[realstatus->track-1].length); ++ } + break; + + case CD_AS_PLAY_PAUSED: +@@ -910,6 +917,11 @@ + ASSIGN_MSF (realstatus->relative, subchnl.data->what.position.reladdr.msf); + ASSIGN_MSF (realstatus->absolute, subchnl.data->what.position.absaddr.msf); + realstatus->track = subchnl.data->what.position.track_number; ++ if(priv && realstatus->track>0 && ++ realstatus->track<=priv->number_tracks){ ++ /* track_info may not be initialized */ ++ ASSIGN_MSF (realstatus->length, priv->track_info[realstatus->track-1].length); ++ } + break; + + case CD_AS_PLAY_COMPLETED: +@@ -917,6 +929,11 @@ + ASSIGN_MSF (realstatus->relative, subchnl.data->what.position.reladdr.msf); + ASSIGN_MSF (realstatus->absolute, subchnl.data->what.position.absaddr.msf); + realstatus->track = subchnl.data->what.position.track_number; ++ if(priv && realstatus->track>0 && ++ realstatus->track<=priv->number_tracks){ ++ /* track_info may not be initialized */ ++ ASSIGN_MSF (realstatus->length, priv->track_info[realstatus->track-1].length); ++ } + break; + + case CD_AS_AUDIO_INVALID: |