View | Details | Raw Unified | Return to bug 192571 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-8 / +25 lines)
Lines 2-23 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	pavucontrol
4
PORTNAME=	pavucontrol
5
PORTVERSION=	0.9.10
5
PORTVERSION=	2.0
6
PORTREVISION=	1
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=		gmake pkgconfig
18
USES=		gmake pkgconfig gettext 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
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
23
.include <bsd.port.mk>
40
.include <bsd.port.mk>
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
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
(-)files/patch-src__devicewidget.cc (+20 lines)
Line 0 Link Here
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) {
(-)files/patch-src__devicewidget.h (+18 lines)
Line 0 Link Here
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;
(-)pkg-descr (-1 / +1 lines)
Lines 3-6 Link Here
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/
(-)pkg-plist (-110 / +49 lines)
Lines 1-114 Link Here
1
bin/pavucontrol
1
bin/pavucontrol
2
lib/locale/as/LC_MESSAGES/pavucontrol.mo
3
lib/locale/bn_IN/LC_MESSAGES/pavucontrol.mo
4
lib/locale/ca/LC_MESSAGES/pavucontrol.mo
5
lib/locale/cs/LC_MESSAGES/pavucontrol.mo
6
lib/locale/da/LC_MESSAGES/pavucontrol.mo
7
lib/locale/de/LC_MESSAGES/pavucontrol.mo
8
lib/locale/el/LC_MESSAGES/pavucontrol.mo
9
lib/locale/es/LC_MESSAGES/pavucontrol.mo
10
lib/locale/fi/LC_MESSAGES/pavucontrol.mo
11
lib/locale/fr/LC_MESSAGES/pavucontrol.mo
12
lib/locale/gu/LC_MESSAGES/pavucontrol.mo
13
lib/locale/hi/LC_MESSAGES/pavucontrol.mo
14
lib/locale/hu/LC_MESSAGES/pavucontrol.mo
15
lib/locale/it/LC_MESSAGES/pavucontrol.mo
16
lib/locale/ja/LC_MESSAGES/pavucontrol.mo
17
lib/locale/kn/LC_MESSAGES/pavucontrol.mo
18
lib/locale/ml/LC_MESSAGES/pavucontrol.mo
19
lib/locale/mr/LC_MESSAGES/pavucontrol.mo
20
lib/locale/nl/LC_MESSAGES/pavucontrol.mo
21
lib/locale/or/LC_MESSAGES/pavucontrol.mo
22
lib/locale/pa/LC_MESSAGES/pavucontrol.mo
23
lib/locale/pl/LC_MESSAGES/pavucontrol.mo
24
lib/locale/pt/LC_MESSAGES/pavucontrol.mo
25
lib/locale/pt_BR/LC_MESSAGES/pavucontrol.mo
26
lib/locale/ru/LC_MESSAGES/pavucontrol.mo
27
lib/locale/sk/LC_MESSAGES/pavucontrol.mo
28
lib/locale/sr/LC_MESSAGES/pavucontrol.mo
29
lib/locale/sr@latin/LC_MESSAGES/pavucontrol.mo
30
lib/locale/sv/LC_MESSAGES/pavucontrol.mo
31
lib/locale/ta/LC_MESSAGES/pavucontrol.mo
32
lib/locale/te/LC_MESSAGES/pavucontrol.mo
33
lib/locale/th/LC_MESSAGES/pavucontrol.mo
34
lib/locale/tr/LC_MESSAGES/pavucontrol.mo
35
lib/locale/uk/LC_MESSAGES/pavucontrol.mo
36
lib/locale/zh_CN/LC_MESSAGES/pavucontrol.mo
37
share/applications/pavucontrol.desktop
2
share/applications/pavucontrol.desktop
38
share/doc/pavucontrol/README
3
%%DOCSDIR%%/README
39
share/doc/pavucontrol/README.html
4
%%DOCSDIR%%/README.html
40
share/doc/pavucontrol/style.css
5
%%DOCSDIR%%/style.css
6
share/locale/as/LC_MESSAGES/pavucontrol.mo
7
share/locale/bn_IN/LC_MESSAGES/pavucontrol.mo
8
share/locale/ca/LC_MESSAGES/pavucontrol.mo
9
share/locale/cs/LC_MESSAGES/pavucontrol.mo
10
share/locale/da/LC_MESSAGES/pavucontrol.mo
11
share/locale/de/LC_MESSAGES/pavucontrol.mo
12
share/locale/el/LC_MESSAGES/pavucontrol.mo
13
share/locale/es/LC_MESSAGES/pavucontrol.mo
14
share/locale/fi/LC_MESSAGES/pavucontrol.mo
15
share/locale/fr/LC_MESSAGES/pavucontrol.mo
16
share/locale/gu/LC_MESSAGES/pavucontrol.mo
17
share/locale/hi/LC_MESSAGES/pavucontrol.mo
18
share/locale/hu/LC_MESSAGES/pavucontrol.mo
19
share/locale/it/LC_MESSAGES/pavucontrol.mo
20
share/locale/ja/LC_MESSAGES/pavucontrol.mo
21
share/locale/kn/LC_MESSAGES/pavucontrol.mo
22
share/locale/ml/LC_MESSAGES/pavucontrol.mo
23
share/locale/mr/LC_MESSAGES/pavucontrol.mo
24
share/locale/nl/LC_MESSAGES/pavucontrol.mo
25
share/locale/or/LC_MESSAGES/pavucontrol.mo
26
share/locale/pa/LC_MESSAGES/pavucontrol.mo
27
share/locale/pl/LC_MESSAGES/pavucontrol.mo
28
share/locale/pt/LC_MESSAGES/pavucontrol.mo
29
share/locale/pt_BR/LC_MESSAGES/pavucontrol.mo
30
share/locale/ru/LC_MESSAGES/pavucontrol.mo
31
share/locale/sk/LC_MESSAGES/pavucontrol.mo
32
share/locale/sr/LC_MESSAGES/pavucontrol.mo
33
share/locale/sr@latin/LC_MESSAGES/pavucontrol.mo
34
share/locale/sv/LC_MESSAGES/pavucontrol.mo
35
share/locale/ta/LC_MESSAGES/pavucontrol.mo
36
share/locale/te/LC_MESSAGES/pavucontrol.mo
37
share/locale/th/LC_MESSAGES/pavucontrol.mo
38
share/locale/tr/LC_MESSAGES/pavucontrol.mo
39
share/locale/uk/LC_MESSAGES/pavucontrol.mo
40
share/locale/zh_CN/LC_MESSAGES/pavucontrol.mo
41
%%DATADIR%%/pavucontrol.glade
41
%%DATADIR%%/pavucontrol.glade
42
@dirrm %%DATADIR%%
42
@dirrm %%DATADIR%%
43
@dirrm share/doc/pavucontrol
43
@dirrmtry share/locale/te/LC_MESSAGES
44
@dirrm lib/locale/zh_CN/LC_MESSAGES
44
@dirrmtry share/locale/te
45
@dirrm lib/locale/zh_CN
45
@dirrmtry share/locale/sr@latin/LC_MESSAGES
46
@dirrm lib/locale/uk/LC_MESSAGES
46
@dirrmtry share/locale/sr@latin
47
@dirrm lib/locale/uk
47
@dirrmtry share/locale/mr/LC_MESSAGES
48
@dirrm lib/locale/tr/LC_MESSAGES
48
@dirrmtry share/locale/mr
49
@dirrm lib/locale/tr
49
@dirrmtry share/locale/bn_IN/LC_MESSAGES
50
@dirrm lib/locale/th/LC_MESSAGES
50
@dirrmtry share/locale/bn_IN
51
@dirrm lib/locale/th
51
@dirrmtry share/locale/as/LC_MESSAGES
52
@dirrm lib/locale/te/LC_MESSAGES
52
@dirrmtry share/locale/as
53
@dirrm lib/locale/te
53
@dirrm %%DOCSDIR%%
54
@dirrm lib/locale/ta/LC_MESSAGES
55
@dirrm lib/locale/ta
56
@dirrmtry lib/locale/sv/LC_MESSAGES
57
@dirrmtry lib/locale/sv
58
@dirrm lib/locale/sr@latin/LC_MESSAGES
59
@dirrm lib/locale/sr@latin
60
@dirrm lib/locale/sr/LC_MESSAGES
61
@dirrm lib/locale/sr
62
@dirrm lib/locale/sk/LC_MESSAGES
63
@dirrm lib/locale/sk
64
@dirrm lib/locale/ru/LC_MESSAGES
65
@dirrm lib/locale/ru
66
@dirrm lib/locale/pt_BR/LC_MESSAGES
67
@dirrm lib/locale/pt_BR
68
@dirrm lib/locale/pt/LC_MESSAGES
69
@dirrm lib/locale/pt
70
@dirrmtry lib/locale/pl/LC_MESSAGES
71
@dirrmtry lib/locale/pl
72
@dirrm lib/locale/pa/LC_MESSAGES
73
@dirrm lib/locale/pa
74
@dirrm lib/locale/or/LC_MESSAGES
75
@dirrm lib/locale/or
76
@dirrm lib/locale/nl/LC_MESSAGES
77
@dirrm lib/locale/nl
78
@dirrm lib/locale/mr/LC_MESSAGES
79
@dirrm lib/locale/mr
80
@dirrm lib/locale/ml/LC_MESSAGES
81
@dirrm lib/locale/ml
82
@dirrm lib/locale/kn/LC_MESSAGES
83
@dirrm lib/locale/kn
84
@dirrm lib/locale/ja/LC_MESSAGES
85
@dirrm lib/locale/ja
86
@dirrm lib/locale/it/LC_MESSAGES
87
@dirrm lib/locale/it
88
@dirrmtry lib/locale/hu/LC_MESSAGES
89
@dirrmtry lib/locale/hu
90
@dirrm lib/locale/hi/LC_MESSAGES
91
@dirrm lib/locale/hi
92
@dirrm lib/locale/gu/LC_MESSAGES
93
@dirrm lib/locale/gu
94
@dirrmtry lib/locale/fr/LC_MESSAGES
95
@dirrmtry lib/locale/fr
96
@dirrm lib/locale/fi/LC_MESSAGES
97
@dirrm lib/locale/fi
98
@dirrm lib/locale/es/LC_MESSAGES
99
@dirrm lib/locale/es
100
@dirrmtry lib/locale/el/LC_MESSAGES
101
@dirrmtry lib/locale/el
102
@dirrmtry lib/locale/de/LC_MESSAGES
103
@dirrmtry lib/locale/de
104
@dirrm lib/locale/da/LC_MESSAGES
105
@dirrm lib/locale/da
106
@dirrm lib/locale/cs/LC_MESSAGES
107
@dirrm lib/locale/cs
108
@dirrm lib/locale/ca/LC_MESSAGES
109
@dirrm lib/locale/ca
110
@dirrm lib/locale/bn_IN/LC_MESSAGES
111
@dirrm lib/locale/bn_IN
112
@dirrm lib/locale/as/LC_MESSAGES
113
@dirrm lib/locale/as
114
@dirrmtry lib/locale

Return to bug 192571