Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Jul 2015 08:27:03 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r391351 - head/net-im/qTox
Message-ID:  <201507050827.t658R3LT064694@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Sun Jul  5 08:27:03 2015
New Revision: 391351
URL: https://svnweb.freebsd.org/changeset/ports/391351

Log:
  - Use multimedia/ffmpeg instead of multimedia/ffmpeg26
    after former has been upgraded to 2.7 branch
  - Bump PORTREVISION
  
  PR:		201324
  Submitted by:	yuri@rawbw.com (maintainer)

Modified:
  head/net-im/qTox/Makefile

Modified: head/net-im/qTox/Makefile
==============================================================================
--- head/net-im/qTox/Makefile	Sun Jul  5 08:27:02 2015	(r391350)
+++ head/net-im/qTox/Makefile	Sun Jul  5 08:27:03 2015	(r391351)
@@ -3,6 +3,7 @@
 
 PORTNAME=	qTox
 PORTVERSION=	0.150614
+PORTREVISION=	1
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	yuri@rawbw.com
@@ -14,7 +15,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/linu
 LIB_DEPENDS=	libtoxcore.so:${PORTSDIR}/net-im/tox \
 		libopencv_highgui.so:${PORTSDIR}/graphics/opencv \
 		libopencv_core.so:${PORTSDIR}/graphics/opencv-core \
-		libavcodec26.so:${PORTSDIR}/multimedia/ffmpeg26 \
+		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 		libvpx.so:${PORTSDIR}/multimedia/libvpx \
 		libfilteraudio.so:${PORTSDIR}/audio/libfilteraudio \
 		libsodium.so:${PORTSDIR}/security/libsodium \
@@ -29,8 +30,6 @@ USE_GNOME=	glib20 gtk20 cairo gdkpixbuf2
 USE_XORG=	x11 xscrnsaver
 USE_QT5=	core gui network xml opengl sql sql-sqlite3_run widgets svg \
 		concurrent buildtools_build linguisttools_build
-CXXFLAGS+=	-I${LOCALBASE}/include/ffmpeg26
-LDFLAGS+=	-L${LOCALBASE}/lib/ffmpeg26
 
 PLIST_FILES=	bin/qtox \
 		share/applications/qTox.desktop
@@ -49,8 +48,6 @@ post-patch:
 		${WRKSRC}/qtox.pro
 	@${REINPLACE_CMD} -e 's|INCLUDEPATH += "/usr/lib|INCLUDEPATH += "${LOCALBASE}/lib|' \
 		${WRKSRC}/qtox.pro
-	@${REINPLACE_CMD} -e 's|-lavformat -lavdevice -lavcodec -lavutil -lswscale|-lavformat26 -lavdevice26 -lavcodec26 -lavutil26 -lswscale26|' \
-		${WRKSRC}/qtox.pro
 
 pre-configure:
 	@${REINPLACE_CMD} '/Comment/s,=.*,=${COMMENT},' \



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