Attachment #188771 for bug #224279

Lines 1-9 Link Here

(-)audio/volumeicon/Makefile (-4 / +11 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= volumeicon	3	PORTNAME= volumeicon
4	PORTVERSION= 0.5.0	4	PORTVERSION= 0.5.1
5	CATEGORIES= audio	5	CATEGORIES= audio
6	MASTER_SITES= http://softwarebakery.com/maato/files/volumeicon/
7		6
8	MAINTAINER= lme@FreeBSD.org	7	MAINTAINER= lme@FreeBSD.org
9	COMMENT= Lightweight volume control for the systray	8	COMMENT= Lightweight volume control for the systray
Lines 16-29 Link Here
16	CPPFLAGS+= -I${LOCALBASE}/include	15	CPPFLAGS+= -I${LOCALBASE}/include
17	LIBS+= -L${LOCALBASE}/lib	16	LIBS+= -L${LOCALBASE}/lib
18		17
19	USES= gmake gettext pkgconfig	18	USES= autoreconf gmake gettext pkgconfig
20	USE_GNOME= gtk30 intltool	19	USE_GNOME= gtk30 intltool cairo gdkpixbuf2
		20	USE_XORG= x11
		21	USE_GITHUB= yes
		22	GH_ACCOUNT= Maato
21		23
22	OPTIONS_DEFINE= NLS NOTIFY	24	OPTIONS_DEFINE= NLS NOTIFY
23	OPTIONS_DEFAULT= NOTIFY	25	OPTIONS_DEFAULT= NOTIFY
24	OPTIONS_SUB= yes	26	OPTIONS_SUB= yes
25		27
		28	NLS_USES= gettext
		29
26	NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify	30	NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify
27	NOTIFY_CONFIGURE_ENABLE=notify	31	NOTIFY_CONFIGURE_ENABLE=notify
28		32
		33	pre-configure:
		34	cd ${WRKSRC} && ./autogen.sh
		35
29	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)audio/volumeicon/distinfo (-2 / +3 lines)
1	SHA256 (volumeicon-0.5.0.tar.gz) = e5f1179f9ec5ab25e3740e4f6bbe0baa75368f0ae87d370197b3fbefb61bd782	1	TIMESTAMP = 1513090597
2	SIZE (volumeicon-0.5.0.tar.gz) = 160089	2	SHA256 (Maato-volumeicon-0.5.1_GH0.tar.gz) = 607979f316e6837eb7c65837c71b213a7dc6a2091153504f7b177a1d67f3da71
		3	SIZE (Maato-volumeicon-0.5.1_GH0.tar.gz) = 60651

Line 0 Link Here

(-)audio/volumeicon/files/patch-data_gui_preferences.ui (+11 lines)
	1	--- data/gui/preferences.ui.orig 2017-12-12 18:43:30 UTC
	2	+++ data/gui/preferences.ui
	3	@@ -197,7 +197,7 @@
	4	<object class="GtkLabel" id="label5">
	5	<property name="visible">True</property>
	6	<property name="can_focus">False</property>
	7	- <property name="label" translatable="yes"><b>Alsa</b></property>
	8	+ <property name="label" translatable="yes"><b>OSS</b></property>
	9	<property name="use_markup">True</property>
	10	</object>
	11	</child>




--- src/oss_backend.c.orig	2015-03-02 22:54:36 UTC
+++ src/oss_backend.c
@@ -22,7 +22,7 @@
 //##############################################################################

 	{
@@ -251,6 +277,7 @@ void oss_set_volume(int volume)
 	assert(m_mixer_fd != -1);
 	volume = (volume < 0 ? 0 : (volume > 100 ? 100 : volume));
 
+#if 0
 	oss_mixer_value vr;
 	vr.dev = m_ext.dev;
 	vr.ctrl = m_ext.ctrl;
@@ -286,9 +313,24 @@ void oss_set_volume(int volume)
 		default:
 			return;
 	}

 	if(volume == 100)
 		m_actual_maxvalue = get_raw_value();
+#endif
+}
+
+const gchar * oss_get_device()
+{
+	return NULL;
+}
+
+const GList * oss_get_device_names()
+{
+	return NULL;
 }

