diff options
| -rw-r--r-- | media-libs/libcaca/ChangeLog | 13 | ||||
| -rw-r--r-- | media-libs/libcaca/Manifest | 28 | ||||
| -rw-r--r-- | media-libs/libcaca/files/digest-libcaca-0.9-r2 | 3 | ||||
| -rw-r--r-- | media-libs/libcaca/files/libcaca-0.9-libtool2.patch | 148 | ||||
| -rw-r--r-- | media-libs/libcaca/libcaca-0.9-r1.ebuild | 14 | ||||
| -rw-r--r-- | media-libs/libcaca/libcaca-0.9-r2.ebuild | 67 | ||||
| -rw-r--r-- | media-libs/libcaca/metadata.xml | 2 |
7 files changed, 254 insertions, 21 deletions
diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog index 9be51947be7e..dd88c1d8ff92 100644 --- a/media-libs/libcaca/ChangeLog +++ b/media-libs/libcaca/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-libs/libcaca -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.19 2005/12/13 20:47:39 seemant Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.20 2006/03/17 01:49:38 flameeyes Exp $ + +*libcaca-0.9-r2 (17 Mar 2006) + + 17 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/libcaca-0.9-libtool2.patch, metadata.xml, libcaca-0.9-r1.ebuild, + +libcaca-0.9-r2.ebuild: + New libtool patch, now link the demo programs installed dynamically instead + of statically, and allow use of --as-needed. This way it also fixes bug + #119428. Minor whitespace cleanup. 13 Dec 2005; Seemant Kulleen <seemant@gentoo.org> libcaca-0.9-r1.ebuild: modular X deps diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest index 67b36b330b76..0d2f5a0be07a 100644 --- a/media-libs/libcaca/Manifest +++ b/media-libs/libcaca/Manifest @@ -1,15 +1,21 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 d15498668716f1e559472ad09fa15626 ChangeLog 2641 +RMD160 bf87f198df0f670781ba3da48834b9ddf07bfb59 ChangeLog 2641 +SHA256 dfb45111d54703140ce1c7a3dcca64d0c92510fac5b440efbcc5b3845aa3f788 ChangeLog 2641 MD5 b74aa05e5d6b2a7d9b7108a84d6b82d7 files/digest-libcaca-0.9-r1 63 +RMD160 197954d96918f22627a41128f148b955279e4995 files/digest-libcaca-0.9-r1 63 +SHA256 a40d05c5ff9dd0feedcceffc4928ef4e0a28b689c3735e209bd8891364746af5 files/digest-libcaca-0.9-r1 63 +MD5 546621581bc2d5c5b8740520bcbff279 files/digest-libcaca-0.9-r2 235 +RMD160 1b5fc9a4bbbdffe62bb36508d96f00afe0830b86 files/digest-libcaca-0.9-r2 235 +SHA256 0419644ddb3da75c00e2ba0714d11ce095058775bd4807d920d9f3e153806e5f files/digest-libcaca-0.9-r2 235 MD5 8f10a784d1326f49c14a32fb0bcdc430 files/libcaca-0.9-libtool.patch 4596 -MD5 bf267174b680306f5485724cee92017d libcaca-0.9-r1.ebuild 1710 +RMD160 535f17f966b68c2f300df63639be56225c0d639d files/libcaca-0.9-libtool.patch 4596 +SHA256 b85ce6528449e0478c570caae436f814c574cd56cdf784194196a2d0d9477799 files/libcaca-0.9-libtool.patch 4596 +MD5 347cd869231b76bab7edada5d9bc813b files/libcaca-0.9-libtool2.patch 4375 +RMD160 ce1e4684b995abea83caf5b359571195f43b5158 files/libcaca-0.9-libtool2.patch 4375 +SHA256 4cdac586c27368ef1119535c0da3cb94c3d4ab062f64be07db8f9128b1ba584c files/libcaca-0.9-libtool2.patch 4375 +MD5 b22da65ad06db2f846a30d87d5597cc9 libcaca-0.9-r2.ebuild 1685 +RMD160 f4aa334ab4705341e9e59f31f71467bc2ebc9545 libcaca-0.9-r2.ebuild 1685 +SHA256 dc6b9154ed97b2f1cccb055b550ae6c214ae608dda05589bdef52d8e52c082b7 libcaca-0.9-r2.ebuild 1685 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDtmx82+ySkm8kpY0RArSTAJ9VUjJ5ZXLQHthLcbl3zo3oyY10XQCgnCiy -9NJWNowCXwwTtuRe2vKOrYg= -=u6ZZ ------END PGP SIGNATURE----- +RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225 +SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 metadata.xml 225 diff --git a/media-libs/libcaca/files/digest-libcaca-0.9-r2 b/media-libs/libcaca/files/digest-libcaca-0.9-r2 new file mode 100644 index 000000000000..a58d569956c0 --- /dev/null +++ b/media-libs/libcaca/files/digest-libcaca-0.9-r2 @@ -0,0 +1,3 @@ +MD5 95a0a89fbd147f6610176fab66d0dd7c libcaca-0.9.tar.gz 215622 +RMD160 c83b691e575937846b024a2ffc9bac7dc7ed35e2 libcaca-0.9.tar.gz 215622 +SHA256 1c85b3eb0e960e7ccf12b03472a338ebaadbd5f6aed673f7a2235ae7fc60265e libcaca-0.9.tar.gz 215622 diff --git a/media-libs/libcaca/files/libcaca-0.9-libtool2.patch b/media-libs/libcaca/files/libcaca-0.9-libtool2.patch new file mode 100644 index 000000000000..4be48b322cb4 --- /dev/null +++ b/media-libs/libcaca/files/libcaca-0.9-libtool2.patch @@ -0,0 +1,148 @@ +Index: libcaca-0.9/caca-config.in +=================================================================== +--- libcaca-0.9.orig/caca-config.in ++++ libcaca-0.9/caca-config.in +@@ -63,13 +63,9 @@ do + --ldflags) + echo_ldflags=yes + ;; +-@NEED_PIC_TRUE@ --libs) +-@NEED_PIC_FALSE@ --libs | --plugin-libs) ++ --libs | --plugin-libs) + echo_libs=yes + ;; +-@NEED_PIC_TRUE@ --plugin-libs) +-@NEED_PIC_TRUE@ echo_plugin_libs=yes +-@NEED_PIC_TRUE@ ;; + *) + usage 1 1>&2 + ;; +@@ -109,11 +105,5 @@ fi + + if test "$echo_libs" = "yes" + then +- echo -L@libdir@ -lcaca @CACA_LIBS@ ++ echo -L@libdir@ -lcaca + fi +- +-@NEED_PIC_TRUE@if test "$echo_plugin_libs" = "yes" +-@NEED_PIC_TRUE@then +-@NEED_PIC_TRUE@ echo -L@libdir@ -lcaca_pic @CACA_LIBS@ +-@NEED_PIC_TRUE@fi +- +Index: libcaca-0.9/configure.ac +=================================================================== +--- libcaca-0.9.orig/configure.ac ++++ libcaca-0.9/configure.ac +@@ -11,7 +11,7 @@ AM_CONFIG_HEADER(config.h) + + AM_PROG_CC_C_O + AC_PROG_CPP +-AC_PROG_RANLIB ++AC_PROG_LIBTOOL + + AC_C_CONST + AC_C_INLINE +Index: libcaca-0.9/examples/Makefile.am +=================================================================== +--- libcaca-0.9.orig/examples/Makefile.am ++++ libcaca-0.9/examples/Makefile.am +@@ -7,27 +7,27 @@ EXTRA_DIST = caca.txt + bin_PROGRAMS = cacademo cacafire cacaball cacaplas cacaview cacamoir + + cacademo_SOURCES = demo.c +-cacademo_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@ ++cacademo_LDADD = ../src/libcaca.la @MATH_LIBS@ + cacademo_CPPFLAGS = -I$(top_srcdir)/src -DDATADIR=\"$(pkgdatadir)\" + + cacafire_SOURCES = aafire.c +-cacafire_LDADD = ../src/libcaca.a @CACA_LIBS@ ++cacafire_LDADD = ../src/libcaca.la + cacafire_CPPFLAGS = -I$(top_srcdir)/src -DLIBCACA=1 + + cacaball_SOURCES = cacaball.c +-cacaball_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@ ++cacaball_LDADD = ../src/libcaca.la @MATH_LIBS@ + cacaball_CPPFLAGS = -I$(top_srcdir)/src + + cacaplas_SOURCES = cacaplas.c +-cacaplas_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@ ++cacaplas_LDADD = ../src/libcaca.la @MATH_LIBS@ + cacaplas_CPPFLAGS = -I$(top_srcdir)/src + + cacamoir_SOURCES = cacamoir.c +-cacamoir_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@ ++cacamoir_LDADD = ../src/libcaca.la @MATH_LIBS@ + cacamoir_CPPFLAGS = -I$(top_srcdir)/src + + cacaview_SOURCES = cacaview.c +-cacaview_LDADD = ../src/libcaca.a @CACA_LIBS@ ++cacaview_LDADD = ../src/libcaca.la + cacaview_CPPFLAGS = -I$(top_srcdir)/src -DX_DISPLAY_MISSING=1 + if USE_IMLIB2 + cacaview_CFLAGS = `imlib2-config --cflags` +Index: libcaca-0.9/src/Makefile.am +=================================================================== +--- libcaca-0.9.orig/src/Makefile.am ++++ libcaca-0.9/src/Makefile.am +@@ -2,8 +2,9 @@ + + include_HEADERS = caca.h + +-lib_LIBRARIES = libcaca.a $(libcaca_pic_a) +-libcaca_a_SOURCES = \ ++lib_LTLIBRARIES = libcaca.la ++libcaca_la_LDFLAGS = -version-info 0:9:0 ++libcaca_la_SOURCES = \ + caca.c \ + caca.h \ + caca_internals.h \ +@@ -18,10 +19,4 @@ libcaca_a_SOURCES = \ + bitmap.c \ + time.c \ + $(NULL) +- +-if NEED_PIC +-libcaca_pic_a = libcaca_pic.a +-endif +-libcaca_pic_a_SOURCES = $(libcaca_a_SOURCES) +-libcaca_pic_a_CPPFLAGS = -fPIC -DPIC +- ++libcaca_la_LIBADD = $(CACA_LIBS) +Index: libcaca-0.9/test/Makefile.am +=================================================================== +--- libcaca-0.9.orig/test/Makefile.am ++++ libcaca-0.9/test/Makefile.am +@@ -3,26 +3,26 @@ + noinst_PROGRAMS = colors dithering event hsv optipal spritedit + + colors_SOURCES = colors.c +-colors_LDADD = ../src/libcaca.a @CACA_LIBS@ ++colors_LDADD = ../src/libcaca.la + colors_CPPFLAGS = -I$(top_srcdir)/src + + dithering_SOURCES = dithering.c +-dithering_LDADD = ../src/libcaca.a @CACA_LIBS@ ++dithering_LDADD = ../src/libcaca.la + dithering_CPPFLAGS = -I$(top_srcdir)/src + + event_SOURCES = event.c +-event_LDADD = ../src/libcaca.a @CACA_LIBS@ ++event_LDADD = ../src/libcaca.la + event_CPPFLAGS = -I$(top_srcdir)/src + + hsv_SOURCES = hsv.c +-hsv_LDADD = ../src/libcaca.a @CACA_LIBS@ ++hsv_LDADD = ../src/libcaca.la + hsv_CPPFLAGS = -I$(top_srcdir)/src + + optipal_SOURCES = optipal.c +-optipal_LDADD = ../src/libcaca.a @CACA_LIBS@ ++optipal_LDADD = ../src/libcaca.la + optipal_CPPFLAGS = -I$(top_srcdir)/src + + spritedit_SOURCES = spritedit.c +-spritedit_LDADD = ../src/libcaca.a @CACA_LIBS@ ++spritedit_LDADD = ../src/libcaca.la + spritedit_CPPFLAGS = -I$(top_srcdir)/src + diff --git a/media-libs/libcaca/libcaca-0.9-r1.ebuild b/media-libs/libcaca/libcaca-0.9-r1.ebuild index 73597355d2c6..5d958e5091eb 100644 --- a/media-libs/libcaca/libcaca-0.9-r1.ebuild +++ b/media-libs/libcaca/libcaca-0.9-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.9-r1.ebuild,v 1.11 2005/12/31 11:32:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.9-r1.ebuild,v 1.12 2006/03/17 01:49:38 flameeyes Exp $ inherit eutils autotools @@ -53,12 +53,12 @@ src_compile() { fi econf \ - $(use_enable doc) \ - $(use_enable ncurses) \ - $(use_enable slang) \ - $(use_enable imlib imlib2) \ + $(use_enable doc) \ + $(use_enable ncurses) \ + $(use_enable slang) \ + $(use_enable imlib imlib2) \ ${myconf} \ - || die + || die emake || die unset VARTEXFONTS } diff --git a/media-libs/libcaca/libcaca-0.9-r2.ebuild b/media-libs/libcaca/libcaca-0.9-r2.ebuild new file mode 100644 index 000000000000..bea43c58c402 --- /dev/null +++ b/media-libs/libcaca/libcaca-0.9-r2.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.9-r2.ebuild,v 1.1 2006/03/17 01:49:38 flameeyes Exp $ + +inherit eutils autotools + +DESCRIPTION="A library that creates colored ASCII-art graphics" +HOMEPAGE="http://sam.zoy.org/projects/libcaca" +SRC_URI="http://sam.zoy.org/projects/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="ncurses slang doc imlib X" + +RDEPEND="ncurses? ( >=sys-libs/ncurses-5.3 ) + slang? ( >=sys-libs/slang-1.4.2 ) + imlib? ( media-libs/imlib2 ) + X? ( || ( ( x11-libs/libX11 + x11-libs/libXt ) + virtual/x11 ) )" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" + +src_unpack() { + unpack ${A} + cd "${WORKDIR}" + # Let libtool build the libraries, see BUG #57359 + epatch "${FILESDIR}/${P}-libtool2.patch" + cd "${S}" + eautoreconf +} + +src_compile() { + # temp font fix #44128 + export VARTEXFONTS="${T}/fonts" + + local myconf="" + + if use X ; then + if [ -e /usr/$(get_libdir)/libX11.so ] || [ -e /usr/$(get_libdir)/libX11.a ] + then + myconf="${myconf} --enable-x11 --with-x --x-libraries=/usr/$(get_libdir)" + else + myconf="${myconf} --enable-x11 --with-x --x-libraries=/usr/X11R6/$(get_libdir)" + fi + else + myconf="${myconf} --disable-x11" + fi + + econf \ + $(use_enable doc) \ + $(use_enable ncurses) \ + $(use_enable slang) \ + $(use_enable imlib imlib2) \ + ${myconf} \ + || die + emake || die + unset VARTEXFONTS +} + +src_install() { + mv doc/man/man3caca doc/man/man3 + make install DESTDIR="${D}" || die + dodoc AUTHORS BUGS ChangeLog NEWS NOTES README TODO +} diff --git a/media-libs/libcaca/metadata.xml b/media-libs/libcaca/metadata.xml index 1cadc2e4ec21..edccfe5754d2 100644 --- a/media-libs/libcaca/metadata.xml +++ b/media-libs/libcaca/metadata.xml @@ -3,6 +3,6 @@ <pkgmetadata> <herd>video</herd> <maintainer> - <email>media-video@gentoo.org</email> +<email>media-video@gentoo.org</email> </maintainer> </pkgmetadata> |