From 8a49b34b7423c2fae649ec73edd9c7beb83131f1 Mon Sep 17 00:00:00 2001 From: rh Date: Mon, 13 Aug 2001 18:38:55 +0000 Subject: Update gnome-media to 1.2.3. Relevant changes include bugfixes and better font handling. --- audio/gnome-media/Makefile | 5 +++-- audio/gnome-media/distinfo | 13 +++++++------ audio/gnome-media/patches/patch-aa | 13 +++++++++++++ audio/gnome-media/patches/patch-ab | 16 +++++++-------- audio/gnome-media/patches/patch-ac | 20 +++++++++---------- audio/gnome-media/patches/patch-ae | 18 ++++++++--------- audio/gnome-media/pkg/PLIST | 40 +++++++++++++++++++++++++++++++++++++- 7 files changed, 89 insertions(+), 36 deletions(-) create mode 100644 audio/gnome-media/patches/patch-aa (limited to 'audio/gnome-media') diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 569fb95a52d..771331aa747 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:18 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/08/13 18:38:55 rh Exp $ -DISTNAME= gnome-media-1.2.0 +DISTNAME= gnome-media-1.2.3 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-media/} @@ -13,6 +13,7 @@ DEPENDS+= gnome-core>=1.2.0:../../x11/gnome-core GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_X11BASE= YES +USE_GMAKE= YES CONFIGURE_ENV+= XGETTEXT="${LOCALBASE}/bin/xgettext" CPPFLAGS+= -I${LOCALBASE}/include diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo index 30a8531b40b..cbe7b0883d3 100644 --- a/audio/gnome-media/distinfo +++ b/audio/gnome-media/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 12:14:30 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/08/13 18:38:55 rh Exp $ -SHA1 (gnome-media-1.2.0.tar.gz) = 969bcb7878f7c2fa595c89d1152952c1084bc255 -Size (gnome-media-1.2.0.tar.gz) = 558393 bytes -SHA1 (patch-ab) = 06b03bde5a185323dbf9c5569a19089d7f038dc9 -SHA1 (patch-ac) = e6324db74f737f11e2264849e5e5094f5233d950 -SHA1 (patch-ae) = 217b2c7233ef536089e5af54737da259372def38 +SHA1 (gnome-media-1.2.3.tar.gz) = 2b20ed2eb69576dad1c740b14c095a01ba270d61 +Size (gnome-media-1.2.3.tar.gz) = 789032 bytes +SHA1 (patch-aa) = 0fbbff8ba31f7a3c662db412701edab02e5af5fd +SHA1 (patch-ab) = c86c48b12a5e61e84b0ae17b73ec3656996c8ed0 +SHA1 (patch-ac) = f5c0b2562fe1a57873af3eac16a793a291a91cbb +SHA1 (patch-ae) = 643f24f3d8a20bd2e7071e1c4d51a8a3590086e8 SHA1 (patch-af) = bc3fe755bc8e12be3436e121da5a1c059883cd11 diff --git a/audio/gnome-media/patches/patch-aa b/audio/gnome-media/patches/patch-aa new file mode 100644 index 00000000000..a3e7393c029 --- /dev/null +++ b/audio/gnome-media/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.3 2001/08/13 18:38:55 rh Exp $ + +--- gmix/prefs.c.orig Mon Jun 11 19:50:47 2001 ++++ gmix/prefs.c +@@ -34,6 +34,8 @@ + #include + #ifdef ALSA + #include ++#elif defined(HAVE_SOUNDCARD_H) ++#include + #else + #ifdef HAVE_LINUX_SOUNDCARD_H + #include diff --git a/audio/gnome-media/patches/patch-ab b/audio/gnome-media/patches/patch-ab index 95062f86b2e..b6550f6b8ef 100644 --- a/audio/gnome-media/patches/patch-ab +++ b/audio/gnome-media/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/08/30 08:41:44 rh Exp $ +$NetBSD: patch-ab,v 1.2 2001/08/13 18:38:55 rh Exp $ ---- gmix/Makefile.in.orig Thu Jul 15 07:55:54 1999 -+++ gmix/Makefile.in Sun Aug 29 17:59:04 1999 -@@ -135,7 +135,7 @@ - gmix_SOURCES = gmix.c +--- gmix/Makefile.in.orig Tue Jun 12 18:58:12 2001 ++++ gmix/Makefile.in +@@ -146,7 +146,7 @@ + gmix_SOURCES = gmix.c gmix.h prefs.c prefs.h --gmix_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) -+gmix_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) -lossaudio +-gmix_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) $(GMIX_LIBS) ++gmix_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) $(GMIX_LIBS) -lossaudio - Audio_DATA = gmix.desktop + Audio_in_files = gmix.desktop.in diff --git a/audio/gnome-media/patches/patch-ac b/audio/gnome-media/patches/patch-ac index 32c3e8f714c..94277567c78 100644 --- a/audio/gnome-media/patches/patch-ac +++ b/audio/gnome-media/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2000/06/01 17:18:01 rh Exp $ +$NetBSD: patch-ac,v 1.3 2001/08/13 18:38:55 rh Exp $ ---- gmix/gmix.c.orig Sun May 21 22:12:50 2000 -+++ gmix/gmix.c Thu Jun 1 18:55:00 2000 -@@ -56,7 +56,9 @@ +--- gmix/gmix.c.orig Mon Jun 11 19:50:47 2001 ++++ gmix/gmix.c +@@ -55,7 +55,9 @@ #ifdef ALSA #include #else @@ -13,8 +13,8 @@ $NetBSD: patch-ac,v 1.2 2000/06/01 17:18:01 rh Exp $ #include #else #include -@@ -90,6 +92,13 @@ - GtkWidget *configwin; +@@ -106,6 +108,13 @@ + GtkWidget *app; GtkWidget *slidernotebook; +#if !defined(HAVE_MIXER_INFO) && !defined(SOUND_MIXER_INFO) @@ -24,10 +24,10 @@ $NetBSD: patch-ac,v 1.2 2000/06/01 17:18:01 rh Exp $ +} mixer_info; +#endif + - typedef struct { - gboolean set_mixer_on_start; - gboolean hide_menu; -@@ -697,12 +706,16 @@ + /* Menus */ + static GnomeUIInfo help_menu[] = { + GNOMEUIINFO_ITEM_STOCK(N_("Help"), NULL, help, GNOME_STOCK_PIXMAP_HELP), +@@ -538,12 +547,16 @@ /* * mixer-name */ diff --git a/audio/gnome-media/patches/patch-ae b/audio/gnome-media/patches/patch-ae index cfb922bbdcc..622dd05e312 100644 --- a/audio/gnome-media/patches/patch-ae +++ b/audio/gnome-media/patches/patch-ae @@ -1,17 +1,17 @@ -$NetBSD: patch-ae,v 1.2 2000/06/01 17:18:02 rh Exp $ +$NetBSD: patch-ae,v 1.3 2001/08/13 18:38:55 rh Exp $ ---- Makefile.in.orig Wed May 24 21:52:40 2000 -+++ Makefile.in Thu Jun 1 19:00:36 2000 -@@ -128,10 +128,10 @@ +--- Makefile.in.orig Tue Jun 12 18:58:00 2001 ++++ Makefile.in +@@ -135,10 +135,10 @@ always_built_SUBDIRS = cddbslave --SUBDIRS = intl po macros $(always_built_SUBDIRS) @PROGRAMS_VUMETER@ @PROGRAMS_GMIX@ @PROGRAMS_TCD@ @PROGRAMS_GRECORD@ -+SUBDIRS = intl po macros $(always_built_SUBDIRS) @PROGRAMS_VUMETER@ @PROGRAMS_GMIX@ @PROGRAMS_GRECORD@ +-SUBDIRS = intl po macros omf-install $(always_built_SUBDIRS) @PROGRAMS_VUMETER@ @PROGRAMS_GMIX@ @PROGRAMS_TCD@ @PROGRAMS_GRECORD@ ++SUBDIRS = intl po macros omf-install $(always_built_SUBDIRS) @PROGRAMS_VUMETER@ @PROGRAMS_GMIX@ @PROGRAMS_GRECORD@ --DIST_SUBDIRS = intl po macros $(always_built_SUBDIRS) vu-meter gmix tcd grecord -+DIST_SUBDIRS = intl po macros $(always_built_SUBDIRS) vu-meter gmix grecord +-DIST_SUBDIRS = intl po macros omf-install $(always_built_SUBDIRS) vu-meter gmix tcd grecord ++DIST_SUBDIRS = intl po macros omf-install $(always_built_SUBDIRS) vu-meter gmix grecord - EXTRA_DIST = gnome-media.spec.in configure acinclude.m4 + EXTRA_DIST = gnome-media.spec.in configure acinclude.m4 COPYING-DOCS sgmldocs.make xml-i18n-extract.in xml-i18n-merge.in xml-i18n-update.in diff --git a/audio/gnome-media/pkg/PLIST b/audio/gnome-media/pkg/PLIST index e50ef277319..00dbd6c9167 100644 --- a/audio/gnome-media/pkg/PLIST +++ b/audio/gnome-media/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2000/06/01 17:18:03 rh Exp $ +@comment $NetBSD: PLIST,v 1.5 2001/08/13 18:38:55 rh Exp $ bin/cddbslave bin/cddbsubmit bin/gmix @@ -8,6 +8,29 @@ share/gnome/apps/Multimedia/gmix.desktop share/gnome/apps/Multimedia/vumeter.desktop share/gnome/apps/Multimedia/Soundrecorder.desktop share/gnome/cddb-submit-methods +share/gnome/help/gmix/C/authors.html +share/gnome/help/gmix/C/bugs.html +share/gnome/help/gmix/C/figures/gmix-prefs.png +share/gnome/help/gmix/C/figures/gmix.png +share/gnome/help/gmix/C/gmix-prefs.html +share/gnome/help/gmix/C/gmix-use.html +share/gnome/help/gmix/C/gmix.sgml +share/gnome/help/gmix/C/index.html +share/gnome/help/gmix/C/license.html +share/gnome/help/gmix/C/ln7.html +share/gnome/help/gmix/C/topic.dat +share/gnome/help/gmix/it/authors.html +share/gnome/help/gmix/it/bugs.html +share/gnome/help/gmix/it/figures/gmix-prefs.png +share/gnome/help/gmix/it/figures/gmix.png +share/gnome/help/gmix/it/gmix-prefs.html +share/gnome/help/gmix/it/gmix-use.html +share/gnome/help/gmix/it/gmix.sgml +share/gnome/help/gmix/it/index.html +share/gnome/help/gmix/it/license.html +share/gnome/help/gmix/it/ln10.html +share/gnome/help/gmix/it/topic.dat +share/locale/az/LC_MESSAGES/gnome-media.mo share/locale/cs/LC_MESSAGES/gnome-media.mo share/locale/da/LC_MESSAGES/gnome-media.mo share/locale/de/LC_MESSAGES/gnome-media.mo @@ -27,6 +50,8 @@ share/locale/pl/LC_MESSAGES/gnome-media.mo share/locale/pt/LC_MESSAGES/gnome-media.mo share/locale/pt_BR/LC_MESSAGES/gnome-media.mo share/locale/ru/LC_MESSAGES/gnome-media.mo +share/locale/sk/LC_MESSAGES/gnome-media.mo +share/locale/sl/LC_MESSAGES/gnome-media.mo share/locale/sv/LC_MESSAGES/gnome-media.mo share/locale/zh_TW.Big5/LC_MESSAGES/gnome-media.mo share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-media.mo @@ -37,7 +62,20 @@ share/locale/uk/LC_MESSAGES/gnome-media.mo share/locale/gl/LC_MESSAGES/gnome-media.mo share/locale/lt/LC_MESSAGES/gnome-media.mo share/locale/tr/LC_MESSAGES/gnome-media.mo +share/omf/gnome-media/gmix-C.omf +share/omf/gnome-media/gmix-it.omf +share/pixmaps/gnome-grecord.png share/pixmaps/gnome-mixer.png share/pixmaps/gnome-vumeter.png share/mime-info/grecord.keys share/mime-info/grecord.mime +@dirrm share/omf/gnome-media +@exec /bin/mkdir -p /usr/X11R6/share/gnome/help/gmix/it/stylesheet-images +@dirrm share/gnome/help/gmix/it/stylesheet-images +@dirrm share/gnome/help/gmix/it/figures +@dirrm share/gnome/help/gmix/it +@exec /bin/mkdir -p /usr/X11R6/share/gnome/help/gmix/C/stylesheet-images +@dirrm share/gnome/help/gmix/C/stylesheet-images +@dirrm share/gnome/help/gmix/C/figures +@dirrm share/gnome/help/gmix/C +@dirrm share/gnome/help/gmix -- cgit v1.2.3