commit 657b057d3f408aa54ad5005e03d4c68656bde67f
Author: Jakub Bogusz <[email protected]>
Date: Fri Apr 15 16:49:45 2022 +0200
- fail successor, updated to 6.1.1
fail.spec | 141 ----------------------------------------------
imagemagick7.patch | 101 ---------------------------------
recoil.spec | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 160 insertions(+), 242 deletions(-)
---
diff --git a/fail.spec b/fail.spec
deleted file mode 100644
index b359ddd..0000000
--- a/fail.spec
+++ /dev/null
@@ -1,141 +0,0 @@
-# TODO:
-# - register gnome thumbnailer in more package-friendly way (not multiple
gconftool runs)
-# - webapp config for -html5? (optional, may be used also locally)
-#
-# Conditional build:
-%bcond_without html5 # HTML5 viewer
-%bcond_without magick # ImageMagick coder
-#
-# html5 requires cito that requires mono that is not available yet on x32
-%ifarch x32
-%undefine with_html5
-%endif
-
-Summary: FAIL - First Atari Image Library
-Summary(pl.UTF-8): FAIL (First Atari Image Library) - biblioteka do
obrazów w formatach Atari
-Name: fail
-Version: 2.0.2
-Release: 1
-License: GPL v2+
-Group: Applications/Graphics
-Source0:
https://downloads.sourceforge.net/recoil/%{name}-%{version}.tar.gz
-# Source0-md5: 553c54fc7e257850765419b8e7bb5482
-Patch0: imagemagick7.patch
-URL: http://recoil.sourceforge.net/
-%{?with_magick:BuildRequires: ImageMagick-devel >= 1:6.8}
-%{?with_html5:BuildRequires: asciidoc}
-%{?with_html5:BuildRequires: cito}
-BuildRequires: libpng-devel
-BuildRequires: libxslt-progs
-BuildRequires: zlib-devel
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%if %{with magick}
-%define im_coders_dir %(pkg-config --variable moduledir
MagickCore)/coders
-%endif
-
-%description
-FAIL is a viewer of pictures in native formats of Atari 8-bit, Atari
-ST, Atari Falcon and Atari Portfolio computers.
-
-%description -l pl.UTF-8
-FAIL to narzędzia do przeglądania obrazów w natywnych formatach
-komputerów Atari 8-bitowych, Atari ST, Atari Falcon oraz Atari
-Portfolio.
-
-%package gnome
-Summary: FAIL support for viewing Atari files in GNOME
-Summary(pl.UTF-8): Wsparcie FAIL do oglądania plików z Atari w GNOME
-Group: X11/Applications/Graphics
-Requires: %{name} = %{version}-%{release}
-
-%description gnome
-FAIL support for viewing Atari files in GNOME.
-
-%description gnome -l pl.UTF-8
-Wsparcie FAIL do oglądania plików z Atari w GNOME.
-
-%package html5
-Summary: HTML5 FAIL viewer for Atari files
-Summary(pl.UTF-8): Przeglądarka FAIL do plików z Atari w HTML5
-Group: Applications/WWW
-
-%description html5
-HTML5 FAIL viewer for Atari files.
-
-%description html5 -l pl.UTF-8
-Przeglądarka FAIL do plików z Atari w HTML5.
-
-%package -n ImageMagick-coder-fail
-Summary: FAIL coder for ImageMagick
-Summary(pl.UTF-8): Koder FAIL dla ImageMagicka
-Group: Libraries
-%requires_ge_to ImageMagick ImageMagick-devel
-
-%description -n ImageMagick-coder-fail
-FAIL coder for ImageMagick to read Atari formats.
-
-%description -n ImageMagick-coder-fail -l pl.UTF-8
-Koder FAIL dla ImageMagicka, czytający formaty Atari.
-
-%prep
-%setup -q
-%patch0 -p1
-
-%build
-%{__make} all fail-mime.xml \
- CC="%{__cc}" \
- CFLAGS="%{rpmcflags} -Wall" \
-%if %{with magick}
- MAGICK_INCLUDE_PATH=/usr/include/ImageMagick-7/private \
- CAN_INSTALL_MAGICK=1
-%endif
-
-%if %{with html5}
-%{__make} -C html5
-%endif
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-%{__make} install-fail2png \
- PREFIX=$RPM_BUILD_ROOT%{_prefix}
-
-# install-thumbnailer is ugly; for now, install only this one
-install -D fail-mime.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/fail-mime.xml
-
-%if %{with magick}
-install -D fail.so $RPM_BUILD_ROOT%{im_coders_dir}/fail.so
-echo "dlname='fail.so'" >$RPM_BUILD_ROOT%{im_coders_dir}/fail.la
-%endif
-
-%if %{with html5}
-install -d $RPM_BUILD_ROOT%{_datadir}/fail-html5
-cp -p html5/*.{js,html} $RPM_BUILD_ROOT%{_datadir}/fail-html5
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(644,root,root,755)
-%doc README.html
-%attr(755,root,root) %{_bindir}/fail2png
-
-%files gnome
-%defattr(644,root,root,755)
-%{_datadir}/mime/packages/fail-mime.xml
-# TODO: gconf files?
-
-%if %{with html5}
-%files html5
-%defattr(644,root,root,755)
-%{_datadir}/fail-html5
-%endif
-
-%if %{with magick}
-%files -n ImageMagick-coder-fail
-%defattr(644,root,root,755)
-%attr(755,root,root) %{im_coders_dir}/fail.so
-%{im_coders_dir}/fail.la
-%endif
diff --git a/recoil.spec b/recoil.spec
new file mode 100644
index 0000000..272b4c9
--- /dev/null
+++ b/recoil.spec
@@ -0,0 +1,160 @@
+# TODO:
+# - finish html5 (BR: vnu.jar)
+# - webapp config for -html5? (optional, may be used also locally)
+#
+# Conditional build:
+%bcond_with html5 # HTML5 viewer
+%bcond_without magick # ImageMagick coder
+#
+# html5 requires cito that requires mono that is not available yet on x32
+%ifarch x32
+%undefine with_html5
+%endif
+
+Summary: RECOIL - Retro Computer Image Library
+Summary(pl.UTF-8): RECOIL (Retro Computer Image Library) - biblioteka do
obrazów w formatach komputerów retro
+Name: recoil
+Version: 6.1.1
+Release: 1
+License: GPL v2+
+Group: Applications/Graphics
+Source0:
https://downloads.sourceforge.net/recoil/%{name}-%{version}.tar.gz
+# Source0-md5: 844d34c62064c8123a4179133493246e
+URL: http://recoil.sourceforge.net/
+%{?with_magick:BuildRequires: ImageMagick-devel >= 1:6.8}
+%{?with_html5:BuildRequires: asciidoc}
+%{?with_html5:BuildRequires: cito}
+BuildRequires: libpng-devel
+BuildRequires: libxslt-progs
+BuildRequires: zlib-devel
+#Obsoletes: fail < 3
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%if %{with magick}
+%define im_coders_dir %(pkg-config --variable moduledir
MagickCore)/coders
+%endif
+
+%description
+RECOIL is a viewer of pictures in native formats of vintage computers:
+Amiga, Amstrad CPC, Apple II, Atari 8-bit, Atari Portfolio, Atari
+ST/TT/Falcon, BBC Micro, Commodore VIC-20, Commodore 16, Commodore 64,
+Commodore 128, Electronika BK, FM Towns, Macintosh 128K, MSX,
+NEC PC-80/88/98, Oric, Psion Series 3, SAM Coupe, Sharp X68000, Tandy
+1000, Timex 2048, TRS-80, TRS-80 Color Computer, ZX81 and ZX Spectrum.
+
+%description -l pl.UTF-8
+RECOIL to przeglądarka obrazów w natywnych formatach klasycznych
+komputerów: Amiga, Amstrad CPC, Apple II, Atari 8-bitowe, Atari
+Portfolio, Atari ST/TT/Falcon, BBC Micro, Commodore VIC-20, Commodore
+16, Commodore 64, Commodore 128, Electronika BK, FM Towns, Macintosh
+128K, MSX, NEC PC-80/88/98, Oric, Psion Series 3, SAM Coupé, Sharp
+X68000, Tandy 1000, Timex 2048, TRS-80, TRS-80 Color Computer, ZX81
+oraz ZX Spectrum.
+
+%package gnome
+Summary: RECOIL support for viewing retro computer files in GNOME
+Summary(pl.UTF-8): Wsparcie RECOIL do oglądania plików z komputerów retro
w GNOME
+Group: X11/Applications/Graphics
+Requires: %{name} = %{version}-%{release}
+Requires: shared-mime-info
+Obsoletes: fail-gnome < 3
+
+%description gnome
+RECOIL support for viewing retro computer files in GNOME.
+
+%description gnome -l pl.UTF-8
+Wsparcie RECOIL do oglądania plików z komputerów retro w GNOME.
+
+%package html5
+Summary: HTML5 RECOIL viewer for retro computer files
+Summary(pl.UTF-8): Przeglądarka RECOIL do plików z komputerów retro w HTML5
+Group: Applications/WWW
+#Obsoletes: fail-html5 < 3
+
+%description html5
+HTML5 RECOIL viewer for retro computer files.
+
+%description html5 -l pl.UTF-8
+Przeglądarka RECOIL do plików z komputerów retro w HTML5.
+
+%package -n ImageMagick-coder-recoil
+Summary: RECOIL coder for ImageMagick
+Summary(pl.UTF-8): Koder RECOIL dla ImageMagicka
+Group: Libraries
+%requires_ge_to ImageMagick ImageMagick-devel
+#Obsoletes: ImageMagick-coder-fail < 3
+
+%description -n ImageMagick-coder-recoil
+RECOIL coder for ImageMagick to read retro computer formats.
+
+%description -n ImageMagick-coder-recoil -l pl.UTF-8
+Koder RECOIL dla ImageMagicka, czytający formaty komputerów retro.
+
+%prep
+%setup -q
+
+%build
+%{__make} \
+ CC="%{__cc}" \
+ CFLAGS="%{rpmcflags} -Wall -I. -DMAGICK7" \
+%if %{with magick}
+ MAGICK_INCLUDE_PATH=/usr/include/ImageMagick-7/private \
+ CAN_INSTALL_MAGICK=1
+%endif
+
+%if %{with html5}
+%{__make} -C www
+%endif
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install-recoil2png install-mime install-thumbnailer \
+ BUILDING_PACKAGE=1 \
+ PREFIX=$RPM_BUILD_ROOT%{_prefix}
+
+# install-thumbnailer is ugly; for now, install only this one
+#install -D recoil-mime.xml
$RPM_BUILD_ROOT%{_datadir}/mime/packages/recoil-mime.xml
+
+%if %{with magick}
+install -D imagemagick/recoil.so $RPM_BUILD_ROOT%{im_coders_dir}/recoil.so
+echo "dlname='recoil.so'" >$RPM_BUILD_ROOT%{im_coders_dir}/recoil.la
+%endif
+
+%if %{with html5}
+install -d $RPM_BUILD_ROOT%{_datadir}/recoil-html5
+cp -p www/*.{js,html} $RPM_BUILD_ROOT%{_datadir}/recoil-html5
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post gnome
+%update_mime_database
+
+%postun gnome
+%update_mime_database
+
+%files
+%defattr(644,root,root,755)
+%doc README
+%attr(755,root,root) %{_bindir}/recoil2png
+%{_mandir}/man1/recoil2png.1*
+
+%files gnome
+%defattr(644,root,root,755)
+%{_datadir}/mime/packages/recoil-mime.xml
+%{_datadir}/thumbnailers/recoil.thumbnailer
+
+%if %{with html5}
+%files html5
+%defattr(644,root,root,755)
+%{_datadir}/recoil-html5
+%endif
+
+%if %{with magick}
+%files -n ImageMagick-coder-recoil
+%defattr(644,root,root,755)
+%attr(755,root,root) %{im_coders_dir}/recoil.so
+%{im_coders_dir}/recoil.la
+%endif
diff --git a/imagemagick7.patch b/imagemagick7.patch
deleted file mode 100644
index 6d6f6fb..0000000
--- a/imagemagick7.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -ur fail-2.0.1/failmagick.c fail-2.0.1-im7/failmagick.c
---- fail-2.0.1/failmagick.c 2013-03-20 10:14:11.000000000 +0100
-+++ fail-2.0.1-im7/failmagick.c 2016-12-26 11:22:35.114121922 +0100
-@@ -23,23 +23,24 @@
-
- #include "fail.h"
-
--#include "magick/studio.h"
--#include "magick/blob.h"
--#include "magick/blob-private.h"
--#include "magick/colorspace.h"
--#include "magick/exception.h"
--#include "magick/exception-private.h"
--#include "magick/image.h"
--#include "magick/image-private.h"
--#include "magick/list.h"
--#include "magick/magick.h"
--#include "magick/memory_.h"
--#include "magick/monitor.h"
--#include "magick/monitor-private.h"
--#include "magick/quantum-private.h"
--#include "magick/static.h"
--#include "magick/string_.h"
--#include "magick/module.h"
-+#include "MagickCore/studio.h"
-+#include "MagickCore/blob.h"
-+#include "MagickCore/blob-private.h"
-+#include "MagickCore/colorspace.h"
-+#include "MagickCore/exception.h"
-+#include "MagickCore/exception-private.h"
-+#include "MagickCore/image.h"
-+#include "MagickCore/image-private.h"
-+#include "MagickCore/list.h"
-+#include "MagickCore/magick.h"
-+#include "MagickCore/memory_.h"
-+#include "MagickCore/monitor.h"
-+#include "MagickCore/monitor-private.h"
-+#include "MagickCore/pixel-accessor.h"
-+#include "MagickCore/quantum-private.h"
-+#include "MagickCore/static.h"
-+#include "MagickCore/string_.h"
-+#include "MagickCore/module.h"
-
- static MagickBooleanType IsFAIL(const unsigned char *magick, const size_t
length)
- {
-@@ -53,18 +54,18 @@
- int content_len;
- FAIL *fail;
- Image *image;
-- PixelPacket *q;
-+ Quantum *q;
- const int *pixels;
- int num_pixels;
- int i;
-
- assert(image_info != NULL);
-- assert(image_info->signature == MagickSignature);
-+ assert(image_info->signature == MagickCoreSignature);
- if (image_info->debug)
- LogMagickEvent(TraceEvent, GetMagickModule(), "%s",
image_info->filename);
- assert(exception != NULL);
-- assert(exception->signature == MagickSignature);
-- image = AcquireImage(image_info);
-+ assert(exception->signature == MagickCoreSignature);
-+ image = AcquireImage(image_info, exception);
- if (!OpenBlob(image_info, image, ReadBinaryBlobMode, exception)) {
- (void) DestroyImageList(image);
- return NULL;
-@@ -82,8 +83,7 @@
- }
-
- image->depth = 8;
-- if (!SetImageExtent(image, FAIL_GetWidth(fail), FAIL_GetHeight(fail))) {
-- InheritException(exception, &image->exception);
-+ if (!SetImageExtent(image, FAIL_GetWidth(fail), FAIL_GetHeight(fail),
exception)) {
- FAIL_Delete(fail);
- (void) DestroyImageList(image);
- return NULL;
-@@ -100,9 +100,10 @@
- num_pixels = image->columns * image->rows;
- for (i = 0; i < num_pixels; i++) {
- int rgb = pixels[i];
-- q[i].red = ScaleCharToQuantum((unsigned char) (rgb >> 16));
-- q[i].green = ScaleCharToQuantum((unsigned char) (rgb >> 8));
-- q[i].blue = ScaleCharToQuantum((unsigned char) rgb);
-+ SetPixelRed(image, ScaleCharToQuantum((unsigned char) (rgb >>
16)), q);
-+ SetPixelGreen(image, ScaleCharToQuantum((unsigned char) (rgb >>
8)), q);
-+ SetPixelBlue(image, ScaleCharToQuantum((unsigned char) rgb), q);
-+ q += GetPixelChannels(image);
- }
- FAIL_Delete(fail);
- SyncAuthenticPixels(image, exception);
-@@ -250,7 +251,7 @@
- const struct Format *pf;
- MagickInfo *entry;
- for (pf = formats; pf < formats + sizeof(formats) / sizeof(formats[0]);
pf++) {
-- entry = SetMagickInfo(pf->name);
-+ entry = AcquireMagickInfo(ConstantString("FAIL"), pf->name,
pf->description);
- entry->decoder = ReadFAILImage;
- entry->magick = IsFAIL;
- entry->description = ConstantString(pf->description);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/recoil.git/commitdiff/657b057d3f408aa54ad5005e03d4c68656bde67f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
