From owner-svn-ports-head@FreeBSD.ORG Tue Oct 23 21:15:43 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1B815D6A; Tue, 23 Oct 2012 21:15:43 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ED47A8FC08; Tue, 23 Oct 2012 21:15:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9NLFg2w058755; Tue, 23 Oct 2012 21:15:42 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9NLFg2D058752; Tue, 23 Oct 2012 21:15:42 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201210232115.q9NLFg2D058752@svn.freebsd.org> From: Guido Falsi Date: Tue, 23 Oct 2012 21:15:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306331 - in head/multimedia: libva libva-vdpau-driver X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Oct 2012 21:15:43 -0000 Author: madpilot Date: Tue Oct 23 21:15:42 2012 New Revision: 306331 URL: http://svn.freebsd.org/changeset/ports/306331 Log: - Remove STRIP option. The STRIP variable needs special handling from bsd.port.mk. Using it as an option breaks DEBUG build and prevents installation of stripped binaries. - Bump PORTREVISION due to change in installed binaries (stripped vs unstripped) Thanks to Jan Beich for pointing this out. Feature safe: yes Modified: head/multimedia/libva-vdpau-driver/Makefile head/multimedia/libva/Makefile Modified: head/multimedia/libva-vdpau-driver/Makefile ============================================================================== --- head/multimedia/libva-vdpau-driver/Makefile Tue Oct 23 21:14:54 2012 (r306330) +++ head/multimedia/libva-vdpau-driver/Makefile Tue Oct 23 21:15:42 2012 (r306331) @@ -2,6 +2,7 @@ PORTNAME= libva-vdpau-driver PORTVERSION= 0.7.4 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://www.freedesktop.org/software/vaapi/releases/${PORTNAME}/ @@ -24,7 +25,7 @@ GNU_CONFIGURE= yes CPPFLAGS+= -isystem${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= DEBUG STRIP +OPTIONS_DEFINE= DEBUG .include @@ -32,7 +33,9 @@ OPTIONS_DEFINE= DEBUG STRIP CONFIGURE_ARGS+= --disable-debug .endif -.if ${PORT_OPTIONS:MSTRIP} +.include + +.if defined(STRIP) && ${STRIP} != "" INSTALL_TARGET= install-strip .endif @@ -43,4 +46,4 @@ post-patch: .SILENT -e '/\^vdpau_version/s|$$CC -E|& ${CPPFLAGS}|' \ ${WRKSRC}/configure -.include +.include Modified: head/multimedia/libva/Makefile ============================================================================== --- head/multimedia/libva/Makefile Tue Oct 23 21:14:54 2012 (r306330) +++ head/multimedia/libva/Makefile Tue Oct 23 21:15:42 2012 (r306331) @@ -2,7 +2,7 @@ PORTNAME= libva PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://cgit.freedesktop.org/${PORTNAME}/snapshot/ @@ -29,10 +29,18 @@ LDFLAGS+= -L${LOCALBASE}/lib # prevent types conflict: videodev2.h vs. drm.h CFLAGS+= -DHAVE_LINUX_INTEGER_TYPES -OPTIONS_DEFINE= DEBUG STRIP +OPTIONS_DEFINE= DEBUG .include +.if ${PORT_OPTIONS:MDEBUG} +CFLAGS+= -D_DEBUG +.else +CFLAGS+= -DNDEBUG +.endif + +.include + # add strnlen(3) from head/lib/libc/string/strnlen.c .if ${OSVERSION} < 800067 EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-va-va_trace.c @@ -42,13 +50,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch- BROKEN= glXCreateContext fails during configure .endif -.if ${PORT_OPTIONS:MDEBUG} -CFLAGS+= -D_DEBUG -.else -CFLAGS+= -DNDEBUG -.endif - -.if {PORT_OPTIONS:MSTRIP} +.if defined(STRIP) && ${STRIP} != "" INSTALL_TARGET= install-strip .endif @@ -69,4 +71,4 @@ post-configure: .SILENT ${REINPLACE_CMD} 's/-lpthread/${PTHREAD_LIBS}/' \ ${WRKSRC}/test/putsurface/Makefile -.include +.include