Author: qboosh Date: Fri Oct 15 07:56:46 2010 GMT Module: packages Tag: HEAD ---- Log message: - package static and .pc files - separated ILUT because of extra dependencies (SDL, allegro, X11) - removed obsolete gnu-inline patch - libpng-related sed call moved to libpng14 patch - build with OpenEXR support
---- Files affected: packages/DevIL: DevIL.spec (1.32 -> 1.33) , libpng14.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/DevIL/DevIL.spec diff -u packages/DevIL/DevIL.spec:1.32 packages/DevIL/DevIL.spec:1.33 --- packages/DevIL/DevIL.spec:1.32 Sun May 16 13:15:52 2010 +++ packages/DevIL/DevIL.spec Fri Oct 15 09:56:41 2010 @@ -1,7 +1,5 @@ # $Revision$, $Date$ -# -# TODO: package rest of files -# +# TODO: libsquish http://code.google.com/p/libsquish/ %define manual_version 1.5.5 Summary: Full featured image library Summary(pl.UTF-8): Biblioteka obsługi obrazów z mnóstwem funkcji @@ -16,9 +14,9 @@ # Source1-md5: 6bb2ddfcbe09930c48ef84b8f99479fe Source2: http://downloads.sourceforge.net/openil/%{name}-docs.tar.gz # Source2-md5: eec6ae7a028a3f058bab1a6918428ed5 -Patch0: %{name}-gnu-inline.patch -Patch1: libpng14.patch +Patch0: libpng14.patch URL: http://openil.sourceforge.net/ +BuildRequires: OpenEXR-devel BuildRequires: OpenGL-GLU-devel BuildRequires: SDL-devel >= 1.2.5 BuildRequires: allegro-devel >= 4.1.16 @@ -35,7 +33,7 @@ BuildRequires: rpmbuild(macros) >= 1.533 BuildRequires: sed >= 4.0 BuildRequires: unzip -Requires: allegro >= 4.1.16 +BuildRequires: xorg-lib-libXext-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _noautoreqdep libGL.so.1 libGLU.so.1 @@ -70,27 +68,82 @@ doom, gif, icns, ico, jp2, jpg, lbm, mdl, mng, pal, pbm, pcd, pcx, pgm, pic, png, ppm, psd, psp, raw, sgi, tga i tif. -Wspierane jest zapisywanie do plików bmp, dds, h, jpg, pal, pbm, pcx, -pgm, png, ppm, raw, sgi, tga i tif. +Obsługiwane jest zapisywanie do plików bmp, dds, h, jpg, pal, pbm, +pcx, pgm, png, ppm, raw, sgi, tga i tif. %package devel -Summary: DevIL devel files -Summary(pl.UTF-8): Nagłówki DevIL +Summary: DevIL development files +Summary(pl.UTF-8): Pliki nagłówkowe bibliotek DevIL Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: OpenEXR-devel Requires: jasper-devel Requires: lcms-devel Requires: libjpeg-devel Requires: libmng-devel Requires: libpng-devel Requires: libtiff-devel -# libILUT additionally: SDL-devel, allegro-devel, OpenGL-GLU-devel %description devel -DevIL devel files. +DevIL development files (for IL and ILU libraries). %description devel -l pl.UTF-8 -Nagłówki DevIL. +Pliki nagłówkowe bibliotek DevIL (IL i ILU). + +%package static +Summary: Static DevIL libraries +Summary(pl.UTF-8): Statyczne biblioteki DevIL +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +Static DevIL libraries (IL and ILU). + +%description static -l pl.UTF-8 +Statyczne biblioteki DevIL (IL i ILU). + +%package ILUT +Summary: DevIL ILUT library +Summary(pl.UTF-8): Biblioteka DevIL ILUT +Group: Libraries +Requires: %{name} = %{version}-%{release} +Requires: SDL >= 1.2.5 +Requires: allegro >= 4.1.16 + +%description ILUT +DevIL ILUT library - connection to higher level libraries. + +%description ILUT +Biblioteka DevIL ILUT - łącznik z bibliotekami wyższego poziomu. + +%package ILUT-devel +Summary: Development files for DevIL ILUT library +Summary(pl.UTF-8): Pliki programistyczne biblioteki DevIL ILUT +Group: Development/Libraries +Requires: %{name}-ILUT = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} +Requires: OpenGL-GLU-devel +Requires: SDL-devel >= 1.2.5 +Requires: allegro-devel >= 4.1.16 +Requires: xorg-lib-libXext-devel + +%description ILUT-devel +Development files for DevIL ILUT library. + +%description ILUT-devel -l pl.UTF-8 +Pliki programistyczne biblioteki DevIL ILUT. + +%package ILUT-static +Summary: Static DevIL ILUT library +Summary(pl.UTF-8): Statyczna biblioteka DevIL ILUT +Group: Development/Libraries +Requires: %{name}-ILUT-devel = %{version}-%{release} + +%description ILUT-static +Static DevIL ILUT library. + +%description ILUT-static -l pl.UTF-8 +Statyczna biblioteka DevIL ILUT. %package doc Summary: DevIL documentation @@ -106,13 +159,6 @@ %prep %setup -q -c -a1 -a2 %patch0 -p1 -%patch1 -p1 - -# lpng12 -> lpng -%{__sed} -i 's,png12,png,' devil-%{version}/m4/devil-definitions.m4 - -# just SDL and messing libtool macros -rm -f acinclude.m4 %build cd devil-%{version} @@ -121,11 +167,9 @@ %{__autoconf} %{__autoheader} %{__automake} -# actual exr support missing in sources, only adds undefined symbol -CPPFLAGS="%{rpmcppflags} -DIL_NO_EXR" %configure \ - --enable-ILU=yes \ - --enable-ILUT=yes \ + --enable-ILU \ + --enable-ILUT \ %{?debug:--disable-release} %{__make} @@ -141,25 +185,56 @@ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%post devel -p /sbin/postshell +-/usr/sbin/fix-info-dir -c %{_infodir} + +%postun devel -p /sbin/postshell +-/usr/sbin/fix-info-dir -c %{_infodir} + %files %defattr(644,root,root,755) %doc devil-%{version}/{AUTHORS,CREDITS,ChangeLog,README.unix} +%attr(755,root,root) %{_bindir}/ilur %attr(755,root,root) %{_libdir}/libIL.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libIL.so.1 %attr(755,root,root) %{_libdir}/libILU.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libILU.so.1 -%attr(755,root,root) %{_libdir}/libILUT.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libILUT.so.1 %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libIL.so %attr(755,root,root) %{_libdir}/libILU.so -%attr(755,root,root) %{_libdir}/libILUT.so %{_libdir}/libIL.la %{_libdir}/libILU.la +%dir %{_includedir}/IL +%{_includedir}/IL/il.h +%{_includedir}/IL/ilu.h +%{_includedir}/IL/ilu_region.h +%{_pkgconfigdir}/IL.pc +%{_pkgconfigdir}/ILU.pc +%{_infodir}/DevIL_manual.info* + +%files static +%defattr(644,root,root,755) +%{_libdir}/libIL.a +%{_libdir}/libILU.a + +%files ILUT +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libILUT.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libILUT.so.1 + +%files ILUT-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libILUT.so +%{_includedir}/IL/devil_cpp_wrapper.hpp +%{_includedir}/IL/ilut.h %{_libdir}/libILUT.la -%{_includedir}/IL +%{_pkgconfigdir}/ILUT.pc + +%files ILUT-static +%defattr(644,root,root,755) +%{_libdir}/libILUT.a %files doc %defattr(644,root,root,755) @@ -171,6 +246,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.33 2010/10/15 07:56:41 qboosh +- package static and .pc files +- separated ILUT because of extra dependencies (SDL, allegro, X11) +- removed obsolete gnu-inline patch +- libpng-related sed call moved to libpng14 patch +- build with OpenEXR support + Revision 1.32 2010/05/16 11:15:52 sparky - BR: pkgconfig - dropped no longer used BR: which ================================================================ Index: packages/DevIL/libpng14.patch diff -u packages/DevIL/libpng14.patch:1.2 packages/DevIL/libpng14.patch:1.3 --- packages/DevIL/libpng14.patch:1.2 Wed Apr 21 15:33:03 2010 +++ packages/DevIL/libpng14.patch Fri Oct 15 09:56:41 2010 @@ -38,3 +38,23 @@ } // Expand RGB images with transparency to full alpha channels +--- DevIL-1.7.8/devil-1.7.8/m4/devil-definitions.m4.orig 2009-03-08 08:10:05.000000000 +0100 ++++ DevIL-1.7.8/devil-1.7.8/m4/devil-definitions.m4 2010-10-15 09:31:19.551741882 +0200 +@@ -244,12 +244,12 @@ + + AC_DEFUN([SETTLE_PNG], + [DEVIL_IL_LIB([png.h], +- [png12]) +- AS_IF([test "x$have_png12" = "xno"], ++ [png]) ++ AS_IF([test "x$have_png" = "xno"], + [DEVIL_IL_LIB([png.h], +- [png]) +- lib_test_result="$have_png"], +- [lib_test_result="$have_png12"]) ++ [png12]) ++ lib_test_result="$have_png12"], ++ [lib_test_result="$have_png"]) + AS_IF([test "x$lib_test_result" = "xyes"], + [MAYBE_OPTIONAL_DEPENDENCY([IL], + [libpng]) ]) ]) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/DevIL/DevIL.spec?r1=1.32&r2=1.33&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/DevIL/libpng14.patch?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
