rpms/DevIL/devel DevIL-1.6.8-rc2-allegropicfix.patch, NONE, 1.1 DevIL-1.6.8-rc2-il_wrap_h.patch, NONE, 1.1 DevIL-1.6.8-rc2-ilu_region.patch, NONE, 1.1 DevIL-1.6.8-rc2-ilut_h.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 DevIL.spec, 1.3, 1.4 sources, 1.2, 1.3 DevIL-1.6.8-rc1-64bit.patch, 1.1, NONE DevIL-1.6.8-rc1-allegropicfix.patch, 1.1, NONE DevIL-1.6.8-rc1-headerfix.patch, 1.1, NONE
Ian Chapman (oddsocks)
fedora-extras-commits at redhat.com
Thu Sep 7 22:01:24 UTC 2006
Author: oddsocks
Update of /cvs/extras/rpms/DevIL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24241/devel
Modified Files:
.cvsignore DevIL.spec sources
Added Files:
DevIL-1.6.8-rc2-allegropicfix.patch
DevIL-1.6.8-rc2-il_wrap_h.patch
DevIL-1.6.8-rc2-ilu_region.patch DevIL-1.6.8-rc2-ilut_h.patch
Removed Files:
DevIL-1.6.8-rc1-64bit.patch
DevIL-1.6.8-rc1-allegropicfix.patch
DevIL-1.6.8-rc1-headerfix.patch
Log Message:
auto-import DevIL-1.6.8-0.10.rc2 on branch devel from DevIL-1.6.8-0.10.rc2.src.rpm
DevIL-1.6.8-rc2-allegropicfix.patch:
--- NEW FILE DevIL-1.6.8-rc2-allegropicfix.patch ---
--- DevIL-1.6.8/configure.orig 2006-09-01 18:41:23.000000000 +0100
+++ DevIL-1.6.8/configure 2006-09-07 22:13:59.000000000 +0100
@@ -23644,13 +23644,12 @@
_ACEOF
SUPPORTED_API=$SUPPORTED_API"Allegro "
- LIBALLEGRO=`allegro-config --libs`
+ LIBALLEGRO=`allegro-config --libs | sed 's/-lalleg_unsharable//'`
HALLEGRO=`allegro-config --cflags`
fi
fi
-
case "$host" in
*mingw32*)
LIBIL_CFLAGS=$LIBIL_CFLAGS" -mno-cygwin"
DevIL-1.6.8-rc2-il_wrap_h.patch:
--- NEW FILE DevIL-1.6.8-rc2-il_wrap_h.patch ---
--- DevIL-1.6.8/include/IL/il_wrap.h.orig 2006-07-02 11:04:36.000000000 +0100
+++ DevIL-1.6.8/include/IL/il_wrap.h 2006-09-07 23:26:38.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-rc2-ilu_region.patch:
--- NEW FILE DevIL-1.6.8-rc2-ilu_region.patch ---
--- DevIL-1.6.8/include/IL/ilu_region.h.orig 2004-07-08 20:13:03.000000000 +0100
+++ DevIL-1.6.8/include/IL/ilu_region.h 2006-09-07 23:30:30.000000000 +0100
@@ -13,8 +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/src-ILU/src/ilu_region.c.orig 2003-04-06 12:44:30.000000000 +0100
+++ DevIL-1.6.8/src-ILU/src/ilu_region.c 2006-09-07 23:34:04.000000000 +0100
@@ -12,6 +12,7 @@
#include "ilu_region.h"
+#include "ilu_internal.h"
ILpointi *RegionPointsi = NULL;
DevIL-1.6.8-rc2-ilut_h.patch:
--- NEW FILE DevIL-1.6.8-rc2-ilut_h.patch ---
--- DevIL-1.6.8/include/IL/ilut.h.orig 2006-09-07 22:37:07.000000000 +0100
+++ DevIL-1.6.8/include/IL/ilut.h 2006-09-07 23:03:38.000000000 +0100
@@ -110,7 +110,7 @@
#elif MACOSX
#define ILUT_USE_OPENGL
#else
-
+
// We are surely using a *nix so the configure script
// may have written the configured config.h header
#include "IL/config.h"
@@ -234,7 +234,7 @@
extern "C" {
#endif
- ILAPI BITMAP* ILAPIENTRY ilutAllegLoadImage(Lstring FileName);
+ ILAPI BITMAP* ILAPIENTRY ilutAllegLoadImage(ILstring FileName);
ILAPI BITMAP* ILAPIENTRY ilutConvertToAlleg(PALETTE Pal);
#endif//ILUT_USE_ALLEGRO
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 31 May 2006 18:30:44 -0000 1.2
+++ .cvsignore 7 Sep 2006 22:01:24 -0000 1.3
@@ -1 +1 @@
-DevIL-1.6.8-RC1-src.tar.gz
+DevIL-1.6.8-rc2.tar.bz2
Index: DevIL.spec
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/DevIL.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DevIL.spec 28 Aug 2006 16:45:53 -0000 1.3
+++ DevIL.spec 7 Sep 2006 22:01:24 -0000 1.4
@@ -1,15 +1,16 @@
Name: DevIL
Version: 1.6.8
-Release: 0.9.rc1%{?dist}
+Release: 0.10.rc2%{?dist}
Summary: A cross-platform image library
Group: System Environment/Libraries
License: LGPL
URL: http://openil.sourceforge.net/
-Source0: http://dl.sf.net/openil/%{name}-%{version}-RC1-src.tar.gz
-Patch0: DevIL-1.6.8-rc1-allegropicfix.patch
-Patch1: DevIL-1.6.8-rc1-headerfix.patch
-Patch2: DevIL-1.6.8-rc1-64bit.patch
+Source0: http://dl.sf.net/openil/%{name}-%{version}-rc2.tar.bz2
+Patch0: DevIL-1.6.8-rc2-allegropicfix.patch
+Patch1: DevIL-1.6.8-rc2-ilut_h.patch
+Patch2: DevIL-1.6.8-rc2-il_wrap_h.patch
+Patch3: DevIL-1.6.8-rc2-ilu_region.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
@@ -20,6 +21,7 @@
BuildRequires: allegro-devel
BuildRequires: libtool
BuildRequires: libGLU-devel
+BuildRequires: libICE-devel
Provides: openil = %{version}-%{release}
Provides: devil = %{version}-%{release}
@@ -35,7 +37,7 @@
%package devel
Summary: Development files for DevIL
Group: Development/Libraries
-Requires: DevIL = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: allegro-devel
Requires: libGLU-devel
Provides: openil-devel = %{version}-%{release}
@@ -46,10 +48,11 @@
%prep
-%setup -q -n %{name}-%{version}-RC1
-%patch0 -p0
+%setup -q
+%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
@@ -60,6 +63,8 @@
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
+
+#Some cleanups
rm -f %{buildroot}%{_libdir}/*.la
rm -f %{buildroot}%{_libdir}/*.a
@@ -92,7 +97,7 @@
%{_libdir}/libILU.so.1.0.0
%{_libdir}/libILUT.so.1
%{_libdir}/libILUT.so.1.0.0
-%doc AUTHORS BUGS ChangeLog COPYING CREDITS README TODO
+%doc AUTHORS ChangeLog COPYING CREDITS README TODO
%files devel
@@ -104,6 +109,13 @@
%changelog
+* Thu Sep 07 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.10.rc2%{?dist}
+- Upgrade to 1.6.8-rc2
+- Added libICE-devel buildrequire
+- Dropped DevIL-1.6.8-rc1-64bit.patch, fixed upstream
+- Updated allegropicfix.patch for new version
+- Updated and split header fixes into separate files for easier maintenance
+
* Mon Aug 28 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.9.rc1%{?dist}
- Release bump for FC6 mass rebuild
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 31 May 2006 18:30:44 -0000 1.2
+++ sources 7 Sep 2006 22:01:24 -0000 1.3
@@ -1 +1 @@
-1a850a979057174e01ae87ed6405dd61 DevIL-1.6.8-RC1-src.tar.gz
+444f1290a4688c4530b9d07a521da212 DevIL-1.6.8-rc2.tar.bz2
--- DevIL-1.6.8-rc1-64bit.patch DELETED ---
--- DevIL-1.6.8-rc1-allegropicfix.patch DELETED ---
--- DevIL-1.6.8-rc1-headerfix.patch DELETED ---
More information about the scm-commits
mailing list