Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Aug 2014 15:33:29 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r365668 - head/net/mediastreamer
Message-ID:  <201408221533.s7MFXTF5005858@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Fri Aug 22 15:33:29 2014
New Revision: 365668
URL: http://svnweb.freebsd.org/changeset/ports/365668
QAT: https://qat.redports.org/buildarchive/r365668/

Log:
  - Unconditionally depend on intltool to fix build with NLS disabled [1]
  - Add OpenGL rendering support [2]
  
  PR:		192856 [1]
  Submitted by:	Nils Beyer <nbe@renzel.net> [2]

Modified:
  head/net/mediastreamer/Makefile

Modified: head/net/mediastreamer/Makefile
==============================================================================
--- head/net/mediastreamer/Makefile	Fri Aug 22 15:31:16 2014	(r365667)
+++ head/net/mediastreamer/Makefile	Fri Aug 22 15:33:29 2014	(r365668)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mediastreamer
 PORTVERSION=	2.10.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	SAVANNAH/linphone/mediastreamer
 
@@ -18,23 +18,23 @@ LIB_DEPENDS=	libortp.so:${PORTSDIR}/net/
 CONFLICTS_INSTALL=	linphone-base-[0-9]*
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-alsa --disable-glx --disable-pulseaudio \
+CONFIGURE_ARGS=	--disable-alsa --disable-pulseaudio \
 		--disable-silent-rules --disable-strict \
 		--with-gsm=${LOCALBASE} xxd_found=yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 USES=		gmake libtool pathfix pkgconfig
-USE_GNOME=	gnomehier
+USE_GNOME=	gnomehier intltool
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		IPV6 NLS UPNP VIDEO
 OPTIONS_GROUP=		AUDIOOPT VIDEOOPT
 OPTIONS_GROUP_AUDIOOPT=	GSM OPUS SPANDSP SPEEX
-OPTIONS_GROUP_VIDEOOPT=	FFMPEG THEORA V4L VPX XVIDEO
+OPTIONS_GROUP_VIDEOOPT=	FFMPEG GLX THEORA V4L VPX XVIDEO
 OPTIONS_DEFAULT=	UPNP VIDEO \
 			GSM OPUS SPANDSP SPEEX \
-			FFMPEG THEORA V4L VPX XVIDEO
+			FFMPEG GLX THEORA V4L VPX XVIDEO
 OPTIONS_SUB=		yes
 
 AUDIOOPT_DESC=		Audio options
@@ -42,6 +42,9 @@ AUDIOOPT_DESC=		Audio options
 FFMPEG_CONFIGURE_ENABLE=ffmpeg
 FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
 
+GLX_CONFIGURE_ENABLE=	glx
+GLX_USE=		GL=glew
+
 GSM_CONFIGURE_ENABLE=	gsm
 GSM_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
 
@@ -49,7 +52,6 @@ IPV6_CONFIGURE_ENABLE=	ipv6
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
-NLS_USE=		GNOME=intltool
 
 OPUS_CONFIGURE_ENABLE=	opus
 OPUS_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
@@ -88,4 +90,14 @@ post-patch:
 	@${REINPLACE_CMD} 's,gsm/gsm\.h,gsm.h,' \
 		${WRKSRC}/configure ${WRKSRC}/src/audiofilters/gsm.c
 
+pre-build:
+# Transform file to C array (similar to xxd -i from editors/vim)
+.for i in yuv2rgb.fs yuv2rgb.vs
+	(cd ${WRKSRC}/src && { \
+		${ECHO_CMD} 'unsigned char ${i:S/./_/}[] = {' && \
+		/usr/bin/hexdump -v -e '" " 12/1 " 0x%02x," "\n" \
+		"  0x00 };\nunsigned int ${i:S/./_/}_len = %_Ad;"' ${i} | \
+		${SED} 's/ 0x  ,//g' ; } > ${i}.h)
+.endfor
+
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408221533.s7MFXTF5005858>