subject:"extend graphics\/DevIL"

Re: extend graphics/DevIL

2013-02-03 Thread Kirill Bychkov

On Wed, January 30, 2013 16:11, Kirill Bychkov wrote:
 On Wed, January 30, 2013 15:58, David Coppa wrote:
 On Wed, Jan 30, 2013 at 1:55 PM, Kirill Bychkov ya...@linklevel.net wrote:
 Hi. This patch extends functionality of graphics/devil:
  - enables ILU and ILUT libraries
  - add ilur utility for graphics transform in command line

 Regen distinfo while here.
 ilur tested on amd64 and works fine. OK to commit?

 Since you're here, could you get rid of PFRAG.shared?

 Done

ping?

 Index: Makefile
 ===
 RCS file: /cvs/ports/graphics/DevIL/Makefile,v
 retrieving revision 1.8
 diff -u -p -r1.8 Makefile
 --- Makefile  20 Sep 2012 14:04:17 -  1.8
 +++ Makefile  30 Jan 2013 13:09:25 -
 @@ -3,8 +3,10 @@
  COMMENT= library for powerful image loading capabilities

  DISTNAME=DevIL-1.7.8
 -REVISION=5
 +REVISION=6
  SHARED_LIBS+=IL  0.0 # 2.0
 +SHARED_LIBS+=ILU 0.0 # 2.0
 +SHARED_LIBS+=ILUT0.0 # 2.0

  CATEGORIES=  graphics devel

 @@ -19,10 +21,15 @@ PERMIT_DISTFILES_FTP= Yes
  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=openil/}
  EXTRACT_SUFX=.zip

 -WANTLIB += Half Iex IlmImf IlmThread Imath jasper jpeg lcms m
 -WANTLIB += mng png pthread stdc++ tiff z
 -
 -LIB_DEPENDS= graphics/ilmbase \
 +WANTLIB += GL GLU Half ICE Iex IlmImf IlmThread Imath SDL SM X11
 +WANTLIB += Xdamage Xext Xfixes Xi Xmu Xrandr Xrender Xt Xxf86vm
 +WANTLIB += c drm glut jasper jpeg lcms m mng png pthread sndio
 +WANTLIB += stdc++ tiff usbhid xcb z
 +
 +MODULES= converters/libiconv
 +LIB_DEPENDS= devel/sdl \
 + graphics/freeglut \
 + graphics/ilmbase \
   graphics/jasper \
   graphics/libmng \
   graphics/lcms \
 @@ -36,7 +43,10 @@ USE_LIBTOOL=   Yes
  AUTOCONF_VERSION=2.61
  CONFIGURE_STYLE= autoconf
  CONFIGURE_ARGS+= --with-squish=no \
 - --with-zlib=yes
 + --with-zlib=yes \
 + --enable-ILU \
 +--enable-ILUT
 +
  # This would only install three binary examples, we'll install it manually.
  CONFIGURE_ARGS+= --with-examples=no
  CONFIGURE_ENV=   CPPFLAGS=-I${LOCALBASE}/include
 -I${LOCALBASE}/include/libpng/ -I${X11BASE}/include \
 Index: distinfo
 ===
 RCS file: /cvs/ports/graphics/DevIL/distinfo,v
 retrieving revision 1.1.1.1
 diff -u -p -r1.1.1.1 distinfo
 --- distinfo  30 Mar 2011 09:27:58 -  1.1.1.1
 +++ distinfo  30 Jan 2013 13:09:25 -
 @@ -1,5 +1,2 @@
 -MD5 (DevIL-1.7.8.zip) = MShT75yFrXshAPnNBosqWw==
 -RMD160 (DevIL-1.7.8.zip) = uSiKTlPpoGEPBLS7H859hf2EhK8=
 -SHA1 (DevIL-1.7.8.zip) = V4fhY12Pqpvxrsjeh83TlhTXLJc=
  SHA256 (DevIL-1.7.8.zip) = Q2jYOzAWter+iYTw1/hszudriZPPkA06jL1JAbUvZOs=
  SIZE (DevIL-1.7.8.zip) = 3452549
 Index: patches/patch-src-ILUT_src_ilut_opengl_c
 ===
 RCS file: patches/patch-src-ILUT_src_ilut_opengl_c
 diff -N patches/patch-src-ILUT_src_ilut_opengl_c
 --- /dev/null 1 Jan 1970 00:00:00 -
 +++ patches/patch-src-ILUT_src_ilut_opengl_c  30 Jan 2013 13:09:25 -
 @@ -0,0 +1,48 @@
 +$OpenBSD$
 +--- src-ILUT/src/ilut_opengl.c.orig  Mon Sep 14 15:22:33 2009
  src-ILUT/src/ilut_opengl.c   Mon Sep 14 15:25:13 2009
 +@@ -58,7 +58,7 @@ void *aglGetProcAddress( const GLubyte *name ) {
 + //  #pragma comment(lib, freeglut.lib)
 + #endif
 +
 +-#ifdef linux
 ++#if defined(linux) || defined (__OpenBSD__)
 + // fix for glXGetProcAddressARB
 + #define GLX_GLXEXT_PROTOTYPES
 + #include GL/glx.h
 +@@ -84,7 +84,7 @@ void *aglGetProcAddress( const GLubyte *name ) {
 +
 + static ILboolean HasCubemapHardware = IL_FALSE;
 + static ILboolean HasNonPowerOfTwoHardware = IL_FALSE;
 +-#if defined(_WIN32) || defined(_WIN64) || defined(linux) ||
 defined(__APPLE__)
 ++#if defined(_WIN32) || defined(_WIN64) || defined(linux) ||
 defined(__APPLE__) || defined (__OpenBSD__)
 + ILGLTEXIMAGE3DARBPROC   ilGLTexImage3D = NULL;
 + ILGLTEXSUBIMAGE3DARBPROCilGLTexSubImage3D = NULL;
 + ILGLCOMPRESSEDTEXIMAGE2DARBPROC ilGLCompressed2D = NULL;
 +@@ -127,7 +127,7 @@ ILboolean ilutGLInit()
 + IsExtensionSupported(GL_EXT_texture3D)) {
 + ilGLCompressed3D =
 (ILGLCOMPRESSEDTEXIMAGE3DARBPROC)wglGetProcAddress(glCompressedTexImage3DARB);
 + }
 +-#elif linux
 ++#elif defined(linux) || defined (__OpenBSD__)
 + if (IsExtensionSupported(GL_ARB_texture_compression) 
 + 
 IsExtensionSupported(GL_EXT_texture_compression_s3tc)) {
 + ilGLCompressed2D =

extend graphics/DevIL

2013-01-30 Thread Kirill Bychkov

Hi. This patch extends functionality of graphics/devil:
 - enables ILU and ILUT libraries
 - add ilur utility for graphics transform in command line

Regen distinfo while here.
ilur tested on amd64 and works fine. OK to commit?

Index: Makefile
===
RCS file: /cvs/ports/graphics/DevIL/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile20 Sep 2012 14:04:17 -  1.8
+++ Makefile30 Jan 2013 12:10:36 -
@@ -3,8 +3,10 @@
 COMMENT=   library for powerful image loading capabilities

 DISTNAME=  DevIL-1.7.8
-REVISION=  5
+REVISION=  6
 SHARED_LIBS+=  IL  0.0 # 2.0
+SHARED_LIBS+=  ILU 0.0 # 2.0
+SHARED_LIBS+=  ILUT0.0 # 2.0

 CATEGORIES=graphics devel

@@ -19,10 +21,15 @@ PERMIT_DISTFILES_FTP=   Yes
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=openil/}
 EXTRACT_SUFX=  .zip

-WANTLIB += Half Iex IlmImf IlmThread Imath jasper jpeg lcms m
-WANTLIB += mng png pthread stdc++ tiff z
-
-LIB_DEPENDS=   graphics/ilmbase \
+WANTLIB += GL GLU Half ICE Iex IlmImf IlmThread Imath SDL SM X11
+WANTLIB += Xdamage Xext Xfixes Xi Xmu Xrandr Xrender Xt Xxf86vm
+WANTLIB += c drm glut jasper jpeg lcms m mng png pthread sndio
+WANTLIB += stdc++ tiff usbhid xcb z
+
+MODULES=   converters/libiconv
+LIB_DEPENDS=   devel/sdl \
+   graphics/freeglut \
+   graphics/ilmbase \
graphics/jasper \
graphics/libmng \
graphics/lcms \
@@ -36,7 +43,10 @@ USE_LIBTOOL= Yes
 AUTOCONF_VERSION=  2.61
 CONFIGURE_STYLE=   autoconf
 CONFIGURE_ARGS+=   --with-squish=no \
-   --with-zlib=yes
+   --with-zlib=yes \
+   --enable-ILU \
+--enable-ILUT
+
 # This would only install three binary examples, we'll install it manually.
 CONFIGURE_ARGS+=   --with-examples=no
 CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng/ -I${X11BASE}/include \
Index: distinfo
===
RCS file: /cvs/ports/graphics/DevIL/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo30 Mar 2011 09:27:58 -  1.1.1.1
+++ distinfo30 Jan 2013 12:10:36 -
@@ -1,5 +1,2 @@
-MD5 (DevIL-1.7.8.zip) = MShT75yFrXshAPnNBosqWw==
-RMD160 (DevIL-1.7.8.zip) = uSiKTlPpoGEPBLS7H859hf2EhK8=
-SHA1 (DevIL-1.7.8.zip) = V4fhY12Pqpvxrsjeh83TlhTXLJc=
 SHA256 (DevIL-1.7.8.zip) = Q2jYOzAWter+iYTw1/hszudriZPPkA06jL1JAbUvZOs=
 SIZE (DevIL-1.7.8.zip) = 3452549
Index: patches/patch-src-ILUT_src_ilut_opengl_c
===
RCS file: patches/patch-src-ILUT_src_ilut_opengl_c
diff -N patches/patch-src-ILUT_src_ilut_opengl_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src-ILUT_src_ilut_opengl_c30 Jan 2013 12:10:36 -
@@ -0,0 +1,48 @@
+$OpenBSD$
+--- src-ILUT/src/ilut_opengl.c.origMon Sep 14 15:22:33 2009
 src-ILUT/src/ilut_opengl.c Mon Sep 14 15:25:13 2009
+@@ -58,7 +58,7 @@ void *aglGetProcAddress( const GLubyte *name ) {
+ //#pragma comment(lib, freeglut.lib)
+ #endif
+
+-#ifdef linux
++#if defined(linux) || defined (__OpenBSD__)
+   // fix for glXGetProcAddressARB
+   #define GLX_GLXEXT_PROTOTYPES
+   #include GL/glx.h
+@@ -84,7 +84,7 @@ void *aglGetProcAddress( const GLubyte *name ) {
+
+ static ILboolean HasCubemapHardware = IL_FALSE;
+ static ILboolean HasNonPowerOfTwoHardware = IL_FALSE;
+-#if defined(_WIN32) || defined(_WIN64) || defined(linux) || defined(__APPLE__)
++#if defined(_WIN32) || defined(_WIN64) || defined(linux) ||
defined(__APPLE__) || defined (__OpenBSD__)
+   ILGLTEXIMAGE3DARBPROC   ilGLTexImage3D = NULL;
+   ILGLTEXSUBIMAGE3DARBPROCilGLTexSubImage3D = NULL;
+   ILGLCOMPRESSEDTEXIMAGE2DARBPROC ilGLCompressed2D = NULL;
+@@ -127,7 +127,7 @@ ILboolean ilutGLInit()
+   IsExtensionSupported(GL_EXT_texture3D)) {
+   ilGLCompressed3D =
(ILGLCOMPRESSEDTEXIMAGE3DARBPROC)wglGetProcAddress(glCompressedTexImage3DARB);
+   }
+-  #elif linux
++  #elif defined(linux) || defined (__OpenBSD__)
+   if (IsExtensionSupported(GL_ARB_texture_compression) 
+   
IsExtensionSupported(GL_EXT_texture_compression_s3tc)) {
+   ilGLCompressed2D = 
(ILGLCOMPRESSEDTEXIMAGE2DARBPROC)
+@@ -246,7 +246,7 @@ ILuint GLGetDXTCNum(ILenum DXTCFormat)
+ ILboolean ILAPIENTRY ilutGLTexImage_(GLuint Level, GLuint Target, ILimage
*Image)
+ {
+   ILimage *ImageCopy, *OldImage;
+-#if defined (_MSC_VER) || defined (linux) || defined(__APPLE__)
++#if defined (_MSC_VER) || defined (linux) ||

Re: extend graphics/DevIL

2013-01-30 Thread David Coppa

On Wed, Jan 30, 2013 at 1:55 PM, Kirill Bychkov ya...@linklevel.net wrote:
 Hi. This patch extends functionality of graphics/devil:
  - enables ILU and ILUT libraries
  - add ilur utility for graphics transform in command line

 Regen distinfo while here.
 ilur tested on amd64 and works fine. OK to commit?

Since you're here, could you get rid of PFRAG.shared?

cheers,
david

Re: extend graphics/DevIL

2013-01-30 Thread Kirill Bychkov

On Wed, January 30, 2013 15:58, David Coppa wrote:
 On Wed, Jan 30, 2013 at 1:55 PM, Kirill Bychkov ya...@linklevel.net wrote:
 Hi. This patch extends functionality of graphics/devil:
  - enables ILU and ILUT libraries
  - add ilur utility for graphics transform in command line

 Regen distinfo while here.
 ilur tested on amd64 and works fine. OK to commit?

 Since you're here, could you get rid of PFRAG.shared?

Done

Index: Makefile
===
RCS file: /cvs/ports/graphics/DevIL/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile20 Sep 2012 14:04:17 -  1.8
+++ Makefile30 Jan 2013 13:09:25 -
@@ -3,8 +3,10 @@
 COMMENT=   library for powerful image loading capabilities

 DISTNAME=  DevIL-1.7.8
-REVISION=  5
+REVISION=  6
 SHARED_LIBS+=  IL  0.0 # 2.0
+SHARED_LIBS+=  ILU 0.0 # 2.0
+SHARED_LIBS+=  ILUT0.0 # 2.0

 CATEGORIES=graphics devel

@@ -19,10 +21,15 @@ PERMIT_DISTFILES_FTP=   Yes
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=openil/}
 EXTRACT_SUFX=  .zip

-WANTLIB += Half Iex IlmImf IlmThread Imath jasper jpeg lcms m
-WANTLIB += mng png pthread stdc++ tiff z
-
-LIB_DEPENDS=   graphics/ilmbase \
+WANTLIB += GL GLU Half ICE Iex IlmImf IlmThread Imath SDL SM X11
+WANTLIB += Xdamage Xext Xfixes Xi Xmu Xrandr Xrender Xt Xxf86vm
+WANTLIB += c drm glut jasper jpeg lcms m mng png pthread sndio
+WANTLIB += stdc++ tiff usbhid xcb z
+
+MODULES=   converters/libiconv
+LIB_DEPENDS=   devel/sdl \
+   graphics/freeglut \
+   graphics/ilmbase \
graphics/jasper \
graphics/libmng \
graphics/lcms \
@@ -36,7 +43,10 @@ USE_LIBTOOL= Yes
 AUTOCONF_VERSION=  2.61
 CONFIGURE_STYLE=   autoconf
 CONFIGURE_ARGS+=   --with-squish=no \
-   --with-zlib=yes
+   --with-zlib=yes \
+   --enable-ILU \
+--enable-ILUT
+
 # This would only install three binary examples, we'll install it manually.
 CONFIGURE_ARGS+=   --with-examples=no
 CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng/ -I${X11BASE}/include \
Index: distinfo
===
RCS file: /cvs/ports/graphics/DevIL/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo30 Mar 2011 09:27:58 -  1.1.1.1
+++ distinfo30 Jan 2013 13:09:25 -
@@ -1,5 +1,2 @@
-MD5 (DevIL-1.7.8.zip) = MShT75yFrXshAPnNBosqWw==
-RMD160 (DevIL-1.7.8.zip) = uSiKTlPpoGEPBLS7H859hf2EhK8=
-SHA1 (DevIL-1.7.8.zip) = V4fhY12Pqpvxrsjeh83TlhTXLJc=
 SHA256 (DevIL-1.7.8.zip) = Q2jYOzAWter+iYTw1/hszudriZPPkA06jL1JAbUvZOs=
 SIZE (DevIL-1.7.8.zip) = 3452549
Index: patches/patch-src-ILUT_src_ilut_opengl_c
===
RCS file: patches/patch-src-ILUT_src_ilut_opengl_c
diff -N patches/patch-src-ILUT_src_ilut_opengl_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src-ILUT_src_ilut_opengl_c30 Jan 2013 13:09:25 -
@@ -0,0 +1,48 @@
+$OpenBSD$
+--- src-ILUT/src/ilut_opengl.c.origMon Sep 14 15:22:33 2009
 src-ILUT/src/ilut_opengl.c Mon Sep 14 15:25:13 2009
+@@ -58,7 +58,7 @@ void *aglGetProcAddress( const GLubyte *name ) {
+ //#pragma comment(lib, freeglut.lib)
+ #endif
+
+-#ifdef linux
++#if defined(linux) || defined (__OpenBSD__)
+   // fix for glXGetProcAddressARB
+   #define GLX_GLXEXT_PROTOTYPES
+   #include GL/glx.h
+@@ -84,7 +84,7 @@ void *aglGetProcAddress( const GLubyte *name ) {
+
+ static ILboolean HasCubemapHardware = IL_FALSE;
+ static ILboolean HasNonPowerOfTwoHardware = IL_FALSE;
+-#if defined(_WIN32) || defined(_WIN64) || defined(linux) || defined(__APPLE__)
++#if defined(_WIN32) || defined(_WIN64) || defined(linux) ||
defined(__APPLE__) || defined (__OpenBSD__)
+   ILGLTEXIMAGE3DARBPROC   ilGLTexImage3D = NULL;
+   ILGLTEXSUBIMAGE3DARBPROCilGLTexSubImage3D = NULL;
+   ILGLCOMPRESSEDTEXIMAGE2DARBPROC ilGLCompressed2D = NULL;
+@@ -127,7 +127,7 @@ ILboolean ilutGLInit()
+   IsExtensionSupported(GL_EXT_texture3D)) {
+   ilGLCompressed3D =
(ILGLCOMPRESSEDTEXIMAGE3DARBPROC)wglGetProcAddress(glCompressedTexImage3DARB);
+   }
+-  #elif linux
++  #elif defined(linux) || defined (__OpenBSD__)
+   if (IsExtensionSupported(GL_ARB_texture_compression) 
+   
IsExtensionSupported(GL_EXT_texture_compression_s3tc)) {
+   ilGLCompressed2D = 
(ILGLCOMPRESSEDTEXIMAGE2DARBPROC)
+@@ -246,7 +246,7 @@ ILuint GLGetDXTCNum(ILenum DXTCFormat)
+ ILboolean ILAPIENTRY ilutGLTexImage_(GLuint

Re: extend graphics/DevIL

2013-01-30 Thread Anthony J. Bentley

Kirill Bychkov writes:
 On Wed, January 30, 2013 15:58, David Coppa wrote:
  On Wed, Jan 30, 2013 at 1:55 PM, Kirill Bychkov ya...@linklevel.net wrote
 :
  Hi. This patch extends functionality of graphics/devil:
   - enables ILU and ILUT libraries
   - add ilur utility for graphics transform in command line
 
  Regen distinfo while here.
  ilur tested on amd64 and works fine. OK to commit?
 
  Since you're here, could you get rid of PFRAG.shared?
 
 Done
 
 Index: Makefile
 ===
 RCS file: /cvs/ports/graphics/DevIL/Makefile,v
 retrieving revision 1.8
 diff -u -p -r1.8 Makefile
 --- Makefile  20 Sep 2012 14:04:17 -  1.8
 +++ Makefile  30 Jan 2013 13:09:25 -
 @@ -3,8 +3,10 @@
  COMMENT= library for powerful image loading capabilities
 
  DISTNAME=DevIL-1.7.8
 -REVISION=5
 +REVISION=6
  SHARED_LIBS+=IL  0.0 # 2.0
 +SHARED_LIBS+=ILU 0.0 # 2.0
 +SHARED_LIBS+=ILUT0.0 # 2.0
 
  CATEGORIES=  graphics devel
 
 @@ -19,10 +21,15 @@ PERMIT_DISTFILES_FTP= Yes
  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=openil/}
  EXTRACT_SUFX=.zip
 
 -WANTLIB += Half Iex IlmImf IlmThread Imath jasper jpeg lcms m
 -WANTLIB += mng png pthread stdc++ tiff z
 -
 -LIB_DEPENDS= graphics/ilmbase \
 +WANTLIB += GL GLU Half ICE Iex IlmImf IlmThread Imath SDL SM X11
 +WANTLIB += Xdamage Xext Xfixes Xi Xmu Xrandr Xrender Xt Xxf86vm
 +WANTLIB += c drm glut jasper jpeg lcms m mng png pthread sndio
 +WANTLIB += stdc++ tiff usbhid xcb z
 +
 +MODULES= converters/libiconv
 +LIB_DEPENDS= devel/sdl \
 + graphics/freeglut \
 + graphics/ilmbase \
   graphics/jasper \
   graphics/libmng \
   graphics/lcms \
 @@ -36,7 +43,10 @@ USE_LIBTOOL=   Yes
  AUTOCONF_VERSION=2.61
  CONFIGURE_STYLE= autoconf
  CONFIGURE_ARGS+= --with-squish=no \
 - --with-zlib=yes
 + --with-zlib=yes \
 + --enable-ILU \
 +--enable-ILUT
 +
  # This would only install three binary examples, we'll install it manually.
  CONFIGURE_ARGS+= --with-examples=no
  CONFIGURE_ENV=   CPPFLAGS=-I${LOCALBASE}/include
 -I${LOCALBASE}/include/libpng/ -I${X11BASE}/include \
 Index: distinfo
 ===
 RCS file: /cvs/ports/graphics/DevIL/distinfo,v
 retrieving revision 1.1.1.1
 diff -u -p -r1.1.1.1 distinfo
 --- distinfo  30 Mar 2011 09:27:58 -  1.1.1.1
 +++ distinfo  30 Jan 2013 13:09:25 -
 @@ -1,5 +1,2 @@
 -MD5 (DevIL-1.7.8.zip) = MShT75yFrXshAPnNBosqWw==
 -RMD160 (DevIL-1.7.8.zip) = uSiKTlPpoGEPBLS7H859hf2EhK8=
 -SHA1 (DevIL-1.7.8.zip) = V4fhY12Pqpvxrsjeh83TlhTXLJc=
  SHA256 (DevIL-1.7.8.zip) = Q2jYOzAWter+iYTw1/hszudriZPPkA06jL1JAbUvZOs=
  SIZE (DevIL-1.7.8.zip) = 3452549
 Index: patches/patch-src-ILUT_src_ilut_opengl_c
 ===
 RCS file: patches/patch-src-ILUT_src_ilut_opengl_c
 diff -N patches/patch-src-ILUT_src_ilut_opengl_c
 --- /dev/null 1 Jan 1970 00:00:00 -
 +++ patches/patch-src-ILUT_src_ilut_opengl_c  30 Jan 2013 13:09:25 -
 @@ -0,0 +1,48 @@
 +$OpenBSD$
 +--- src-ILUT/src/ilut_opengl.c.orig  Mon Sep 14 15:22:33 2009
  src-ILUT/src/ilut_opengl.c   Mon Sep 14 15:25:13 2009
 +@@ -58,7 +58,7 @@ void *aglGetProcAddress( const GLubyte *name ) {
 + //  #pragma comment(lib, freeglut.lib)
 + #endif
 +
 +-#ifdef linux
 ++#if defined(linux) || defined (__OpenBSD__)
 + // fix for glXGetProcAddressARB
 + #define GLX_GLXEXT_PROTOTYPES
 + #include GL/glx.h
 +@@ -84,7 +84,7 @@ void *aglGetProcAddress( const GLubyte *name ) {
 +
 + static ILboolean HasCubemapHardware = IL_FALSE;
 + static ILboolean HasNonPowerOfTwoHardware = IL_FALSE;
 +-#if defined(_WIN32) || defined(_WIN64) || defined(linux) || defined(__APPLE
 __)
 ++#if defined(_WIN32) || defined(_WIN64) || defined(linux) ||
 defined(__APPLE__) || defined (__OpenBSD__)
 + ILGLTEXIMAGE3DARBPROC   ilGLTexImage3D = NULL;
 + ILGLTEXSUBIMAGE3DARBPROCilGLTexSubImage3D = NULL;
 + ILGLCOMPRESSEDTEXIMAGE2DARBPROC ilGLCompressed2D = NULL;
 +@@ -127,7 +127,7 @@ ILboolean ilutGLInit()
 + IsExtensionSupported(GL_EXT_texture3D)) {
 + ilGLCompressed3D =
 (ILGLCOMPRESSEDTEXIMAGE3DARBPROC)wglGetProcAddress(glCompressedTexImage3DARB
 );
 + }
 +-#elif linux
 ++#elif defined(linux) || defined (__OpenBSD__)
 + if (IsExtensionSupported(GL_ARB_texture_compression) 
 + IsExtensionSupported(GL_EXT_texture_compression_s3tc)
 ) {
 + ilGLCompressed2D = (ILGLCOMPRESSEDTEXIMAGE2DARB
 PROC)
 +@@

Re: extend graphics/DevIL

2013-01-30 Thread Kirill Bychkov

On Thu, January 31, 2013 04:03, Anthony J. Bentley wrote:
 Kirill Bychkov writes:
 On Wed, January 30, 2013 15:58, David Coppa wrote:
  On Wed, Jan 30, 2013 at 1:55 PM, Kirill Bychkov ya...@linklevel.net
 wrote
 :
  Hi. This patch extends functionality of graphics/devil:
   - enables ILU and ILUT libraries
   - add ilur utility for graphics transform in command line
 
  Regen distinfo while here.
  ilur tested on amd64 and works fine. OK to commit?
 
  Since you're here, could you get rid of PFRAG.shared?

 Done



 I've tried on i386.

 It tries to pull in graphics/nvtt (from openbsd-wip, not the main tree),
 and fails; this is probably an issue with the nvtt port not including all
 headers:

 c++ -DHAVE_CONFIG_H -I. -I../include/IL -I ./../src-IL/include -I ./../include
 -I/usr/local/include -I/usr/local/include/libpng/ -I/usr/X11R6/include -msse
 -msse2 -msse3 -pthread -I/usr/local/include/OpenEXR -g -O2 -pipe -MT
 libIL_la-il_nvidia.lo -MD -MP -MF .deps/libIL_la-il_nvidia.Tpo -c
 ./../src-IL/src/il_nvidia.cpp -fPIC -DPIC -o .libs/libIL_la-il_nvidia.o
 ./../src-IL/src/il_nvidia.cpp:22:27: error: nvcore/Memory.h: No such file or
 directory
 Error while executing c++ -DHAVE_CONFIG_H -I. -I../include/IL -I
 ./../src-IL/include -I ./../include -I/usr/local/include
 -I/usr/local/include/libpng/ -I/usr/X11R6/include -msse -msse2 -msse3 -pthread
 -I/usr/local/include/OpenEXR -g -O2 -pipe -MT libIL_la-il_nvidia.lo -MD -MP
 -MF .deps/libIL_la-il_nvidia.Tpo -c ./../src-IL/src/il_nvidia.cpp -fPIC -DPIC
 -o .libs/libIL_la-il_nvidia.o
 *** Error 1 in lib (Makefile:1368 'libIL_la-il_nvidia.lo')
 *** Error 1 in /usr/ports/pobj/DevIL-1.7.8/devil-1.7.8 (Makefile:344
 'all-recursive')
 *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2603
 '/usr/ports/pobj/DevIL-1.7.8/.build_done')
 *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1804
 '/usr/ports/packages/i386/all/DevIL-1.7.8p6.tgz')
 *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1802
 '/usr/ports/packages/i386/all/DevIL-1.7.8p6.tgz')
 *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2340 'subpackage')
 *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1818
 '/var/db/pkg/DevIL-1.7.8p6/+CONTENTS')
 *** Error 1 in /usr/ports/graphics/DevIL
 (/usr/ports/infrastructure/mk/bsd.port.mk:2323 'install')

 If I uninstall nvtt, it gets to here:

 ./../src-ILUT/src/ilut_opengl.c: In function 'ilutGLInit':
 ./../src-ILUT/src/ilut_opengl.c:158: error: 'ilGLTexImage3D' undeclared (first
 use in this function)
 ./../src-ILUT/src/ilut_opengl.c:158: error: (Each undeclared identifier is
 reported only once
 ./../src-ILUT/src/ilut_opengl.c:158: error: for each function it appears in.)
 ./../src-ILUT/src/ilut_opengl.c: In function 'ilutGLSubTex3D':
 ./../src-ILUT/src/ilut_opengl.c:469: error: 'ilGLTexSubImage3D' undeclared
 (first use in this function)
 ./../src-ILUT/src/ilut_opengl.c: In function 'ilutGLSetTex3D':
 ./../src-ILUT/src/ilut_opengl.c:839: error: 'ilGLTexImage3D' undeclared (first
 use in this function)
 Error while executing cc -DHAVE_CONFIG_H -I. -I../include/IL -I
 ./../src-ILUT/include -I ./../include -I/usr/local/include
 -I/usr/local/include/libpng/ -I/usr/X11R6/include -msse -msse2 -msse3
 -I/usr/local/include -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 -I/usr/X11R6/include -DXTHREADS -I/usr/local/include -g -O2 -pipe -MT
 libILUT_la-ilut_opengl.lo -MD -MP -MF .deps/libILUT_la-ilut_opengl.Tpo -c
 ./../src-ILUT/src/ilut_opengl.c -fPIC -DPIC -o .libs/libILUT_la-ilut_opengl.o
 *** Error 1 in lib (Makefile:1319 'libILUT_la-ilut_opengl.lo')
 *** Error 1 in /usr/ports/pobj/DevIL-1.7.8/devil-1.7.8 (Makefile:344
 'all-recursive')
 *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2603
 '/usr/ports/pobj/DevIL-1.7.8/.build_done')
 *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1804
 '/usr/ports/packages/i386/all/DevIL-1.7.8p6.tgz')
 *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1802
 '/usr/ports/packages/i386/all/DevIL-1.7.8p6.tgz')
 *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2340 'subpackage')
 *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1818
 '/var/db/pkg/DevIL-1.7.8p6/+CONTENTS')
 *** Error 1 in /usr/ports/graphics/DevIL
 (/usr/ports/infrastructure/mk/bsd.port.mk:2323 'install')


Hi. Use patch - E. You haven't applied patch to src-ILUT_src_ilut_opengl_c, as
I can see. I';; take a look on how to disable pulling in nvtt later.

Re: extend graphics/DevIL

extend graphics/DevIL

Re: extend graphics/DevIL

Re: extend graphics/DevIL

Re: extend graphics/DevIL

Re: extend graphics/DevIL

6 matches

Site Navigation

Mail list logo

Footer information