From owner-svn-ports-branches@FreeBSD.ORG Tue Oct 7 11:23:30 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C5EFC8E3; Tue, 7 Oct 2014 11:23:30 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 95EC6F20; Tue, 7 Oct 2014 11:23:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97BNUT0025447; Tue, 7 Oct 2014 11:23:30 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97BNU6j025445; Tue, 7 Oct 2014 11:23:30 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201410071123.s97BNU6j025445@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 7 Oct 2014 11:23:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370294 - in branches/2014Q4/graphics/devil: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Oct 2014 11:23:30 -0000 Author: amdmi3 Date: Tue Oct 7 11:23:29 2014 New Revision: 370294 URL: https://svnweb.freebsd.org/changeset/ports/370294 QAT: https://qat.redports.org/buildarchive/r370294/ Log: MFH: r370262 - Fix segfault (1) - Fix duplicate PORTREVISION PR: 194154 (1) Submitted by: rndfax@yandex.ru Approved by: portmgr Added: branches/2014Q4/graphics/devil/files/patch-src-IL__src__il_alloc.c - copied unchanged from r370262, head/graphics/devil/files/patch-src-IL__src__il_alloc.c Modified: branches/2014Q4/graphics/devil/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/graphics/devil/Makefile ============================================================================== --- branches/2014Q4/graphics/devil/Makefile Tue Oct 7 10:52:10 2014 (r370293) +++ branches/2014Q4/graphics/devil/Makefile Tue Oct 7 11:23:29 2014 (r370294) @@ -3,9 +3,8 @@ PORTNAME= devil PORTVERSION= 1.7.8 -PORTREVISION= 36 +PORTREVISION= 18 PORTEPOCH= 1 -PORTREVISION= 17 CATEGORIES= graphics MASTER_SITES= SF/openil/DevIL/${PORTVERSION} DISTNAME= DevIL-${PORTVERSION} Copied: branches/2014Q4/graphics/devil/files/patch-src-IL__src__il_alloc.c (from r370262, head/graphics/devil/files/patch-src-IL__src__il_alloc.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/graphics/devil/files/patch-src-IL__src__il_alloc.c Tue Oct 7 11:23:29 2014 (r370294, copy of r370262, head/graphics/devil/files/patch-src-IL__src__il_alloc.c) @@ -0,0 +1,11 @@ +--- src-IL/src/il_alloc.c.orig 2009-03-08 10:10:09.000000000 +0300 ++++ src-IL/src/il_alloc.c 2014-10-07 01:39:56.201078445 +0400 +@@ -123,7 +123,7 @@ + { + if (ptr) + { +-#ifdef MM_MALLOC ++#if defined(VECTORMEM) && defined(MM_MALLOC) + _mm_free((void*)ptr); + #else + #if defined(VECTORMEM) & !defined(POSIX_MEMALIGN) & !defined(VALLOC) & !defined(MEMALIGN) & !defined(MM_MALLOC)