Date: Sun, 20 Oct 2013 20:49:37 -0200 From: William Grzybowski <william88@gmail.com> To: Andriy Gapon <avg@freebsd.org> Cc: "Jason E. Hale" <jhale@freebsd.org>, multimedia@freebsd.org Subject: Re: graphics/opencv dependency on ffmpeg is broken by multimedia/ffmpeg upgrade Message-ID: <CAHtVNLNghzneDmmu0PCsnzmx3hRq1DPZAkbdRwouaedr%2Bi9DzA@mail.gmail.com> In-Reply-To: <5263F447.40705@FreeBSD.org> References: <5263F447.40705@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
jhale, please approve this patch.
Thank you.
On Sun, Oct 20, 2013 at 1:18 PM, Andriy Gapon <avg@freebsd.org> wrote:
>
> LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
>
> multimedia/ffmpeg no longer provides libavcodec.so.1.
> It's libavcodec.so.55 now.
>
> --
> Andriy Gapon
--
William Grzybowski
------------------------------------------
Curitiba/PR - Brasil
[-- Attachment #2 --]
Index: Makefile
===================================================================
--- Makefile (revision 330901)
+++ Makefile (working copy)
@@ -66,8 +66,9 @@
.endif
.if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+= libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0
CMAKE_ARGS+= -DWITH_FFMPEG:BOOL=On
+CXXFLAGS+= -I${LOCALBASE}/include/ffmpeg0
.else
CMAKE_ARGS+= -DWITH_FFMPEG:BOOL=Off
.endif
@@ -220,6 +221,12 @@
${WRKSRC}/samples/*/CMakeLists.txt \
${WRKSRC}/samples/*/*/CMakeLists.txt
@${FIND} ${WRKSRC} -name '*.orig' -exec rm {} \;
+ @${REINPLACE_CMD} \
+ -e 's,libavcodec ,libavcodec0 ,g' \
+ -e 's,libavformat ,libavformat0 ,g' \
+ -e 's,libswscale ,libswscale0 ,g' \
+ -e 's,libavutil ,libavutil0 ,g' \
+ ${WRKSRC}/CMakeLists.txt
.if defined(_BUILDING_OPENCV_CORE) && !defined(_BUILDING_OPENCV_PYTHON)
@${REINPLACE_CMD} -e '/add_subdirectory(data)/ d' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAHtVNLNghzneDmmu0PCsnzmx3hRq1DPZAkbdRwouaedr%2Bi9DzA>