From owner-freebsd-ports@FreeBSD.ORG Tue Apr 13 12:29:25 2010 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3B9C106564A for ; Tue, 13 Apr 2010 12:29:25 +0000 (UTC) (envelope-from demelier.david@gmail.com) Received: from mail-ww0-f54.google.com (mail-ww0-f54.google.com [74.125.82.54]) by mx1.freebsd.org (Postfix) with ESMTP id 454C18FC18 for ; Tue, 13 Apr 2010 12:29:24 +0000 (UTC) Received: by wwa36 with SMTP id 36so455331wwa.13 for ; Tue, 13 Apr 2010 05:29:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=uVOqkrF8foKAU3WRJZXjOfRnxigXmmXxgL5BNs98c4Q=; b=cnt1777iAbqORD4dzk1lgfPOR1d1S7C55lVEnnFcAD8soi37iVbe08ALIMk63XbcJo YSwppvV2LMDmPeupLFmyQOQpJ4d5PiGxBuCX0nDwo9s83ZW5DtdczVQqxH+bIW/Oc4kj NrMbwXzUuZG3Hobv4J3SBfPoAfUGDr4X7ldxA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=kab2bdSGFNLapg6WfrjDPKnGnKB+ASxlJx6cfv7bB7L+PmmTOz48HvmsH2wF9lP2Vz 7m+gR+SctQ2i5QHIEPJE8JqPB5F4RNy6Wc13yswLcZtOi7rBQ9tOvVPcqRMo7VTxzmF0 jU4jCc4npeqIKpHBzhoMWFCYUm4ohaPTPiE0w= Received: by 10.216.86.196 with SMTP id w46mr3405284wee.201.1271160019985; Tue, 13 Apr 2010 05:00:19 -0700 (PDT) Received: from Abricot.malikania.fr (121.21.102-84.rev.gaoland.net [84.102.21.121]) by mx.google.com with ESMTPS id r29sm119559wbv.3.2010.04.13.05.00.17 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 13 Apr 2010 05:00:18 -0700 (PDT) Date: Tue, 13 Apr 2010 14:00:19 +0200 From: Demelier David To: freebsd-ports@freebsd.org Message-ID: <20100413120019.GA46201@Abricot.malikania.fr> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="8t9RHnE3ZwKMSgU+" Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Subject: [PATCH] removing pulseaudio dependency on gnome-media and gnome-settings-daemon X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Apr 2010 12:29:25 -0000 --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 + +.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 +.include --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 + +.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 +.include --8t9RHnE3ZwKMSgU+--