[weasel-commit] Source: libcaca=0.99.beta16-1
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Thu, 14 Jan 2010 18:31:47 -0500
================================
libcaca:source=0.99.beta16-1 (previous: 0.9-1)
cvc rdiff libcaca -1 /weasel.rpath.org@wgl:3-devel/0.99.beta16-1
================================
0.99.beta16-1 Filip Brcic (brcha@xxxxxxx) Thu Jan 14 18:31:42 2010
version bump + metadata
libcaca-0.99_beta14-deoptimise.patch: new
--- /dev/null
+++ libcaca-0.99_beta14-deoptimise.patch
@@ -0,0 +22 @@
+Index: libcaca-0.99.beta14/configure.ac
+===================================================================
+--- libcaca-0.99.beta14.orig/configure.ac
++++ libcaca-0.99.beta14/configure.ac
+@@ -290,7 +290,7 @@ fi
+ if test "${enable_vga}" = "yes"; then
+ ac_cv_my_have_vga="yes"
+ CPPFLAGS="${CPPFLAGS} -I. -D__KERNEL__ -nostdinc -include kernel/kernel.h
-fno-stack-protector"
+- CFLAGS="${CFLAGS} -fno-builtin -O2 -Wall -fno-stack-protector"
++ CFLAGS="${CFLAGS} -Wall -fno-stack-protector"
+ CCASFLAGS="${CCASFLAGS} -I. -fno-stack-protector"
+ LDFLAGS="${LDFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,100000
-fno-stack-protector"
+ AC_DEFINE(USE_VGA, 1, Define to 1 to activate the VGA backend driver)
+@@ -347,7 +347,7 @@ fi
+ AC_SUBST(CUCUL_TYPES)
+
+ # Optimizations
+-CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer"
++CFLAGS="${CFLAGS}"
+ # Code qui fait des warnings == code de porc == deux baffes dans ta gueule
+ CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual
-Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes
-Wnested-externs -Wsign-compare"
+
libcaca-0.99.beta16.tar.gz: new
libcaca.recipe: changed
Index: libcaca.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- libcaca.recipe /weasel.rpath.org@wgl:3-devel/0.9-1
+++ libcaca.recipe /weasel.rpath.org@wgl:3-devel/0.99.beta16-1
@@ -1,55 +1,46 @@
#
-# Copyright (c) 2009 Filip Brcic <brcha@xxxxxxx>
+# Copyright (c) 2009-2010 Filip Brcic <brcha@xxxxxxx>
# Distributed under the terms of the GNU General Public License v3
#
class Libcaca(AutoPackageRecipe):
name = 'libcaca'
- version = '0.9'
+ version = '0.99.beta16'
buildRequires = [
- 'freetype:devel', 'imlib2:devel', 'libX11:devel', 'libXext:devel',
'ncurses:devel',
- 'slang:devel', 'zlib:devel',
+ 'freetype:devel', 'imlib2:devel', 'libX11:devel',
+ 'libXext:devel', 'ncurses:devel', 'slang:devel', 'zlib:devel',
+ 'Mesa:devel', 'autoconf:runtime', 'automake:runtime',
+ 'freeglut:devel', 'libstdc++:devel', 'libtool:runtime',
+ 'pkg-config:devel',
]
- if Arch.x86_64:
- buildRequires.extend(['multiarch_wrapper:runtime'])
+ shortDesc = 'Graphics 2 text library'
+ longDesc = """
+Libcaca is a graphics library that outputs text instead of pixels, so
+that it can work on older video cards or text terminals.
+"""
+ url = 'http://libcaca.zoy.org/'
+ licenses = [ 'WTFPL-2', 'LGPL-2.1' ]
+ categories = [ 'Media/Libraries' ]
def unpack(r):
- r.Description(shortDesc='Graphics 2 text library',
- longDesc='Libcaca is a graphics library that outputs
text instead of pixels, so that it can work on older video cards or text
terminals.')
- r.PackageURL('http://libcaca.zoy.org/')
- r.Licenses('LGPL')
- r.addArchive('http://libcaca.zoy.org/raw-attachment/wiki/libcaca/')
+ r.addArchive('http://libcaca.zoy.org/files/%(name)s/')
- r.Run('sed -i "s:man/man3:&caca:g" doc/Makefile.in')
+ r.addPatch('libcaca-0.99_beta14-deoptimise.patch')
+ r.addPatch('libcaca-0.99_beta16-freeglut-2.6.patch')
- r.extraConfig = '--disable-doc' # reenable when doxygen is built
-
- if Arch.x86_64:
- # First build 32bit version
- macros32 = r.macros.copy()
- macros32.cc = '"gcc -m32"'
- macros32.cxx = '"g++ -m32"'
- macros32.libdir = '%(prefix)s/lib'
-
- r.Run('cp -a %(builddir)s %(builddir)s/../32bit')
-
- r.Configure(r.extraConfig, dir='../32bit', overrideMacros=macros32,
- preConfigure='USE_ARCH=32')
- r.Make(dir='../32bit', overrideMacros=macros32,
preMake='USE_ARCH=32')
- r.MakeInstall(dir='../32bit', overrideMacros=macros32,
preMake='USE_ARCH=32')
-
- r.Move('%(bindir)s/caca-config', '%(bindir)s/caca-config-32')
- r.ComponentSpec('devel', '%(bindir)s/caca-config-32')
-
- r.NormalizePkgConfig(exceptions='.*')
+ r.Autoreconf()
def configure(r):
- r.Configure(r.extraConfig)
-
- def policy(r):
- r.Move('%(bindir)s/caca-config', '%(bindir)s/caca-config-64')
- r.ComponentSpec('devel', '%(bindir)s/caca-config-64')
- r.Symlink('%(bindir)s/multiarch_wrapper', '%(bindir)s/caca-config')
- r.DanglingSymlinks(exceptions='%(bindir)s/caca-config')
+ r.Configure(
+# ' --enable-doc' # when doxygen is compiled
+ ' --enable-ncurses'
+ ' --enable-slang'
+ ' --enable-imlib2'
+ ' --enable-x11 --with-x --x-libraries=%(libdir)s'
+ ' --enable-gl'
+ ' --enable-cxx'
+# ' --enable-csharp' # when mono is compiled
+# ' --enable-ruby' # when ruby is compiled
+ )
libcaca-0.99_beta16-freeglut-2.6.patch: new
--- /dev/null
+++ libcaca-0.99_beta16-freeglut-2.6.patch
@@ -0,0 +11 @@
+--- configure.ac
++++ configure.ac
+@@ -223,7 +223,7 @@
+ break])
+ if test "${ac_cv_my_have_gl}" = "yes"; then
+ AC_DEFINE(USE_GL, 1, Define to 1 to activate the OpenGL backend driver)
+- GL_LIBS="${GL_LIBS} -lGL -lglut"
++ GL_LIBS="${GL_LIBS} -lGL -lGLU -lglut"
+ CACA_DRIVERS="${CACA_DRIVERS} gl"
+ elif test "${enable_gl}" = "yes"; then
+ AC_MSG_ERROR([cannot find OpenGL+FreeGLUT development files])
libcaca-0.9.tar.bz2: removed
Committed by: brcha
Other related posts:
- » [weasel-commit] Source: libcaca=0.99.beta16-1 - rbuilder
