rpms/DevIL/devel DevIL-1.6.8-rc1-allegropicfix.patch, NONE, 1.1 DevIL-1.6.8-rc1-headerfix.patch, NONE, 1.1 DevIL.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Ian Chapman (oddsocks)
fedora-extras-commits at redhat.com
Wed May 31 18:30:44 UTC 2006
Author: oddsocks
Update of /cvs/extras/rpms/DevIL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13662/devel
Modified Files:
.cvsignore sources
Added Files:
DevIL-1.6.8-rc1-allegropicfix.patch
DevIL-1.6.8-rc1-headerfix.patch DevIL.spec
Log Message:
auto-import DevIL-1.6.8-0.7.rc1 on branch devel from DevIL-1.6.8-0.7.rc1.src.rpm
DevIL-1.6.8-rc1-allegropicfix.patch:
--- NEW FILE DevIL-1.6.8-rc1-allegropicfix.patch ---
--- configure.orig 2006-04-15 15:21:01.000000000 +0100
+++ configure 2006-05-27 15:20:19.000000000 +0100
@@ -23727,7 +23727,7 @@
LIBALLEGRO=""
HALLEGRO=""
else
- LIBALLEGRO=`allegro-config --libs`
+ LIBALLEGRO=`allegro-config --libs | sed 's/-lalleg_unsharable//'`
HALLEGRO=`allegro-config --cflags`
fi
fi
DevIL-1.6.8-rc1-headerfix.patch:
--- NEW FILE DevIL-1.6.8-rc1-headerfix.patch ---
--- DevIL-1.6.8-RC1/include/IL/il_wrap.h.orig 2002-01-26 01:15:36.000000000 +0000
+++ DevIL-1.6.8-RC1/include/IL/il_wrap.h 2006-05-29 02:23:58.000000000 +0100
@@ -3,7 +3,7 @@
/*#include <il/il.h>
#include <il/ilu.h>*/
-#include <il/ilut.h> // Probably only have to #include this one
+#include <IL/ilut.h> // Probably only have to #include this one
#ifdef _MSC_VER
#ifndef _IL_WRAP_BUILD_LIB
@@ -202,4 +202,4 @@
};
-#endif//WRAPPER_H
\ No newline at end of file
+#endif//WRAPPER_H
--- DevIL-1.6.8-RC1/include/IL/ilu_region.h.orig 2004-07-08 20:13:03.000000000 +0100
+++ DevIL-1.6.8-RC1/include/IL/ilu_region.h 2006-05-29 02:24:54.000000000 +0100
@@ -13,7 +13,7 @@
#ifndef ILU_REGION_H
#define ILU_REGION_H
-#include "ilu_internal.h"
+#include <IL/il.h>
typedef struct Edge
--- DevIL-1.6.8-RC1/src-ILU/src/ilu_region.c.orig 2003-04-06 12:44:30.000000000 +0100
+++ DevIL-1.6.8-RC1/src-ILU/src/ilu_region.c 2006-05-29 02:25:45.000000000 +0100
@@ -12,7 +12,7 @@
#include "ilu_region.h"
-
+#include "ilu_internal.h"
ILpointi *RegionPointsi = NULL;
ILpointf *RegionPointsf = NULL;
--- NEW FILE DevIL.spec ---
Name: DevIL
Version: 1.6.8
Release: 0.7.rc1%{?dist}
Summary: A cross-platform image library
Group: System Environment/Libraries
License: LGPL
URL: http://openil.sourceforge.net/
Source0: http://download.sourceforge.net/openil/%{name}-%{version}-RC1-src.tar.gz
Patch0: DevIL-1.6.8-rc1-allegropicfix.patch
Patch1: DevIL-1.6.8-rc1-headerfix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
BuildRequires: lcms-devel
BuildRequires: libmng-devel
BuildRequires: SDL-devel => 1.2.5
BuildRequires: allegro-devel
BuildRequires: libtool
BuildRequires: libGLU-devel
Provides: openil = %{version}-%{release}
Provides: devil = %{version}-%{release}
%description
Developer's Image Library (DevIL) is a programmer's library to develop
applications with very powerful image loading capabilities, yet is easy for a
developer to learn and use. Ultimate control of images is left to the
developer, so unnecessary conversions, etc. are not performed. DevIL utilizes
a simple, yet powerful, syntax. DevIL can load, save, convert, manipulate,
filter and display a wide variety of image formats.
%package devel
Summary: Development files for DevIL
Group: Development/Libraries
Requires: DevIL = %{version}-%{release}
Requires: allegro-devel
Requires: libGLU-devel
Provides: openil-devel = %{version}-%{release}
Provides: devil-devel = %{version}-%{release}
%description devel
Development files for DevIL
%prep
%setup -q -n %{name}-%{version}-RC1
%patch0 -p0
%patch1 -p1
%build
%configure
make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_libdir}/*.la
rm -f %{buildroot}%{_libdir}/*.a
#Replace autoconf generated config.h to avoid potential define collisions
cat >%{buildroot}%{_includedir}/IL/config.h <<EOF
/* Support Allegro API */
#define ILUT_USE_ALLEGRO
/* Support OpenGL API */
#define ILUT_USE_OPENGL
/* Support SDL API */
#define ILUT_USE_SDL
EOF
%clean
rm -rf %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%{_libdir}/libIL.so.1
%{_libdir}/libIL.so.1.0.0
%{_libdir}/libILU.so.1
%{_libdir}/libILU.so.1.0.0
%{_libdir}/libILUT.so.1
%{_libdir}/libILUT.so.1.0.0
%doc AUTHORS BUGS ChangeLog COPYING CREDITS README TODO
%files devel
%defattr(-,root,root,-)
%{_libdir}/libIL.so
%{_libdir}/libILU.so
%{_libdir}/libILUT.so
%{_includedir}/IL
%changelog
* Wed May 31 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.7.rc1%{?dist}
- Added libGLU-devel to buildrequires
- Dropped libGL-devel from requires for devel package
* Sun May 28 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.6.rc1.iss
- Dropped xorg-x11-devel as a buildrequire
- Dropped zlib-devel as a buildrequire
- Dropped xorg-x11-devel as a require for the devel package
- Added libGL-devel and libGLU-devel as requires for devel package
- Dropped superfluous documentation from devel package
- Added provides to offer lower case alias in preparation for probable
policy change
- Replace autoconf generated config.h in devel package to avoid potential
define collisions
- Replace source URL with primary sf site, rather than a mirror
- Fix ilu_region.h to use IL\il.h and not ilu_internal.h and roll into
a single patch incorporating previous header fixes.
* Sat May 27 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.5.rc1.iss
- Added patch to stop linking against alleg_unsharable, otherwise non PIC code
is included in the library
- Use %%{?dist} for most recent changelog entry - avoids incoherent changelog
versions if %%{?dist} macro is missing or different.
* Fri May 26 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.4.rc1.iss
- Made zlib-devel and xorg-x11-devel explicit buildrequires
- Corrected release name format to 0.%%{X}.%%{alphatag} from 0.%%{alphatag}.%%{X}
- Added -q to %%setup
- Added %%{version}-%%{release} to provides field
* Sun May 21 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.RC1.3.iss
- Use Fedora's libtool, seems to fix rpaths problem on x86_64.
* Sun May 14 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.RC1.2.iss
- Now compiled against allegro
* Sat May 13 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.RC1.1.iss
- Initial Release
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 31 May 2006 18:29:31 -0000 1.1
+++ .cvsignore 31 May 2006 18:30:44 -0000 1.2
@@ -0,0 +1 @@
+DevIL-1.6.8-RC1-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 31 May 2006 18:29:31 -0000 1.1
+++ sources 31 May 2006 18:30:44 -0000 1.2
@@ -0,0 +1 @@
+1a850a979057174e01ae87ed6405dd61 DevIL-1.6.8-RC1-src.tar.gz
More information about the fedora-extras-commits
mailing list