svn commit: r370294 - in branches/2014Q4/graphics/devil: . files

[Dmitry Marakasov]

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 at 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)