Date: Mon, 21 Oct 2013 16:47:07 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331156 - in head/graphics/cimg: . files Message-ID: <201310211647.r9LGl7wV013123@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Mon Oct 21 16:47:07 2013 New Revision: 331156 URL: http://svnweb.freebsd.org/changeset/ports/331156 Log: graphics/cimg: link against ffmpeg - Link against ffmpeg - USES gmake Approved by: portmgr (bapt, implicit) Modified: head/graphics/cimg/Makefile head/graphics/cimg/files/patch-examples::Makefile Modified: head/graphics/cimg/Makefile ============================================================================== --- head/graphics/cimg/Makefile Mon Oct 21 16:36:14 2013 (r331155) +++ head/graphics/cimg/Makefile Mon Oct 21 16:47:07 2013 (r331156) @@ -3,7 +3,7 @@ PORTNAME= cimg PORTVERSION= 1.5.6 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 3 CATEGORIES= graphics devel MASTER_SITES= SF/${PORTNAME} \ @@ -34,7 +34,7 @@ CPPFLAGS+= ${CFLAGS} ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} .if !defined(NOPORTDOCS) -USE_GMAKE= yes +USES= gmake REINPLACE_ARGS= -i "" LIB_DEPENDS+= board.0:${PORTSDIR}/graphics/libboard @@ -61,7 +61,7 @@ WITHOUT_LAPACK= yes RUN_DEPENDS+= medcon:${PORTSDIR}/graphics/xmedcon . endif . if !defined(WITHOUT_FFMPEG) -LIB_DEPENDS+= avformat1:${PORTSDIR}/multimedia/ffmpeg1 +LIB_DEPENDS+= avformat:${PORTSDIR}/multimedia/ffmpeg . endif DOCBASE= README.txt Modified: head/graphics/cimg/files/patch-examples::Makefile ============================================================================== --- head/graphics/cimg/files/patch-examples::Makefile Mon Oct 21 16:36:14 2013 (r331155) +++ head/graphics/cimg/files/patch-examples::Makefile Mon Oct 21 16:47:07 2013 (r331156) @@ -51,7 +51,7 @@ # Flags to enable fast image display, using the XSHM library (when using X11). # !!! Seems to randomly crash when used on MacOSX and 64bits systems, so use it only when necessary !!! -@@ -185,13 +185,13 @@ +@@ -185,8 +185,8 @@ # Flags to enable native support for EXR image files, using the OpenEXR library. # ( http://www.openexr.com/ ) @@ -61,13 +61,6 @@ # Flags to enable native support for various video files, using the FFMPEG library. # ( http://www.ffmpeg.org/ ) --CIMG_FFMPEG_CFLAGS = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -I/usr/include/libavcodec -I/usr/include/libavformat -I/usr/include/libswscale -I/usr/include/ffmpeg --CIMG_FFMPEG_LDFLAGS = -lavcodec -lavformat -lswscale -+CIMG_FFMPEG_CFLAGS = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -I/$(LOCALBASE)/include/ffmpeg1/libavcodec -I/$(LOCALBASE)/include/ffmpeg1/libavformat -I/$(LOCALBASE)/include/ffmpeg1/libswscale -I/$(LOCALBASE)/include/ffmpeg1 -+CIMG_FFMPEG_LDFLAGS = -L$(LOCALBASE)/lib/ffmpeg1 -lavcodec1 -lavformat1 -lswscale1 - - # Flags to enable native support for compressed .cimgz files, using the Zlib library. - # ( http://www.zlib.net/ ) @@ -200,8 +200,8 @@ # Flags to enable native support of most classical image file formats, using the Magick++ library.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310211647.r9LGl7wV013123>