aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-08-22 05:07:55 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-08-22 05:07:55 +0000
commit678d6bd2bab4f318210159608e7a886fc8c682e3 (patch)
tree1b29c41787b6d6122a0446afb0796e9a69d2ea34
parentbbb485331bc9872354e079d15a653d4f82b942b8 (diff)
downloadports-678d6bd2bab4f318210159608e7a886fc8c682e3.tar.gz
ports-678d6bd2bab4f318210159608e7a886fc8c682e3.zip
Notes
-rw-r--r--audio/gnome-media/Makefile2
-rw-r--r--audio/gnome-media/files/patch-gnome-cd_freebsd-cdrom.c19
-rw-r--r--audio/gnomemedia2/Makefile2
-rw-r--r--audio/gnomemedia2/files/patch-gnome-cd_freebsd-cdrom.c19
4 files changed, 30 insertions, 12 deletions
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 9419747e0a2a..6b079e2c4601 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomemedia2
PORTVERSION= 2.6.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-media/2.6
diff --git a/audio/gnome-media/files/patch-gnome-cd_freebsd-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_freebsd-cdrom.c
index 4d61c74e7175..47ce9e0aa32b 100644
--- a/audio/gnome-media/files/patch-gnome-cd_freebsd-cdrom.c
+++ b/audio/gnome-media/files/patch-gnome-cd_freebsd-cdrom.c
@@ -1,6 +1,15 @@
---- gnome-cd/freebsd-cdrom.c.orig Sun Aug 22 00:42:31 2004
-+++ gnome-cd/freebsd-cdrom.c Sun Aug 22 00:48:36 2004
-@@ -903,6 +903,11 @@
+--- gnome-cd/freebsd-cdrom.c.orig Mon Jan 5 23:12:49 2004
++++ gnome-cd/freebsd-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;
@@ -12,7 +21,7 @@
break;
case CD_AS_PLAY_PAUSED:
-@@ -910,6 +915,11 @@
+@@ -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;
@@ -24,7 +33,7 @@
break;
case CD_AS_PLAY_COMPLETED:
-@@ -917,6 +927,11 @@
+@@ -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;
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 9419747e0a2a..6b079e2c4601 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomemedia2
PORTVERSION= 2.6.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-media/2.6
diff --git a/audio/gnomemedia2/files/patch-gnome-cd_freebsd-cdrom.c b/audio/gnomemedia2/files/patch-gnome-cd_freebsd-cdrom.c
index 4d61c74e7175..47ce9e0aa32b 100644
--- a/audio/gnomemedia2/files/patch-gnome-cd_freebsd-cdrom.c
+++ b/audio/gnomemedia2/files/patch-gnome-cd_freebsd-cdrom.c
@@ -1,6 +1,15 @@
---- gnome-cd/freebsd-cdrom.c.orig Sun Aug 22 00:42:31 2004
-+++ gnome-cd/freebsd-cdrom.c Sun Aug 22 00:48:36 2004
-@@ -903,6 +903,11 @@
+--- gnome-cd/freebsd-cdrom.c.orig Mon Jan 5 23:12:49 2004
++++ gnome-cd/freebsd-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;
@@ -12,7 +21,7 @@
break;
case CD_AS_PLAY_PAUSED:
-@@ -910,6 +915,11 @@
+@@ -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;
@@ -24,7 +33,7 @@
break;
case CD_AS_PLAY_COMPLETED:
-@@ -917,6 +927,11 @@
+@@ -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;