- added squish patch, build with libsquish support

- added as-needed patch (add libs to _LIBADD, not _LDFLAGS)
- don't use -msse -msse2 -msse3 for CPUs which don't support these extensions

Changed files:
    DevIL-as-needed.patch -> 1.1
    DevIL-squish.patch -> 1.1
    DevIL.spec -> 1.34

diff --git a/DevIL-as-needed.patch b/DevIL-as-needed.patch
new file mode 100644 (file)
index 0000000..e5754c7
--- /dev/null
+++ b/DevIL-as-needed.patch
@@ -0,0 +1,32 @@
+--- DevIL-1.7.8/devil-1.7.8/lib/Makefile.am.orig       2009-03-08 21:45:36.000000000 +0100
++++ DevIL-1.7.8/devil-1.7.8/lib/Makefile.am    2010-10-16 11:39:10.511734339 +0200
+@@ -46,7 +46,8 @@
+ libIL_la_SOURCES = $(il_src)/il_alloc.c $(il_src)/il_doom.c $(il_src)/il_stack.c $(il_src)/il_pcx.c $(il_src)/il_rle.c $(il_src)/il_bits.c $(il_src)/il_endian.c $(il_src)/il_exr.cpp $(il_src)/il_jpeg.c $(il_src)/il_pic.c $(il_src)/il_sgi.c $(il_src)/il_bmp.c $(il_src)/il_error.c $(il_src)/il_lif.c $(il_src)/il_png.c $(il_src)/il_states.c $(il_src)/il_convbuff.c $(il_src)/il_files.c $(il_src)/il_main.c $(il_src)/il_pnm.c $(il_src)/il_targa.c $(il_src)/il_wdp.c $(il_src)/il_convert.c $(il_src)/il_gif.c $(il_src)/il_manip.c $(il_src)/il_profiles.c $(il_src)/il_tiff.c $(il_src)/il_cut.c $(il_src)/il_header.c $(il_src)/il_mdl.c $(il_src)/il_quantizer.c $(il_src)/il_utility.c $(il_src)/il_dcx.c $(il_src)/il_icon.c $(il_src)/il_mng.c $(il_src)/il_raw.c $(il_src)/il_wal.c $(il_src)/il_dds.c $(il_src)/il_internal.c $(il_src)/il_pal.c $(il_src)/il_rawdata.c $(il_src)/il_devil.c $(il_src)/il_io.c $(il_src)/il_pcd.c $(il_src)/il_register.c $(il_src)/il_psd.c $(il_src)/il_fastconv.c $(il_src)/il_neuquant.c $(il_src)/il_dds-save.c $(il_src)/il_psp.c $(il_src)/il_pix.c $(il_src)/il_pxr.c $(il_src)/il_vtf.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c $(il_src)/il_icns.c $(il_src)/il_jp2.c $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c $(il_src)/il_sun.c $(il_src)/il_nvidia.cpp $(il_src)/il_wbmp.c $(il_src)/il_squish.cpp $(il_src)/il_iff.c $(il_src)/il_ilbm.c $(il_src)/il_size.c $(il_src)/il_tpl.c $(il_src)/il_fits.c $(il_src)/il_iwi.c $(il_src)/il_blp.c $(il_src)/il_ftx.c $(il_src)/il_dicom.c $(il_src)/il_rot.c $(il_src)/il_texture.c $(il_src)/il_dpx.c $(il_src)/il_utx.cpp $(il_src)/il_mp3.c
+ 
+ libIL_la_SOURCES += $(il_include)/altivec_common.h $(il_include)/altivec_typeconversion.h $(il_include)/il_alloc.h $(il_include)/il_bits.h $(il_include)/il_bmp.h $(il_include)/il_dcx.h $(il_include)/il_dds.h $(il_include)/il_doompal.h $(il_include)/il_dpx.h $(il_include)/il_endian.h $(il_include)/il_exr.h $(il_include)/il_files.h $(il_include)/il_gif.h $(il_include)/il_hdr.h $(il_include)/il_icns.h $(il_include)/il_icon.h $(il_include)/il_internal.h $(il_include)/il_jp2.h $(il_include)/il_jpeg.h $(il_include)/il_lif.h $(il_include)/il_manip.h $(il_include)/il_mdl.h $(il_include)/il_pal.h $(il_include)/il_pcx.h $(il_include)/il_pic.h $(il_include)/il_pnm.h $(il_include)/il_psd.h $(il_include)/il_psp.h $(il_include)/il_q2pal.h $(il_include)/il_register.h $(il_include)/il_rle.h $(il_include)/il_sgi.h $(il_include)/il_stack.h $(il_include)/il_states.h $(il_include)/il_targa.h $(il_include)/il_utx.h $(il_include)/il_vtf.h $(il_include)/il_wdp.h $(all_include)/IL/devil_internal_exports.h
+-libIL_la_LDFLAGS = @IL_LIBS@ $(AM_LDFLAGS)
++libIL_la_LDFLAGS = $(AM_LDFLAGS)
++libIL_la_LIBADD = @IL_LIBS@
+ 
+ libILU_la_CPPFLAGS = -I $(ilu_include) -I $(all_include)
+ libILU_la_CFLAGS = $(AM_CFLAGS) @ILU_CFLAGS@
+@@ -54,15 +55,15 @@
+ 
+ libILU_la_SOURCES += $(ilu_include)/ilu_alloc.h $(ilu_include)/ilu_filter.h $(ilu_include)/ilu_internal.h $(ilu_include)/ilu_region.h $(ilu_include)/ilu_states.h $(all_include)/IL/devil_internal_exports.h $(all_include)/IL/ilu_region.h $(ilu_include)/ilu_error/ilu_err-arabic.h $(ilu_include)/ilu_error/ilu_err-dutch.h $(ilu_include)/ilu_error/ilu_err-english.h $(ilu_include)/ilu_error/ilu_err-french.h $(ilu_include)/ilu_error/ilu_err-german.h $(ilu_include)/ilu_error/ilu_err-japanese.h $(ilu_include)/ilu_error/ilu_err-spanish.h 
+ 
+-libILU_la_LDFLAGS = @ILU_LIBS@ $(AM_LDFLAGS)
+-libILU_la_LIBADD = libIL.la
++libILU_la_LDFLAGS = $(AM_LDFLAGS)
++libILU_la_LIBADD = libIL.la @ILU_LIBS@
+ 
+ libILUT_la_CPPFLAGS = -I $(ilut_include) -I $(all_include)
+ libILUT_la_CFLAGS = $(AM_CFLAGS) @ILUT_CFLAGS@
+ libILUT_la_SOURCES = $(ilut_src)/ilut_main.c $(ilut_src)/ilut_states.c $(ilut_src)/ilut_internal.c  
+ libILUT_la_SOURCES += $(ilut_include)/ilut_internal.h $(ilut_include)/ilut_states.h $(all_include)/IL/devil_internal_exports.h
+-libILUT_la_LDFLAGS = @ILUT_LIBS@ $(AM_LDFLAGS)
+-libILUT_la_LIBADD = libILU.la
++libILUT_la_LDFLAGS = $(AM_LDFLAGS)
++libILUT_la_LIBADD = libILU.la @ILUT_LIBS@
+ 
+ if USE_ALLEGRO
+ libILUT_la_SOURCES += $(ilut_src)/ilut_allegro.c $(ilut_include)/ilut_allegro.h 

