CVS commit: pkgsrc/devel/devIL

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Sat Sep 24 21:06:42 UTC 2022

Modified Files:
        pkgsrc/devel/devIL: Makefile distinfo
Added Files:
        pkgsrc/devel/devIL/patches: patch-src-IL_include_altivec__common.h
            patch-src-IL_src_il__quantizer.c patch-src-IL_src_il__sgi.c

Log Message:
devel/devIL: make this build & install on NetBSD/macppc.

A few patches to include <altivec.h> when __ALTIVEC__ is defined,
and passing -maltivec on powerpc ports.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/devel/devIL/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/devIL/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/devIL/patches/patch-src-IL_include_altivec__common.h \
    pkgsrc/devel/devIL/patches/patch-src-IL_src_il__quantizer.c \
    pkgsrc/devel/devIL/patches/patch-src-IL_src_il__sgi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/devIL/Makefile
diff -u pkgsrc/devel/devIL/Makefile:1.42 pkgsrc/devel/devIL/Makefile:1.43
--- pkgsrc/devel/devIL/Makefile:1.42    Fri Jun  5 12:48:59 2020
+++ pkgsrc/devel/devIL/Makefile Sat Sep 24 21:06:42 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2020/06/05 12:48:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.43 2022/09/24 21:06:42 he Exp $
 #
 
 DISTNAME=      DevIL-${DEVIL_VERSION}
@@ -25,6 +25,11 @@ INFO_FILES=          yes
 CONFIGURE_ARGS+=       --enable-ILU
 CONFIGURE_ARGS+=       --enable-ILUT
 
+.if (${MACHINE_ARCH} == "powerpc")
+# Uses __vector deep in the gcc10 includes...
+CFLAGS+=       -maltivec
+.endif
+
 .include "options.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"

Index: pkgsrc/devel/devIL/distinfo
diff -u pkgsrc/devel/devIL/distinfo:1.15 pkgsrc/devel/devIL/distinfo:1.16
--- pkgsrc/devel/devIL/distinfo:1.15    Tue Oct 26 10:14:32 2021
+++ pkgsrc/devel/devIL/distinfo Sat Sep 24 21:06:42 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2021/10/26 10:14:32 nia Exp $
+$NetBSD: distinfo,v 1.16 2022/09/24 21:06:42 he Exp $
 
 BLAKE2s (DevIL-1.7.8.tar.gz) = 135843f792b50024862d04d63a924d053d4f810d2f50c4f49bcafa4ee2d79bb1
 SHA512 (DevIL-1.7.8.tar.gz) = a67e1488d6cb366431d9fcb460b8fe5b8a1dd79426ac77f8abd0db4a5aad7512697f72ef0c49ddb0e806469cc37ba1319e10ccd2ebd73942332df2c3c507458e
@@ -10,5 +10,8 @@ SHA1 (patch-ad) = c8885607457c9af2d89dcf
 SHA1 (patch-include_IL_il.h) = 553b2fbbd930ff6bab4b5bc790d13ebcccbfffba
 SHA1 (patch-lib_Makefile.in) = a2ae8d1a97f2cbd9c46b2f5923be06839dd6c64f
 SHA1 (patch-src-ILU_ilur_ilur.c) = 611f0068a98f4da6771c11c8b267cafbea7cb76a
+SHA1 (patch-src-IL_include_altivec__common.h) = ac14657153ff7dbe3292b69bf57eb5d1bed4a945
 SHA1 (patch-src-IL_include_il__endian.h) = 25ed5f24fc871ceebb685e1c242a4c7b724142a2
 SHA1 (patch-src-IL_src_il__jp2.c) = 7474bdc6507f4a9daa42800fa626ec9ffe6892fe
+SHA1 (patch-src-IL_src_il__quantizer.c) = 0744471f7b92f746d5dbb5ba207c79803c97bf82
+SHA1 (patch-src-IL_src_il__sgi.c) = d01754446dd2a51b2f0b6a6b91700a3b85508487

Added files:

Index: pkgsrc/devel/devIL/patches/patch-src-IL_include_altivec__common.h
diff -u /dev/null pkgsrc/devel/devIL/patches/patch-src-IL_include_altivec__common.h:1.1
--- /dev/null   Sat Sep 24 21:06:42 2022
+++ pkgsrc/devel/devIL/patches/patch-src-IL_include_altivec__common.h   Sat Sep 24 21:06:42 2022
@@ -0,0 +1,17 @@
+$NetBSD: patch-src-IL_include_altivec__common.h,v 1.1 2022/09/24 21:06:42 he Exp $
+
+Use <altivec.h> if __ALTIVEC__ is defined.
+
+--- ./src-IL/include/altivec_common.h.orig     2009-03-08 07:10:08.000000000 +0000
++++ ./src-IL/include/altivec_common.h
+@@ -8,6 +8,10 @@
+ 
+ #include "il_internal.h"
+ 
++#ifdef __ALTIVEC__
++#include <altivec.h>
++#endif
++
+ #ifdef ALTIVEC_GCC
+ #ifndef ALTIVEC_COMMON
+ #define ALTIVEC_COMMON
Index: pkgsrc/devel/devIL/patches/patch-src-IL_src_il__quantizer.c
diff -u /dev/null pkgsrc/devel/devIL/patches/patch-src-IL_src_il__quantizer.c:1.1
--- /dev/null   Sat Sep 24 21:06:42 2022
+++ pkgsrc/devel/devIL/patches/patch-src-IL_src_il__quantizer.c Sat Sep 24 21:06:42 2022
@@ -0,0 +1,17 @@
+$NetBSD: patch-src-IL_src_il__quantizer.c,v 1.1 2022/09/24 21:06:42 he Exp $
+
+Use <altivec.h> if __ALTIVEC__ is defined.
+
+--- src-IL/src/il_quantizer.c.orig     2009-03-08 07:10:09.000000000 +0000
++++ src-IL/src/il_quantizer.c
+@@ -35,6 +35,10 @@
+ 
+ #include "il_internal.h"
+ 
++#ifdef __ALTIVEC__
++#include <altivec.h>
++#endif
++
+ #define MAXCOLOR      256
+ #define       RED                     2
+ #define       GREEN           1
Index: pkgsrc/devel/devIL/patches/patch-src-IL_src_il__sgi.c
diff -u /dev/null pkgsrc/devel/devIL/patches/patch-src-IL_src_il__sgi.c:1.1
--- /dev/null   Sat Sep 24 21:06:42 2022
+++ pkgsrc/devel/devIL/patches/patch-src-IL_src_il__sgi.c       Sat Sep 24 21:06:42 2022
@@ -0,0 +1,17 @@
+$NetBSD: patch-src-IL_src_il__sgi.c,v 1.1 2022/09/24 21:06:42 he Exp $
+
+Use <altivec.h> if __ALTIVEC__ is defined.
+
+--- src-IL/src/il_sgi.c.orig   2009-03-08 07:10:09.000000000 +0000
++++ src-IL/src/il_sgi.c
+@@ -16,6 +16,10 @@
+ #include "il_manip.h"
+ #include <limits.h>
+ 
++#ifdef __ALTIVEC__
++#include <altivec.h>
++#endif
++
+ static char *FName = NULL;
+ 
+ /*----------------------------------------------------------------------------*/