From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 21 05:40:11 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 545C91065679 for ; Fri, 21 Oct 2011 05:40:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 309E08FC1A for ; Fri, 21 Oct 2011 05:40:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p9L5eBUL088368 for ; Fri, 21 Oct 2011 05:40:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p9L5eBVS088359; Fri, 21 Oct 2011 05:40:11 GMT (envelope-from gnats) Resent-Date: Fri, 21 Oct 2011 05:40:11 GMT Resent-Message-Id: <201110210540.p9L5eBVS088359@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Nali Toja Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B410B106564A for ; Fri, 21 Oct 2011 05:35:52 +0000 (UTC) (envelope-from nalitoja@gmail.com) Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182]) by mx1.freebsd.org (Postfix) with ESMTP id 758B48FC12 for ; Fri, 21 Oct 2011 05:35:52 +0000 (UTC) Received: by ggnq2 with SMTP id q2so2868542ggn.13 for ; Thu, 20 Oct 2011 22:35:51 -0700 (PDT) Received: by 10.101.163.20 with SMTP id q20mr3009570ano.43.1319175351776; Thu, 20 Oct 2011 22:35:51 -0700 (PDT) Received: from nil ([68.71.46.138]) by mx.google.com with ESMTPS id t7sm32732796anh.15.2011.10.20.22.35.46 (version=SSLv3 cipher=OTHER); Thu, 20 Oct 2011 22:35:51 -0700 (PDT) Message-Id: <86ehy6ap0d.fsf@gmail.com> Date: Fri, 21 Oct 2011 05:32:18 +0000 From: Nali Toja To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/161858: [patch] emulators/qemu-devel: trim deps for -nographic X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Oct 2011 05:40:11 -0000 >Number: 161858 >Category: ports >Synopsis: [patch] emulators/qemu-devel: trim deps for -nographic >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Oct 21 05:40:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Nali Toja >Release: FreeBSD 10.0-CURRENT amd64 >Organization: >Environment: # everything is `off' $ make showconfig | fgrep \=on >Description: Allow bulding qemu without linking against non-base libs like it was possible before the port was updated to 0.15.0. >How-To-Repeat: >Fix: --- deps.diff begins here --- Index: emulators/qemu-devel/Makefile =================================================================== RCS file: /a/.csup/ports/emulators/qemu-devel/Makefile,v retrieving revision 1.128 diff -u -p -r1.128 Makefile --- emulators/qemu-devel/Makefile 13 Oct 2011 19:08:30 -0000 1.128 +++ emulators/qemu-devel/Makefile 21 Oct 2011 05:16:01 -0000 @@ -25,8 +25,6 @@ COMMENT= QEMU CPU Emulator - development HAS_CONFIGURE= yes USE_GMAKE= yes -USE_PYTHON= yes -USE_GNOME= glib20 USE_PERL5_BUILD= yes PATCH_STRIP= -p1 MAKE_ENV+= BSD_MAKE="${MAKE}" @@ -41,6 +39,9 @@ OPTIONS= SAMBA "samba dependency (for -s OPENGL "OpenGL dependency" On \ GNUTLS "gnutls dependency (vnc encryption)" On \ SASL "cyrus-sasl dependency (vnc encryption)" On \ + JPEG "jpeg dependency (vnc lossy compression)" On \ + PNG "png dependency (vnc compression)" On \ + GA "glib20 dependency (guest agent)" On \ CURL "libcurl dependency (remote images)" On \ CDROM_DMA "IDE CDROM DMA" On \ PCAP "pcap dependency (networking with bpf)" On \ @@ -50,12 +51,10 @@ OPTIONS= SAMBA "samba dependency (for -s ADD_AUDIO "Emulate more audio hardware (experimental!)" Off \ ALL_TARGETS "Also build bsd-user targets (for testing)" Off -.include +.include CONFIGURE_ARGS+= --extra-ldflags=-L${LOCALBASE}/lib PORTDOCS= docs qemu-doc.html qemu-tech.html -LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png .if defined(WITHOUT_ALL_TARGETS) CONFIGURE_ARGS+= --disable-bsd-user @@ -105,6 +104,27 @@ CONFIGURE_ARGS+= --disable-vnc-sasl LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 .endif +.if defined(WITHOUT_JPEG) +CONFIGURE_ARGS+= --disable-vnc-jpeg +.else +LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg +.endif + +.if defined(WITHOUT_PNG) +CONFIGURE_ARGS+= --disable-vnc-png +.else +LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +.endif + +.if defined(WITHOUT_GA) +CONFIGURE_ARGS+= --disable-guest-agent --python="${NONEXISTENT}" +PLIST_SUB+= GA="@comment " +.else +USE_PYTHON_BUILD= yes +USE_GNOME+= glib20 +PLIST_SUB+= GA="" +.endif + .if defined(WITHOUT_CURL) CONFIGURE_ARGS+= --disable-curl .else @@ -210,4 +234,4 @@ post-install: fi @${CAT} ${PKGMESSAGE} -.include +.include Index: emulators/qemu-devel/pkg-plist =================================================================== RCS file: /a/.csup/ports/emulators/qemu-devel/pkg-plist,v retrieving revision 1.31 diff -u -p -r1.31 pkg-plist --- emulators/qemu-devel/pkg-plist 16 Sep 2011 19:17:12 -0000 1.31 +++ emulators/qemu-devel/pkg-plist 21 Oct 2011 03:11:52 -0000 @@ -1,5 +1,5 @@ bin/qemu -bin/qemu-ga +%%GA%%bin/qemu-ga bin/qemu-img bin/qemu-io bin/qemu-nbd --- deps.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: