Date: Tue, 13 Apr 2010 14:00:19 +0200 From: Demelier David <demelier.david@gmail.com> To: freebsd-ports@freebsd.org Subject: [PATCH] removing pulseaudio dependency on gnome-media and gnome-settings-daemon Message-ID: <20100413120019.GA46201@Abricot.malikania.fr>
next in thread | raw e-mail | index | archive | help
--8t9RHnE3ZwKMSgU+
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi freebsd-ports@,
I made a PR to remove 145669 to remove pulseaudio from audio/gnome-media but the
patch was completely bad. I rewrote it and I also made it for
sysutils/gnome-settings-daemon.
Could you check them and commit if you think it's okay ? Any feedback would
be helpful.
King regards,
David.
--
Demelier David
--8t9RHnE3ZwKMSgU+
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="gnome-media.patch"
--- Makefile.orig 2010-03-28 08:31:01.000000000 +0200
+++ Makefile 2010-04-13 13:56:50.000000000 +0200
@@ -18,9 +18,11 @@
BUILD_DEPENDS= xml2po:${PORTSDIR}/textproc/gnome-doc-utils
LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
- pulse.0:${PORTSDIR}/audio/pulseaudio \
unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+OPTIONS= PULSE "Enable Pulse Audio support" off
+
+
USE_BZIP2= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
@@ -32,6 +34,15 @@
USE_GNOME= gnomeprefix gnomehack intlhack gtk20 libxml2 libglade2 \
gconf2
USE_GSTREAMER= gconf good
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_PULSE)
+LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
+PLIST_SUB+= PULSE=""
+CONFIGURE_ARGS+= --enable-pulseaudio
+.endif
+
CONFIGURE_ARGS= --disable-gstmix
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -39,4 +50,4 @@
GCONF_SCHEMAS= gnome-audio-profiles.schemas \
gnome-sound-recorder.schemas
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--8t9RHnE3ZwKMSgU+
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="gnome-settings-daemon.patch"
--- Makefile.orig 2010-03-28 08:43:48.000000000 +0200
+++ Makefile 2010-04-13 13:53:19.000000000 +0200
@@ -16,11 +16,13 @@
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 settings daemon
-LIB_DEPENDS= pulse.0:${PORTSDIR}/audio/pulseaudio \
- canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
+LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
notify.1:${PORTSDIR}/devel/libnotify
RUN_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb
+OPTIONS= PULSE "Enable Pulse Audio support" off
+
+
USE_XORG= xxf86misc
USE_BZIP2= yes
USE_GMAKE= yes
@@ -29,6 +31,15 @@
USE_GSTREAMER= good
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_PULSE)
+LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
+CONFIGURE_ARGS+= --disable-pulse
+PLIST_SUB+= PULSE=""
+.endif
+
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -40,4 +51,4 @@
desktop_gnome_peripherals_touchpad.schemas \
gnome-settings-daemon.schemas
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--8t9RHnE3ZwKMSgU+--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100413120019.GA46201>