extragear/multimedia/amarok

[Jeff Mitchell]

Andy--

You may want to inform package maintainers about this commit, as some may wish 
to add it as a patch against 1.4.2 so that they can build the mtp plugin 
against 0.0.12.

--Jeff


On Wednesday 23 August 2006 02:34, Andy Kelk wrote:
> SVN commit 576121 by kelk:
>
> Check for libmtp version. If it's 0.0.12 (or greater) then we must use
> LIBMTP_Get_Friendlyname instead of LIBMTP_Get_Ownername.
>
>
>
>  M  +11 -5     configure.in.in
>  M  +1 -0      src/mediadevice/mtp/Makefile.am
>  M  +4 -0      src/mediadevice/mtp/mtpmediadevice.cpp
>
>
> --- trunk/extragear/multimedia/amarok/configure.in.in #576120:576121
> @@ -808,16 +808,22 @@
>      [build_libmtp=$withval],
>      [build_libmtp=yes]
>  )
> -
>      if test "$build_libmtp" != "no"; then
>          if test "$PKGCONFIGFOUND" = "yes" ; then
> +            have_libmtp=no
> +            LIBMTP_FRIENDLY_NAME=0
> +            PKG_CHECK_MODULES(LIBMTP, libmtp >= 0.0.12,
> +            [
> +                LIBMTP_FRIENDLY_NAME=1
> +                have_libmtp=yes
> +            ],
> +            [
> +                PKG_CHECK_MODULES(LIBMTP, libmtp < 0.0.12,
> have_libmtp=yes, have_libmtp=no) +            ])
>
> -        # check for libmtp
> -        have_libmtp=no
> -
> -        PKG_CHECK_MODULES(LIBMTP, libmtp, have_libmtp=yes,have_libmtp=no)
>          if test "x$have_libmtp" != "xno"; then
>              AC_DEFINE(HAVE_LIBMTP, 1, [have libmtp])
> +            AC_SUBST(LIBMTP_FRIENDLY_NAME)
>          fi
>      fi
>  fi
> --- trunk/extragear/multimedia/amarok/src/mediadevice/mtp/Makefile.am
> #576120:576121 @@ -9,6 +9,7 @@
>      -I$(top_srcdir)/amarok/src/engine \
>      -I$(top_builddir)/amarok/src/engine \
>      -I$(top_srcdir)/amarok/src/mediadevice \
> +    -DLIBMTP_FRIENDLY_NAME=$(LIBMTP_FRIENDLY_NAME) \
>      $(taglib_includes) \
>      $(all_includes)
>
> ---
> trunk/extragear/multimedia/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
> #576120:576121 @@ -631,7 +631,11 @@
>  	}
>
>      QString modelname = QString( LIBMTP_Get_Modelname( m_device ) );
> +#if LIBMTP_FRIENDLY_NAME
> +    QString ownername = QString( LIBMTP_Get_Friendlyname( m_device ) );
> +#else
>      QString ownername = QString( LIBMTP_Get_Ownername( m_device ) );
> +#endif
>      m_name = modelname;
>      if(! ownername.isEmpty() )
>      {