Date: Thu, 19 Feb 2009 02:01:00 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/131830: Update port: graphics/devil to 1.7.7 Message-ID: <20090219020100.74a37c60.tkato432@yahoo.com> Resent-Message-ID: <200902181730.n1IHU4kP012498@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 131830
>Category: ports
>Synopsis: Update port: graphics/devil to 1.7.7
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 18 17:30:04 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.1-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Update to version 1.7.7
New file:
files/patch-configure.ac
files/patch-src-ILUT__src__ilut_opengl.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/devil/Makefile graphics/devil/Makefile
--- /usr/ports/graphics/devil/Makefile 2009-01-18 16:12:02.000000000 +0900
+++ graphics/devil/Makefile 2009-02-18 05:55:07.000000000 +0900
@@ -6,7 +6,7 @@
#
PORTNAME= devil
-PORTVERSION= 1.7.5
+PORTVERSION= 1.7.7
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= SF/openil
@@ -26,6 +26,7 @@
WRKSRC= ${WRKDIR}/${DISTNAME:L}
+USE_GNOME= pkgconfig
USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15
ACLOCAL_ARGS= -I m4 -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing --copy --force-missing
@@ -35,7 +36,6 @@
--disable-altivec --disable-sse --disable-sse2 --disable-sse3
USE_LDCONFIG= yes
-CFLAGS+= -DIL_NO_VTF
CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
@@ -99,8 +99,9 @@
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|-O3||g' ${WRKSRC}/configure.ac
@${REINPLACE_CMD} -e '/^SUBDIRS/s|docs||g' ${WRKSRC}/Makefile.am
+ @${REINPLACE_CMD} -e '/^pkgdir=/s|$$(libdir)/|$$(prefix)/libdata/|g' \
+ ${WRKSRC}/data/Makefile.am
post-install:
.if !defined(NOPORTDOCS)
diff -urN /usr/ports/graphics/devil/distinfo graphics/devil/distinfo
--- /usr/ports/graphics/devil/distinfo 2009-01-18 16:12:02.000000000 +0900
+++ graphics/devil/distinfo 2009-02-18 05:24:05.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (DevIL-1.7.5.tar.gz) = 2a74578507a21d75d7fcc5afd41444d0
-SHA256 (DevIL-1.7.5.tar.gz) = c27bce29bf1113fd5914b669c2eb72aa083ac4e925b5b62246e508f1f8ba942d
-SIZE (DevIL-1.7.5.tar.gz) = 1199330
+MD5 (DevIL-1.7.7.tar.gz) = 23839e37e20dc85ee2a1188fb6d8920f
+SHA256 (DevIL-1.7.7.tar.gz) = 208f1684109a9da99860515cf4900402713a05f888f5b373ea01910009927da8
+SIZE (DevIL-1.7.7.tar.gz) = 1482814
diff -urN /usr/ports/graphics/devil/files/patch-configure.ac graphics/devil/files/patch-configure.ac
--- /usr/ports/graphics/devil/files/patch-configure.ac 1970-01-01 09:00:00.000000000 +0900
+++ graphics/devil/files/patch-configure.ac 2009-02-19 00:19:12.000000000 +0900
@@ -0,0 +1,10 @@
+--- configure.ac.orig 2009-02-07 03:17:37.000000000 +0900
++++ configure.ac 2009-02-19 00:18:55.000000000 +0900
+@@ -303,6 +303,7 @@
+ TEST_FORMAT([sgi], [SGI])
+ TEST_FORMAT([tga], [TGA])
+ TEST_FORMAT([tiff],[TIF], [SETTLE_TIFF])
++TEST_FORMAT([vtf], [VTF])
+ TEST_FORMAT([xpm], [XPM])
+ TEST_FORMAT([wal], [WAL])
+ TEST_FORMAT([wdp], [WDP])
diff -urN /usr/ports/graphics/devil/files/patch-src-ILUT__src__ilut_opengl.c graphics/devil/files/patch-src-ILUT__src__ilut_opengl.c
--- /usr/ports/graphics/devil/files/patch-src-ILUT__src__ilut_opengl.c 1970-01-01 09:00:00.000000000 +0900
+++ graphics/devil/files/patch-src-ILUT__src__ilut_opengl.c 2009-02-19 00:19:34.000000000 +0900
@@ -0,0 +1,47 @@
+--- src-ILUT/src/ilut_opengl.c.orig 2009-02-07 03:17:36.000000000 +0900
++++ src-ILUT/src/ilut_opengl.c 2009-02-19 00:18:59.000000000 +0900
+@@ -58,7 +58,7 @@
+ // #pragma comment(lib, "freeglut.lib")
+ #endif
+
+-#ifdef linux
++#if defined(linux) || defined(__FreeBSD__)
+ // fix for glXGetProcAddressARB
+ #define GLX_GLXEXT_PROTOTYPES
+ #include <GL/glx.h>
+@@ -84,7 +84,7 @@
+
+ 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(__FreeBSD__)
+ ILGLTEXIMAGE3DARBPROC ilGLTexImage3D = NULL;
+ ILGLTEXSUBIMAGE3DARBPROC ilGLTexSubImage3D = NULL;
+ ILGLCOMPRESSEDTEXIMAGE2DARBPROC ilGLCompressed2D = NULL;
+@@ -127,7 +127,7 @@
+ IsExtensionSupported("GL_EXT_texture3D")) {
+ ilGLCompressed3D = (ILGLCOMPRESSEDTEXIMAGE3DARBPROC)wglGetProcAddress("glCompressedTexImage3DARB");
+ }
+- #elif linux
++ #elif (defined(linux) || defined(__FreeBSD__))
+ if (IsExtensionSupported("GL_ARB_texture_compression") &&
+ IsExtensionSupported("GL_EXT_texture_compression_s3tc")) {
+ ilGLCompressed2D = (ILGLCOMPRESSEDTEXIMAGE2DARBPROC)
+@@ -246,7 +246,7 @@
+ 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(__FreeBSD__)
+ ILenum DXTCFormat;
+ ILuint Size;
+ ILubyte *Buffer;
+@@ -259,7 +259,7 @@
+
+ OldImage = ilGetCurImage();
+
+-#if defined (_MSC_VER) || defined (linux) || defined(__APPLE__)
++#if defined (_MSC_VER) || defined (linux) || defined(__APPLE__) || defined(__FreeBSD__)
+ if (ilutGetBoolean(ILUT_GL_USE_S3TC) && ilGLCompressed2D != NULL) {
+ if (Image->DxtcData != NULL && Image->DxtcSize != 0) {
+ DXTCFormat = GLGetDXTCNum(Image->DxtcFormat);
diff -urN /usr/ports/graphics/devil/pkg-plist graphics/devil/pkg-plist
--- /usr/ports/graphics/devil/pkg-plist 2009-01-18 16:12:02.000000000 +0900
+++ graphics/devil/pkg-plist 2009-02-18 05:46:56.000000000 +0900
@@ -6,15 +6,18 @@
lib/libIL.a
lib/libIL.la
lib/libIL.so
-lib/libIL.so.1
+lib/libIL.so.2
lib/libILU.a
lib/libILU.la
lib/libILU.so
-lib/libILU.so.1
+lib/libILU.so.2
%%X11%%lib/libILUT.a
%%X11%%lib/libILUT.la
%%X11%%lib/libILUT.so
-%%X11%%lib/libILUT.so.1
+%%X11%%lib/libILUT.so.2
+libdata/pkgconfig/IL.pc
+libdata/pkgconfig/ILU.pc
+%%X11%%libdata/pkgconfig/ILUT.pc
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090219020100.74a37c60.tkato432>