From d971a7d8b71f21bfb28f9fc788b1fd078c9d3263 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 16 Jul 2006 06:21:52 +0000 Subject: Make xinerama support optional #139594 by Viktor Griph. Package-Manager: portage-2.1.1_pre2-r8 --- media-gfx/feh/ChangeLog | 7 ++++- media-gfx/feh/Manifest | 36 +++++++++++++++++------ media-gfx/feh/feh-1.3.4.ebuild | 32 +++++++++++++++------ media-gfx/feh/files/digest-feh-1.3.4 | 2 ++ media-gfx/feh/files/feh-1.3.4-headers.patch | 18 ++++++++++++ media-gfx/feh/files/feh-1.3.4-xinerama.patch | 43 ++++++++++++++++++++++++++++ 6 files changed, 120 insertions(+), 18 deletions(-) create mode 100644 media-gfx/feh/files/feh-1.3.4-headers.patch create mode 100644 media-gfx/feh/files/feh-1.3.4-xinerama.patch (limited to 'media-gfx/feh') diff --git a/media-gfx/feh/ChangeLog b/media-gfx/feh/ChangeLog index 84a89eaf018b..6c82f0c93ec3 100644 --- a/media-gfx/feh/ChangeLog +++ b/media-gfx/feh/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/feh # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.27 2006/01/20 00:50:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.28 2006/07/16 06:21:52 vapier Exp $ + + 16 Jul 2006; Mike Frysinger + +files/feh-1.3.4-headers.patch, +files/feh-1.3.4-xinerama.patch, + feh-1.3.4.ebuild: + Make xinerama support optional #139594 by Viktor Griph. 20 Jan 2006; Mike Frysinger feh-1.3.4.ebuild: Add modular X deps by Marcelo Goes #115988. diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest index 7777affe2b39..d088d5526f71 100644 --- a/media-gfx/feh/Manifest +++ b/media-gfx/feh/Manifest @@ -1,16 +1,34 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 b82cde7332a4e924a6e1f185727ee881 ChangeLog 3205 -MD5 826a683ce31263c0ad95f77f94962197 feh-1.3.1.ebuild 744 -MD5 78586b008bfef6253c6242820021c612 feh-1.3.4.ebuild 909 -MD5 0fc5a46b6b7d9f077f8ac14d46a46bb3 files/digest-feh-1.3.1 61 -MD5 312971fb12bccd6a985f23011fdc9974 files/digest-feh-1.3.4 61 +AUX feh-1.3.4-headers.patch 321 RMD160 80f5a6a37e05d73627a176bd516d3fd06428830d SHA1 7eb1698611968f92d7bc235234e19e9622c77e91 SHA256 58441ad19defbfff523ec296d715e726b82a0b2e44ccc92596c1b955614bbf16 +MD5 f90cfea77f0d6b19ad6eb9727cfc97b7 files/feh-1.3.4-headers.patch 321 +RMD160 80f5a6a37e05d73627a176bd516d3fd06428830d files/feh-1.3.4-headers.patch 321 +SHA256 58441ad19defbfff523ec296d715e726b82a0b2e44ccc92596c1b955614bbf16 files/feh-1.3.4-headers.patch 321 +AUX feh-1.3.4-xinerama.patch 1325 RMD160 cec72da1d1615b137fcd0be6f866368f271fc060 SHA1 469dc6e439c715023449c5ec08fb955248d9966f SHA256 ffb99685611e6fb186dba59bfe17b266b1f9c49999c52c64b4eb3b1548baccf4 +MD5 4677ec137b1ad31e909e422ea2fb4826 files/feh-1.3.4-xinerama.patch 1325 +RMD160 cec72da1d1615b137fcd0be6f866368f271fc060 files/feh-1.3.4-xinerama.patch 1325 +SHA256 ffb99685611e6fb186dba59bfe17b266b1f9c49999c52c64b4eb3b1548baccf4 files/feh-1.3.4-xinerama.patch 1325 +DIST feh-1.3.4.tar.gz 409530 RMD160 7e27d31cf974b30fc321d4dbef2fd46fbd21d34c SHA1 cf02fd48325ba02467c7f791634a28e98edbe801 SHA256 81b9f2bbc15ffda4640958701753447b95cd2cbf11bc8e85dd00fdd2a2f83124 +EBUILD feh-1.3.4.ebuild 1188 RMD160 77f322030bca84b5b964f0698dd8d5dfd09586a4 SHA1 e68529f8dcad5cf39481e461f750b7aa3f1482e3 SHA256 eaf02787daee410035ae0d802fee3be8142a364388b36423517bae4e3bd893c4 +MD5 10afd5ed121ab1a0d8690145f0e92385 feh-1.3.4.ebuild 1188 +RMD160 77f322030bca84b5b964f0698dd8d5dfd09586a4 feh-1.3.4.ebuild 1188 +SHA256 eaf02787daee410035ae0d802fee3be8142a364388b36423517bae4e3bd893c4 feh-1.3.4.ebuild 1188 +MISC ChangeLog 3401 RMD160 be6f212046bf7e71d31a1fde9f7df70746042b4a SHA1 72cf28c6ed33a627967aa48889196227e393d9a8 SHA256 c5b70fd0a3e13567df002b6db53ac94138fed7f75358e0ac868f0ef550a1b496 +MD5 264eae88f97f1649938ec958415092f8 ChangeLog 3401 +RMD160 be6f212046bf7e71d31a1fde9f7df70746042b4a ChangeLog 3401 +SHA256 c5b70fd0a3e13567df002b6db53ac94138fed7f75358e0ac868f0ef550a1b496 ChangeLog 3401 +MISC metadata.xml 326 RMD160 bf7c6c2c8f8fcc29d32141cd28055940b9d34af2 SHA1 c0d9d68800159085113023b9a18175b905baffa5 SHA256 3cb1d41c8e0400a8a4ecf3e222d77141fc26e5a5730b876477b83924644be57f MD5 6c9f94613437cd65762f7330c0b20ad1 metadata.xml 326 +RMD160 bf7c6c2c8f8fcc29d32141cd28055940b9d34af2 metadata.xml 326 +SHA256 3cb1d41c8e0400a8a4ecf3e222d77141fc26e5a5730b876477b83924644be57f metadata.xml 326 +MD5 1564ef6e738e79cca6272b55e09fee1d files/digest-feh-1.3.4 229 +RMD160 c8e142b4cfaa232f482fd0d830adc65937e354a7 files/digest-feh-1.3.4 229 +SHA256 c3daf4618b1add99a7a019d2814f829b2e62ad4d2d3181494fac58dabacf7d80 files/digest-feh-1.3.4 229 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) +Version: GnuPG v1.4.4 (GNU/Linux) -iD8DBQFD0DRD2+ySkm8kpY0RAqLOAJ9JZfmw1qDCqtannZt1/jp5MXh+OQCgoczz -B1jw1eUmq6Lwo8LOnxea9sM= -=NOuO +iD8DBQFEudtGamhnQswr0vIRArZVAKCS11gWqpC31T+qgUm3fnecv1vRKQCfWK5L +0HrirqITz6sanqaVEtr77JI= +=rE2y -----END PGP SIGNATURE----- diff --git a/media-gfx/feh/feh-1.3.4.ebuild b/media-gfx/feh/feh-1.3.4.ebuild index a7a86e5a6456..1bc9f0365afe 100644 --- a/media-gfx/feh/feh-1.3.4.ebuild +++ b/media-gfx/feh/feh-1.3.4.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.3.4.ebuild,v 1.7 2006/01/20 00:50:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.3.4.ebuild,v 1.8 2006/07/16 06:21:52 vapier Exp $ + +inherit eutils autotools DESCRIPTION="A fast, lightweight imageviewer using imlib2" HOMEPAGE="http://www.linuxbrit.co.uk/feh" @@ -9,22 +11,36 @@ SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz" LICENSE="as-is" SLOT="0" KEYWORDS="alpha amd64 ppc ppc64 sparc x86" -IUSE="" +IUSE="xinerama" -DEPEND=">=media-libs/giblib-1.2.4 +RDEPEND=">=media-libs/giblib-1.2.4 >=media-libs/imlib2-1.0.0 >=media-libs/jpeg-6b-r4 media-libs/libpng - || ( - ( x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama - x11-libs/libXt x11-proto/xproto x11-proto/xineramaproto ) - ( virtual/x11 ) + || ( ( + x11-libs/libX11 + x11-libs/libXext + xinerama? ( x11-libs/libXinerama ) + x11-libs/libXt + ) + virtual/x11 )" +DEPEND="${RDEPEND} + || ( ( x11-proto/xproto x11-proto/xineramaproto ) virtual/x11 )" src_unpack() { unpack ${A} cd "${S}" - sed -i -e "/^docsdir =/s:doc/feh:share/doc/${PF}:" Makefile.in || die + rm -f configure.ac + epatch "${FILESDIR}"/${P}-xinerama.patch + epatch "${FILESDIR}"/${P}-headers.patch + sed -i -e "/^docsdir =/s:doc/feh:share/doc/${PF}:" Makefile.am || die + eautoreconf +} + +src_compile() { + econf $(use_enable xinerama) || die + emake || die } src_install() { diff --git a/media-gfx/feh/files/digest-feh-1.3.4 b/media-gfx/feh/files/digest-feh-1.3.4 index 268af30ff3b8..964a45b78439 100644 --- a/media-gfx/feh/files/digest-feh-1.3.4 +++ b/media-gfx/feh/files/digest-feh-1.3.4 @@ -1 +1,3 @@ MD5 3d35ba3d2f0693b019800787f1103891 feh-1.3.4.tar.gz 409530 +RMD160 7e27d31cf974b30fc321d4dbef2fd46fbd21d34c feh-1.3.4.tar.gz 409530 +SHA256 81b9f2bbc15ffda4640958701753447b95cd2cbf11bc8e85dd00fdd2a2f83124 feh-1.3.4.tar.gz 409530 diff --git a/media-gfx/feh/files/feh-1.3.4-headers.patch b/media-gfx/feh/files/feh-1.3.4-headers.patch new file mode 100644 index 000000000000..16070f770b04 --- /dev/null +++ b/media-gfx/feh/files/feh-1.3.4-headers.patch @@ -0,0 +1,18 @@ +--- src/md5.c ++++ src/md5.c +@@ -39,6 +39,7 @@ + */ + + #include "md5.h" ++#include + + #ifdef TEST + /* +@@ -46,7 +47,6 @@ + * The test program should print out the same values as given in section + * A.5 of RFC 1321, reproduced below. + */ +-#include + main() + { + static const char *const test[7] = { diff --git a/media-gfx/feh/files/feh-1.3.4-xinerama.patch b/media-gfx/feh/files/feh-1.3.4-xinerama.patch new file mode 100644 index 000000000000..af435d02cf14 --- /dev/null +++ b/media-gfx/feh/files/feh-1.3.4-xinerama.patch @@ -0,0 +1,43 @@ +--- feh-1.3.4/configure.in ++++ feh-1.3.4/configure.in +@@ -41,11 +41,25 @@ + AC_SUBST(GIBLIB_CFLAGS) + + dnl Check for Xinerama +-LIBS="-L/usr/X11R6/lib $LIBS -lm -ljpeg" +-AC_CHECK_LIB(Xext,XMissingExtension) +-AC_CHECK_LIB(Xinerama,XineramaQueryScreens) +-AC_SUBST(HAVE_XINERAMA) +-AC_SUBST(XINERAMA_LIBS) ++AC_ARG_ENABLE(xinerama, ++ AC_HELP_STRING([--disable-xinerama],[disable Xinerama multi screen support]), ++ [ ++ if test x"$enableval" = xyes; then ++ with_xinerama="yes" ++ else ++ with_xinerama="no" ++ fi ++ ], ++ [with_xinerama="detect"] ++) ++if test x"$with_xinerama" != xno; then ++ AC_CHECK_LIB(Xext,XMissingExtension,[ ++ AC_CHECK_LIB(Xinerama,XineramaQueryScreens,[ ++ AC_DEFINE(HAVE_LIBXINERAMA, [], [Enable Xinerama support]) ++ LIBS="$LIBS -lXext -lXinerama" ++ ]) ++ ]) ++fi + AC_CHECK_LIB(jpeg, jpeg_destroy_decompress) + + dnl AC_CHECK_FUNC(getopt_long,,[AC_LIBOBJ="$AC_LIBOBJ getopt.o getopt1.o"]) +--- feh-1.3.4/src/Makefile.am ++++ feh-1.3.4/src/Makefile.am +@@ -1,7 +1,6 @@ + # A list of all the files in the current directory which can be regenerated + MAINTAINERCLEANFILES = Makefile.in + +-LDFLAGS = -L/usr/X11R6/lib -L/usr/local/lib -lz -lpng + INCLUDES = -I/usr/X11R6/include $(X_CFLAGS) \ + -I$(prefix)/include -I$(includedir) \ + -I. -I$(top_srcdir)/src \ -- cgit v1.2.3-65-gdbad