diff --git a/DevIL-squish.patch b/DevIL-squish.patch
new file mode 100644 (file)
index 0000000..3fbb392
--- /dev/null
+++ b/DevIL-squish.patch
@@ -0,0 +1,13 @@
+--- DevIL-1.7.8/devil-1.7.8/configure.ac.orig  2009-03-08 21:43:03.000000000 +0100
++++ DevIL-1.7.8/devil-1.7.8/configure.ac       2010-10-16 11:14:19.027741043 +0200
+@@ -336,7 +336,9 @@
+           [],
+           [with_libsquish="yes"])
+ AS_IF([test "x$with_libsquish" = "xyes"],
+-      [DEVIL_CHECK_LIBSQUISH])
++      [AC_LANG([C++])
++       DEVIL_CHECK_LIBSQUISH
++       AC_LANG([C])])
+ 
+ AC_ARG_WITH([nvtt],
+           [AS_HELP_STRING([--with-nvtt[[=yes/no]]],

diff --git a/DevIL.spec b/DevIL.spec
index 36061fb65b5abc8265a0888d10de6cd6f5876bff..4b31926aeaff5ab9cebe9d74147ed3bd0680d39a 100644 (file)
--- a/DevIL.spec
+++ b/DevIL.spec
@@ -1,4 +1,15 @@
-# TODO: libsquish http://code.google.com/p/libsquish/
+#
+# Conditional build:
+%bcond_with    sse     # use SSE extension
+%bcond_with    sse2    # use SSE2 extension
+%bcond_with    sse3    # use SSE3 extension
+#
+%ifarch pentium3 pentium4 %{x8664}
+%define        with_sse        1
+%endif
+%ifarch pentium4 %{x8664}
+%define        with_sse2       1
+%endif
 %define                manual_version  1.5.5
 Summary:       Full featured image library
 Summary(pl.UTF-8):     Biblioteka obsługi obrazów z mnóstwem funkcji
@@ -14,6 +25,8 @@ Source1:      http://downloads.sourceforge.net/openil/%{name}-Manual-%{manual_version
 Source2:       http://downloads.sourceforge.net/openil/%{name}-docs.tar.gz
 # Source2-md5: eec6ae7a028a3f058bab1a6918428ed5
 Patch0:                libpng14.patch
+Patch1:                %{name}-squish.patch
+Patch2:                %{name}-as-needed.patch
 URL:           http://openil.sourceforge.net/
 BuildRequires: OpenEXR-devel
 BuildRequires: OpenGL-GLU-devel
@@ -30,6 +43,7 @@ BuildRequires:        libtiff-devel
 BuildRequires: libtool >= 2:1.5
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.533
+BuildRequires: squish-devel
 BuildRequires: sed >= 4.0
 BuildRequires: unzip
 BuildRequires: xorg-lib-libXext-devel
@@ -82,6 +96,7 @@ Requires:     libjpeg-devel
 Requires:      libmng-devel
 Requires:      libpng-devel
 Requires:      libtiff-devel
+Requires:      squish-devel
 
 %description devel
 DevIL development files (for IL and ILU libraries).
@@ -158,6 +173,8 @@ Dokumentacja DevIL.
 %prep
 %setup -q -c -a1 -a2
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 cd devil-%{version}
@@ -169,7 +186,10 @@ cd devil-%{version}
 %configure \
        --enable-ILU \
        --enable-ILUT \
-       %{?debug:--disable-release}
+       %{?debug:--disable-release} \
+       %{!?with_sse:--disable-sse} \
+       %{!?with_sse2:--disable-sse2} \
+       %{!?with_sse3:--disable-sse3}
 %{__make}
 
 %install