Index: Makefile =================================================================== --- Makefile (révision 364745) +++ Makefile (copie de travail) @@ -2,22 +2,39 @@ # $FreeBSD$ PORTNAME= pavucontrol -PORTVERSION= 0.9.10 -PORTREVISION= 1 +PORTVERSION= 2.0 CATEGORIES= audio -MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/ +MASTER_SITES= http://freedesktop.org/software/pulseaudio/${PORTNAME}/ MAINTAINER= romain@FreeBSD.org COMMENT= GTK mixer for PulseAudio -LIB_DEPENDS= libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \ - libpulse.so:${PORTSDIR}/audio/pulseaudio \ - libcanberra.so:${PORTSDIR}/audio/libcanberra +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE +LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio + GNU_CONFIGURE= yes -USES= gmake pkgconfig -USE_GNOME= intltool +USES= gmake pkgconfig gettext tar:xz +USE_GNOME= glibmm intltool libsigc++20 +OPTIONS_SUB= yes +OPTIONS_SINGLE= GTK +OPTIONS_SINGLE_GTK= GTK2 GTK3 +OPTIONS_DEFAULT= GTK2 + CONFIGURE_ARGS= --disable-lynx +GTK2_USE= GNOME=gtkmm24 +GTK2_LIB_DEPENDS= libcanberra.so:${PORTSDIR}/audio/libcanberra +GTK2_CONFIGURE_ON= --disable-gtk3 + +GTK3_USE= GNOME=gtkmm30 +GTK3_LIB_DEPENDS= libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 + +post-patch: +# Install locales files in right place + ${REINPLACE_CMD} -e 's|[$$][(]DATADIRNAME[)]|share|' \ + ${WRKSRC}/po/Makefile.in.in + .include Index: distinfo =================================================================== --- distinfo (révision 364745) +++ distinfo (copie de travail) @@ -1,2 +1,2 @@ -SHA256 (pavucontrol-0.9.10.tar.gz) = 7ee96d2ddc28f53e392a1bc51a7316d2a9087ea2ad18e611f6f6725e756a5a3c -SIZE (pavucontrol-0.9.10.tar.gz) = 227735 +SHA256 (pavucontrol-2.0.tar.xz) = 22f29dd81b4a1a34ec7bffe9b027aff2a37fc76ccded4539d43a8c126a39470b +SIZE (pavucontrol-2.0.tar.xz) = 151560 Index: files/patch-src__devicewidget.cc =================================================================== --- files/patch-src__devicewidget.cc (révision 0) +++ files/patch-src__devicewidget.cc (copie de travail) @@ -0,0 +1,20 @@ +From: Alam Arias +Date: Fri, 8 Mar 2013 14:27:02 -0500 +Subject: added back support for gtkmm-2.4 builds + +--- ./src/devicewidget.cc.orig 2012-12-17 09:50:42.000000000 +0000 ++++ ./src/devicewidget.cc 2014-08-12 18:56:20.000000000 +0000 +@@ -63,8 +63,13 @@ + for (unsigned i = 0; i < PA_CHANNELS_MAX; i++) + channelWidgets[i] = NULL; + ++#ifdef HAVE_GTK3 + offsetAdjustment = Gtk::Adjustment::create(0.0, -2000.0, 2000.0, 10.0, 50.0, 0.0); + offsetButton->configure(offsetAdjustment, 0, 2); ++#else ++ offsetAdjustment = new Gtk::Adjustment(0.0, -2000.0, 2000.0, 10.0, 50.0, 0.0); ++ offsetButton->configure(*offsetAdjustment, 0.0, 2); ++#endif /* HAVE_GTK3 */ + } + + void DeviceWidget::init(MainWindow* mainWindow, Glib::ustring deviceType) { Index: files/patch-src__devicewidget.h =================================================================== --- files/patch-src__devicewidget.h (révision 0) +++ files/patch-src__devicewidget.h (copie de travail) @@ -0,0 +1,18 @@ +From: Alam Arias +Date: Fri, 8 Mar 2013 14:27:02 -0500 +Subject: added back support for gtkmm-2.4 builds + +--- ./src/devicewidget.h.orig 2012-12-17 09:17:56.000000000 +0000 ++++ ./src/devicewidget.h 2014-08-12 18:56:20.000000000 +0000 +@@ -98,7 +98,11 @@ + Gtk::HBox *portSelect, *offsetSelect; + Gtk::ComboBox *portList; + Glib::RefPtr treeModel; ++#ifdef HAVE_GTK3 + Glib::RefPtr offsetAdjustment; ++#else ++ Gtk::Adjustment *offsetAdjustment; ++#endif /* HAVE_GTK3 */ + + private: + Glib::ustring mDeviceType; Index: pkg-descr =================================================================== --- pkg-descr (révision 364745) +++ pkg-descr (copie de travail) @@ -3,4 +3,4 @@ tools this one allows you to control both the volume of hardware devices and of each playback stream separately. -WWW: http://0pointer.de/lennart/projects/pavucontrol/ +WWW: http://freedesktop.org/software/pulseaudio/pavucontrol/ Index: pkg-plist =================================================================== --- pkg-plist (révision 364745) +++ pkg-plist (copie de travail) @@ -1,114 +1,53 @@ bin/pavucontrol -lib/locale/as/LC_MESSAGES/pavucontrol.mo -lib/locale/bn_IN/LC_MESSAGES/pavucontrol.mo -lib/locale/ca/LC_MESSAGES/pavucontrol.mo -lib/locale/cs/LC_MESSAGES/pavucontrol.mo -lib/locale/da/LC_MESSAGES/pavucontrol.mo -lib/locale/de/LC_MESSAGES/pavucontrol.mo -lib/locale/el/LC_MESSAGES/pavucontrol.mo -lib/locale/es/LC_MESSAGES/pavucontrol.mo -lib/locale/fi/LC_MESSAGES/pavucontrol.mo -lib/locale/fr/LC_MESSAGES/pavucontrol.mo -lib/locale/gu/LC_MESSAGES/pavucontrol.mo -lib/locale/hi/LC_MESSAGES/pavucontrol.mo -lib/locale/hu/LC_MESSAGES/pavucontrol.mo -lib/locale/it/LC_MESSAGES/pavucontrol.mo -lib/locale/ja/LC_MESSAGES/pavucontrol.mo -lib/locale/kn/LC_MESSAGES/pavucontrol.mo -lib/locale/ml/LC_MESSAGES/pavucontrol.mo -lib/locale/mr/LC_MESSAGES/pavucontrol.mo -lib/locale/nl/LC_MESSAGES/pavucontrol.mo -lib/locale/or/LC_MESSAGES/pavucontrol.mo -lib/locale/pa/LC_MESSAGES/pavucontrol.mo -lib/locale/pl/LC_MESSAGES/pavucontrol.mo -lib/locale/pt/LC_MESSAGES/pavucontrol.mo -lib/locale/pt_BR/LC_MESSAGES/pavucontrol.mo -lib/locale/ru/LC_MESSAGES/pavucontrol.mo -lib/locale/sk/LC_MESSAGES/pavucontrol.mo -lib/locale/sr/LC_MESSAGES/pavucontrol.mo -lib/locale/sr@latin/LC_MESSAGES/pavucontrol.mo -lib/locale/sv/LC_MESSAGES/pavucontrol.mo -lib/locale/ta/LC_MESSAGES/pavucontrol.mo -lib/locale/te/LC_MESSAGES/pavucontrol.mo -lib/locale/th/LC_MESSAGES/pavucontrol.mo -lib/locale/tr/LC_MESSAGES/pavucontrol.mo -lib/locale/uk/LC_MESSAGES/pavucontrol.mo -lib/locale/zh_CN/LC_MESSAGES/pavucontrol.mo share/applications/pavucontrol.desktop -share/doc/pavucontrol/README -share/doc/pavucontrol/README.html -share/doc/pavucontrol/style.css +%%DOCSDIR%%/README +%%DOCSDIR%%/README.html +%%DOCSDIR%%/style.css +share/locale/as/LC_MESSAGES/pavucontrol.mo +share/locale/bn_IN/LC_MESSAGES/pavucontrol.mo +share/locale/ca/LC_MESSAGES/pavucontrol.mo +share/locale/cs/LC_MESSAGES/pavucontrol.mo +share/locale/da/LC_MESSAGES/pavucontrol.mo +share/locale/de/LC_MESSAGES/pavucontrol.mo +share/locale/el/LC_MESSAGES/pavucontrol.mo +share/locale/es/LC_MESSAGES/pavucontrol.mo +share/locale/fi/LC_MESSAGES/pavucontrol.mo +share/locale/fr/LC_MESSAGES/pavucontrol.mo +share/locale/gu/LC_MESSAGES/pavucontrol.mo +share/locale/hi/LC_MESSAGES/pavucontrol.mo +share/locale/hu/LC_MESSAGES/pavucontrol.mo +share/locale/it/LC_MESSAGES/pavucontrol.mo +share/locale/ja/LC_MESSAGES/pavucontrol.mo +share/locale/kn/LC_MESSAGES/pavucontrol.mo +share/locale/ml/LC_MESSAGES/pavucontrol.mo +share/locale/mr/LC_MESSAGES/pavucontrol.mo +share/locale/nl/LC_MESSAGES/pavucontrol.mo +share/locale/or/LC_MESSAGES/pavucontrol.mo +share/locale/pa/LC_MESSAGES/pavucontrol.mo +share/locale/pl/LC_MESSAGES/pavucontrol.mo +share/locale/pt/LC_MESSAGES/pavucontrol.mo +share/locale/pt_BR/LC_MESSAGES/pavucontrol.mo +share/locale/ru/LC_MESSAGES/pavucontrol.mo +share/locale/sk/LC_MESSAGES/pavucontrol.mo +share/locale/sr/LC_MESSAGES/pavucontrol.mo +share/locale/sr@latin/LC_MESSAGES/pavucontrol.mo +share/locale/sv/LC_MESSAGES/pavucontrol.mo +share/locale/ta/LC_MESSAGES/pavucontrol.mo +share/locale/te/LC_MESSAGES/pavucontrol.mo +share/locale/th/LC_MESSAGES/pavucontrol.mo +share/locale/tr/LC_MESSAGES/pavucontrol.mo +share/locale/uk/LC_MESSAGES/pavucontrol.mo +share/locale/zh_CN/LC_MESSAGES/pavucontrol.mo %%DATADIR%%/pavucontrol.glade @dirrm %%DATADIR%% -@dirrm share/doc/pavucontrol -@dirrm lib/locale/zh_CN/LC_MESSAGES -@dirrm lib/locale/zh_CN -@dirrm lib/locale/uk/LC_MESSAGES -@dirrm lib/locale/uk -@dirrm lib/locale/tr/LC_MESSAGES -@dirrm lib/locale/tr -@dirrm lib/locale/th/LC_MESSAGES -@dirrm lib/locale/th -@dirrm lib/locale/te/LC_MESSAGES -@dirrm lib/locale/te -@dirrm lib/locale/ta/LC_MESSAGES -@dirrm lib/locale/ta -@dirrmtry lib/locale/sv/LC_MESSAGES -@dirrmtry lib/locale/sv -@dirrm lib/locale/sr@latin/LC_MESSAGES -@dirrm lib/locale/sr@latin -@dirrm lib/locale/sr/LC_MESSAGES -@dirrm lib/locale/sr -@dirrm lib/locale/sk/LC_MESSAGES -@dirrm lib/locale/sk -@dirrm lib/locale/ru/LC_MESSAGES -@dirrm lib/locale/ru -@dirrm lib/locale/pt_BR/LC_MESSAGES -@dirrm lib/locale/pt_BR -@dirrm lib/locale/pt/LC_MESSAGES -@dirrm lib/locale/pt -@dirrmtry lib/locale/pl/LC_MESSAGES -@dirrmtry lib/locale/pl -@dirrm lib/locale/pa/LC_MESSAGES -@dirrm lib/locale/pa -@dirrm lib/locale/or/LC_MESSAGES -@dirrm lib/locale/or -@dirrm lib/locale/nl/LC_MESSAGES -@dirrm lib/locale/nl -@dirrm lib/locale/mr/LC_MESSAGES -@dirrm lib/locale/mr -@dirrm lib/locale/ml/LC_MESSAGES -@dirrm lib/locale/ml -@dirrm lib/locale/kn/LC_MESSAGES -@dirrm lib/locale/kn -@dirrm lib/locale/ja/LC_MESSAGES -@dirrm lib/locale/ja -@dirrm lib/locale/it/LC_MESSAGES -@dirrm lib/locale/it -@dirrmtry lib/locale/hu/LC_MESSAGES -@dirrmtry lib/locale/hu -@dirrm lib/locale/hi/LC_MESSAGES -@dirrm lib/locale/hi -@dirrm lib/locale/gu/LC_MESSAGES -@dirrm lib/locale/gu -@dirrmtry lib/locale/fr/LC_MESSAGES -@dirrmtry lib/locale/fr -@dirrm lib/locale/fi/LC_MESSAGES -@dirrm lib/locale/fi -@dirrm lib/locale/es/LC_MESSAGES -@dirrm lib/locale/es -@dirrmtry lib/locale/el/LC_MESSAGES -@dirrmtry lib/locale/el -@dirrmtry lib/locale/de/LC_MESSAGES -@dirrmtry lib/locale/de -@dirrm lib/locale/da/LC_MESSAGES -@dirrm lib/locale/da -@dirrm lib/locale/cs/LC_MESSAGES -@dirrm lib/locale/cs -@dirrm lib/locale/ca/LC_MESSAGES -@dirrm lib/locale/ca -@dirrm lib/locale/bn_IN/LC_MESSAGES -@dirrm lib/locale/bn_IN -@dirrm lib/locale/as/LC_MESSAGES -@dirrm lib/locale/as -@dirrmtry lib/locale +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as +@dirrm %%DOCSDIR%%