Attachment #151298 for bug #192571




# $FreeBSD$

PORTNAME=	pavucontrol
PORTVERSION=	2.0
PORTREVISION=	3
CATEGORIES=	audio
MASTER_SITES=	http://freedesktop.org/software/pulseaudio/${PORTNAME}/

MAINTAINER=	romain@FreeBSD.org
COMMENT=	GTK mixer for PulseAudio

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/LICENSE
		libcanberra.so:${PORTSDIR}/audio/libcanberra

LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio

GNU_CONFIGURE=	yes
USES=		gettext gmake pkgconfig 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
CPPFLAGS+=	-I${LOCALBASE}/include
LIBS+=		-L${LOCALBASE}/lib

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 <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (pavucontrol-0.9.10.tar.gz) = 7ee96d2ddc28f53e392a1bc51a7316d2a9087ea2ad18e611f6f6725e756a5a3c	1	SHA256 (pavucontrol-2.0.tar.xz) = 22f29dd81b4a1a34ec7bffe9b027aff2a37fc76ccded4539d43a8c126a39470b
2	SIZE (pavucontrol-0.9.10.tar.gz) = 227735	2	SIZE (pavucontrol-2.0.tar.xz) = 151560




From: Alam Arias <alam.gbc@gmail.com>
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) {
yes
native
text/plain




From: Alam Arias <alam.gbc@gmail.com>
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<Gtk::ListStore> treeModel;
+#ifdef HAVE_GTK3
     Glib::RefPtr<Gtk::Adjustment> offsetAdjustment;
+#else
+    Gtk::Adjustment *offsetAdjustment;
+#endif /* HAVE_GTK3 */
 
 private:
     Glib::ustring mDeviceType;
yes
native
text/plain

Lines 3-6 Link Here

(-)pkg-descr (-1 / +1 lines)
3	tools this one allows you to control both the volume of hardware devices and of	3	tools this one allows you to control both the volume of hardware devices and of
4	each playback stream separately.	4	each playback stream separately.
5		5
6	WWW: http://0pointer.de/lennart/projects/pavucontrol/	6	WWW: http://freedesktop.org/software/pulseaudio/pavucontrol/

Lines 1-8 Link Here

(-)pkg-plist (-3 / +3 lines)
1	bin/pavucontrol	1	bin/pavucontrol
2	share/applications/pavucontrol.desktop	2	share/applications/pavucontrol.desktop
3	share/doc/pavucontrol/README	3	%%DOCSDIR%%/README
4	share/doc/pavucontrol/README.html	4	%%DOCSDIR%%/README.html
5	share/doc/pavucontrol/style.css	5	%%DOCSDIR%%/style.css
6	share/locale/as/LC_MESSAGES/pavucontrol.mo	6	share/locale/as/LC_MESSAGES/pavucontrol.mo
7	share/locale/bn_IN/LC_MESSAGES/pavucontrol.mo	7	share/locale/bn_IN/LC_MESSAGES/pavucontrol.mo
8	share/locale/ca/LC_MESSAGES/pavucontrol.mo	8	share/locale/ca/LC_MESSAGES/pavucontrol.mo

Return to bug 192571

Lines 2-25 Link Here

(-)Makefile (-10 / +25 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= pavucontrol	4	PORTNAME= pavucontrol
5	PORTVERSION= 0.9.10	5	PORTVERSION= 2.0
6	PORTREVISION= 3
7	CATEGORIES= audio	6	CATEGORIES= audio
8	MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/	7	MASTER_SITES= http://freedesktop.org/software/pulseaudio/${PORTNAME}/
9		8
10	MAINTAINER= romain@FreeBSD.org	9	MAINTAINER= romain@FreeBSD.org
11	COMMENT= GTK mixer for PulseAudio	10	COMMENT= GTK mixer for PulseAudio
12		11
13	LIB_DEPENDS= libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \	12	LICENSE= GPLv2
14	libpulse.so:${PORTSDIR}/audio/pulseaudio \	13	LICENSE_FILE= ${WRKSRC}/LICENSE
15	libcanberra.so:${PORTSDIR}/audio/libcanberra
16		14
		15	LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio
		16
17	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
18	USES= gettext gmake pkgconfig	18	USES= gettext gmake pkgconfig tar:xz
19	USE_GNOME= intltool	19	USE_GNOME= glibmm intltool libsigc++20
20		20
		21	OPTIONS_SUB= yes
		22	OPTIONS_SINGLE= GTK
		23	OPTIONS_SINGLE_GTK=GTK2 GTK3
		24	OPTIONS_DEFAULT=GTK2
		25
21	CONFIGURE_ARGS= --disable-lynx	26	CONFIGURE_ARGS= --disable-lynx
22	CPPFLAGS+= -I${LOCALBASE}/include
23	LIBS+= -L${LOCALBASE}/lib
24		27
		28	GTK2_USE= GNOME=gtkmm24
		29	GTK2_LIB_DEPENDS=libcanberra.so:${PORTSDIR}/audio/libcanberra
		30	GTK2_CONFIGURE_ON=--disable-gtk3
		31
		32	GTK3_USE= GNOME=gtkmm30
		33	GTK3_LIB_DEPENDS=libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
		34
		35	post-patch:
		36	# Install locales files in right place
		37	${REINPLACE_CMD} -e 's\|[$$][(]DATADIRNAME[)]\|share\|' \
		38	${WRKSRC}/po/Makefile.in.in
		39
25	.include <bsd.port.mk>	40	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-src__devicewidget.cc (+23 lines)
	1	From: Alam Arias <alam.gbc@gmail.com>
	2	Date: Fri, 8 Mar 2013 14:27:02 -0500
	3	Subject: added back support for gtkmm-2.4 builds
	4
	5	--- ./src/devicewidget.cc.orig 2012-12-17 09:50:42.000000000 +0000
	6	+++ ./src/devicewidget.cc 2014-08-12 18:56:20.000000000 +0000
	7	@@ -63,8 +63,13 @@
	8	for (unsigned i = 0; i < PA_CHANNELS_MAX; i++)
	9	channelWidgets[i] = NULL;
	10
	11	+#ifdef HAVE_GTK3
	12	offsetAdjustment = Gtk::Adjustment::create(0.0, -2000.0, 2000.0, 10.0, 50.0, 0.0);
	13	offsetButton->configure(offsetAdjustment, 0, 2);
	14	+#else
	15	+ offsetAdjustment = new Gtk::Adjustment(0.0, -2000.0, 2000.0, 10.0, 50.0, 0.0);
	16	+ offsetButton->configure(*offsetAdjustment, 0.0, 2);
	17	+#endif /* HAVE_GTK3 */
	18	}
	19
	20	void DeviceWidget::init(MainWindow* mainWindow, Glib::ustring deviceType) {
	21	yes
	22	native
	23	text/plain

Line 0 Link Here

(-)files/patch-src__devicewidget.h (+21 lines)
	1	From: Alam Arias <alam.gbc@gmail.com>
	2	Date: Fri, 8 Mar 2013 14:27:02 -0500
	3	Subject: added back support for gtkmm-2.4 builds
	4
	5	--- ./src/devicewidget.h.orig 2012-12-17 09:17:56.000000000 +0000
	6	+++ ./src/devicewidget.h 2014-08-12 18:56:20.000000000 +0000
	7	@@ -98,7 +98,11 @@
	8	Gtk::HBox portSelect, offsetSelect;
	9	Gtk::ComboBox *portList;
	10	Glib::RefPtr<Gtk::ListStore> treeModel;
	11	+#ifdef HAVE_GTK3
	12	Glib::RefPtr<Gtk::Adjustment> offsetAdjustment;
	13	+#else
	14	+ Gtk::Adjustment *offsetAdjustment;
	15	+#endif /* HAVE_GTK3 */
	16
	17	private:
	18	Glib::ustring mDeviceType;
	19	yes
	20	native
	21	text/plain