From: Chris White Date: Mon, 3 Jan 2005 19:46:47 +0000 (+0000) Subject: Fixing stupid xv errors to fix tons of duplicate bugs I'd rather not list :P. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6547d400e808265a69e55cb58c7b20d845d0ca64;p=gentoo.git Fixing stupid xv errors to fix tons of duplicate bugs I'd rather not list :P. --- diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index 0383ffa8409c..3740826f9890 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/xine-lib # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.182 2005/01/03 03:26:58 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.183 2005/01/03 19:46:47 chriswhite Exp $ + + 04 Jan 2005; Chris White + +files/xine-lib-configure.ac.patch, xine-lib-1.0.ebuild: + Fixing xv for various bugs. 03 Jan 2005; Chris White xine-lib-1.0.ebuild: Quick fix. Removed libcaca USE flag but forgot to remove the conditional dep diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index 96ca113b8ac9..db933a0c2cb1 100644 --- a/media-libs/xine-lib/Manifest +++ b/media-libs/xine-lib/Manifest @@ -1,9 +1,9 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 fd8ee7f6edcfb8465de1df1d1da2658f ChangeLog 30876 +MD5 61dc66044873bedae4be4daaac1dec47 ChangeLog 31017 MD5 af08cabbae4b191018ca153392a86bea metadata.xml 304 -MD5 f53520f3758182b52e401a2e47f24e4e xine-lib-1.0.ebuild 7994 +MD5 ecc75a8fa2b8be0fdf376ca2bc1a655f xine-lib-1.0.ebuild 8088 MD5 4052265429970e0a67ed0d039d770515 xine-lib-1_rc5-r3.ebuild 5473 MD5 9b1839aa704083ac8bc733e78fe15bd2 xine-lib-1_rc6.ebuild 5401 MD5 f9634de2e799d22a319aa81a2b38bd1d xine-lib-1_rc7.ebuild 5370 @@ -44,10 +44,11 @@ MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423 MD5 5d2c3c00bf3ae9a89dfcaa8b5c5b17a2 files/xine-lib-x11.patch 703 MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601 MD5 ddf48f1eb00a6985b6fba5fff9386ad0 files/xine-lib-hardened-mmx.patch 2558 +MD5 d8f3138ae2260f7c98bf46ae7159be11 files/xine-lib-configure.ac.patch 926 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFB2LucFdQwWVoAgN4RApd7AJ0dQW7qrok9q800fqnfMVTnDS1qKgCcCk9x -GaKBQybocMWCIFjR/deVTNc= -=x5rF +iD8DBQFB2aA4FdQwWVoAgN4RAkl+AKDY0/rXZplqKsR+Nh9FoTqiLkyi6gCdHrXx +sHZB6+7OG5N44ddqtzz0Et8= +=eFbl -----END PGP SIGNATURE----- diff --git a/media-libs/xine-lib/files/xine-lib-configure.ac.patch b/media-libs/xine-lib/files/xine-lib-configure.ac.patch new file mode 100644 index 000000000000..681e295d0308 --- /dev/null +++ b/media-libs/xine-lib/files/xine-lib-configure.ac.patch @@ -0,0 +1,27 @@ +--- xine-lib-1.0/configure.ac 2004-12-26 02:40:24.000000000 +0900 ++++ xine-lib/configure.ac 2004-12-30 18:55:16.000000000 +0900 +@@ -495,9 +495,6 @@ + dnl With recent XFree86 or Xorg, dynamic linking is preferred! + dnl Only dynamic linking is possible when using libtool < 1.4.0 + +-dnl ---------------------------------------------- +-dnl SECTION: Check for Xv and XvMC support (iconv is also tested here?) +-dnl ---------------------------------------------- + AC_ARG_WITH(xv-path, AC_HELP_STRING([--with-xv-path=path], [where libXv is installed]), + xv_path="$withval",) + +@@ -507,13 +504,9 @@ + xv_prefer_shared="yes") + + if test x"$no_x" != "xyes"; then +- +- dnl ----------------------------------------------- +- dnl Finding install Xv library +- dnl ----------------------------------------------- + AC_FIND_LIBXV +- + fi ++AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes") + + + host_or_hostalias="$host" diff --git a/media-libs/xine-lib/xine-lib-1.0.ebuild b/media-libs/xine-lib/xine-lib-1.0.ebuild index c57e9e6d45d8..7bb2779c35b9 100644 --- a/media-libs/xine-lib/xine-lib-1.0.ebuild +++ b/media-libs/xine-lib/xine-lib-1.0.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-libs/xine-lib/xine-lib-1.0.ebuild,v 1.12 2005/01/03 03:26:58 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.0.ebuild,v 1.13 2005/01/03 19:46:47 chriswhite Exp $ inherit eutils flag-o-matic gcc libtool @@ -66,6 +66,10 @@ src_unpack() { # fixes bad X11 directories epatch ${FILESDIR}/${PN}-x11.patch + # fixes bad configure stuff + # for xv handling + epatch ${FILESDIR}/${PN}-configure.ac.patch + # Bad version included... may drop .so #libtoolize --copy --force