pool/libcaca
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 286456 from multimedia:libs

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/286456
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcaca?expand=0&rev=35
This commit is contained in:
Dominique Leuenberger 2015-02-20 11:00:47 +00:00 committed by Git OBS Bridge
commit 298b29b7eb
7 changed files with 22 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
automake-1.12.patch
View File

@ -1,13 +0,0 @@
Index: libcaca-0.99.beta18/bootstrap
===================================================================
--- libcaca-0.99.beta18.orig/bootstrap
+++ libcaca-0.99.beta18/bootstrap
@@ -36,7 +36,7 @@ aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL
# Check for automake
amvers="no"
-for v in 11 10 9 8 7 6 5; do
+for v in 12 11 10 9 8 7 6 5; do
if automake-1.${v} --version >/dev/null 2>&1; then
amvers="-1.${v}"
break

10
libcaca-0.99-texbuild.patch
View File

@ -2,12 +2,12 @@ Index: doc/doxygen.cfg.in
===================================================================
--- doc/doxygen.cfg.in.orig 2010-01-03 04:54:32.000000000 +0200
+++ doc/doxygen.cfg.in 2010-11-20 07:32:05.000000000 +0200
@@ -1047,7 +1047,7 @@ USE_PDFLATEX = YES
# running if errors occur, instead of asking the user for help.
# This option is also used when generating formulas in HTML.
@@ -1663,7 +1663,7 @@
# The default value is: NO.
# This tag requires that the tag GENERATE_LATEX is set to YES.
-LATEX_BATCHMODE = YES
+LATEX_BATCHMODE = NO
# If LATEX_HIDE_INDICES is set to YES then doxygen will not
# include the index chapters (such as File Index, Compound Index, etc.)
# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
# index chapters (such as File Index, Compound Index, etc.) in the output.

3
libcaca-0.99.beta18.tar.gz
View File

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

3
libcaca-0.99.beta19.tar.gz Normal file
View File

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

127
libcaca-ruby_vendor_install.patch
View File

@ -2,18 +2,18 @@ Index: configure.ac
===================================================================
--- configure.ac.orig 2012-05-14 11:56:04.447928052 +0200
+++ configure.ac 2012-05-14 12:03:02.562272828 +0200
@@ -462,14 +462,17 @@ ac_cv_my_have_ruby="no"
@@ -465,14 +465,17 @@
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 -r mkmf -e 'conf = RbConfig::CONFIG.merge("hdrdir" => $hdrdir, "arch_hdrdir" => $arch_hdrdir); print RbConfig::expand("#$INCFLAGS", conf)')"
+ RUBY_CFLAGS=$(pkg-config --cflags ruby-1.9)
+ if test -z "$RUBY_CFLAGS"; then
+ RUBY_CFLAGS="-I$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"archdir"@:>@')"
+ fi
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_LIBS="-L$(ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"libdir"@:>@') -l$(ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"RUBY_SO_NAME"@:>@')"
- RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"sitearchdir"@:>@'`
- RUBY_SITELIBDIR=`ruby -r rbconfig -e 'print RbConfig::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)
@ -42,119 +42,4 @@ Index: ruby/Makefile.am
+rubyvendor_DATA = lib/caca.rb
TESTS = test
endif
Index: ruby/caca-canvas.c
===================================================================
--- ruby/caca-canvas.c.orig 2010-02-16 00:49:40.000000000 +0100
+++ ruby/caca-canvas.c 2012-05-14 12:05:27.623453608 +0200
@@ -274,7 +274,7 @@ static VALUE draw_polyline(VALUE self, V
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 @@ static VALUE draw_polyline(VALUE self, V
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 @@ static VALUE draw_thin_polyline(VALUE se
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 @@ static VALUE draw_thin_polyline(VALUE se
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 @@ static VALUE fill_triangle_textured(VALU
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 @@ static VALUE fill_triangle_textured(VALU
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 @@ static VALUE fill_triangle_textured(VALU
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 render_canvas(VALUE self, V
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_from_memory(VALUE se
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));
Index: ruby/caca-dither.c
===================================================================
--- ruby/caca-dither.c.orig 2010-02-16 00:49:47.000000000 +0100
+++ ruby/caca-dither.c 2012-05-14 12:06:49.420608093 +0200
@@ -48,7 +48,7 @@ static VALUE set_dither_palette(VALUE se
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 @@ static VALUE set_dither_palette(VALUE se
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);

7
libcaca.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Feb 17 03:37:09 UTC 2015 - p.drouand@gmail.com
- Update to version 0.99beta19
* No changelog available
- Remove automake-1.12.patch; fixed on upstream release
-------------------------------------------------------------------
Thu Jan 15 13:35:26 UTC 2015 - olaf@aepfle.de

5
libcaca.spec
View File

@ -43,7 +43,7 @@ BuildRequires: ruby-devel
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(x11)
Version: 0.99.beta18
Version: 0.99.beta19
Release: 0
Summary: Library for Colour ASCII Art, text mode graphics
License: WTFPL
@ -57,7 +57,6 @@ Patch4: libcaca-ruby_am_cflags.patch
Patch5: libcaca-ruby_vendor_install.patch
Patch7: libcaca-0.99.beta16-missing-GLU.patch
Patch9: caca-no-build-date.patch
Patch10: automake-1.12.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}
@ -189,7 +188,6 @@ chmod 0644 %{S:0}
%patch7
%patch9
%patch1
%patch10 -p1
RUBY="ruby-`echo %{rb_ver} | sed 's|\.[^\.]*$||'`"
find . -type f -exec sed -i "s|ruby-1.9|$RUBY|" \{\} \;
@ -263,7 +261,6 @@ make %{?_smp_mflags}
%{_includedir}/*
%{_mandir}/man1/caca-config.1*
%{_mandir}/man3/*
%{_datadir}/doc/libcucul-dev
%{_datadir}/doc/libcaca-dev
%if 0%{?withjava} == 1
%{_libdir}/jni/libcaca-java.so