Line 0 Link Here

(-)audio/volumeicon/files/patch-src_oss__backend.h (+10 lines)
	1	--- src/oss_backend.h.orig 2015-03-02 22:54:36 UTC
	2	+++ src/oss_backend.h
	3	@@ -35,5 +35,7 @@ int oss_get_volume();
	4	gboolean oss_get_mute();
	5	const gchar * oss_get_channel();
	6	const GList * oss_get_channel_names();
	7	+const gchar * oss_get_device();
	8	+const GList * oss_get_device_names();
	9
	10	#endif

Line 0 Link Here

(-)audio/volumeicon/files/patch-src_volumeicon.c (+11 lines)
	1	--- src/volumeicon.c.orig 2015-03-02 22:54:36 UTC
	2	+++ src/volumeicon.c
	3	@@ -1295,6 +1295,8 @@ int main(int argc, char * argv[])
	4	backend_get_mute = &oss_get_mute;
	5	backend_get_channel = &oss_get_channel;
	6	backend_get_channel_names = &oss_get_channel_names;
	7	+ backend_get_device = &oss_get_device;
	8	+ backend_get_device_names = &oss_get_device_names;
	9	#else
	10	backend_setup = &asound_setup;
	11	backend_set_channel = &asound_set_channel;

Lines 1-5 Link Here

(-)audio/volumeicon/pkg-plist (+2 lines)
1	bin/volumeicon	1	bin/volumeicon
		2	%%NLS%%share/locale/de/LC_MESSAGES/volumeicon.mo
2	%%NLS%%share/locale/fr/LC_MESSAGES/volumeicon.mo	3	%%NLS%%share/locale/fr/LC_MESSAGES/volumeicon.mo
		4	%%NLS%%share/locale/pl/LC_MESSAGES/volumeicon.mo
3	%%DATADIR%%/gui/appicon.svg	5	%%DATADIR%%/gui/appicon.svg
4	%%DATADIR%%/gui/preferences.ui	6	%%DATADIR%%/gui/preferences.ui
5	%%DATADIR%%/icons/Black Gnome/1.png	7	%%DATADIR%%/icons/Black Gnome/1.png

Return to bug 224279

Lines 1-4 Link Here

(-)audio/volumeicon/files/patch-src_oss__backend.c (-3 / +13 lines)
1	--- src/oss_backend.c.orig 2013-02-25 15:52:49 UTC	1	--- src/oss_backend.c.orig 2015-03-02 22:54:36 UTC
2	+++ src/oss_backend.c	2	+++ src/oss_backend.c
3	@@ -22,7 +22,7 @@	3	@@ -22,7 +22,7 @@
4	//##############################################################################	4	//##############################################################################
Lines 154-166 Link Here
154	{	154	{
155	@@ -251,6 +277,7 @@ void oss_set_volume(int volume)	155	@@ -251,6 +277,7 @@ void oss_set_volume(int volume)
156	assert(m_mixer_fd != -1);	156	assert(m_mixer_fd != -1);
157	assert(volume >= 0 && volume <= 100);	157	volume = (volume < 0 ? 0 : (volume > 100 ? 100 : volume));
158		158
159	+#if 0	159	+#if 0
160	oss_mixer_value vr;	160	oss_mixer_value vr;
161	vr.dev = m_ext.dev;	161	vr.dev = m_ext.dev;
162	vr.ctrl = m_ext.ctrl;	162	vr.ctrl = m_ext.ctrl;
163	@@ -286,9 +313,14 @@ void oss_set_volume(int volume)	163	@@ -286,9 +313,24 @@ void oss_set_volume(int volume)
164	default:	164	default:
165	return;	165	return;
166	}	166	}
Lines 177-180 Link Here
177	if(volume == 100)	177	if(volume == 100)
178	m_actual_maxvalue = get_raw_value();	178	m_actual_maxvalue = get_raw_value();
179	+#endif	179	+#endif
		180	+}
		181	+
		182	+const gchar * oss_get_device()
		183	+{
		184	+ return NULL;
		185	+}
		186	+
		187	+const GList * oss_get_device_names()
		188	+{
		189	+ return NULL;
180	}	190	}