Date: Sun, 14 Jun 2015 15:03:43 -0400 From: "Jason E. Hale" <jhale@FreeBSD.org> To: Tijl Coosemans <tijl@freebsd.org> Cc: ports-committers <ports-committers@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org> Subject: Re: svn commit: r389642 - in head/graphics: opencv opencv-core opencv-java py-opencv Message-ID: <CAJE75NGQOdPM_ksk3JFtUzWD7Z1Y6dBGs7Y7FjR4h8aPg-yEUA@mail.gmail.com> In-Reply-To: <20150614180031.0a62314f@kalimero.tijl.coosemans.org> References: <201506141528.t5EFS3Ou060777@svn.freebsd.org> <20150614180031.0a62314f@kalimero.tijl.coosemans.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Jun 14, 2015 at 12:00 PM, Tijl Coosemans <tijl@freebsd.org> wrote: > On Sun, 14 Jun 2015 15:28:03 +0000 (UTC) "Jason E. Hale" <jhale@FreeBSD.org> wrote: >> Author: jhale >> Date: Sun Jun 14 15:28:03 2015 >> New Revision: 389642 >> URL: https://svnweb.freebsd.org/changeset/ports/389642 >> >> Log: >> - Add SIMD option to specifically disable CPU optimizations and prevent crashes >> with ffmpeg on processors that do not support SSE instructions. OFF by >> default for package building, ON with autodetect for ports to keep with >> POLA. [1][2] >> - Bump PORTREVISION on all opencv ports >> >> PR: 199715 [1], 200234 [2] >> Submitted by: Randy Westlund <rwestlun@gmail.com> [1], sasamotikomi@gmail.com [2] >> >> Modified: >> head/graphics/opencv-core/Makefile >> head/graphics/opencv-java/Makefile >> head/graphics/opencv/Makefile >> head/graphics/py-opencv/Makefile >> >> Modified: head/graphics/opencv-core/Makefile >> ============================================================================== >> --- head/graphics/opencv-core/Makefile Sun Jun 14 15:15:42 2015 (r389641) >> +++ head/graphics/opencv-core/Makefile Sun Jun 14 15:28:03 2015 (r389642) >> @@ -1,7 +1,7 @@ >> # Created by: Martin Matuska <mm@FreeBSD.org> >> # $FreeBSD$ >> >> -PORTREVISION= 2 >> +PORTREVISION= 3 >> PKGNAMESUFFIX= -${OCV_SLAVE} >> >> COMMENT= OpenCV core libraries >> >> Modified: head/graphics/opencv-java/Makefile >> ============================================================================== >> --- head/graphics/opencv-java/Makefile Sun Jun 14 15:15:42 2015 (r389641) >> +++ head/graphics/opencv-java/Makefile Sun Jun 14 15:28:03 2015 (r389642) >> @@ -1,6 +1,6 @@ >> # $FreeBSD$ >> >> -PORTREVISION= 1 >> +PORTREVISION= 2 >> CATEGORIES= graphics java >> PKGNAMESUFFIX= -${OCV_SLAVE} >> >> >> Modified: head/graphics/opencv/Makefile >> ============================================================================== >> --- head/graphics/opencv/Makefile Sun Jun 14 15:15:42 2015 (r389641) >> +++ head/graphics/opencv/Makefile Sun Jun 14 15:28:03 2015 (r389642) >> @@ -3,7 +3,7 @@ >> >> PORTNAME?= opencv >> PORTVERSION= 2.4.9 >> -PORTREVISION?= 4 >> +PORTREVISION?= 5 >> CATEGORIES= graphics >> MASTER_SITES= SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION} >> >> @@ -42,7 +42,7 @@ OCV_NONFREE_MODS= nonfree >> OCV_JAVA_MODS= java >> OCV_PYTHON_MODS= python >> >> -OPTIONS_DEFINE= DC1394 EXAMPLES NONFREE OPENGL >> +OPTIONS_DEFINE= DC1394 EXAMPLES NONFREE OPENGL SIMD >> OPTIONS_GROUP= IMAGE PERFORMANCE VIDEO >> OPTIONS_GROUP_IMAGE= JASPER JPEG OPENEXR PNG TIFF >> OPTIONS_GROUP_PERFORMANCE= EIGEN3 TBB >> @@ -50,6 +50,9 @@ OPTIONS_GROUP_VIDEO= FFMPEG GSTREAMER V4 >> OPTIONS_RADIO= GUI >> OPTIONS_RADIO_GUI= GTK2 QT4 >> OPTIONS_DEFAULT= EIGEN3 JASPER JPEG PNG TIFF V4L >> +.if !defined(PACKAGE_BUILDING) >> +OPTIONS_DEFAULT= SIMD >> +.endif > > This also disables SSE/SSE2 in the amd64 package. You can just remove > this though. The package builders will do the right thing. There are probably a few amd64 processors that don't support SSE3, although all should support SSE and SSE2. Trying to work all of that out so certain packages have a bare minimum of optimizations is a bit more work. It was easier to just disable it all because it will just end up autodetecting whatever the package builder supports and making a package that might not work on some systems. When I add in SSSE3, SSE41, and SSE42 support later, it will be even more of a headache than it's worth.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJE75NGQOdPM_ksk3JFtUzWD7Z1Y6dBGs7Y7FjR4h8aPg-yEUA>