[packages/ResIL] - up to 1.8.4, still broken outside Windows
qboosh
qboosh at pld-linux.org
Sun Apr 26 17:53:21 CEST 2020
commit e8f3ca4d7f101c5ec71682870d5d1a268aa6f752
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Apr 26 17:53:37 2020 +0200
- up to 1.8.4, still broken outside Windows
ResIL-am.patch | 24 ------------------------
ResIL-restrict.patch | 43 -------------------------------------------
ResIL.spec | 37 +++++++++----------------------------
3 files changed, 9 insertions(+), 95 deletions(-)
---
diff --git a/ResIL.spec b/ResIL.spec
index d6295cf..10f5e99 100644
--- a/ResIL.spec
+++ b/ResIL.spec
@@ -15,12 +15,12 @@
Summary: Full featured image library
Summary(pl.UTF-8): Biblioteka obsługi obrazów z mnóstwem funkcji
Name: ResIL
-Version: 1.8.3
+Version: 1.8.4
Release: 0.1
License: LGPL v2.1
Group: Libraries
Source0: http://downloads.sourceforge.net/resil/%{name}-%{version}.zip
-# Source0-md5: 8863fcf78985ca532a202b66b1f9636a
+# Source0-md5: 3fe55b630edd468374c10c301ea2afeb
Patch0: %{name}-restrict.patch
Patch1: %{name}-am.patch
URL: http://resil.sourceforge.net/
@@ -167,39 +167,20 @@ ResIL documentation.
Dokumentacja ResIL.
%prep
-%setup -q
-
-%undos configure.ac Makefile.am lib/Makefile.am
-%{__rm} configure
-%patch0 -p1
-%patch1 -p1
-
-%{__sed} -e 's,\$(il_src),../src-IL/src,g' \
- -e 's,\$(ilu_src),../src-ILU/src,g' \
- -e 's,\$(ilut_src),../src-ILUT/src,g' -i lib/Makefile.am
-%{__sed} -e '/_SOURCES/s,\$(example_srcdir)/,../examples/,g' -i bin/Makefile.am
+%setup -q -c -T
+%{__unzip} -qq %{SOURCE0} -d .. -x 'ResIL-1.8.4/projects/*'
%build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-CXXFLAGS="%{rpmcxxflags} -std=c++0x"
-%configure \
- --enable-ILU \
- --enable-ILUT \
- %{?debug:--disable-release} \
- %{!?with_sse:--disable-sse} \
- %{!?with_sse2:--disable-sse2} \
- %{!?with_sse3:--disable-sse3} \
- --disable-allegro --disable-opengl --disable-sdl --disable-x11 # broken
+install -d build
+cd build
+%cmake ..
+
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
%clean
diff --git a/ResIL-am.patch b/ResIL-am.patch
deleted file mode 100644
index d78fefb..0000000
--- a/ResIL-am.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ResIL-1.8.3/lib/Makefile.am.orig 2016-05-21 18:34:56.031037924 +0200
-+++ ResIL-1.8.3/lib/Makefile.am 2016-05-21 18:35:27.107703286 +0200
-@@ -45,18 +45,18 @@
- libIL_la_CFLAGS = $(AM_CFLAGS) @IL_CFLAGS@
- libIL_la_CXXFLAGS = $(AM_CFLAGS) @IL_CFLAGS@
-
--libIL_la_SOURCES = $(il_src)/il_alloc.cpp $(il_src)/il_doom.cpp $(il_src)/il_stack.cpp $(il_src)/il_pcx.cpp $(il_src)/il_rle.cpp $(il_src)/il_bits.cpp $(il_src)/il_endian.cpp $(il_src)/il_exr.cpp $(il_src)/il_jpeg.cpp $(il_src)/il_pic.cpp $(il_src)/il_sgi.cpp $(il_src)/il_bmp.cpp $(il_src)/il_error.cpp $(il_src)/il_lif.cpp $(il_src)/il_png.cpp $(il_src)/il_states.cpp $(il_src)/il_convbuff.cpp $(il_src)/il_files.cpp $(il_src)/il_main.cpp $(il_src)/il_pnm.cpp $(il_src)/il_targa.cpp $(il_src)/il_wdp.cpp $(il_src)/il_convert.cpp $(il_src)/il_gif.cpp $(il_src)/il_manip.cpp $(il_src)/il_profiles.cpp $(il_src)/il_tiff.cpp $(il_src)/il_cut.cpp $(il_src)/il_header.cpp $(il_src)/il_mdl.cpp $(il_src)/il_quantizer.cpp $(il_src)/il_utility.cpp $(il_src)/il_dcx.cpp $(il_src)/il_icon.cpp $(il_src)/il_mng.cpp $(il_src)/il_raw.cpp $(il_src)/il_wal.cpp $(il_src)/il_dds.cpp $(il_src)/il_internal.cpp $(il_src)/il_pal.cpp $(il_src)/il_rawdata.cpp $(il_src)/il_devil.cpp $(il_src)/il_io.cpp $(il_src)/il_pcd.cpp $(il_src)/il_register.cpp $(il_src)/il_psd.cpp $(il_src)/il_fastconv.cpp $(il_src)/il_neuquant.cpp $(il_src)/il_dds-save.cpp $(il_src)/il_psp.cpp $(il_src)/il_pix.cpp $(il_src)/il_pxr.cpp $(il_src)/il_vtf.cpp $(il_src)/il_xpm.cpp $(il_src)/il_hdr.cpp $(il_src)/il_icns.cpp $(il_src)/il_jp2.cpp $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c $(il_src)/il_sun.cpp $(il_src)/il_nvidia.cpp $(il_src)/il_wbmp.cpp $(il_src)/il_squish.cpp $(il_src)/il_iff.cpp $(il_src)/il_ilbm.cpp $(il_src)/il_size.cpp $(il_src)/il_tpl.cpp $(il_src)/il_fits.cpp $(il_src)/il_iwi.cpp $(il_src)/il_blp.cpp $(il_src)/il_ftx.cpp $(il_src)/il_dicom.cpp $(il_src)/il_rot.cpp $(il_src)/il_texture.cpp $(il_src)/il_dpx.cpp $(il_src)/il_utx.cpp $(il_src)/il_mp3.cpp
-+libIL_la_SOURCES = $(il_src)/il_alloc.cpp $(il_src)/il_doom.cpp $(il_src)/il_stack.cpp $(il_src)/il_pcx.cpp $(il_src)/il_rle.cpp $(il_src)/il_bits.cpp $(il_src)/il_endian.cpp $(il_src)/il_exr.cpp $(il_src)/il_jpeg.cpp $(il_src)/il_pic.cpp $(il_src)/il_sgi.cpp $(il_src)/il_bmp.cpp $(il_src)/il_error.cpp $(il_src)/il_lif.cpp $(il_src)/il_png.cpp $(il_src)/il_states.cpp $(il_src)/il_convbuff.cpp $(il_src)/il_files.cpp $(il_src)/il_main.cpp $(il_src)/il_pnm.cpp $(il_src)/il_targa.cpp $(il_src)/il_wdp.cpp $(il_src)/il_convert.cpp $(il_src)/il_gif.cpp $(il_src)/il_manip.cpp $(il_src)/il_profiles.cpp $(il_src)/il_tiff.cpp $(il_src)/il_cut.cpp $(il_src)/il_header.cpp $(il_src)/il_mdl.cpp $(il_src)/il_quantizer.cpp $(il_src)/il_utility.cpp $(il_src)/il_dcx.cpp $(il_src)/il_icon.cpp $(il_src)/il_mng.cpp $(il_src)/il_raw.cpp $(il_src)/il_wal.cpp $(il_src)/il_dds.cpp $(il_src)/il_internal.cpp $(il_src)/il_palette.cpp $(il_src)/il_rawdata.cpp $(il_src)/il_devil.cpp $(il_src)/il_io.cpp $(il_src)/il_pcd.cpp $(il_src)/il_register.cpp $(il_src)/il_psd.cpp $(il_src)/il_fastconv.cpp $(il_src)/il_neuquant.cpp $(il_src)/il_dds-save.cpp $(il_src)/il_psp.cpp $(il_src)/il_pix.cpp $(il_src)/il_pxr.cpp $(il_src)/il_vtf.cpp $(il_src)/il_xpm.cpp $(il_src)/il_hdr.cpp $(il_src)/il_icns.cpp $(il_src)/il_jp2.cpp $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c $(il_src)/il_sun.cpp $(il_src)/il_nvidia.cpp $(il_src)/il_wbmp.cpp $(il_src)/il_squish.cpp $(il_src)/il_iff.cpp $(il_src)/il_ilbm.cpp $(il_src)/il_size.cpp $(il_src)/il_tpl.cpp $(il_src)/il_fits.cpp $(il_src)/il_iwi.cpp $(il_src)/il_blp.cpp $(il_src)/il_ftx.cpp $(il_src)/il_dicom.cpp $(il_src)/il_rot.cpp $(il_src)/il_texture.cpp $(il_src)/il_dpx.cpp $(il_src)/il_utx.cpp $(il_src)/il_mp3.cpp
-
- libIL_la_LDFLAGS = @IL_LIBS@ $(AM_LDFLAGS)
-
--libILU_la_CPPFLAGS = -I $(ilu_include) -I $(all_include)
-+libILU_la_CPPFLAGS = -I $(ilu_include) -I $(il_include) -I $(all_include)
- libILU_la_CFLAGS = $(AM_CFLAGS) @ILU_CFLAGS@
- libILU_la_SOURCES = $(ilu_src)/ilu_alloc.cpp $(ilu_src)/ilu_internal.cpp $(ilu_src)/ilu_noise.cpp $(ilu_src)/ilu_scale.cpp $(ilu_src)/ilu_error.cpp $(ilu_src)/ilu_main.cpp $(ilu_src)/ilu_rotate.cpp $(ilu_src)/ilu_scaling.cpp $(ilu_src)/ilu_filter.cpp $(ilu_src)/ilu_manip.cpp $(ilu_src)/ilu_scale2d.cpp $(ilu_src)/ilu_states.cpp $(ilu_src)/ilu_filter_rcg.cpp $(ilu_src)/ilu_mipmap.cpp $(ilu_src)/ilu_scale3d.cpp $(ilu_src)/ilu_utilities.cpp $(ilu_src)/ilu_region.cpp
-
- libILU_la_LDFLAGS = @ILU_LIBS@ $(AM_LDFLAGS)
- libILU_la_LIBADD = libIL.la
-
--libILUT_la_CPPFLAGS = -I $(ilut_include) -I $(all_include) @SDL_CFLAGS@
-+libILUT_la_CPPFLAGS = -I $(ilut_include) -I $(il_include) -I $(all_include) @SDL_CFLAGS@
- libILUT_la_CFLAGS = $(AM_CFLAGS) @ILUT_CFLAGS@ @SDL_CFLAGS@
- libILUT_la_SOURCES = $(ilut_src)/ilut_main.cpp $(ilut_src)/ilut_states.cpp $(ilut_src)/ilut_internal.cpp
- libILUT_la_LDFLAGS = @ILUT_LIBS@ $(AM_LDFLAGS)
diff --git a/ResIL-restrict.patch b/ResIL-restrict.patch
deleted file mode 100644
index 6da5445..0000000
--- a/ResIL-restrict.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- ResIL-1.8.3/m4/devil-definitions.m4.orig 2014-08-21 18:35:48.000000000 +0200
-+++ ResIL-1.8.3/m4/devil-definitions.m4 2016-05-20 18:58:27.951271202 +0200
-@@ -273,6 +273,16 @@
- [enable_$1="yes"]) ])
-
- dnl Test for restrict c/c++ keyword
-+AC_DEFUN([DEVIL_CHECK___RESTRICT],
-+ [AC_MSG_CHECKING([__restrict keyword])
-+ AC_COMPILE_IFELSE(AC_LANG_SOURCE([void foo(void * __restrict test){}]),
-+ [AC_DEFINE([__RESTRICT_KEYWORD],
-+ [],
-+ [__restrict keyword available])
-+ restrict_keyword="found"
-+ AC_MSG_RESULT([yes]) ],
-+ [AC_MSG_RESULT([no]) ]) ])
-+
- AC_DEFUN([DEVIL_CHECK_RESTRICT],
- [AC_MSG_CHECKING([restrict keyword])
- AC_COMPILE_IFELSE(AC_LANG_SOURCE([void foo(void * restrict test){}]),
---- ResIL-1.8.3/include/IL/il_constants.h.orig 2014-11-15 16:01:26.000000000 +0100
-+++ ResIL-1.8.3/include/IL/il_constants.h 2016-05-20 19:01:19.014597356 +0200
-@@ -74,8 +74,8 @@
- #endif
-
- #ifdef RESTRICT_KEYWORD
--#define RESTRICT restrict
--#define CONST_RESTRICT const restrict
-+#define RESTRICT __restrict
-+#define CONST_RESTRICT const __restrict
- #else
- #define RESTRICT
- #define CONST_RESTRICT const
---- ResIL-1.8.3/configure.ac.orig 2016-05-20 16:32:31.754971998 +0200
-+++ ResIL-1.8.3/configure.ac 2016-05-20 19:02:14.314595036 +0200
-@@ -151,6 +151,8 @@
-
- dnl Test for restrict c/c++ keyword
- DEVIL_CHECK_RESTRICT
-+AS_IF([test "x$restrict_keyword" = "xfound"], [],
-+ [DEVIL_CHECK___RESTRICT])
-
- dnl checking if the -std=gnu99 flag is required
- AS_IF([test "x$restrict_keyword" = "xfound"], [],
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ResIL.git/commitdiff/e8f3ca4d7f101c5ec71682870d5d1a268aa6f752
More information about the pld-cvs-commit
mailing list