[packages/libcaca] - updated to 0.99.beta19 - removed obsolete install,ruby1.9,format patches - disable pdf documentati
qboosh
qboosh at pld-linux.org
Sun Jul 13 08:43:09 CEST 2014
commit 7993638275d8c4ee9e35280e5ad89caa9fa1b815
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jul 13 08:47:58 2014 +0200
- updated to 0.99.beta19
- removed obsolete install,ruby1.9,format patches
- disable pdf documentation build because of doxygen vs latex problems
install.patch | 34 -------
libcaca-format.patch | 242 --------------------------------------------------
libcaca-ruby1.9.patch | 122 -------------------------
libcaca.spec | 65 ++++----------
4 files changed, 16 insertions(+), 447 deletions(-)
---
diff --git a/libcaca.spec b/libcaca.spec
index fd6071e..b53338b 100644
--- a/libcaca.spec
+++ b/libcaca.spec
@@ -15,17 +15,14 @@ Summary: Graphics library that outputs text instead of pixels
Summary(pl.UTF-8): Biblioteka graficzna wyświetlająca tekst zamiast pikseli
Name: libcaca
Version: 0.99
-%define subver beta18
+%define subver beta19
Release: 0.%{subver}.1
License: WTFPL v2
Group: Libraries
-Source0: http://libcaca.zoy.org/files/libcaca/%{name}-%{version}.%{subver}.tar.gz
-# Source0-md5: 93d35dbdb0527d4c94df3e9a02e865cc
-Patch0: install.patch
-Patch1: %{name}-ruby1.9.patch
-Patch2: %{name}-format.patch
-Patch3: %{name}-monodir.patch
-URL: http://libcaca.zoy.org/
+Source0: http://caca.zoy.org/raw-attachment/wiki/libcaca/%{name}-%{version}.%{subver}.tar.gz
+# Source0-md5: a3d4441cdef488099f4a92f4c6c1da00
+Patch0: %{name}-monodir.patch
+URL: http://caca.zoy.org/
BuildRequires: OpenGL-devel
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -45,10 +42,10 @@ BuildRequires: rpmbuild(monoautodeps)
BuildRequires: ruby-devel
BuildRequires: sed >= 4.0
BuildRequires: slang-devel >= 2.0.0
-BuildRequires: texlive-fonts-jknappen
-BuildRequires: texlive-format-pdflatex
-BuildRequires: texlive-makeindex
-BuildRequires: texlive-latex-ams
+#BuildRequires: texlive-fonts-jknappen
+#BuildRequires: texlive-format-pdflatex
+#BuildRequires: texlive-makeindex
+#BuildRequires: texlive-latex-ams
BuildRequires: xorg-lib-libX11-devel
BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -242,11 +239,7 @@ Wiązania języka Ruby do libcaca.
%prep
%setup -q -n %{name}-%{version}.%{subver}
-%undos */Makefile.am
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
%{__libtoolize}
@@ -256,21 +249,25 @@ Wiązania języka Ruby do libcaca.
%{__automake}
# NOTE: ncurses driver builds, but there's no color when linked against
# ABI 6. While caca defaults to ncurses this must be disabled until fixed.
+# NOTE: as of libcaca 0.99beta19 / doxygen 1.8.7 pdflatex fails - use
+# KPSEWHICH hack to disable PDF documentation.
%configure \
- --disable-ncurses \
+ KPSEWHICH=/nonexisting \
--enable-csharp%{!?with_dotnet:=no} \
--enable-cxx \
--enable-gl \
--enable-java%{!?with_java:=no} \
+ --disable-ncurses \
--enable-plugins \
--enable-slang \
--enable-x11
-
+# --disable-silent-rules doesn't work due to AM_DEFAULT_VERBOSITY=0; use V=1 instead
# ObjC file not used, use plain CC to link library to avoid C++/ObjC deps
%{__make} %{?with_java:-j1} \
CLASSPATH=$(pwd)/java \
OBJC="%{__cc}" \
+ V=1 \
jnidir=%{_libdir}
%install
@@ -293,22 +290,7 @@ echo '.so cacafire.1' > $RPM_BUILD_ROOT%{_mandir}/man1/cacademo.1
# man3 pages have too common base names to be included
%{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/*.3caca
# packaged as %doc in -devel
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/lib{caca,cucul}-dev
-
-cd $RPM_BUILD_ROOT%{_libdir}
-for i in libcaca.so.*.*.* libcaca++.so.*.*.*; do
- ln -sf $i $(echo $i |sed 's/caca/cucul/')
-done
-ln -sf libcaca.a $RPM_BUILD_ROOT%{_libdir}/libcucul.a
-ln -sf libcaca.la $RPM_BUILD_ROOT%{_libdir}/libcucul.la
-ln -sf libcaca.so $RPM_BUILD_ROOT%{_libdir}/libcucul.so
-ln -sf libcaca.so.0 $RPM_BUILD_ROOT%{_libdir}/libcucul.so.0
-ln -sf libcaca++.a $RPM_BUILD_ROOT%{_libdir}/libcucul++.a
-ln -sf libcaca++.la $RPM_BUILD_ROOT%{_libdir}/libcucul++.la
-ln -sf libcaca++.so $RPM_BUILD_ROOT%{_libdir}/libcucul++.so
-ln -sf libcaca++.so.0 $RPM_BUILD_ROOT%{_libdir}/libcucul++.so.0
-ln -sf caca++.h $RPM_BUILD_ROOT%{_includedir}/cucul++.h
-ln -sf caca_types.h $RPM_BUILD_ROOT%{_includedir}/cucul_types.h
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/libcaca-dev
%py_postclean
@@ -334,8 +316,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/cacaserver
%attr(755,root,root) %{_libdir}/libcaca.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libcaca.so.0
-%attr(755,root,root) %{_libdir}/libcucul.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcucul.so.0
%dir %{_libdir}/caca
%{_datadir}/%{name}
%{_mandir}/man1/cacademo.1*
@@ -363,47 +343,34 @@ rm -rf $RPM_BUILD_ROOT
%doc doc/html/*
%attr(755,root,root) %{_bindir}/caca-config
%attr(755,root,root) %{_libdir}/libcaca.so
-%attr(755,root,root) %{_libdir}/libcucul.so
%{_libdir}/libcaca.la
-%{_libdir}/libcucul.la
%{_includedir}/caca.h
%{_includedir}/caca0.h
%{_includedir}/caca_conio.h
%{_includedir}/caca_types.h
-%{_includedir}/cucul.h
-%{_includedir}/cucul_types.h
%{_pkgconfigdir}/caca.pc
-%{_pkgconfigdir}/cucul.pc
%{_mandir}/man1/caca-config.1*
# man3 pages have too common base names to be included
%files static
%defattr(644,root,root,755)
%{_libdir}/libcaca.a
-%{_libdir}/libcucul.a
%files c++
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libcaca++.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libcaca++.so.0
-%attr(755,root,root) %{_libdir}/libcucul++.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcucul++.so.0
%files c++-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libcaca++.so
-%attr(755,root,root) %{_libdir}/libcucul++.so
%{_libdir}/libcaca++.la
-%{_libdir}/libcucul++.la
%{_includedir}/caca++.h
-%{_includedir}/cucul++.h
%{_pkgconfigdir}/caca++.pc
-%{_pkgconfigdir}/cucul++.pc
%files c++-static
%defattr(644,root,root,755)
%{_libdir}/libcaca++.a
-%{_libdir}/libcucul++.a
%if %{with dotnet}
%files -n dotnet-caca-sharp
diff --git a/install.patch b/install.patch
deleted file mode 100644
index 7be231b..0000000
--- a/install.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- libcaca-0.99.beta16/caca/Makefile.am.orig 2008-10-18 14:49:52.000000000 +0200
-+++ libcaca-0.99.beta16/caca/Makefile.am 2010-02-24 21:31:41.372010500 +0100
-@@ -65,14 +65,6 @@
- driver/win32.c \
- $(NULL)
-
--install-exec-local:
-- $(mkinstalldirs) $(DESTDIR)$(libdir)
-- . ./libcaca.la || exit 1; \
-- for x in $$library_names; do \
-- ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
-- done
-- ln -sf libcaca.la $(DESTDIR)$(libdir)/libcucul.la
--
- install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
- ln -sf caca.pc $(DESTDIR)$(pkgconfigdir)/cucul.pc
---- libcaca-0.99.beta16/cxx/Makefile.am.orig 2008-10-17 01:44:45.000000000 +0200
-+++ libcaca-0.99.beta16/cxx/Makefile.am 2010-02-24 21:31:49.485343884 +0100
-@@ -23,14 +23,6 @@
- cxxtest_LDADD = libcaca++.la ../caca/libcaca.la
-
- if USE_CXX
--install-exec-local:
-- $(mkinstalldirs) $(DESTDIR)$(libdir)
-- . ./libcaca++.la || exit 1; \
-- for x in $$library_names; do \
-- ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
-- done
-- ln -sf libcaca++.la $(DESTDIR)$(libdir)/libcucul++.la
--
- install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
- ln -sf caca++.pc $(DESTDIR)$(pkgconfigdir)/cucul++.pc
diff --git a/libcaca-format.patch b/libcaca-format.patch
deleted file mode 100644
index 70a352e..0000000
--- a/libcaca-format.patch
+++ /dev/null
@@ -1,242 +0,0 @@
---- libcaca-0.99.beta18/ruby/caca-display.c.orig 2012-04-06 22:36:17.000000000 +0200
-+++ libcaca-0.99.beta18/ruby/caca-display.c 2012-12-04 20:28:37.435444821 +0100
-@@ -84,7 +84,7 @@
-
- if(display == NULL)
- {
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
- }
-
- _SELF = display;
-@@ -131,7 +131,7 @@
- {
- if(caca_set_display_title(_SELF, StringValuePtr(t))<0)
- {
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
- }
- return t;
- }
-@@ -252,7 +252,7 @@
- {
- if(caca_set_display_driver(_SELF, StringValuePtr(driver))<0)
- {
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
- }
- return driver;
- }
-@@ -267,7 +267,7 @@
- {
- if(caca_set_cursor(_SELF, flag)<0)
- {
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
- }
- return flag;
- }
---- libcaca-0.99.beta18/ruby/caca-canvas.c.orig 2012-12-04 19:55:24.012153037 +0100
-+++ libcaca-0.99.beta18/ruby/caca-canvas.c 2012-12-04 21:28:19.848703487 +0100
-@@ -22,7 +22,7 @@
- static VALUE x (VALUE self) \
- { \
- if( caca_##x (_SELF) <0) \
-- rb_raise(rb_eRuntimeError, strerror(errno)); \
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno)); \
- \
- return self; \
- }
-@@ -58,7 +58,7 @@
-
- if(canvas == NULL)
- {
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
- }
-
- _SELF = canvas;
-@@ -104,7 +104,7 @@
- static VALUE gotoxy(VALUE self, VALUE x, VALUE y)
- {
- if( caca_gotoxy(_SELF, NUM2INT(x), NUM2INT(y)) <0) {
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
- }
- return self;
- }
-@@ -150,7 +150,7 @@
- static VALUE set_attr(VALUE self, VALUE attr)
- {
- if(caca_set_attr(_SELF, NUM2ULONG(attr)) <0)
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
-
- return self;
- }
-@@ -164,7 +164,7 @@
- static VALUE put_attr(VALUE self, VALUE x, VALUE y, VALUE attr)
- {
- if(caca_put_attr(_SELF, NUM2INT(x), NUM2INT(y), NUM2ULONG(attr)) <0)
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
-
- return self;
- }
-@@ -172,7 +172,7 @@
- static VALUE set_color_ansi(VALUE self, VALUE fg, VALUE bg)
- {
- if(caca_set_color_ansi(_SELF, NUM2INT(fg), NUM2INT(bg)) <0)
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
-
- return self;
- }
-@@ -180,7 +180,7 @@
- static VALUE set_color_argb(VALUE self, VALUE fg, VALUE bg)
- {
- if(caca_set_color_argb(_SELF, NUM2UINT(fg), NUM2UINT(bg)) <0) {
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
- }
- return self;
- }
-@@ -234,7 +234,7 @@
- cmask = NULL;
-
- if(caca_blit(_SELF, NUM2INT(x), NUM2INT(y), csrc, cmask)<0)
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
-
- return self;
- }
-@@ -243,7 +243,7 @@
- {
- if(caca_set_canvas_boundaries(_SELF, NUM2INT(x), NUM2INT(y), NUM2UINT(w), NUM2UINT(h))<0)
- {
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
- }
- return self;
- }
-@@ -524,7 +524,7 @@
- static VALUE set_frame(VALUE self, VALUE id)
- {
- if(caca_set_frame(_SELF, NUM2INT(id))<0)
-- rb_raise(rb_eArgError, strerror(errno));
-+ rb_raise(rb_eArgError, "%s", strerror(errno));
-
- return self;
- }
-@@ -543,7 +543,7 @@
- static VALUE set_frame_name(VALUE self, VALUE name)
- {
- if(caca_set_frame_name(_SELF, StringValuePtr(name))<0)
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
-
- return self;
- }
-@@ -557,7 +557,7 @@
- static VALUE create_frame(VALUE self, VALUE id)
- {
- if(caca_create_frame(_SELF, NUM2INT(id))<0) {
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
- }
- return self;
- }
-@@ -565,7 +565,7 @@
- static VALUE free_frame(VALUE self, VALUE id)
- {
- if(caca_free_frame(_SELF, NUM2INT(id))<0) {
-- rb_raise(rb_eArgError, strerror(errno));
-+ rb_raise(rb_eArgError, "%s", strerror(errno));
- }
- return self;
- }
-@@ -602,7 +602,7 @@
- long int bytes;
- bytes = caca_import_canvas_from_memory (_SELF, StringValuePtr(data), RSTRING_LEN(StringValue(data)), StringValuePtr(format));
- if(bytes <= 0)
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
-
- return self;
- }
-@@ -612,7 +612,7 @@
- long int bytes;
- bytes = caca_import_area_from_memory (_SELF, NUM2INT(x), NUM2INT(y), StringValuePtr(data), RSTRING_LEN(StringValue(data)), StringValuePtr(format));
- if(bytes <= 0)
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
-
- return self;
- }
-@@ -622,7 +622,7 @@
- long int bytes;
- bytes = caca_import_canvas_from_file (_SELF, StringValuePtr(filename), StringValuePtr(format));
- if(bytes <= 0)
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
-
- return self;
- }
-@@ -632,7 +632,7 @@
- long int bytes;
- bytes = caca_import_area_from_file (_SELF, NUM2INT(x), NUM2INT(y), StringValuePtr(filename), StringValuePtr(format));
- if(bytes <= 0)
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
-
- return self;
- }
---- libcaca-0.99.beta18/ruby/caca-dither.c.orig 2012-12-04 19:55:24.012153037 +0100
-+++ libcaca-0.99.beta18/ruby/caca-dither.c 2012-12-04 21:29:14.038702358 +0100
-@@ -35,7 +35,7 @@
- dither = caca_create_dither(NUM2UINT(bpp), NUM2UINT(w), NUM2UINT(h), NUM2UINT(pitch), NUM2ULONG(rmask), NUM2ULONG(gmask), NUM2ULONG(bmask), NUM2ULONG(amask));
- if(dither == NULL)
- {
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
- }
- _SELF = dither;
- return self;
-@@ -121,7 +121,7 @@
- free(green);
- free(blue);
- free(alpha);
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
- }
-
- free(red);
-@@ -142,7 +142,7 @@
- static VALUE set_##x(VALUE self, VALUE x) \
- { \
- if(caca_set_dither_##x(_SELF, (float)NUM2DBL(x))<0) \
-- rb_raise(rb_eRuntimeError, strerror(errno)); \
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno)); \
- \
- return x; \
- } \
-@@ -163,7 +163,7 @@
- { \
- if(caca_set_dither_##x(_SELF, StringValuePtr(x))<0) \
- { \
-- rb_raise(rb_eRuntimeError, strerror(errno)); \
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno)); \
- } \
- return x; \
- } \
---- libcaca-0.99.beta18/ruby/caca-font.c.orig 2010-02-16 00:49:54.000000000 +0100
-+++ libcaca-0.99.beta18/ruby/caca-font.c 2012-12-04 21:33:34.698696928 +0100
-@@ -35,7 +35,7 @@
- font = caca_load_font(StringValuePtr(name), 0);
- if(font == NULL)
- {
-- rb_raise(rb_eRuntimeError, strerror(errno));
-+ rb_raise(rb_eRuntimeError, "%s", strerror(errno));
- }
- _SELF = font;
- return self;
diff --git a/libcaca-ruby1.9.patch b/libcaca-ruby1.9.patch
deleted file mode 100644
index fd11145..0000000
--- a/libcaca-ruby1.9.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- libcaca-0.99.beta17/configure.ac~ 2010-02-08 13:34:28.000000000 +0100
-+++ libcaca-0.99.beta17/configure.ac 2010-03-02 17:34:37.239187424 +0100
-@@ -469,7 +469,7 @@
- if test "${enable_ruby}" != "no"; then
- AC_PATH_PROG(RUBY, ruby, no)
- if test "${RUBY}" != "no"; then
-- RUBY_CFLAGS="-I$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"archdir"@:>@')"
-+ RUBY_CFLAGS=`($RUBY -rmkmf -e 'puts "-I#$hdrdir/#{CONFIG["arch"]} -I#$hdrdir"') 2>/dev/null`
- 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"@:>@'`
---- libcaca-0.99.beta17/ruby/caca-canvas.c~ 2009-12-14 18:38:56.000000000 +0100
-+++ libcaca-0.99.beta17/ruby/caca-canvas.c 2010-03-02 17:40:06.868186374 +0100
-@@ -274,7 +274,7 @@
- int error = 0;
- VALUE v, x, y;
-
-- n = RARRAY(points)->len;
-+ n = RARRAY_LEN(points);
-
- ax = (int*)malloc(n*sizeof(int));
- if(!ax)
-@@ -290,7 +290,7 @@
- for(i=0; i<n; i++)
- {
- v = rb_ary_entry(points, i);
-- if((TYPE(v) == T_ARRAY) && (RARRAY(v)->len == 2))
-+ if((TYPE(v) == T_ARRAY) && (RARRAY_LEN(v) == 2))
- {
- x = rb_ary_entry(v,0);
- y = rb_ary_entry(v,1);
-@@ -336,7 +336,7 @@
- int error = 0;
- VALUE v, x, y;
-
-- n = RARRAY(points)->len;
-+ n = RARRAY_LEN(points);
-
- ax = (int*)malloc(n*sizeof(int));
- if(!ax)
-@@ -352,7 +352,7 @@
- for(i=0; i<n; i++)
- {
- v = rb_ary_entry(points, i);
-- if((TYPE(v) == T_ARRAY) && (RARRAY(v)->len == 2))
-+ if((TYPE(v) == T_ARRAY) && (RARRAY_LEN(v) == 2))
- {
- x = rb_ary_entry(v,0);
- y = rb_ary_entry(v,1);
-@@ -459,7 +459,7 @@
- float cuv[6];
- VALUE v;
-
-- l = RARRAY(coords)->len;
-+ l = RARRAY_LEN(coords);
- if(l != 6 && l != 3)
- {
- rb_raise(rb_eArgError, "invalid coords list");
-@@ -471,14 +471,14 @@
- ccoords[i] = NUM2INT(v);
- else
- {
-- if((TYPE(v) != T_ARRAY) || (RARRAY(v)->len != 2))
-+ if((TYPE(v) != T_ARRAY) || (RARRAY_LEN(v) != 2))
- rb_raise(rb_eArgError, "invalid coords list");
- ccoords[2*i] = NUM2INT(rb_ary_entry(v, 0));
- ccoords[2*i+1] = NUM2INT(rb_ary_entry(v, 1));
- }
- }
-
-- l = RARRAY(uv)->len;
-+ l = RARRAY_LEN(uv);
- if(l != 6 && l != 3)
- {
- rb_raise(rb_eArgError, "invalid uv list");
-@@ -490,7 +490,7 @@
- cuv[i] = NUM2DBL(v);
- else
- {
-- if((TYPE(v) != T_ARRAY) || (RARRAY(v)->len != 2))
-+ if((TYPE(v) != T_ARRAY) || (RARRAY_LEN(v) != 2))
- rb_raise(rb_eArgError, "invalid uv list");
- ccoords[2*i] = NUM2DBL(rb_ary_entry(v, 0));
- ccoords[2*i+1] = NUM2DBL(rb_ary_entry(v, 1));
-@@ -600,7 +600,7 @@
- static VALUE import_from_memory(VALUE self, VALUE data, VALUE format)
- {
- long int bytes;
-- bytes = caca_import_canvas_from_memory (_SELF, StringValuePtr(data), RSTRING(StringValue(data))->len, StringValuePtr(format));
-+ bytes = caca_import_canvas_from_memory (_SELF, StringValuePtr(data), RSTRING_LEN(StringValue(data)), StringValuePtr(format));
- if(bytes <= 0)
- rb_raise(rb_eRuntimeError, strerror(errno));
-
-@@ -610,7 +610,7 @@
- static VALUE import_area_from_memory(VALUE self, VALUE x, VALUE y, VALUE data, VALUE format)
- {
- long int bytes;
-- bytes = caca_import_area_from_memory (_SELF, NUM2INT(x), NUM2INT(y), StringValuePtr(data), RSTRING(StringValue(data))->len, StringValuePtr(format));
-+ bytes = caca_import_area_from_memory (_SELF, NUM2INT(x), NUM2INT(y), StringValuePtr(data), RSTRING_LEN(StringValue(data)), StringValuePtr(format));
- if(bytes <= 0)
- rb_raise(rb_eRuntimeError, strerror(errno));
-
---- libcaca-0.99.beta17/ruby/caca-dither.c~ 2009-11-17 16:58:37.000000000 +0100
-+++ libcaca-0.99.beta17/ruby/caca-dither.c 2010-03-02 17:40:33.434124529 +0100
-@@ -48,7 +48,7 @@
- VALUE v, r, g, b, a;
- int error = 0;
-
-- if(RARRAY(palette)->len != 256)
-+ if(RARRAY_LEN(palette) != 256)
- {
- rb_raise(rb_eArgError, "Palette must contain 256 elements");
- }
-@@ -84,7 +84,7 @@
- for(i=0; i<256; i++)
- {
- v = rb_ary_entry(palette, i);
-- if((TYPE(v) == T_ARRAY) && (RARRAY(v)->len == 4))
-+ if((TYPE(v) == T_ARRAY) && (RARRAY_LEN(v) == 4))
- {
- r = rb_ary_entry(v,0);
- g = rb_ary_entry(v,1);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libcaca.git/commitdiff/7993638275d8c4ee9e35280e5ad89caa9fa1b815
More information about the pld-cvs-commit
mailing list