From 3c5abc1adbcf33b55cb991a7415c4ac937d8cd58 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Sun, 5 Jul 2015 08:27:03 +0000 Subject: - 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) --- net-im/qTox/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'net-im/qTox') diff --git a/net-im/qTox/Makefile b/net-im/qTox/Makefile index 954c47a9112b..96259e4a342e 100644 --- a/net-im/qTox/Makefile +++ b/net-im/qTox/Makefile @@ -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/linux/videodev2.h:${PORTSDIR}/multimedia/v4l 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},' \ -- cgit v1.2.3