From dedd2477f575ed9c802e5401e29d58ec913498a0 Mon Sep 17 00:00:00 2001 From: reed Date: Thu, 15 Sep 2005 19:00:32 +0000 Subject: Add two patches to use rint instead of lrint. The proper fix would be to use autoconf system, but even gnome developers changed their code upstream to use rint instead. This will close PR #30139. Over past few months many users have reported this issue. Bump PKGREVISION. --- multimedia/gnome2-media/Makefile | 3 ++- multimedia/gnome2-media/distinfo | 4 +++- multimedia/gnome2-media/patches/patch-aa | 13 +++++++++++++ multimedia/gnome2-media/patches/patch-ab | 25 +++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 multimedia/gnome2-media/patches/patch-aa create mode 100644 multimedia/gnome2-media/patches/patch-ab (limited to 'multimedia/gnome2-media') diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile index 5482ea8d444..7782295c18b 100644 --- a/multimedia/gnome2-media/Makefile +++ b/multimedia/gnome2-media/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:20 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/09/15 19:00:32 reed Exp $ DISTNAME= gnome-media-2.10.2 +PKGREVISION= 1 CATEGORIES= multimedia gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-media/2.10/} EXTRACT_SUFX= .tar.bz2 diff --git a/multimedia/gnome2-media/distinfo b/multimedia/gnome2-media/distinfo index f2365a52155..290390a1fba 100644 --- a/multimedia/gnome2-media/distinfo +++ b/multimedia/gnome2-media/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.9 2005/05/02 11:56:53 drochner Exp $ +$NetBSD: distinfo,v 1.10 2005/09/15 19:00:32 reed Exp $ SHA1 (gnome-media-2.10.2.tar.bz2) = 7e668effbfd35f731f57709b834023540cc8894e RMD160 (gnome-media-2.10.2.tar.bz2) = 2019031e5f8cbb9d3c3556c6ecb5f0922997dddf Size (gnome-media-2.10.2.tar.bz2) = 3328141 bytes +SHA1 (patch-aa) = 6d72e7ef6fb4c7bacfed8afd4654ab670c415c6f +SHA1 (patch-ab) = 0b03cc24429983e6e91f4d697905852820ebc679 diff --git a/multimedia/gnome2-media/patches/patch-aa b/multimedia/gnome2-media/patches/patch-aa new file mode 100644 index 00000000000..66b646dcf74 --- /dev/null +++ b/multimedia/gnome2-media/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.4 2005/09/15 19:00:32 reed Exp $ + +--- gnome-cd/gst-cdparanoia-cdrom.c.orig 2005-03-20 06:32:33.000000000 -0800 ++++ gnome-cd/gst-cdparanoia-cdrom.c 2005-09-14 22:30:01.000000000 -0700 +@@ -1242,7 +1242,7 @@ + + build_pipeline (lcd); + g_object_get (G_OBJECT (priv->vol_element), "volume", &vol, NULL); +- realstatus->volume = lrint (vol * 255.0); ++ realstatus->volume = rint (vol * 255.0); + cur_gst_status = + gst_element_get_state (GST_ELEMENT (priv->play_thread)); + diff --git a/multimedia/gnome2-media/patches/patch-ab b/multimedia/gnome2-media/patches/patch-ab new file mode 100644 index 00000000000..5502e8b5a5b --- /dev/null +++ b/multimedia/gnome2-media/patches/patch-ab @@ -0,0 +1,25 @@ +$NetBSD: patch-ab,v 1.3 2005/09/15 19:00:32 reed Exp $ + +--- volume.c 2005/04/15 12:59:37 1.5 ++++ gst-mixer/src/volume.c 2005/08/08 21:05:37 1.6 +@@ -480,9 +480,9 @@ + if (gnome_volume_control_button_get_active ( + GNOME_VOLUME_CONTROL_BUTTON (vol->button))) { + gtk_adjustment_set_value (adj, gtk_adjustment_get_value (_adj)); +- volumes[i++] = lrint (gtk_adjustment_get_value (_adj)); ++ volumes[i++] = rint (gtk_adjustment_get_value (_adj)); + } else { +- volumes[i++] = lrint (gtk_adjustment_get_value (adj)); ++ volumes[i++] = rint (gtk_adjustment_get_value (adj)); + } + } + +@@ -554,7 +554,7 @@ + scales != NULL; scales = scales->next, n++) { + GtkAdjustment *adj = gtk_range_get_adjustment (scales->data); + +- if (lrint (gtk_adjustment_get_value (adj)) != 0) { ++ if (rint (gtk_adjustment_get_value (adj)) != 0) { + *slider_zero = FALSE; + break; + } -- cgit v1.2.3