aboutsummaryrefslogtreecommitdiff
path: root/audio/gnome-media
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-08-22 04:58:43 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-08-22 04:58:43 +0000
commit8e8bb40025b1e19028cefec60d91d8b425bb0562 (patch)
tree0ecac9d1d420f9d9c17bf13f52b60025e0ec1b85 /audio/gnome-media
parentbfe8bdb87433694c60ae8a858c68f4fad242c3f7 (diff)
Notes
Diffstat (limited to 'audio/gnome-media')
-rw-r--r--audio/gnome-media/Makefile6
-rw-r--r--audio/gnome-media/files/patch-gnome-cd_freebsd-cdrom.c38
2 files changed, 41 insertions, 3 deletions
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index f1747e486b2f..9419747e0a2a 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomemedia2
PORTVERSION= 2.6.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-media/2.6
@@ -20,11 +20,11 @@ COMMENT= Multimedia applications for the GNOME 2 desktop
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomehier gnomedesktop \
+USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomedesktop \
gail gstreamerplugins
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/gnome-media/files/patch-gnome-cd_freebsd-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_freebsd-cdrom.c
new file mode 100644
index 000000000000..4d61c74e7175
--- /dev/null
+++ b/audio/gnome-media/files/patch-gnome-cd_freebsd-cdrom.c
@@ -0,0 +1,38 @@
+--- 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 @@
+ 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 +915,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 +927,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: