diff options
author | Olivier Crête <tester@gentoo.org> | 2006-01-01 19:23:44 +0000 |
---|---|---|
committer | Olivier Crête <tester@gentoo.org> | 2006-01-01 19:23:44 +0000 |
commit | ccf95da6d9d3eadca79aec75b91625009a8af2e5 (patch) | |
tree | a35db3cf6baf803da1a337456f4f4658acac9537 /media-libs/libgpod/files | |
parent | Initial commit to the tree. Thanks to Sebastian for the ebuild. Closes bug ... (diff) | |
download | gentoo-2-ccf95da6d9d3eadca79aec75b91625009a8af2e5.tar.gz gentoo-2-ccf95da6d9d3eadca79aec75b91625009a8af2e5.tar.bz2 gentoo-2-ccf95da6d9d3eadca79aec75b91625009a8af2e5.zip |
Add patch to disable/enable hal/gdk-pixbuf forcefully instead of auto-detecting
(Portage version: 2.0.53)
Diffstat (limited to 'media-libs/libgpod/files')
-rw-r--r-- | media-libs/libgpod/files/libgpod-0.3.0-config-enables.diff | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/media-libs/libgpod/files/libgpod-0.3.0-config-enables.diff b/media-libs/libgpod/files/libgpod-0.3.0-config-enables.diff new file mode 100644 index 000000000000..6d3eb264b31d --- /dev/null +++ b/media-libs/libgpod/files/libgpod-0.3.0-config-enables.diff @@ -0,0 +1,54 @@ +--- configure.ac.orig 2006-01-01 13:44:30.000000000 -0500 ++++ configure.ac 2006-01-01 14:09:57.000000000 -0500 +@@ -56,25 +56,40 @@ + dnl ************************************************** + dnl * GDKPIXBUF is optional + dnl ************************************************** ++ ++AC_ARG_ENABLE(gdk-pixbuf, [AC_HELP_STRING([--disable-gdk-pixbuf],[ArtworkDB will be disabled without gdk-pixbuf])], ++[case "${enableval}" in ++ no) have_gdkpixbuf=no ;; ++ *) have_gdkpixbuf=yes;; ++esac], have_gdkpixbuf=yes) + AH_TEMPLATE([HAVE_GDKPIXBUF], [Whether gdk-pixbuf is installed, ArtworkDB writing support will be disabled if it can't be found]) +-PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0, have_gdkpixbuf=yes, have_gdkpibux=no) +-AM_CONDITIONAL(HAVE_GDKPIXBUF, test x"$have_gdkpixbuf" = xyes) +-if test x"$have_gdkpixbuf" = xyes; then +- AC_DEFINE_UNQUOTED(HAVE_GDKPIXBUF, 1) ++if test x$have_gdkpixbuf = xyes; then ++ PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0, have_gdkpixbuf=yes, have_gdkpixbuf=no) ++ if test x"$have_gdkpixbuf" = xyes; then ++ AC_DEFINE_UNQUOTED(HAVE_GDKPIXBUF, 1) ++ fi ++ LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $GDKPIXBUF_CFLAGS" ++ LIBGPOD_LIBS="$LIBGPOD_LIBS $GDKPIXBUF_LIBS" + fi +-LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $GDKPIXBUF_CFLAGS" +-LIBGPOD_LIBS="$LIBGPOD_LIBS $GDKPIXBUF_LIBS" ++AM_CONDITIONAL(HAVE_GDKPIXBUF, test x"$have_gdkpixbuf" = xyes) + + dnl ************************************************** + dnl * hal is optional + dnl ************************************************** + +-PKG_CHECK_MODULES(HAL, dbus-1 dbus-glib-1 hal >= 0.5.2 hal < 0.6, enable_hal05=yes, enable_hal05=no) +-if test x$enable_hal05 == xyes; then +- AC_DEFINE_UNQUOTED(HAVE_LIBHAL, 1, [Whether HAL is available or not]) ++AC_ARG_ENABLE(hal, [AC_HELP_STRING([--enable-hal],[support hal])], ++[case "${enableval}" in ++ yes) enable_hal05=yes ;; ++ *) enable_hal05=no;; ++esac], enable_hal05=no) ++if test x$enable_hal05 = xyes; then ++ PKG_CHECK_MODULES(HAL, dbus-1 dbus-glib-1 hal >= 0.5.2 hal < 0.6, enable_hal05=yes, enable_hal05=no) ++ if test x$enable_hal05 = xyes; then ++ AC_DEFINE_UNQUOTED(HAVE_LIBHAL, 1, [Whether HAL is available or not]) ++ fi ++ LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $HAL_CFLAGS" ++ LIBGPOD_LIBS="$LIBGPOD_LIBS $HAL_LIBS" + fi +-LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $HAL_CFLAGS" +-LIBGPOD_LIBS="$LIBGPOD_LIBS $HAL_LIBS" + + dnl ************************************************** + dnl * necessary for the HAL libipoddevice code |