svn commit: r306331 - in head/multimedia: libva libva-vdpau-driver

[Guido Falsi]

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 <jbeich at tormail.org> 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 <bsd.port.options.mk>
 
@@ -32,7 +33,9 @@ OPTIONS_DEFINE=	DEBUG STRIP
 CONFIGURE_ARGS+=	--disable-debug
 .endif
 
-.if ${PORT_OPTIONS:MSTRIP}
+.include <bsd.port.pre.mk>
+
+.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 <bsd.port.mk>
+.include <bsd.port.post.mk>

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 <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MDEBUG}
+CFLAGS+=	-D_DEBUG
+.else
+CFLAGS+=	-DNDEBUG
+.endif
+
+.include <bsd.port.pre.mk>
+
 # 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 <bsd.port.mk>
+.include <bsd.port.post.mk>