Date: Tue, 28 Jun 2011 22:01:58 +0200 (CEST) From: Martin Matuska <mm@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: bsdkaffee@gmail.com Subject: ports/158408: [PATCH] graphics/frei0r: put opencv and gavl plugins into leaf ports Message-ID: <20110628200158.6AFDF108EC4@mail2.vx.sk> Resent-Message-ID: <201106282010.p5SKAA1T037710@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158408 >Category: ports >Synopsis: [PATCH] graphics/frei0r: put opencv and gavl plugins into leaf ports >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jun 28 20:10:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 8.2-STABLE amd64 >Organization: >Environment: System: FreeBSD neo.vx.sk 8.2-STABLE FreeBSD 8.2-STABLE #4 r223328M: Mon Jun 20 10:31:57 CEST >Description: Put opencv and gavl plugins into leaf ports (frei0r-plugins-opencv, frei0r-plugins-gavl) and so make frei0r dependency-free. This way we can include it in ffmpeg etc. Always enable CPU optimization ond amd64, as all amd64 CPUs support mmx, sse and sse2. Port maintainer (bsdkaffee@gmail.com) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- frei0r-1.3_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/frei0r/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile 11 Mar 2011 12:42:45 -0000 1.13 +++ Makefile 28 Jun 2011 19:59:11 -0000 @@ -8,6 +8,7 @@ PORTNAME= frei0r PORTVERSION= 1.3 DISTVERSIONPREFIX= plugins- +PORTREVISION?= 1 CATEGORIES= graphics MASTER_SITES= http://piksel.no/${PORTNAME}/releases/ \ ftp://ftp.dyne.org/${PORTNAME}/releases/ \ @@ -16,45 +17,90 @@ MAINTAINER= bsdkaffee@gmail.com COMMENT= Minimalistic plugin API for video effects -LIB_DEPENDS= cv.2:${PORTSDIR}/graphics/opencv \ - gavl.1:${PORTSDIR}/multimedia/gavl - GNU_CONFIGURE= yes USE_GNOME= gnomehack pkgconfig -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" MAKE_JOBS_SAFE= yes LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + +.if defined(BUILDING_FREI0R_OPENCV) +COMMENT= Frei0r OpenCV plugins +PKGNAMESUFFIX= -plugins-opencv +LIB_DEPENDS+= opencv_legacy.2:${PORTSDIR}/graphics/opencv + +FREI0R_PLUGINS= facebl0r facedetect + +.elif defined(BUILDING_FREI0R_GAVL) +COMMENT= Frei0r gavl plugins +PKGNAMESUFFIX= -plugins-gavl +LIB_DEPENDS+= gavl.1:${PORTSDIR}/multimedia/gavl + +FREI0R_PLUGINS= rgbparade scale0tilt vectorscope + +.else + PORTDOCS= * OPTIONS= APIDOC "Install full documentation (requires doxygen)" off \ MMX "Enable MMX CPU instructions" off -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - .include <bsd.port.options.mk> -.if !defined(NOPORTDOCS) && defined(WITH_APIDOC) +. if !defined(NOPORTDOCS) && defined(WITH_APIDOC) BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen +. endif + +.endif # !defined(BUILDING_FREI0R_OPENCV) && !defined(BUILDING_FREI0R_GAVL) + +.if defined(FREI0R_PLUGINS) +CPPFLAGS+= "-I${LOCALBASE}/include" +PLIST= ${WRKSRC}/PLIST +ALL_TARGET= +BUILD_WRKSRC= ${WRKSRC}/src +. for FILE in ${FREI0R_PLUGINS} +ALL_TARGET+= ${FILE}.la +PLIST_FILES+= lib/frei0r-1/${FILE}.so +. endfor +PLIST_FILES+= "@dirrmtry lib/frei0r-1" .endif -.if !defined(WITH_MMX) +.include <bsd.port.pre.mk> + +.if !defined(WITH_MMX) && ${ARCH} != "amd64" CONFIGURE_ARGS+=--disable-cpuflags .endif post-patch: -.if !defined(NOPORTDOCS) && defined(WITH_APIDOC) - @${REINPLACE_CMD} -e '/^SUBDIRS/s|include|include doc|' ${WRKSRC}/Makefile.in +.if !defined(BUILDING_FREI0R_GAVL) + @${REINPLACE_CMD} -e 's/HAVE_GAVL=true/HAVE_GAVL=false/g' \ + ${WRKSRC}/configure +.endif +.if !defined(BUILDING_FREI0R_OPENCV) + @${REINPLACE_CMD} -e 's/HAVE_OPENCV=true/HAVE_OPENCV=false/g' \ + ${WRKSRC}/configure .endif -.if defined(NOPORTDOCS) +.if !defined(FREI0R_PLUGINS) +. if !defined(NOPORTDOCS) && defined(WITH_APIDOC) + @${REINPLACE_CMD} -e '/^SUBDIRS/s|include|include doc|' ${WRKSRC}/Makefile.in +. endif +. if defined(NOPORTDOCS) @${REINPLACE_CMD} -e '/^install-data-am/s| install-docsDATA||' \ ${WRKSRC}/Makefile.in -.endif +. endif @${REINPLACE_CMD} -e 's|^docsdir.*|docsdir = ${DOCSDIR}|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|^htmldocsdir.*|htmldocsdir = ${DOCSDIR}|' \ ${WRKSRC}/doc/Makefile.in +.else +do-install: + @${MKDIR} ${PREFIX}/lib/frei0r-1 +. for FILE in ${FREI0R_PLUGINS} + @${INSTALL_LIB} ${BUILD_WRKSRC}/.libs/${FILE}.so \ + ${PREFIX}/lib/frei0r-1/${FILE}.so +. endfor +.endif #!defined(FREI0R_PLUGINS) -.include <bsd.port.mk> +.include <bsd.port.post.mk> Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/graphics/frei0r/pkg-plist,v retrieving revision 1.4 diff -u -r1.4 pkg-plist --- pkg-plist 11 Mar 2011 12:42:45 -0000 1.4 +++ pkg-plist 28 Jun 2011 19:59:11 -0000 @@ -42,8 +42,6 @@ lib/frei0r-1/dodge.so lib/frei0r-1/edgeglow.so lib/frei0r-1/equaliz0r.so -lib/frei0r-1/facebl0r.so -lib/frei0r-1/facedetect.so lib/frei0r-1/flippo.so lib/frei0r-1/gamma.so lib/frei0r-1/glow.so @@ -76,10 +74,8 @@ lib/frei0r-1/pr0be.so lib/frei0r-1/pr0file.so lib/frei0r-1/primaries.so -lib/frei0r-1/rgbparade.so lib/frei0r-1/saturat0r.so lib/frei0r-1/saturation.so -lib/frei0r-1/scale0tilt.so lib/frei0r-1/scanline0r.so lib/frei0r-1/screen.so lib/frei0r-1/select0r.so @@ -104,7 +100,6 @@ lib/frei0r-1/twolay0r.so lib/frei0r-1/uvmap.so lib/frei0r-1/value.so -lib/frei0r-1/vectorscope.so lib/frei0r-1/vertigo.so lib/frei0r-1/xfade0r.so libdata/pkgconfig/frei0r.pc --- frei0r-1.3_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110628200158.6AFDF108EC4>