Added patch to build fine without X at all.

Package-Manager: portage-2.0.51.22

4 files changed, 49 insertions, 7 deletions

diff --git a/media-video/toxine/ChangeLog b/media-video/toxine/ChangeLog
index 33ce25b650ac..aae75233155d 100644
--- a/media-video/toxine/ChangeLog
+++ b/media-video/toxine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/toxine
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/toxine/ChangeLog,v 1.1 2005/08/18 22:12:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/toxine/ChangeLog,v 1.2 2005/08/19 19:31:52 flameeyes Exp $
+
+  19 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/toxine-0.6.3-nox.patch, toxine-0.6.3.ebuild:
+  Added patch to build fine without X at all.
 
 *toxine-0.6.3 (18 Aug 2005)
 
diff --git a/media-video/toxine/Manifest b/media-video/toxine/Manifest
index 9ee7ef5ff5f6..818f271d817c 100644
--- a/media-video/toxine/Manifest
+++ b/media-video/toxine/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 eb9a1fa35b808b9431bc21eb883ace98 ChangeLog 465
-MD5 3fb65f2e9052017e6b5637345fdb1081 toxine-0.6.3.ebuild 1295
+MD5 23d0c90a4c4ce5359bc19cd1e2a7698e ChangeLog 619
+MD5 d2bd6e3f075b9ebe90af01a88c33d09e toxine-0.6.3.ebuild 1330
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 add3f1d4c9ff4a333b42042658cb8521 files/toxine-0.6.3-gcc4.patch 533
+MD5 5650d3830b5b67954a7927180e784d76 files/toxine-0.6.3-nox.patch 1236
 MD5 73614b82fc7fd731d3501c21f541311e files/digest-toxine-0.6.3 64
 MD5 84d6bad99dfaa6bca6e774afe297a3ba files/toxine-0.6.3-configure.patch 2505
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDBQfjj5H05b2HAEkRAmbNAJsGM5fp5cILzO16DVLVplG4RJ/q5wCfRVWk
-spm10lYAffxGMp+WKebE1TM=
-=hgzm
+iD8DBQFDBjPbj5H05b2HAEkRAsAuAJ9vK2RbezhYyBm/D3Zbj1yzAm+X8ACcCnoU
+Bjy9vLkGpIFsuuD3zsVOj+k=
+=WPR1
 -----END PGP SIGNATURE-----
diff --git a/media-video/toxine/files/toxine-0.6.3-nox.patch b/media-video/toxine/files/toxine-0.6.3-nox.patch
new file mode 100644
index 000000000000..d86db6d4a760
--- /dev/null
+++ b/media-video/toxine/files/toxine-0.6.3-nox.patch
@@ -0,0 +1,36 @@
+diff -ur toxine-0.6.3/configure.ac toxine-0.6.3-nox/configure.ac
+--- toxine-0.6.3/configure.ac	2004-04-16 18:32:30.000000000 +0200
++++ toxine-0.6.3-nox/configure.ac	2005-08-19 21:22:55.000000000 +0200
+@@ -141,6 +141,7 @@
+ if test x"$no_x" != x"yes"; then
+     AC_DEFINE(HAVE_X11,,[Define this if you have X11R6 installed])
+ fi
++AM_CONDITIONAL(HAVE_X11, test x"$no_x" != x"yes")
+ 
+ dnl
+ dnl XTest Extension
+Only in toxine-0.6.3-nox: configure.ac~
+diff -ur toxine-0.6.3/src/plugins/Makefile.am toxine-0.6.3-nox/src/plugins/Makefile.am
+--- toxine-0.6.3/src/plugins/Makefile.am	2004-04-12 00:29:01.000000000 +0200
++++ toxine-0.6.3-nox/src/plugins/Makefile.am	2005-08-19 21:23:36.000000000 +0200
+@@ -6,6 +6,10 @@
+ 
+ LIBTOOL = $(SHELL) $(top_builddir)/libtoolplugin-nofpic
+ 
++if HAVE_X11
++x11_plugin = toxine_vo_plugin_x11.la
++endif
++
+ if HAVE_AA
+ aa_plugin = toxine_vo_plugin_aa.la
+ endif
+@@ -14,7 +18,7 @@
+ caca_plugin = toxine_vo_plugin_caca.la
+ endif
+ 
+-lib_LTLIBRARIES = $(aa_plugin) $(caca_plugin) toxine_vo_plugin_x11.la \
++lib_LTLIBRARIES = $(aa_plugin) $(caca_plugin) $(x11_plugin) \
+ 	toxine_vo_plugin_dxr3.la toxine_vo_plugin_none.la
+ 
+ toxine_vo_plugin_x11_la_SOURCES = vo_x11.c
+Only in toxine-0.6.3-nox/src/plugins: Makefile.am~
diff --git a/media-video/toxine/toxine-0.6.3.ebuild b/media-video/toxine/toxine-0.6.3.ebuild
index ff7c95206909..6ba50ac81253 100644
--- a/media-video/toxine/toxine-0.6.3.ebuild
+++ b/media-video/toxine/toxine-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/toxine/toxine-0.6.3.ebuild,v 1.1 2005/08/18 22:12:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/toxine/toxine-0.6.3.ebuild,v 1.2 2005/08/19 19:31:52 flameeyes Exp $
 
 inherit eutils
 
@@ -29,6 +29,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-configure.patch
 	epatch ${FILESDIR}/${P}-gcc4.patch
+	epatch ${FILESDIR}/${P}-nox.patch
 
 	aclocal -I m4 || die "aclocal failed"
 	autoconf || die "autoconf failed"