diff options
| author |   Rémi Cardona <remi@gentoo.org> | 2008-05-09 17:09:34 +0000 |
|---|---|---|
| committer | Rémi Cardona <remi@gentoo.org> | 2008-05-09 17:09:34 +0000 |
| commit | e5a9a279562aeb6111b8d1a09101336feea61f6e (patch) | |
| tree | ab50d1be84670186319948d7d339be32e64031b0 /media-video/totem/files | |
| parent | Sparc stable --- Bug #208899 --- It's been fine for 4 months now. (diff) | |
| download | gentoo-2-e5a9a279562aeb6111b8d1a09101336feea61f6e.tar.gz gentoo-2-e5a9a279562aeb6111b8d1a09101336feea61f6e.tar.bz2 gentoo-2-e5a9a279562aeb6111b8d1a09101336feea61f6e.zip | |
media-video/totem: Add a patch for python detection (and libtool 2.2) and clean up the ebuild
(Portage version: 2.1.5_rc7)
Diffstat (limited to 'media-video/totem/files')
| -rw-r--r-- | media-video/totem/files/totem-2.22.2-fix-python-and-libtool-2.2.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/media-video/totem/files/totem-2.22.2-fix-python-and-libtool-2.2.patch b/media-video/totem/files/totem-2.22.2-fix-python-and-libtool-2.2.patch new file mode 100644 index 000000000000..55c0b3c9d56e --- /dev/null +++ b/media-video/totem/files/totem-2.22.2-fix-python-and-libtool-2.2.patch @@ -0,0 +1,58 @@ +Index: configure.in +=================================================================== +--- configure.in (revision 5399) ++++ configure.in (working copy) +@@ -24,7 +24,10 @@ + + AC_PROG_CXX + AM_PROG_CC_C_O +-AC_PROG_LIBTOOL() ++ ++AC_PROG_LIBTOOL ++m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) ++ + PKG_PROG_PKG_CONFIG + + AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal]) +@@ -266,23 +269,14 @@ + [enable_python=autodetect have_python=yes]) + AC_MSG_RESULT([$enable_python]) + +-if test "x$have_python" != "xyes"; then +- if test "x$enable_python" = "xyes"; then +- AC_MSG_ERROR([Python not found]) +- elif test "x$enable_python" = "xautodetect"; then +- enable_python=no +- AC_MSG_WARN([Python not found, disabling python support]) +- fi +-fi +- +-if test "x$have_python" != "xno"; then ++if test "x$enable_python" != "xno"; then + AM_PATH_PYTHON([2.3],[],[have_python=no]) + if test "x$PYTHON" = "x:"; then + have_python=no + fi + fi + +-if test "x$have_python" != "xno"; then ++if test "x$enable_python" != "xno"; then + PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'` + PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'` + PYTHON_LIBS="-lpython$PYTHON_VERSION" +@@ -329,6 +323,15 @@ + AC_MSG_RESULT([$result]) + fi + ++if test "x$have_python" != "xyes"; then ++ if test "x$enable_python" = "xyes"; then ++ AC_MSG_ERROR([Python not found]) ++ elif test "x$enable_python" = "xautodetect"; then ++ enable_python=no ++ AC_MSG_WARN([Python not found, disabling python support]) ++ fi ++fi ++ + if test "x$have_python" != "xno"; then + PYGTK_REQUIRED=2.12.0 + |