On Wed, January 30, 2013 15:58, David Coppa wrote:
> On Wed, Jan 30, 2013 at 1:55 PM, Kirill Bychkov <[email protected]> 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 -0000 1.8
+++ Makefile 30 Jan 2013 13:09:25 -0000
@@ -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+= ILUT 0.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 -0000 1.1.1.1
+++ distinfo 30 Jan 2013 13:09:25 -0000
@@ -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 -0000
+++ patches/patch-src-ILUT_src_ilut_opengl_c 30 Jan 2013 13:09:25 -0000
@@ -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;
+ ILGLTEXSUBIMAGE3DARBPROC ilGLTexSubImage3D = 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) || defined(__APPLE__) || defined
(__OpenBSD__)
+ ILenum DXTCFormat;
+ ILuint Size;
+ ILubyte *Buffer;
+@@ -259,7 +259,7 @@ ILboolean ILAPIENTRY ilutGLTexImage_(GLuint Level, GLu
+
+ OldImage = ilGetCurImage();
+
+-#if defined (_MSC_VER) || defined (linux) || defined(__APPLE__)
++#if defined (_MSC_VER) || defined (linux) || defined(__APPLE__) || defined
(__OpenBSD__)
+ if (ilutGetBoolean(ILUT_GL_USE_S3TC) && ilGLCompressed2D != NULL) {
+ if (Image->DxtcData != NULL && Image->DxtcSize != 0) {
+ DXTCFormat = GLGetDXTCNum(Image->DxtcFormat);
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared 30 Mar 2011 09:27:58 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2011/03/30 09:27:58 jasper Exp $
-@lib lib/libIL.so.${LIBIL_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/DevIL/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 30 Mar 2011 09:50:53 -0000 1.3
+++ pkg/PLIST 30 Jan 2013 13:09:25 -0000
@@ -1,13 +1,25 @@
@comment $OpenBSD: PLIST,v 1.3 2011/03/30 09:50:53 jasper Exp $
-%%SHARED%%
+@bin bin/ilur
include/IL/
include/IL/devil_cpp_wrapper.hpp
include/IL/il.h
+include/IL/ilu.h
+include/IL/ilu_region.h
+include/IL/ilut.h
@info info/DevIL_manual.info
lib/libIL.a
lib/libIL.la
+@lib lib/libIL.so.${LIBIL_VERSION}
+lib/libILU.a
+lib/libILU.la
+@lib lib/libILU.so.${LIBILU_VERSION}
+lib/libILUT.a
+lib/libILUT.la
+@lib lib/libILUT.so.${LIBILUT_VERSION}
lib/pkgconfig/
lib/pkgconfig/IL.pc
+lib/pkgconfig/ILU.pc
+lib/pkgconfig/ILUT.pc
share/devil/
share/devil/examples/
share/devil/examples/allegro_example/
>
> cheers,
> david
>
>
