diff --git a/NEWS b/NEWS index 32a2351..9c86316 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,14 @@ $Id$ +Changes between 0.5 and 0.6: +---------------------------- + + * 30% speed increase in the bitmap rendering routine + * mouse support and various speed optimisations in the X11 driver + * X11 is now the preferred driver + * improved documentation + * minor bugfixes + Changes between 0.4 and 0.5: ---------------------------- diff --git a/configure.ac b/configure.ac index d366fa2..e6cbe21 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_PREREQ(2.50) AC_CONFIG_AUX_DIR(autotools) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(libcaca, 0.5) +AM_INIT_AUTOMAKE(libcaca, 0.6) AM_CONFIG_HEADER(config.h) AM_PROG_CC_C_O diff --git a/debian/changelog b/debian/changelog index 2960368..d30b404 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libcaca (0.6-1) unstable; urgency=low + + * New upstream release. + + -- Sam Hocevar (Debian packages) Sat, 3 Jan 2004 23:59:08 +0100 + libcaca (0.5-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 7e75c17..55554f1 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Package: libcaca-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, libncurses5-dev, slang1-dev, xlibs-dev -Description: text mode graphics library +Description: development files for libcaca libcaca is the Colour AsCii Art library. It provides high level functions for colour text drawing, simple primitives for line, polygon and ellipse drawing, as well as powerful image to text conversion routines. diff --git a/debian/rules b/debian/rules index 0ec45d4..c8f8a65 100755 --- a/debian/rules +++ b/debian/rules @@ -49,12 +49,13 @@ install: build mv debian/libcaca-dev/usr/share/libcaca debian/caca-utils/usr/share mv debian/libcaca-dev/usr/share/man/man1/cacademo.1 \ - debian/caca-utils/usr/share/man/man1 - ln -s cacademo.1 debian/caca-utils/usr/share/man/man1/cacafire.1 + debian/caca-utils/usr/share/man/man1/ + mv debian/libcaca-dev/usr/share/man/man1/cacafire.1 \ + debian/caca-utils/usr/share/man/man1/ mv debian/libcaca-dev/usr/share/man/man1/cacaview.1 \ - debian/caca-utils/usr/share/man/man1 + debian/caca-utils/usr/share/man/man1/ mv debian/libcaca-dev/usr/share/man/man1/caca-spritedit.1 \ - debian/caca-utils/usr/share/man/man1 + debian/caca-utils/usr/share/man/man1/ cp debian/libcaca-dev/usr/share/doc/libcaca-dev/README \ debian/libcaca-dev/usr/share/doc/libcaca-dev/BUGS \ diff --git a/doc/Makefile.am b/doc/Makefile.am index 13719b9..735904b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -42,5 +42,8 @@ if DOXYGEN $(DESTDIR)$(datadir)/doc/libcaca-dev/html $(mkinstalldirs) $(DESTDIR)$(mandir)/man3 cp man/man3/*.3caca $(DESTDIR)$(mandir)/man3 + $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 + rm -f $(DESTDIR)$(mandir)/man1/cacafire.1 + ln -s cacademo.1 $(DESTDIR)$(mandir)/man1/cacafire.1 endif diff --git a/libcaca.spec b/libcaca.spec index 3c25b73..92abcb6 100644 --- a/libcaca.spec +++ b/libcaca.spec @@ -1,60 +1,113 @@ %define name libcaca -%define version 0.5 +%define version 0.6 %define release 1 -Summary: render images on text terminals Name: %{name} Version: %{version} Release: %{release} -Source0: %{name}-%{version}.tar.bz2 -Copyright: GPL -Group: System Environment/Libs +URL: http://sam.zoy.org/projects/libcaca/ +Source: http://sam.zoy.org/projects/libcaca/%{name}-%{version}.tar.bz2 +License: GPL +Group: System/Libraries +Packager: Sam Hocevar (RPM packages) BuildRoot: %{_tmppath}/%{name}-buildroot Prefix: %{_prefix} -#URL: - +Buildrequires: XFree86-devel, ncurses-devel >= 5, slang-devel +Buildrequires: imlib2-devel +Buildrequires: doxygen, tetex-latex +Summary: Text mode graphics library %description - -library and viewer to render images on text terminals +libcaca is the Colour AsCii Art library. It provides high level functions +for colour text drawing, simple primitives for line, polygon and ellipse +drawing, as well as powerful image to text conversion routines. + +%package -n %{name}-devel +Summary: Development files for libcaca +Group: Development/C +Requires: XFree86-devel, ncurses-devel >= 5, slang-devel +Provides: %{name}-devel = %{version}-%{release} +%description -n %{name}-devel +libcaca is the Colour AsCii Art library. It provides high level functions +for colour text drawing, simple primitives for line, polygon and ellipse +drawing, as well as powerful image to text conversion routines. + +This package contains the header files and static libraries needed to +compile applications or shared objects that use libcaca. + +%package -n caca-utils +Summary: Text mode graphics utilities +Group: Graphics +%description -n caca-utils +This package contains utilities and demonstration programs for libcaca, the +Colour AsCii Art library. + +cacaview is a simple image viewer for the terminal. It opens most image +formats such as JPEG, PNG, GIF etc. and renders them on the terminal using +ASCII art. The user can zoom and scroll the image, set the dithering method +or enable anti-aliasing. + +cacafire is a port of AALib's aafire and displays burning ASCII art flames. + +cacademo is a simple application that shows the libcaca rendering features +such as line and ellipses drawing, triangle filling, and sprite blitting. + +caca-spritedit is a simple sprite viewer for libcaca. %prep - case "${RPM_COMMAND:-all}" in all) %setup -q ;;esac %build - case "${RPM_COMMAND:-all}" in all) -#export CFLAGS="$RPM_OPT_FLAGS -O1 -g" -#./configure --prefix=%{prefix} - -%configure --enable-x11 --enable-imlib - +./configure --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --bindir=\${prefix}/bin \ + --mandir=\${prefix}/share/man \ + --infodir=\${prefix}/share/info \ + --enable-slang --enable-ncurses --enable-x11 --enable-imlib2 ;;esac - make %install - -#install -d $RPM_BUILD_ROOT%{prefix}/bin -#install -d $RPM_BUILD_ROOT%{prefix}/man/man1 -#make prefix=$RPM_BUILD_ROOT%{prefix} install - +rm -rf %{buildroot} %makeinstall +mv %{buildroot}/%{_prefix}/share/doc/libcaca-dev %{buildroot}/%{_prefix}/share/doc/libcaca-devel +mkdir %{buildroot}/%{_prefix}/share/doc/caca-utils +cp `find %{buildroot}/%{_prefix}/share/doc/libcaca-devel/ -name '[A-Z]*'` %{buildroot}/%{_prefix}/share/doc/caca-utils/ %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%files +%files -n %{name}-devel %defattr(-,root,root) -%doc COPYING README TODO -%{_prefix}/* +%{_libdir}/* +%{_prefix}/bin/caca-config +%{_prefix}/include/* +%{_prefix}/share/doc/libcaca-devel/* +%{_prefix}/share/man/man1/caca-config.1* +%{_prefix}/share/man/man3/* + +%files -n caca-utils +%defattr(-,root,root) +%{_prefix}/bin/cacademo +%{_prefix}/bin/cacafire +%{_prefix}/bin/cacaview +%{_prefix}/bin/caca-spritedit +%{_prefix}/share/doc/caca-utils/* +%{_prefix}/share/libcaca/* +%{_prefix}/share/man/man1/cacademo.1* +%{_prefix}/share/man/man1/cacafire.1* +%{_prefix}/share/man/man1/cacaview.1* +%{_prefix}/share/man/man1/caca-spritedit.1* %changelog +* Sat Jan 3 2004 Sam Hocevar (RPM packages) 0.6-1 +- new release + * Mon Dec 29 2003 Richard Zidlicky 0.5-1 - created specfile