diff options
author | rh <rh> | 2000-06-01 17:17:58 +0000 |
---|---|---|
committer | rh <rh> | 2000-06-01 17:17:58 +0000 |
commit | 51d8f2eef1f57aa3be32ecb1a93dda0eb8a72026 (patch) | |
tree | 6e736fa6373c5fd479f2041324332f1c0b3f7099 | |
parent | b0e74c4f83e76d369da3f6a656922873867b15d2 (diff) | |
download | pkgsrc-51d8f2eef1f57aa3be32ecb1a93dda0eb8a72026.tar.gz |
Update gnome-media to 1.2.0. Changes include bugfixes and a new utility,
grecord.
-rw-r--r-- | audio/gnome-media/Makefile | 8 | ||||
-rw-r--r-- | audio/gnome-media/files/md5 | 4 | ||||
-rw-r--r-- | audio/gnome-media/files/patch-sum | 9 | ||||
-rw-r--r-- | audio/gnome-media/patches/patch-aa | 27 | ||||
-rw-r--r-- | audio/gnome-media/patches/patch-ac | 30 | ||||
-rw-r--r-- | audio/gnome-media/patches/patch-ad | 22 | ||||
-rw-r--r-- | audio/gnome-media/patches/patch-ae | 14 | ||||
-rw-r--r-- | audio/gnome-media/patches/patch-ag | 13 | ||||
-rw-r--r-- | audio/gnome-media/pkg/PLIST | 14 |
9 files changed, 44 insertions, 97 deletions
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 4fbfe5cd9fc..8b0c6171bda 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.6 2000/06/01 11:23:13 rh Exp $ +# $NetBSD: Makefile,v 1.7 2000/06/01 17:17:58 rh Exp $ -DISTNAME= gnome-media-1.0.51 +DISTNAME= gnome-media-1.2.0 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-media/} MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.gnome.org/ -DEPENDS+= gnome-core-*:../../x11/gnome-core +DEPENDS+= gnome-core>=1.2.0:../../x11/gnome-core GNU_CONFIGURE= YES -USE_PKGLIBTOOL= YES +USE_LIBTOOL= YES USE_X11BASE= YES CONFIGURE_ENV+= XGETTEXT="${LOCALBASE}/bin/xgettext" diff --git a/audio/gnome-media/files/md5 b/audio/gnome-media/files/md5 index a4c1c2fe88e..f4df64b354d 100644 --- a/audio/gnome-media/files/md5 +++ b/audio/gnome-media/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 1999/11/07 21:58:12 tron Exp $ +$NetBSD: md5,v 1.3 2000/06/01 17:17:59 rh Exp $ -MD5 (gnome-media-1.0.51.tar.gz) = d52772de47b214d9fc48aea75108cce7 +MD5 (gnome-media-1.2.0.tar.gz) = c7cda6054b47f71aa46aaabe9db6fb4c diff --git a/audio/gnome-media/files/patch-sum b/audio/gnome-media/files/patch-sum index 90c26a6861e..136e0abb95f 100644 --- a/audio/gnome-media/files/patch-sum +++ b/audio/gnome-media/files/patch-sum @@ -1,9 +1,6 @@ -$NetBSD: patch-sum,v 1.3 1999/11/19 09:44:20 tron Exp $ +$NetBSD: patch-sum,v 1.4 2000/06/01 17:17:59 rh Exp $ -MD5 (patch-aa) = f562db3f01988eacd425c180dc188736 MD5 (patch-ab) = 4a6fb0cecdee89a006de8ee65fc61c14 -MD5 (patch-ac) = d4daba9f497d5e2df820e7e4395ea93c -MD5 (patch-ad) = 23dbf15d350cc2481818f60f285b006e -MD5 (patch-ae) = 63d18f1bd73ca141e76a76bc58012d0c +MD5 (patch-ac) = 2226af1058496ed508241d51eb914a1f +MD5 (patch-ae) = b45063443900b04096e550c7a9143b48 MD5 (patch-af) = f063755711830ffd6371ce8811aa2692 -MD5 (patch-ag) = 2add2794b5bd5e9e55f47c683602ac49 diff --git a/audio/gnome-media/patches/patch-aa b/audio/gnome-media/patches/patch-aa deleted file mode 100644 index 2d725a30eb2..00000000000 --- a/audio/gnome-media/patches/patch-aa +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/08/30 08:41:44 rh Exp $ - ---- configure.orig Thu Jul 15 07:43:28 1999 -+++ configure Sun Aug 29 17:54:52 1999 -@@ -3457,11 +3457,13 @@ - fi - - -+if false; then - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+fi - - # Redirect the config.log output again, so that the ltconfig log is not - # clobbered by the next message. -@@ -4658,7 +4660,7 @@ - - - PROGRAMS_GMIX="" --for ac_hdr in linux/soundcard.h -+for ac_hdr in soundcard.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 diff --git a/audio/gnome-media/patches/patch-ac b/audio/gnome-media/patches/patch-ac index c1a69f29187..32c3e8f714c 100644 --- a/audio/gnome-media/patches/patch-ac +++ b/audio/gnome-media/patches/patch-ac @@ -1,11 +1,11 @@ -$NetBSD: patch-ac,v 1.1.1.1 1999/08/30 08:41:44 rh Exp $ +$NetBSD: patch-ac,v 1.2 2000/06/01 17:18:01 rh Exp $ ---- gmix/gmix.c.orig Thu Apr 8 21:40:37 1999 -+++ gmix/gmix.c Mon Aug 30 09:38:18 1999 -@@ -46,7 +46,9 @@ - #include <string.h> - #include <signal.h> - #include <ctype.h> +--- 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 @@ + #ifdef ALSA + #include <sys/asoundlib.h> + #else -#ifdef HAVE_LINUX_SOUNDCARD_H +#ifdef HAVE_SOUNDCARD_H +#include <soundcard.h> @@ -13,21 +13,21 @@ $NetBSD: patch-ac,v 1.1.1.1 1999/08/30 08:41:44 rh Exp $ #include <linux/soundcard.h> #else #include <machine/soundcard.h> -@@ -67,6 +69,13 @@ - void init_devices(void); - void open_dialog(void); +@@ -90,6 +92,13 @@ + GtkWidget *configwin; + GtkWidget *slidernotebook; -+#ifndef HAVE_MIXER_INFO ++#if !defined(HAVE_MIXER_INFO) && !defined(SOUND_MIXER_INFO) +typedef struct { + char id[20]; + char name[40]; +} mixer_info; +#endif + - /* - * Gnome info: - */ -@@ -294,12 +303,16 @@ + typedef struct { + gboolean set_mixer_on_start; + gboolean hide_menu; +@@ -697,12 +706,16 @@ /* * mixer-name */ diff --git a/audio/gnome-media/patches/patch-ad b/audio/gnome-media/patches/patch-ad deleted file mode 100644 index 0dcce2a5adf..00000000000 --- a/audio/gnome-media/patches/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 1999/08/30 08:41:44 rh Exp $ - ---- config.h.in.orig Thu Jul 15 05:58:29 1999 -+++ config.h.in Mon Aug 30 09:25:31 1999 -@@ -53,6 +53,7 @@ - #undef HAVE_CATGETS - #undef HAVE_GETTEXT - #undef HAVE_LINUX_SOUNDCARD_H -+#undef HAVE_SOUNDCARD_H - #undef HAVE_PROGRAM_INVOCATION_SHORT_NAME - #undef HAVE_PROGRAM_INVOCATION_NAME - -@@ -150,6 +151,9 @@ - - /* Define if you have the <linux/soundcard.h> header file. */ - #undef HAVE_LINUX_SOUNDCARD_H -+ -+/* Define if you have the <soundcard.h> header file. */ -+#undef HAVE_SOUNDCARD_H - - /* Define if you have the <locale.h> header file. */ - #undef HAVE_LOCALE_H diff --git a/audio/gnome-media/patches/patch-ae b/audio/gnome-media/patches/patch-ae index ccfb5aaf804..cfb922bbdcc 100644 --- a/audio/gnome-media/patches/patch-ae +++ b/audio/gnome-media/patches/patch-ae @@ -1,17 +1,17 @@ -$NetBSD: patch-ae,v 1.1.1.1 1999/08/30 08:41:44 rh Exp $ +$NetBSD: patch-ae,v 1.2 2000/06/01 17:18:02 rh Exp $ ---- Makefile.in.orig Thu Jul 15 07:55:47 1999 -+++ Makefile.in Mon Aug 30 10:25:50 1999 +--- Makefile.in.orig Wed May 24 21:52:40 2000 ++++ Makefile.in Thu Jun 1 19:00:36 2000 @@ -128,10 +128,10 @@ always_built_SUBDIRS = cddbslave --SUBDIRS = intl po macros $(always_built_SUBDIRS) @PROGRAMS_VUMETER@ @PROGRAMS_GMIX@ @PROGRAMS_TCD@ -+SUBDIRS = intl po macros $(always_built_SUBDIRS) @PROGRAMS_VUMETER@ @PROGRAMS_GMIX@ +-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@ --DIST_SUBDIRS = intl po macros $(always_built_SUBDIRS) vu-meter gmix tcd -+DIST_SUBDIRS = intl po macros $(always_built_SUBDIRS) vu-meter gmix +-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 EXTRA_DIST = gnome-media.spec.in configure acinclude.m4 diff --git a/audio/gnome-media/patches/patch-ag b/audio/gnome-media/patches/patch-ag deleted file mode 100644 index 219de434fd1..00000000000 --- a/audio/gnome-media/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1 1999/11/19 09:44:46 tron Exp $ - ---- gmix/gmix.c.orig Fri Nov 19 02:06:22 1999 -+++ gmix/gmix.c Fri Nov 19 10:41:25 1999 -@@ -74,7 +74,7 @@ - void init_devices(void); - void open_dialog(void); - --#ifndef HAVE_MIXER_INFO -+#if !defined(HAVE_MIXER_INFO) && !defined(SOUND_MIXER_INFO) - typedef struct { - char id[20]; - char name[40]; diff --git a/audio/gnome-media/pkg/PLIST b/audio/gnome-media/pkg/PLIST index 28b55276112..e50ef277319 100644 --- a/audio/gnome-media/pkg/PLIST +++ b/audio/gnome-media/pkg/PLIST @@ -1,10 +1,12 @@ -@comment $NetBSD: PLIST,v 1.3 1999/11/07 21:58:12 tron Exp $ +@comment $NetBSD: PLIST,v 1.4 2000/06/01 17:18:03 rh Exp $ bin/cddbslave bin/cddbsubmit bin/gmix +bin/grecord bin/vumeter share/gnome/apps/Multimedia/gmix.desktop share/gnome/apps/Multimedia/vumeter.desktop +share/gnome/apps/Multimedia/Soundrecorder.desktop share/gnome/cddb-submit-methods share/locale/cs/LC_MESSAGES/gnome-media.mo share/locale/da/LC_MESSAGES/gnome-media.mo @@ -27,5 +29,15 @@ share/locale/pt_BR/LC_MESSAGES/gnome-media.mo share/locale/ru/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 +share/locale/ca/LC_MESSAGES/gnome-media.mo +share/locale/el/LC_MESSAGES/gnome-media.mo +share/locale/ro/LC_MESSAGES/gnome-media.mo +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/pixmaps/gnome-mixer.png share/pixmaps/gnome-vumeter.png +share/mime-info/grecord.keys +share/mime-info/grecord.mime |