diff --git a/x11/gnome/media/Makefile b/x11/gnome/media/Makefile index bd82ff026b8..83a22b74d96 100644 --- a/x11/gnome/media/Makefile +++ b/x11/gnome/media/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.37 2010/07/25 08:15:33 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.38 2010/09/30 07:35:18 ajacoutot Exp $ COMMENT= GNOME media utilities GNOME_PROJECT= gnome-media -GNOME_VERSION= 2.30.0 -REVISION= 0 +GNOME_VERSION= 2.32.0 SHARED_LIBS += gnome-media-profiles 1.0 # .0.0 @@ -17,14 +16,14 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB += ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext -WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 -WANTLIB += dbus-glib-1 expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 +WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo +WANTLIB += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 gstbase-0.10 WANTLIB += gstreamer-0.10 gthread-2.0 gtk-x11-2.0 ltdl m ogg pango-1.0 WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread WANTLIB += pthread-stubs vorbis vorbisfile xcb xml2 z xcb-render WANTLIB += xcb-render-util gstaudio-0.10 gstinterfaces-0.10 canberra-gtk -WANTLIB += canberra +WANTLIB += canberra gladeui-1 MODULES= devel/gettext \ x11/gnome \ @@ -32,7 +31,8 @@ MODULES= devel/gettext \ BUILD_DEPENDS= ::multimedia/gstreamer-0.10/plugins-good LIB_DEPENDS= :gstreamer-plugins-base->=0.10.25:multimedia/gstreamer-0.10/plugins-base \ - ::audio/libcanberra + ::audio/libcanberra \ + ::devel/glade3 MODGNOME_HELP_FILES= Yes USE_X11= Yes diff --git a/x11/gnome/media/distinfo b/x11/gnome/media/distinfo index f1367ec8853..ebb7d2d1d00 100644 --- a/x11/gnome/media/distinfo +++ b/x11/gnome/media/distinfo @@ -1,5 +1,5 @@ -MD5 (gnome/gnome-media-2.30.0.tar.bz2) = AnsR+4sSarGyXe9rnhIb0w== -RMD160 (gnome/gnome-media-2.30.0.tar.bz2) = m6b2/cJa+jQHLoDKQQKADX114rw= -SHA1 (gnome/gnome-media-2.30.0.tar.bz2) = wHfxwKTvl5CMe7NuQUd8dwaf3NA= -SHA256 (gnome/gnome-media-2.30.0.tar.bz2) = mUzZuI/yLkgVWFYpsU78goqVKEkAgJsLT4683gxuKSY= -SIZE (gnome/gnome-media-2.30.0.tar.bz2) = 2707711 +MD5 (gnome/gnome-media-2.32.0.tar.bz2) = BvyMZ63TTJi8SE4NvEBNQQ== +RMD160 (gnome/gnome-media-2.32.0.tar.bz2) = wk7H12yhxjYQynj2KRsquxnwWjw= +SHA1 (gnome/gnome-media-2.32.0.tar.bz2) = Y/1RUVM45KZ9C9KHH/TVVCRbxXw= +SHA256 (gnome/gnome-media-2.32.0.tar.bz2) = KwrU3s11QGOY9G6CoXDlO8vG4b3DNj8DoHsA9Zwv5eY= +SIZE (gnome/gnome-media-2.32.0.tar.bz2) = 2814365 diff --git a/x11/gnome/media/patches/patch-gstreamer-properties_pipeline-constants_c b/x11/gnome/media/patches/patch-gstreamer-properties_pipeline-constants_c index afdf8c97a38..b90ab89db70 100644 --- a/x11/gnome/media/patches/patch-gstreamer-properties_pipeline-constants_c +++ b/x11/gnome/media/patches/patch-gstreamer-properties_pipeline-constants_c @@ -1,16 +1,16 @@ -$OpenBSD: patch-gstreamer-properties_pipeline-constants_c,v 1.5 2009/10/11 23:01:22 jasper Exp $ ---- gstreamer-properties/pipeline-constants.c.orig Thu Aug 13 13:31:19 2009 -+++ gstreamer-properties/pipeline-constants.c Sun Oct 11 23:59:57 2009 -@@ -78,6 +78,8 @@ GSTPPipelineDescription audiosink_pipelines[] = { - "osssink", NULL, FALSE, TEST_PIPE_SUPPLIED, audiosink_test_pipe, TRUE}, - {PIPE_TYPE_AUDIOSINK, 0, N_("PulseAudio Sound Server"), +$OpenBSD: patch-gstreamer-properties_pipeline-constants_c,v 1.6 2010/09/30 07:35:18 ajacoutot Exp $ +--- gstreamer-properties/pipeline-constants.c.orig Wed Aug 4 15:22:33 2010 ++++ gstreamer-properties/pipeline-constants.c Tue Sep 28 18:59:24 2010 +@@ -82,6 +82,8 @@ GSTPPipelineDescription audiosink_pipelines[] = { "pulsesink", NULL, FALSE, TEST_PIPE_SUPPLIED, audiosink_test_pipe, FALSE}, + {PIPE_TYPE_AUDIOSINK, 0, N_("Sun Audio"), + "sunaudiosink", NULL, FALSE, TEST_PIPE_SUPPLIED, audiosink_test_pipe, TRUE}, + {PIPE_TYPE_AUDIOSINK, 0, N_("SNDIO - audio access library"), + "libsndiosink", NULL, FALSE, TEST_PIPE_SUPPLIED, audiosink_test_pipe, FALSE}, {PIPE_TYPE_AUDIOSINK, 0, N_("Custom"), NULL, NULL, TRUE, TEST_PIPE_SUPPLIED, audiosink_test_pipe, TRUE} }; -@@ -127,6 +129,8 @@ GSTPPipelineDescription audiosrc_pipelines[] = { +@@ -135,6 +137,8 @@ GSTPPipelineDescription audiosrc_pipelines[] = { TEST_PIPE_AUDIOSINK, NULL, FALSE}, {PIPE_TYPE_AUDIOSRC, 0, N_("PulseAudio Sound Server"), "pulsesrc", NULL, FALSE, TEST_PIPE_AUDIOSINK, NULL, FALSE}, diff --git a/x11/gnome/media/pkg/DESCR b/x11/gnome/media/pkg/DESCR index dcb9a8d6356..dd7705f57f7 100644 --- a/x11/gnome/media/pkg/DESCR +++ b/x11/gnome/media/pkg/DESCR @@ -1,5 +1,5 @@ This package contains a few media utilities for the GNOME desktop: - * the GNOME GStreamer-based audio mixer; - * a volume level meter for ESD; - * the GNOME Sound Recorder; - * the GStreamer properties capplet. + * the GNOME GStreamer-based audio mixer + * a volume level meter + * the GNOME Sound Recorder + * the GStreamer properties capplet diff --git a/x11/gnome/media/pkg/PFRAG.shared b/x11/gnome/media/pkg/PFRAG.shared index 3a549d9423c..6f1d503207e 100644 --- a/x11/gnome/media/pkg/PFRAG.shared +++ b/x11/gnome/media/pkg/PFRAG.shared @@ -1,2 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.3 2010/04/22 19:14:03 ajacoutot Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.4 2010/09/30 07:35:18 ajacoutot Exp $ +lib/glade3/modules/libgnome-media-profiles.so @lib lib/libgnome-media-profiles.so.${LIBgnome-media-profiles_VERSION} diff --git a/x11/gnome/media/pkg/PLIST b/x11/gnome/media/pkg/PLIST index ab0ccd3ef0b..56f7ad71b27 100644 --- a/x11/gnome/media/pkg/PLIST +++ b/x11/gnome/media/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.13 2010/04/22 19:14:03 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.14 2010/09/30 07:35:18 ajacoutot Exp $ %%SHARED%% @bin bin/gnome-audio-profiles-properties @bin bin/gnome-sound-recorder @@ -11,12 +11,19 @@ include/gnome-media/profiles/audio-profile-edit.h include/gnome-media/profiles/audio-profile.h include/gnome-media/profiles/audio-profiles-edit.h include/gnome-media/profiles/gnome-media-profiles.h +lib/glade3/ +lib/glade3/modules/ +@comment lib/glade3/modules/libgnome-media-profiles.a +@comment lib/glade3/modules/libgnome-media-profiles.la lib/libgnome-media-profiles.a lib/libgnome-media-profiles.la lib/pkgconfig/gnome-media-profiles.pc share/applications/gnome-sound-recorder.desktop share/applications/gnome-volume-control.desktop share/applications/gstreamer-properties.desktop +share/glade3/ +share/glade3/catalogs/ +share/glade3/catalogs/gnome-media-profiles.xml share/gnome-media/ share/gnome-media/gnome-audio-profile-edit.ui share/gnome-media/gnome-audio-profile-new.ui @@ -35,6 +42,12 @@ share/gnome/help/gnome-audio-profiles/C/figures/gnome-audio-profiles-profile-win share/gnome/help/gnome-audio-profiles/C/figures/gnome-audio-profiles-profiles-window.png share/gnome/help/gnome-audio-profiles/C/gnome-audio-profiles.xml share/gnome/help/gnome-audio-profiles/C/legal.xml +share/gnome/help/gnome-audio-profiles/da/ +share/gnome/help/gnome-audio-profiles/da/figures/ +share/gnome/help/gnome-audio-profiles/da/figures/gnome-audio-profiles-profile-window.png +share/gnome/help/gnome-audio-profiles/da/figures/gnome-audio-profiles-profiles-window.png +share/gnome/help/gnome-audio-profiles/da/gnome-audio-profiles.xml +share/gnome/help/gnome-audio-profiles/da/legal.xml share/gnome/help/gnome-audio-profiles/de/ share/gnome/help/gnome-audio-profiles/de/figures/ share/gnome/help/gnome-audio-profiles/de/figures/gnome-audio-profiles-profile-window.png @@ -141,6 +154,10 @@ share/gnome/help/gnome-volume-control/cs/ share/gnome/help/gnome-volume-control/cs/figures/ share/gnome/help/gnome-volume-control/cs/figures/gnome-volume-control_window.png share/gnome/help/gnome-volume-control/cs/gnome-volume-control.xml +share/gnome/help/gnome-volume-control/da/ +share/gnome/help/gnome-volume-control/da/figures/ +share/gnome/help/gnome-volume-control/da/figures/gnome-volume-control_window.png +share/gnome/help/gnome-volume-control/da/gnome-volume-control.xml share/gnome/help/gnome-volume-control/de/ share/gnome/help/gnome-volume-control/de/figures/ share/gnome/help/gnome-volume-control/de/figures/gnome-volume-control_window.png @@ -195,6 +212,10 @@ share/gnome/help/gstreamer-properties/cs/ share/gnome/help/gstreamer-properties/cs/figures/ share/gnome/help/gstreamer-properties/cs/figures/gstreamer_properties_window.png share/gnome/help/gstreamer-properties/cs/gstreamer-properties.xml +share/gnome/help/gstreamer-properties/da/ +share/gnome/help/gstreamer-properties/da/figures/ +share/gnome/help/gstreamer-properties/da/figures/gstreamer_properties_window.png +share/gnome/help/gstreamer-properties/da/gstreamer-properties.xml share/gnome/help/gstreamer-properties/de/ share/gnome/help/gstreamer-properties/de/figures/ share/gnome/help/gstreamer-properties/de/figures/gstreamer_properties_window.png @@ -358,6 +379,7 @@ share/locale/tk/ share/locale/tk/LC_MESSAGES/ share/locale/tk/LC_MESSAGES/gnome-media-2.0.mo share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo +share/locale/ug/LC_MESSAGES/gnome-media-2.0.mo share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo share/locale/wa/LC_MESSAGES/gnome-media-2.0.mo @@ -367,6 +389,7 @@ share/locale/zh_HK/LC_MESSAGES/gnome-media-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo share/omf/gnome-audio-profiles/ share/omf/gnome-audio-profiles/gnome-audio-profiles-C.omf +share/omf/gnome-audio-profiles/gnome-audio-profiles-da.omf share/omf/gnome-audio-profiles/gnome-audio-profiles-de.omf share/omf/gnome-audio-profiles/gnome-audio-profiles-el.omf share/omf/gnome-audio-profiles/gnome-audio-profiles-es.omf @@ -392,6 +415,7 @@ share/omf/gnome-volume-control/ share/omf/gnome-volume-control/gnome-volume-control-C.omf share/omf/gnome-volume-control/gnome-volume-control-ca.omf share/omf/gnome-volume-control/gnome-volume-control-cs.omf +share/omf/gnome-volume-control/gnome-volume-control-da.omf share/omf/gnome-volume-control/gnome-volume-control-de.omf share/omf/gnome-volume-control/gnome-volume-control-el.omf share/omf/gnome-volume-control/gnome-volume-control-en_GB.omf @@ -406,6 +430,7 @@ share/omf/gstreamer-properties/ share/omf/gstreamer-properties/gstreamer-properties-C.omf share/omf/gstreamer-properties/gstreamer-properties-ca.omf share/omf/gstreamer-properties/gstreamer-properties-cs.omf +share/omf/gstreamer-properties/gstreamer-properties-da.omf share/omf/gstreamer-properties/gstreamer-properties-de.omf share/omf/gstreamer-properties/gstreamer-properties-el.omf share/omf/gstreamer-properties/gstreamer-properties-en_GB.omf