]> git.pld-linux.org Git - packages/DevIL.git/commitdiff
- cvsnt is BREAKING FILES
authorJakub Bogusz <qboosh@pld-linux.org>
Wed, 22 Oct 2008 19:15:18 +0000 (19:15 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    DevIL-link.patch -> 1.5

DevIL-link.patch [new file with mode: 0644]

diff --git a/DevIL-link.patch b/DevIL-link.patch
new file mode 100644 (file)
index 0000000..9ff97ba
--- /dev/null
@@ -0,0 +1,68 @@
+--- DevIL-1.7.2/configure.ac.orig      2008-09-05 03:19:19.000000000 +0200
++++ DevIL-1.7.2/configure.ac   2008-10-22 18:13:22.182086647 +0200
+@@ -191,27 +191,6 @@
+ dnl Special code for libjpeg\r
+ AC_DEFINE(IL_USE_JPEGLIB_UNMODIFIED,,[Use libjpeg without modification. always enabled.])\r
\r
+-dnl\r
+-dnl Setup Libraries\r
+-dnl\r
+-AC_DEFUN([SET_LIB],[\r
+-LIB$2=""\r
+-AC_ARG_WITH($1,AC_HELP_STRING([--with-$1=path],[Specify the lib$1 installation path]),\r
+-      ADD_CFLAGS([-I$enable_$1dir/include])\r
+-      LIB$2="-L$enable_$1dir/lib"\r
+-      no_$1=no\r
+-      use_$1=yes )\r
+-AS_IF([test ! "$no_$1" = "yes" && test "$use_$1" = "yes" && test -z "$3"],[LIB$2="$LIB$2 -l$1"]\r
+-     ,[test ! "$no_$1" = "yes" && test "$use_$1" = "yes" && ! test -z "$3"],[LIB$2="$3"],[])\r
+-AC_SUBST(LIB$2) ])\r
+-\r
+-SET_LIB(jpeg,JPG)\r
+-SET_LIB(tiff,TIFF)\r
+-SET_LIB(lcms,LCMS)\r
+-SET_LIB(mng,MNG)\r
+-SET_LIB(jp2,JP2)\r
+-SET_LIB(z,Z)\r
+-\r
+ dnl libpng configuration\r
+ AC_MSG_CHECKING(libpng)\r
+ LIBPNG_INCLUDE=""\r
+@@ -278,6 +257,27 @@
+ AC_SUBST(LIBPNG_INCLUDE)\r
\r
+ dnl\r
++dnl Setup Libraries\r
++dnl\r
++AC_DEFUN([SET_LIB],[\r
++LIB$2=""\r
++AC_ARG_WITH($1,AC_HELP_STRING([--with-$1=path],[Specify the lib$1 installation path]),\r
++      ADD_CFLAGS([-I$enable_$1dir/include])\r
++      LIB$2="-L$enable_$1dir/lib"\r
++      no_$1=no\r
++      use_$1=yes )\r
++AS_IF([test ! "$no_$1" = "yes" && test "$use_$1" = "yes" && test -z "$3"],[LIB$2="$LIB$2 -l$1"]\r
++     ,[test ! "$no_$1" = "yes" && test "$use_$1" = "yes" && ! test -z "$3"],[LIB$2="$3"],[])\r
++AC_SUBST(LIB$2) ])\r
++\r
++SET_LIB(jpeg,JPG)\r
++SET_LIB(tiff,TIFF)\r
++SET_LIB(lcms,LCMS)\r
++SET_LIB(mng,MNG)\r
++SET_LIB(jp2,JP2,[-ljasper])\r
++SET_LIB(z,Z)\r
++\r
++dnl\r
+ dnl ILUT APIs checking\r
+ dnl\r
+ AC_DEFUN([TEST_API],[\r
+--- DevIL-1.7.2/src-IL/src/Makefile.am.orig    2008-08-24 19:32:38.000000000 +0200
++++ DevIL-1.7.2/src-IL/src/Makefile.am 2008-10-22 18:22:57.715154030 +0200
+@@ -15,6 +15,6 @@
\r
+ AM_CFLAGS = @LIBIL_CFLAGS@\r
+ libIL_la_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ @VERSIONINFO@\r
+-libIL_la_LIBADD = @LIBPNG@ @LIBJPG@ @LIBTIFF@ @LIBMNG@ @LIBLCMS@ @LIBZ@\r
++libIL_la_LIBADD = @LIBPNG@ @LIBJPG@ @LIBTIFF@ @LIBMNG@ @LIBLCMS@ @LIBZ@ @LIBJP2@\r
\r
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src-IL/include -I$(top_builddir)/include @LIBPNG_INCLUDE@\r
This page took 0.103071 seconds and 4 git commands to generate.