Add patch to allow disabling xinerama and add xinerama useflag.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 61 insertions, 16 deletions

diff --git a/media-tv/tvtime/ChangeLog b/media-tv/tvtime/ChangeLog
index 1ab298c93c12..dc9042ab3bf0 100644
--- a/media-tv/tvtime/ChangeLog
+++ b/media-tv/tvtime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/tvtime
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.25 2006/03/15 00:51:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.26 2006/04/20 05:00:49 flameeyes Exp $
+
+  20 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/tvtime-1.0.2-xinerama.patch, tvtime-1.0.2.ebuild:
+  Add patch to allow disabling xinerama and add xinerama useflag.
 
   15 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> files/tvtime-pic.patch:
   Fix PIC handling on AMD64 systems when PIE is enabled, bug #122437. Many
diff --git a/media-tv/tvtime/Manifest b/media-tv/tvtime/Manifest
index f82cb92f905d..238b74fe051b 100644
--- a/media-tv/tvtime/Manifest
+++ b/media-tv/tvtime/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 41387721920f53eb1d8d8ad7a0e697f4 ChangeLog 5200
-RMD160 72fcd19cdb5d8a25948907ea97f6289fa63ab5a9 ChangeLog 5200
-SHA256 dbe2de2c90fe504cfed4327a310fe26f756a14c39f6e5b950f98f0726427130b ChangeLog 5200
+MD5 91b884eda2640ecc35f4992d0d06b227 ChangeLog 5379
+RMD160 d69f6791742de83d75717b7ba76e7bbd4b7540e3 ChangeLog 5379
+SHA256 79a28b1f49b930bc68832a971fd304139246bc469b8be574bc8a4febc600df4d ChangeLog 5379
 MD5 352d39fb5ee53bdb9ea901579c0d7b9d files/digest-tvtime-0.9.12 66
 RMD160 5d68165f6ccc4d96d2833c15c3d971b19f59c976 files/digest-tvtime-0.9.12 66
 SHA256 7deb6a15c96ac6432a9ff12f276a6e7a71feaf657bf8f1dbcaceb6b1c9879825 files/digest-tvtime-0.9.12 66
@@ -25,6 +25,9 @@ SHA256 50a4162ab9e1587b8d61633c6c168664da538853e6ee688bdf9b8c7e3baeb443 files/tv
 MD5 c782789825dfa664e1f6fcc96ac7246c files/tvtime-1.0.2-gcc41.patch 2114
 RMD160 9d9068c95fe551cb4d886857b4c24fcebae790a9 files/tvtime-1.0.2-gcc41.patch 2114
 SHA256 5272246501f80135ba11fdbe15e345e430bade41c552cfdef696d10396a7cdfd files/tvtime-1.0.2-gcc41.patch 2114
+MD5 7716009f7064bdae850d1464e33f455d files/tvtime-1.0.2-xinerama.patch 1292
+RMD160 1c725852d9c692786614b0e3710a5c38682c1f5e files/tvtime-1.0.2-xinerama.patch 1292
+SHA256 8177203fe7109782e9d20afa66456e4c21fc973d1fafaa160409b9be29570e5b files/tvtime-1.0.2-xinerama.patch 1292
 MD5 4bc08a98c7cc134accb89aea3018c2f6 files/tvtime-pic.patch 254
 RMD160 31f3fb8937ae15c28ade1f55a1a6947bf31766cf files/tvtime-pic.patch 254
 SHA256 db033fc267bf72034f49705680ced9d086b413efc9f947bd94b4e9117f808d41 files/tvtime-pic.patch 254
@@ -43,13 +46,13 @@ SHA256 5b78ac14737109718dfe32d18a6184eda301c59796e373891ca3232fee416de5 tvtime-0
 MD5 8476949ca4ef9c07c35153ea05418869 tvtime-1.0.1.ebuild 1392
 RMD160 9791b3f03d29bcc1941d33e58ff8d684cae8e313 tvtime-1.0.1.ebuild 1392
 SHA256 43c45bd94718145fd0e2e84f0719c24a3f02efb21db2ad706773ed9f6008e2b2 tvtime-1.0.1.ebuild 1392
