OBS User unknown 2008-06-26 13:55:14 +00:00 committed by Git OBS Bridge
parent 55a30d0a95
commit 9fa726e0f9
10 changed files with 294 additions and 83 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f99617dc3fe6664cb9dfd4cd56548c6a40e4cc11d1389eccc09567ff9abd43a0
size 171854

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:838d682d4ecb9bfc588b9c875bc0b6cb4d6438783ea70d706c5911b1ba41c448
size 743510

View File

@ -1,12 +1,11 @@
--- configure.ac
+++ configure.ac
@@ -107,7 +107,8 @@
@@ -173,7 +173,7 @@
AC_CHECK_LIB(X11, XOpenDisplay,
[ac_cv_my_have_x11="yes"
if test -n "${x_includes}"; then X_CFLAGS="-I${x_includes}"; fi
- if test -n "${x_libraries}"; then X_LIBS="-lX11 -L${x_libraries}"; fi
+ if test -n "${x_libraries}"; then X_LIBS="-lX11"; fi
+ if test "${x_libraries}" != "/usr"; then X_LIBS="$X_LIBS -L${x_libraries}"; fi
AC_DEFINE(USE_X11, 1, Define to activate the X11 backend driver)
- if test -n "${x_libraries}"; then X_LIBS="-L${x_libraries}"; fi
+ if test -n "${x_libraries}" -a "${x_libraries}" != "/usr"; then X_LIBS="-L${x_libraries}"; fi
AC_DEFINE(USE_X11, 1, Define to 1 to activate the X11 backend driver)
CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
CACA_LIBS="${CACA_LIBS} ${X_LIBS}"
X11_LIBS="${X11_LIBS} -lX11 ${X_LIBS}"

View File

@ -1,38 +0,0 @@
--- Makefile.am
+++ Makefile.am
@@ -8,6 +8,6 @@
bin_SCRIPTS = caca-config
-doc_DATA = README BUGS TODO AUTHORS NEWS NOTES THANKS
-docdir = $(datadir)/doc/libcaca-dev
+# doc_DATA = README BUGS TODO AUTHORS NEWS NOTES THANKS
+# docdir = $(datadir)/doc/libcaca-dev
--- doc/Makefile.am
+++ doc/Makefile.am
@@ -6,10 +6,10 @@
if BUILD_DOCUMENTATION
htmldoc_DATA = html/doxygen.css
-htmldocdir = $(datadir)/doc/libcaca-dev/html
+htmldocdir = $(datadir)/doc/packages/libcaca-devel/html
if USE_LATEX
psdoc_DATA = latex/libcaca.ps
-psdocdir = $(datadir)/doc/libcaca-dev/ps
+psdocdir = $(datadir)/doc/packages/libcaca-devel/ps
endif
endif
@@ -41,9 +41,9 @@
install-data-local:
if BUILD_DOCUMENTATION
- $(mkinstalldirs) $(DESTDIR)$(datadir)/doc/libcaca-dev/html
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/doc/packages/libcaca-devel/html
cp `find html -name '*.html' -o -name '*.gif' -o -name '*.png'` \
- $(DESTDIR)$(datadir)/doc/libcaca-dev/html
+ $(DESTDIR)$(datadir)/doc/packages/libcaca-devel/html
$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
rm -f $(DESTDIR)$(mandir)/man1/cacaball.1
ln -s cacademo.1 $(DESTDIR)$(mandir)/man1/cacaball.1

View File

@ -0,0 +1,11 @@
--- cxx/cxxtest.cpp
+++ cxx/cxxtest.cpp
@@ -13,7 +13,7 @@
*/
#include <iostream>
-
+#include <string.h>
#include <cucul++.h>
#include <caca++.h>

View File

@ -1,11 +1,23 @@
--- doc/Makefile.am
+++ doc/Makefile.am
@@ -44,8 +44,6 @@
$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/libcaca-dev/html
@@ -4,7 +4,7 @@
$(man_MANS) $(doxygen_DOX)
doxygen_DOX = libcaca.dox user.dox migrating.dox tutorial.dox canvas.dox font.dox style.dox
-man_MANS = caca-config.1 cacafire.1 cacaview.1 cacaserver.1 img2txt.1 cacaplay.1
+man1_MANS = caca-config.1 cacafire.1 cacaview.1 cacaserver.1 img2txt.1 cacaplay.1
if BUILD_DOCUMENTATION
htmldoc_DATA = html/doxygen.css
@@ -46,11 +46,6 @@
$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/libcucul-dev/html
cp `find html -name '*.html' -o -name '*.gif' -o -name '*.png'` \
$(DESTDIR)$(datadir)/doc/libcaca-dev/html
$(DESTDIR)$(datadir)/doc/libcucul-dev/html
- $(mkinstalldirs) $(DESTDIR)$(mandir)/man3
- cp man/man3/*.3caca $(DESTDIR)$(mandir)/man3
- for man in $$(find man -name '*.3caca'); do \
- sed -e 's/man3caca/man3/g' -e "s/fC'\([a-zA-Z0-9]*\)'/fC\"\1\"/g" \
- $$man >$(DESTDIR)$(mandir)/man3/$${man##*/}; \
- done
$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
rm -f $(DESTDIR)$(mandir)/man1/cacaball.1
ln -s cacademo.1 $(DESTDIR)$(mandir)/man1/cacaball.1
rm -f $(DESTDIR)$(mandir)/man1/cacademo.1
ln -s cacafire.1 $(DESTDIR)$(mandir)/man1/cacademo.1

View File

@ -0,0 +1,11 @@
--- ruby/Makefile.am
+++ ruby/Makefile.am
@@ -9,7 +9,7 @@
TESTS = test
endif
-CFLAGS += -Wno-strict-prototypes -Wno-missing-prototypes
+AM_CFLAGS = -Wno-strict-prototypes -Wno-missing-prototypes
cucul_la_CPPFLAGS = -I$(top_srcdir)/cucul $(RUBY_CFLAGS)
cucul_la_SOURCES = cucul.c \

View File

@ -0,0 +1,36 @@
--- configure.ac
+++ configure.ac
@@ -355,12 +355,12 @@
if test "${RUBY}" != "no"; then
RUBY_CFLAGS="-I$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"archdir"@:>@')"
RUBY_LIBS="-L$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"libdir"@:>@') -l$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"RUBY_SO_NAME"@:>@')"
- RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"sitearchdir"@:>@'`
- RUBY_SITELIBDIR=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"sitelibdir"@:>@'`
+ RUBY_VENDORARCHDIR=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"vendorarchdir"@:>@'`
+ RUBY_VENDORLIBDIR=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"vendorlibdir"@:>@'`
AC_SUBST(RUBY_CFLAGS)
AC_SUBST(RUBY_LIBS)
- AC_SUBST(RUBY_SITEARCHDIR)
- AC_SUBST(RUBY_SITELIBDIR)
+ AC_SUBST(RUBY_VENDORARCHDIR)
+ AC_SUBST(RUBY_VENDORLIBDIR)
CPPFLAGS="${CPPFLAGS} ${RUBY_CFLAGS}"
AC_CHECK_HEADERS([ruby.h],
[ac_cv_my_have_ruby="yes"
--- ruby/Makefile.am
+++ ruby/Makefile.am
@@ -1,11 +1,11 @@
# $Id: $
-rubylibdir = $(RUBY_SITEARCHDIR)
-rubysitedir = $(RUBY_SITELIBDIR)
+rubylibdir = $(RUBY_VENDORARCHDIR)
+rubyvendordir = $(RUBY_VENDORLIBDIR)
if USE_RUBY
rubylib_LTLIBRARIES = caca.la cucul.la
-rubysite_DATA = lib/caca.rb
+rubyvendor_DATA = lib/caca.rb
TESTS = test
endif

View File

@ -1,3 +1,61 @@
-------------------------------------------------------------------
Thu Jun 12 19:19:15 CEST 2008 - pth@suse.de
- Build dynamic libraries, disable creation of static ones.
- Compile with OpenGL support.
- Install ruby bindings in vendorarch/vendorlib.
- Fix file list.
-------------------------------------------------------------------
Wed Feb 13 12:39:11 CET 2008 - pth@suse.de
- Update to 0.99beta13:
- device-dependent cursor support
- event API rewrite
- Ruby bindings
- Massive C# bindings improvements
- Python sample code
- support for 90-degree canvas rotation
- better behaviour when trying to output Unicode on an ASCII terminal
- the built-in font now supports the Geometric Shapes, Halfwidth and Fullwidth
Forms and Miscellaneous Symbols Unicode blocks
- new rotozoom effect in cacademo
- preliminary .NET bindings
- blitting canvases now makes use of the canvas' handle coordinates
- import functions can read streamed data
- attribute to colorspace transformations
- added katakana and hiragana glyphs to the built-in font
- support for blink, bold, italics and underline attributes
- fixed Imlib2 support in cacaview
- fixed buffer overflows in the file importer
- support for fullwidth Unicode characters
- transparency support in the UTF-8 importer and exporter
- ANSI importer now handles transparency and UTF-8
- various memory leaks were fixed
- implemented cucul_getchar() and cucul_get_color()
- handle transparency in the IRC export
- new cropping and expanding filters
- full Unicode support in the OpenGL driver
- all demos except cacafire were merged into cacademo
- added a compatibility layer for pre-1.x libcaca applications
- libcaca functions use errno for error reporting
- ANSI importer
- cacadraw, an ANSI viewer that will evolve into an editor
- Unicode input and output support for SLang and ncurses
- license switched to WTFPL
- libcaca was split into libcucul, a standalone text manipulation backend,
and libcaca, the display and user input frontend
- TrueColor (more than 16 colours) support
- Floyd-Steinberg dithering
- gamma correction
- export functions for HTML, IRC, ANSI, SVG, PostScript, TGA...
- builtin fonts for device-independent bitmap output
- various text transformation routines (rotation, horizontal flip...)
- OpenGL renderer
- kernel mode to build libcaca programs into a bootable x86 kernel
- cacaserver, a telnet server that can be hooked to libcaca applications
- img2irc, an image to IRC conversion utility
-------------------------------------------------------------------
Sun Apr 22 23:10:09 CEST 2007 - ro@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package libcaca (Version 0.9)
# spec file for package libcaca (Version 0.99.beta13b)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -10,20 +10,28 @@
# norootforbuild
Name: libcaca
BuildRequires: doxygen freetype2-devel imlib2-devel ncurses-devel pkgconfig slang-devel texlive-latex xorg-x11 xorg-x11-devel xorg-x11-libs
Version: 0.9
Release: 63
License: GNU General Public License (GPL)
BuildRequires: doxygen freetype2-devel imlib2-devel ncurses-devel pkgconfig
BuildRequires: slang-devel texlive-latex xorg-x11 xorg-x11-devel
BuildRequires: freeglut-devel xorg-x11-libs
BuildRequires: gcc-c++ libstdc++-devel mono-devel ruby-devel
Version: 0.99.beta13b
Release: 2
License: GPL v2 or later
Summary: Library for Colour ASCII Art, text mode graphics
Group: Development/Languages/C and C++
URL: http://sam.zoy.org/projects/libcaca/
Url: http://sam.zoy.org/projects/libcaca/
Source: http://sam.zoy.org/projects/libcaca/%{name}-%{version}.tar.bz2
Patch0: libcaca-no_slang_acsmap.patch
Patch1: libcaca-no_man3_pages.patch
Patch2: libcaca-documentation.patch
Patch3: libcaca-X11_test.patch
Patch2: libcaca-X11_test.patch
Patch3: libcaca-missing_header.patch
Patch4: libcaca-ruby_am_cflags.patch
Patch5: libcaca-ruby_vendor_install.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define rb_vendorarch %{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}
%define rb_vendorlib %{_libdir}/ruby/vendor_ruby/%{rb_ver}
%description
libcaca is the Colour AsCii Art library. It provides high level
@ -43,10 +51,16 @@ Authors:
%else
%define _xorg7libs /usr/X11R6/%{_lib}
%endif
%package devel
License: GPL v2 or later
Summary: Library for Colour ASCII Art, text mode graphics
Group: Development/Languages/C and C++
Requires: XFree86-devel, ncurses-devel >= 5, slang-devel
Requires: xorg-x11-devel, xorg-x11-libXext-devel, xorg-x11-libX11-devel,
Requires: xorg-x11-libxcb-devel, xorg-x11-libXau-devel
Requires: ncurses-devel >= 5, slang-devel, freeglut-devel, Mesa
Requires: Mesa-devel, glibc-devel
Requires: %{name} = %{version}
%description devel
This package contains the header files and static libraries needed to
@ -54,12 +68,45 @@ compile applications or shared objects that use libcaca.
Authors:
--------
Sam Hocevar <sam@zoy.org>
Jean-Yves Lamoureux <jylam@lnxscene.org>
%package csharp
License: GPL v2 or later
Summary: C# support for libcaca
Group: Development/Languages/Mono
Requires: %{name} = %{version} mono
%description csharp
This package contains all that is needed to use libcaca from C# code.
Authors:
--------
Sam Hocevar <sam@zoy.org>
Jean-Yves Lamoureux <jylam@lnxscene.org>
%package ruby
License: GPL v2 or later
Summary: Ruby bindings for libcaca
Group: Development/Languages/Ruby
Requires: %{name} = %{version} ruby
%description ruby
All that is needed to use libcaca from ruby code.
Authors:
--------
Sam Hocevar <sam@zoy.org>
Jean-Yves Lamoureux <jylam@lnxscene.org>
%package -n caca-utils
License: GPL v2 or later
Summary: Colour ASCII Art Text mode graphics utilities based on libcaca
Group: Amusements/Toys/Graphics
@ -93,6 +140,8 @@ Authors:
%patch1
%patch2
%patch3
%patch4
%patch5
%build
export CFLAGS="%{optflags}"
@ -103,61 +152,134 @@ autoreconf -fi
--enable-ncurses \
--enable-x11 \
--x-libraries=%{_xorg7libs} \
--enable-imlib2
--enable-imlib2 \
--enable-gl \
--enable-shared \
--disable-static
%{__make}
%install
make DESTDIR=%{buildroot} install
%makeinstall
# We want to include the docs ourselves from the source directory
%{__mv} %{buildroot}%{_docdir}/%{name}-devel %{name}-devel-docs
#%{__mv} %{buildroot}%{_docdir}/%{name}-devel %{name}-devel-docs
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root, 0755)
%doc AUTHORS BUGS COPYING NEWS NOTES README THANKS TODO
#%{_libdir}/*.so*
%doc AUTHORS ChangeLog COPYING NEWS NOTES README THANKS TODO
%{_libdir}/*.so.*
%files devel
%defattr(-, root, root, 0755)
%{_libdir}/*.a
#%{_libdir}/*.a
%{_libdir}/*.so
%{_libdir}/*.la
%{_bindir}/caca-config
%{_libdir}/pkgconfig/*.pc
%{_includedir}/*
%{_mandir}/man1/caca-config.1*
%{_datadir}/doc/libcucul-dev
%files csharp
%defattr(-, root, root, 0755)
%{_libdir}/caca-sharp
%{_libdir}/cucul-sharp
%files ruby
%defattr(-, root, root, 0755)
%{rb_vendorarch}/*
%{rb_vendorlib}/caca.rb
%files -n caca-utils
%defattr(-, root, root, 0755)
%{_bindir}/cacaball
%{_bindir}/cacademo
%{_bindir}/cacafire
%{_bindir}/cacamoir
%{_bindir}/cacaplas
%{_bindir}/cacaview
%{_bindir}/cacaplay
%{_bindir}/cacaserver
%{_bindir}/img2txt
%{_datadir}/libcaca
%{_mandir}/man1/cacaball.1*
%{_mandir}/man1/cacademo.1*
%{_mandir}/man1/cacafire.1*
%{_mandir}/man1/cacamoir.1*
%{_mandir}/man1/cacaplas.1*
%{_mandir}/man1/cacaview.1*
%{_mandir}/man1/cacaplay.1*
%{_mandir}/man1/cacaserver.1*
%{_mandir}/man1/img2txt.1*
%changelog
* Sun Apr 22 2007 - ro@suse.de
* Thu Jun 12 2008 pth@suse.de
- Build dynamic libraries, disable creation of static ones.
- Compile with OpenGL support.
- Install ruby bindings in vendorarch/vendorlib.
- Fix file list.
* Wed Feb 13 2008 pth@suse.de
- Update to 0.99beta13:
- device-dependent cursor support
- event API rewrite
- Ruby bindings
- Massive C# bindings improvements
- Python sample code
- support for 90-degree canvas rotation
- better behaviour when trying to output Unicode on an ASCII terminal
- the built-in font now supports the Geometric Shapes, Halfwidth and Fullwidth
Forms and Miscellaneous Symbols Unicode blocks
- new rotozoom effect in cacademo
- preliminary .NET bindings
- blitting canvases now makes use of the canvas' handle coordinates
- import functions can read streamed data
- attribute to colorspace transformations
- added katakana and hiragana glyphs to the built-in font
- support for blink, bold, italics and underline attributes
- fixed Imlib2 support in cacaview
- fixed buffer overflows in the file importer
- support for fullwidth Unicode characters
- transparency support in the UTF-8 importer and exporter
- ANSI importer now handles transparency and UTF-8
- various memory leaks were fixed
- implemented cucul_getchar() and cucul_get_color()
- handle transparency in the IRC export
- new cropping and expanding filters
- full Unicode support in the OpenGL driver
- all demos except cacafire were merged into cacademo
- added a compatibility layer for pre-1.x libcaca applications
- libcaca functions use errno for error reporting
- ANSI importer
- cacadraw, an ANSI viewer that will evolve into an editor
- Unicode input and output support for SLang and ncurses
- license switched to WTFPL
- libcaca was split into libcucul, a standalone text manipulation backend,
and libcaca, the display and user input frontend
- TrueColor (more than 16 colours) support
- Floyd-Steinberg dithering
- gamma correction
- export functions for HTML, IRC, ANSI, SVG, PostScript, TGA...
- builtin fonts for device-independent bitmap output
- various text transformation routines (rotation, horizontal flip...)
- OpenGL renderer
- kernel mode to build libcaca programs into a bootable x86 kernel
- cacaserver, a telnet server that can be hooked to libcaca applications
- img2irc, an image to IRC conversion utility
* Mon Apr 23 2007 ro@suse.de
- use texlive for building
* Fri Mar 30 2007 - rguenther@suse.de
* Fri Mar 30 2007 rguenther@suse.de
- Add ncurses-devel BuildRequires.
* Fri Aug 04 2006 - pth@suse.de
* Fri Aug 04 2006 pth@suse.de
- Adapt to new X11 paths.
* Wed Mar 29 2006 - pth@suse.de
* Wed Mar 29 2006 pth@suse.de
- Fix BuildRequires.
* Wed Mar 29 2006 - pth@suse.de
* Wed Mar 29 2006 pth@suse.de
- Add X11 devel files to BuildRequires.
* Wed Jan 25 2006 - mls@suse.de
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Mon Dec 19 2005 - ro@suse.de
* Mon Dec 19 2005 ro@suse.de
- added missing manpage symlinks to filelist
* Fri Nov 25 2005 - pth@suse.de
* Fri Nov 25 2005 pth@suse.de
- Initial package.
- undef clashing acs_map from slang.h
- don't try to install non-existing man3 pages