From bff2137f6eac68365a3f877399fdbec38fb1bea7 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 12 Jan 2004 15:28:27 +0000 Subject: [PATCH] * examples/cacamoir.c: + Renamed cacacirc to cacamoir. * libcaca.spec debian/ doc/: + Added cacamoir to the distributed files. --- NEWS | 1 + debian/control | 8 +++--- debian/rules | 6 +++++ doc/Makefile.am | 8 ++++-- doc/cacademo.1 | 39 +++++++++++++++++++---------- examples/Makefile.am | 8 +++--- examples/{cacacirc.c => cacamoir.c} | 2 +- libcaca.spec | 12 ++++++--- 8 files changed, 58 insertions(+), 26 deletions(-) rename examples/{cacacirc.c => cacamoir.c} (98%) diff --git a/NEWS b/NEWS index fd1f83a..e1c6519 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ Changes between 0.7 and 0.8: * autorepeat emulation in the ncurses and slang drivers * support for more keycodes in the ncurses and slang drivers * cacaplas, a plasma animation example + * cacamoir, a moiré circles animation example Changes between 0.6 and 0.7: ---------------------------- diff --git a/debian/control b/debian/control index dcdfad2..4cf2657 100644 --- a/debian/control +++ b/debian/control @@ -34,6 +34,8 @@ Description: text mode graphics utilities . cacaball is a tiny graphic program that renders animated ASCII metaballs on the screen, cacafire is a port of AALib's aafire and displays burning ASCII - art flames, and cacademo is a simple application that shows the libcaca - rendering features such as line and ellipses drawing, triangle filling and - sprite blitting. + art flames, cacamoir animates colourful moire circles and cacaplas displays + an old school plasma effect. + . + cacademo is a simple application that shows the libcaca rendering features + such as line and ellipses drawing, triangle filling and sprite blitting. diff --git a/debian/rules b/debian/rules index 070f65a..41bccf5 100755 --- a/debian/rules +++ b/debian/rules @@ -46,6 +46,8 @@ install: build mv debian/libcaca-dev/usr/bin/cacademo debian/caca-utils/usr/bin mv debian/libcaca-dev/usr/bin/cacaview debian/caca-utils/usr/bin mv debian/libcaca-dev/usr/bin/cacafire debian/caca-utils/usr/bin + mv debian/libcaca-dev/usr/bin/cacamoir debian/caca-utils/usr/bin + mv debian/libcaca-dev/usr/bin/cacaplas debian/caca-utils/usr/bin mv debian/libcaca-dev/usr/share/libcaca debian/caca-utils/usr/share mv debian/libcaca-dev/usr/share/man/man1/cacaball.1 \ @@ -54,6 +56,10 @@ install: build 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/cacamoir.1 \ + debian/caca-utils/usr/share/man/man1/ + mv debian/libcaca-dev/usr/share/man/man1/cacaplas.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/ diff --git a/doc/Makefile.am b/doc/Makefile.am index c5200d0..949174a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -45,9 +45,13 @@ if DOXYGEN $(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 rm -f $(DESTDIR)$(mandir)/man1/cacaball.1 ln -s cacademo.1 $(DESTDIR)$(mandir)/man1/cacaball.1 + rm -f $(DESTDIR)$(mandir)/man1/cacafire.1 + ln -s cacademo.1 $(DESTDIR)$(mandir)/man1/cacafire.1 + rm -f $(DESTDIR)$(mandir)/man1/cacamoir.1 + ln -s cacademo.1 $(DESTDIR)$(mandir)/man1/cacamoir.1 + rm -f $(DESTDIR)$(mandir)/man1/cacaplas.1 + ln -s cacademo.1 $(DESTDIR)$(mandir)/man1/cacaplas.1 endif diff --git a/doc/cacademo.1 b/doc/cacademo.1 index d37fd53..4b7027e 100644 --- a/doc/cacademo.1 +++ b/doc/cacademo.1 @@ -1,42 +1,55 @@ .TH libcaca 1 "2004-1-6" "libcaca" .SH NAME -cacademo, cacafire, cacaball \- libcaca's demonstration applications +cacademo, cacaball, cacafire, cacamoir, cacaplas \- libcaca's demonstration +applications .SH SYNOPSIS cacademo .PP +cacaball +.PP cacafire .PP -cacaball +cacamoir +.PP +cacaplas .RI .SH DESCRIPTION -This manual page documents briefly the cacademo, cacafire and cacaball -programs. +This manual page documents briefly the cacademo, cacaball, cacafire, cacamoir +and cacaplas programs. .PP .B cacademo is a simple demo which demonstrates some features of the libcaca library. The main menu lists available keys and their actions. To exit a particular demo, press any key. .PP +.B cacaball +displays ASCII art metaballs. +.PP .B cacafire displays burning ASCII art flames. .PP -.B cacaball -displays ASCII art metaballs. +.B cacamoir +displays a coloured ASCII art moire pattern of concentric circles. +.PP +.B cacaplas +displays an old school ASCII art plasma effect. .SH BUGS Please report any bugs you find to . .SH LICENSE -cacademo, cacafire and cacaball are covered by the GNU Lesser General -Public License (LGPL). +cacademo, cacaball, cacafire, cacamoir and cacaplas are covered by the GNU +Lesser General Public License (LGPL). .SH AUTHORS -.B cacademo +.B cacademo, cacamoir and this manual page were written by Sam Hocevar . .PP +.B cacaball +was written by Jean-Yves Lamoureux , .B cacafire is a port of AAlib's .B aafire -written by Jan Hubicka . -.PP -.B cacaball -was written by Jean-Yves Lamoureux . +written by Jan Hubicka and +.B cacaplas +is a port of an SDL plasma effect written and put in the public domain by +Michele Bini . .SH SEE ALSO cacaview(1), aafire(1) diff --git a/examples/Makefile.am b/examples/Makefile.am index c28e717..6b26544 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -6,7 +6,7 @@ pkgdata_DATA = caca.txt EXTRA_DIST = caca.txt -bin_PROGRAMS = cacademo cacafire cacaball cacaplas cacaview cacacirc +bin_PROGRAMS = cacademo cacafire cacaball cacaplas cacaview cacamoir cacademo_SOURCES = demo.c cacademo_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@ @@ -24,9 +24,9 @@ cacaplas_SOURCES = cacaplas.c cacaplas_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@ cacaplas_CPPFLAGS = -I$(top_srcdir)/src -cacacirc_SOURCES = cacacirc.c -cacacirc_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@ -cacacirc_CPPFLAGS = -I$(top_srcdir)/src +cacamoir_SOURCES = cacamoir.c +cacamoir_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@ +cacamoir_CPPFLAGS = -I$(top_srcdir)/src cacaview_SOURCES = cacaview.c cacaview_LDADD = ../src/libcaca.a @CACA_LIBS@ diff --git a/examples/cacacirc.c b/examples/cacamoir.c similarity index 98% rename from examples/cacacirc.c rename to examples/cacamoir.c index dcc0b07..67192c1 100644 --- a/examples/cacacirc.c +++ b/examples/cacamoir.c @@ -1,5 +1,5 @@ /* - * cacacirc circle effect for libcaca + * cacamoir moiré circles effect for libcaca * Copyright (c) 2004 Sam Hocevar * All Rights Reserved * diff --git a/libcaca.spec b/libcaca.spec index dd05c7b..f462612 100644 --- a/libcaca.spec +++ b/libcaca.spec @@ -49,9 +49,11 @@ or enable anti-aliasing. cacaball is a tiny graphic program that renders animated ASCII metaballs on the screen, cacafire is a port of AALib's aafire and displays burning ASCII -art flames, and cacademo is a simple application that shows the libcaca -rendering features such as line and ellipses drawing, triangle filling and -sprite blitting. +art flames, cacamoir animates colourful moire circles and cacaplas displays +an old school plasma effect. + +cacademo is a simple application that shows the libcaca rendering features +such as line and ellipses drawing, triangle filling and sprite blitting. %prep case "${RPM_COMMAND:-all}" in @@ -95,12 +97,16 @@ rm -rf %{buildroot} %{_prefix}/bin/cacaball %{_prefix}/bin/cacademo %{_prefix}/bin/cacafire +%{_prefix}/bin/cacamoir +%{_prefix}/bin/cacaplas %{_prefix}/bin/cacaview %{_prefix}/share/doc/caca-utils-%{version}/* %{_prefix}/share/libcaca/* %{_prefix}/share/man/man1/cacaball.1* %{_prefix}/share/man/man1/cacademo.1* %{_prefix}/share/man/man1/cacafire.1* +%{_prefix}/share/man/man1/cacamoir.1* +%{_prefix}/share/man/man1/cacaplas.1* %{_prefix}/share/man/man1/cacaview.1* %changelog