# ChangeLog for media-libs/libafterimage
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.39 2011/10/15 11:38:58 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.40 2011/10/23 19:57:28 ssuominen Exp $
+
+ 23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+ -libafterimage-1.18-r1.ebuild, -files/libafterimage-1.18-glx.patch,
+ -files/libafterimage-1.18-recmake_bsd.patch:
+ old
15 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org>
libafterimage-1.20.ebuild:
+++ /dev/null
-===================================================================
-RCS file: /home/cvsroot/afterstep-stable/libAfterImage/asvisual.c,v
-rcsdiff: /home/cvsroot/afterstep-stable/libAfterImage/asvisual.c,v: warning: Unknown phrases like `commitid ...;' are present.
-retrieving revision 1.111
-retrieving revision 1.112
-diff -u -r1.111 -r1.112
---- afterstep-stable/libAfterImage/asvisual.c 2008/05/29 22:23:25 1.111
-+++ afterstep-stable/libAfterImage/asvisual.c 2008/11/12 22:38:31 1.112
-@@ -404,9 +404,9 @@
- }
- #ifdef HAVE_GLX
- if( asv->glx_scratch_gc_direct )
-- glXDestroyContext(dpy, asv->glx_scratch_gc_direct );
-+ glXDestroyContext(asv->dpy, asv->glx_scratch_gc_direct );
- if( asv->glx_scratch_gc_indirect )
-- glXDestroyContext(dpy, asv->glx_scratch_gc_indirect );
-+ glXDestroyContext(asv->dpy, asv->glx_scratch_gc_indirect );
- #endif
- if( asv->scratch_window )
- XDestroyWindow( asv->dpy, asv->scratch_window );
+++ /dev/null
---- libAfterImage-1.18/Makefile.in.old 2008-12-13 13:31:30 +0000
-+++ libAfterImage-1.18/Makefile.in 2008-12-13 13:32:06 +0000
-@@ -206,7 +206,7 @@
- )
-
- install.apps: install.lib
-- @(if test -d apps; then cd apps; make install || exit 1; fi)
-+ @(if test -d apps; then cd apps; $(MAKE) install || exit 1; fi)
-
- # uninstallation targets :
- #
-@@ -250,7 +250,7 @@
- done
-
- uninstall.apps:
-- @(if test -d apps; then cd apps; make uninstall || exit 1; fi)
-+ @(if test -d apps; then cd apps; $(MAKE) uninstall || exit 1; fi)
-
- uninstall.lib: @LIBUNINSTALL@ uninstall.inc uninstall.apps
-
-@@ -261,11 +261,11 @@
- clean:
- $(RMF) $(LIB_SHARED) $(LIB_SHARED_CYG) $(LIB_SHARED_CYG_AR) $(LIB_STATIC) *.so.* *.so *.o *~ *% *.bak \#* core ; \
- for I in ${subdirs}; do $(RMF) $$I/*.o $$I/*.obj $$I/*.bak; done
-- @(if test -d apps; then cd apps; make clean || exit 1; fi)
-+ @(if test -d apps; then cd apps; $(MAKE) clean || exit 1; fi)
-
- distclean: clean
- $(RMF) $(LIB_SHARED) $(LIB_SHARED_CYG) $(LIB_SHARED_CYG_AR) $(LIB_STATIC) *.o *.so.* *~ *% *.bak \#* *.orig core Makefile
-- @(if test -d apps; then cd apps; make distclean || exit 1; fi)
-+ @(if test -d apps; then cd apps; $(MAKE) distclean || exit 1; fi)
-
- indent:
- @SRCS=`echo "$(AFTERIMAGE_OBJS) " | sed "s/.o /.c /g"`; \
-@@ -276,7 +276,7 @@
- mv /tmp/$$i $$i; \
- fi; \
- done ; \
-- (if test -d apps; then cd apps; make indent || exit 1; fi )
-+ (if test -d apps; then cd apps; $(MAKE) indent || exit 1; fi )
-
- deps:
- @echo -n > .depend ; \
-@@ -310,10 +310,10 @@
- echo -n ' $$('$(LIB_NAME)_PATH')'/$$f >> .shared ; \
- done; \
- echo "" >> .shared ; \
-- (if test -d apps; then cd apps; make deps || exit 1; fi)
-+ (if test -d apps; then cd apps; $(MAKE) deps || exit 1; fi)
-
- apps: @APPSDEPS@
-- @(if test -d apps; then cd apps; make; fi )
-+ @(if test -d apps; then cd apps; $(MAKE); fi )
-
-
- $(LIB_STATIC): $(LIB_OBJS) $(LIB_INCS) config.h
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/libafterimage-1.18-r1.ebuild,v 1.9 2010/11/11 10:08:26 ssuominen Exp $
-
-EAPI=2
-inherit eutils
-
-MY_PN=libAfterImage
-
-DESCRIPTION="Afterstep's standalone generic image manipulation library"
-HOMEPAGE="http://www.afterstep.org/afterimage/index.php"
-SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="gif jpeg mmx nls png tiff examples"
-
-RDEPEND="media-libs/freetype
- x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXrender
- png? ( >=media-libs/libpng-1.4 )
- jpeg? ( virtual/jpeg )
- gif? ( media-libs/giflib )
- tiff? ( media-libs/tiff )"
-DEPEND="${RDEPEND}
- x11-proto/xextproto
- !x11-wm/afterstep"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
- # fix some ldconfig problem in makefile.in
- epatch "${FILESDIR}"/${PN}-makefile.in.patch
- # fix lib paths in afterimage-config
- epatch "${FILESDIR}"/${PN}-config.patch
- # Fix recursive make calls, bug #210965
- epatch "${FILESDIR}"/${P}-recmake_bsd.patch
- # fix x11-terms/rxvt-unicode segfault, bug #252651
- epatch "${FILESDIR}"/${P}-glx.patch
- # remove forced flags
- sed -i \
- -e 's/CFLAGS="-O3"//' \
- -e 's/ -rdynamic//' \
- configure || die "sed failed"
-}
-
-src_configure() {
- econf \
- $(use_enable nls i18n) \
- $(use_enable mmx mmx-optimization) \
- $(use_with png) \
- $(use_with jpeg) \
- $(use_with gif) \
- $(use_with tiff) \
- --enable-glx \
- --enable-sharedlibs \
- --with-x \
- --with-xpm \
- --without-builtin-gif \
- --without-builtin-ungif \
- --without-builtin-zlib \
- --without-afterbase
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- AFTER_DOC_DIR="${D}/usr/share/doc/${PF}" \
- install || die "emake install failed"
- dodoc ChangeLog README || die
- if use examples; then
- cd apps || die
- emake clean
- rm -f Makefile*
- insinto /usr/share/doc/${PF}/examples
- doins * || die "install examples failed"
- fi
-}