-MD5 61f0b883016265880a71112c1cb61697 tvtime-1.0.2.ebuild 1665
-RMD160 c7fcdf74e342bfff686877a596d8f504bcee450c tvtime-1.0.2.ebuild 1665
-SHA256 4be809782b078162cb5b4a36835a0c7f9e6d57b7d3d3d6bed37d079e45cbed36 tvtime-1.0.2.ebuild 1665
+MD5 3c6fffe47d35567504192a44087004fa tvtime-1.0.2.ebuild 1806
+RMD160 9905a9ac41d6980b1301678ce05d9b9bb6a200f2 tvtime-1.0.2.ebuild 1806
+SHA256 6b3392873fb2737eac5ba3635a194bf03ddfec5626c02e73c28bf1490ff86ffe tvtime-1.0.2.ebuild 1806
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEF2UEAiZjviIA2XgRAteJAKDOFbUWvDoXHV281xDXMtt0DZNTqgCgmTXj
-DRlObC9f9k8qK3ZTEe25qnY=
-=M25b
+iD8DBQFERxTOAiZjviIA2XgRArpvAJ4v0zswoIzTJDus7VnatJnHvkGVIQCdEgYo
+jWkzji0b82eIL8T5viwmjrs=
+=+0O0
 -----END PGP SIGNATURE-----
diff --git a/media-tv/tvtime/files/tvtime-1.0.2-xinerama.patch b/media-tv/tvtime/files/tvtime-1.0.2-xinerama.patch
new file mode 100644
index 000000000000..0964d055768d
--- /dev/null
+++ b/media-tv/tvtime/files/tvtime-1.0.2-xinerama.patch
@@ -0,0 +1,32 @@
+Index: tvtime-1.0.2/configure.ac
+===================================================================
+--- tvtime-1.0.2.orig/configure.ac
++++ tvtime-1.0.2/configure.ac
+@@ -99,6 +99,8 @@ dnl ------------------------------------
+ dnl check for X11, Xv and XF86VidModeExtension
+ dnl ---------------------------------------------
+ AC_PATH_XTRA
++AC_ARG_WITH([xinerama],
++    [AS_HELP_STRING([--without-xinerama], [Disable Xinerama extension support (default: check)])])
+ if test x"$no_x" != x"yes"; then
+     dnl check for Xshm
+     AC_CHECK_LIB([Xext],[XShmCreateImage],
+@@ -112,11 +114,13 @@ if test x"$no_x" != x"yes"; then
+ 	    X11_LIBS="$X11_LIBS -lXv"],,
+ 	    [$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext])
+ 
+-	dnl check for Xinerama
+-	AC_CHECK_LIB([Xinerama],[XineramaQueryScreens],
+-	    [AC_DEFINE([HAVE_XINERAMA],,[Xinerama support])
+-	    X11_LIBS="$X11_LIBS -lXinerama"],,
+-	    [$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext])
++	if test "x$with_xinerama" != "xno"; then
++		dnl check for Xinerama
++		AC_CHECK_LIB([Xinerama],[XineramaQueryScreens],
++		    [AC_DEFINE([HAVE_XINERAMA],,[Xinerama support])
++		    X11_LIBS="$X11_LIBS -lXinerama"],,
++		    [$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext])
++	fi
+ 
+ 	dnl check for XTest
+         AC_CHECK_LIB([Xtst],[XTestFakeKeyEvent],
diff --git a/media-tv/tvtime/tvtime-1.0.2.ebuild b/media-tv/tvtime/tvtime-1.0.2.ebuild
index a271f3589977..1461cafaf0ec 100644
--- a/media-tv/tvtime/tvtime-1.0.2.ebuild
+++ b/media-tv/tvtime/tvtime-1.0.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/tvtime-1.0.2.ebuild,v 1.2 2006/01/12 17:19:08 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/tvtime-1.0.2.ebuild,v 1.3 2006/04/20 05:00:49 flameeyes Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="High quality television application for use with video capture cards"
 HOMEPAGE="http://tvtime.sourceforge.net/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
+IUSE="nls xinerama"
 
 RDEPEND="|| ( ( x11-libs/libSM
 				x11-libs/libICE
@@ -19,7 +19,7 @@ RDEPEND="|| ( ( x11-libs/libSM
 				x11-libs/libXext
 				x11-libs/libXv
 				x11-libs/libXxf86vm
-				x11-libs/libXinerama
+				xinerama? ( x11-libs/libXinerama )
 				x11-libs/libXtst
 				x11-libs/libXau
 				x11-libs/libXdmcp )
@@ -27,7 +27,8 @@ RDEPEND="|| ( ( x11-libs/libSM
 	>=media-libs/freetype-2
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/libpng-1.2
-	>=dev-libs/libxml2-2.5.11"
+	>=dev-libs/libxml2-2.5.11
+	nls? ( virtual/libintl )"
 
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
@@ -43,10 +44,15 @@ src_unpack() {
 
 	# patch to adapt to PIC or __PIC__ for pic support
 	epatch "${FILESDIR}"/${PN}-pic.patch #74227
+
+	epatch "${FILESDIR}/${P}-xinerama.patch"
+
+	eautoreconf
 }
 
 src_compile() {
-	econf $(use_enable nls) || die "econf failed"
+	econf $(use_enable nls) \
+		$(use_with xinerama) || die "econf failed"
 	emake || die "compile problem"
 
 }