From owner-svn-ports-head@FreeBSD.ORG Tue Oct 8 22:39:09 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1986F4D4; Tue, 8 Oct 2013 22:39:09 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DFB6F27C9; Tue, 8 Oct 2013 22:39:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r98Md8XK013898; Tue, 8 Oct 2013 22:39:08 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r98Md8YQ013893; Tue, 8 Oct 2013 22:39:08 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310082239.r98Md8YQ013893@svn.freebsd.org> From: William Grzybowski Date: Tue, 8 Oct 2013 22:39:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329841 - in head/audio/cuberok: . files 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, 08 Oct 2013 22:39:09 -0000 Author: wg Date: Tue Oct 8 22:39:08 2013 New Revision: 329841 URL: http://svnweb.freebsd.org/changeset/ports/329841 Log: audio/cuberok: link using ffmpeg0 - Link using ffmpeg0 Approved by: portmgr (bapt, implicit) Modified: head/audio/cuberok/Makefile head/audio/cuberok/files/patch-src-player_ffmpeg.h Modified: head/audio/cuberok/Makefile ============================================================================== --- head/audio/cuberok/Makefile Tue Oct 8 22:36:41 2013 (r329840) +++ head/audio/cuberok/Makefile Tue Oct 8 22:39:08 2013 (r329841) @@ -12,10 +12,10 @@ COMMENT= A music player and a collection BUILD_DEPENDS= audiere-config:${PORTSDIR}/audio/audiere \ ${LOCALBASE}/lib/libdumb.a:${PORTSDIR}/audio/dumb -LIB_DEPENDS= avcodec:${PORTSDIR}/multimedia/ffmpeg \ - avformat:${PORTSDIR}/multimedia/ffmpeg \ - avutil:${PORTSDIR}/multimedia/ffmpeg \ - tag:${PORTSDIR}/audio/taglib +LIB_DEPENDS= libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 \ + libavformat0.so:${PORTSDIR}/multimedia/ffmpeg0 \ + libavutil0.so:${PORTSDIR}/multimedia/ffmpeg0 \ + libtag.so:${PORTSDIR}/audio/taglib USE_LDCONFIG= yes USE_QT4= gui xml qmake_build uic_build moc_build rcc_build \ @@ -27,6 +27,14 @@ QMAKEFLAGS+= "CONFIG+=player_phonon" MAKE_ENV+= INSTALL_ROOT=${PREFIX} QMAKEPRO= Cuberok.pro +post-patch: + @${REINPLACE_CMD} \ + -e 's,libavcodec,libavcodec0,g' \ + -e 's,libavutil,libavutil0,g' \ + -e 's,libavformat,libavformat0,g' \ + ${WRKSRC}/Cuberok.pro \ + ${WRKSRC}/plugins/player_ffmpeg/player_ffmpeg.pro + do-configure: cd ${WRKSRC} && ${REINPLACE_CMD} -e 's/lib64/lib/g' \ plugins/plugins_path-x86* Modified: head/audio/cuberok/files/patch-src-player_ffmpeg.h ============================================================================== --- head/audio/cuberok/files/patch-src-player_ffmpeg.h Tue Oct 8 22:36:41 2013 (r329840) +++ head/audio/cuberok/files/patch-src-player_ffmpeg.h Tue Oct 8 22:39:08 2013 (r329841) @@ -1,13 +1,16 @@ ---- src/player_ffmpeg.h.orig 2009-07-10 14:14:03.000000000 +0800 -+++ src/player_ffmpeg.h 2010-05-10 21:49:51.000000000 +0800 -@@ -27,8 +27,8 @@ +--- src/player_ffmpeg.h.orig 2009-07-10 03:14:03.000000000 -0300 ++++ src/player_ffmpeg.h 2013-10-08 19:36:06.326157022 -0300 +@@ -23,13 +23,8 @@ + #include + #include "player.h" + extern "C" { +-#ifdef WIN32 #include #include - #else +-#else -#include -#include -+#include -+#include - #endif +-#endif } + class PlayThread : public QThread