Attachment #95462 for bug #145448

Lines 631-637 Link Here

(-)amarok/src/mediadevice/mtp/mtpmediadevice.cpp.orig (+4 lines)
631	}	631	}
632		632
633	QString modelname = QString( LIBMTP_Get_Modelname( m_device ) );	633	QString modelname = QString( LIBMTP_Get_Modelname( m_device ) );
		634	#if LIBMTP_FRIENDLY_NAME
		635	QString ownername = QString( LIBMTP_Get_Friendlyname( m_device ) );
		636	#else
634	QString ownername = QString( LIBMTP_Get_Ownername( m_device ) );	637	QString ownername = QString( LIBMTP_Get_Ownername( m_device ) );
		638	#endif
635	m_name = modelname;	639	m_name = modelname;
636	if(! ownername.isEmpty() )	640	if(! ownername.isEmpty() )
637	{	641	{

Lines 9-14 Link Here

(-)amarok/src/mediadevice/mtp/Makefile.am.orig (+1 lines)
9	-I$(top_srcdir)/amarok/src/engine \	9	-I$(top_srcdir)/amarok/src/engine \
10	-I$(top_builddir)/amarok/src/engine \	10	-I$(top_builddir)/amarok/src/engine \
11	-I$(top_srcdir)/amarok/src/mediadevice \	11	-I$(top_srcdir)/amarok/src/mediadevice \
		12	-DLIBMTP_FRIENDLY_NAME=$(LIBMTP_FRIENDLY_NAME) \
12	$(taglib_includes) \	13	$(taglib_includes) \
13	$(all_includes)	14	$(all_includes)
14		15




    [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

###############################################################################

ruby_includes=[`$RUBY -rrbconfig -e 'puts Config::MAKEFILE_CONFIG["topdir"]'`]
ruby_ldflags=[`$RUBY -rrbconfig -e 'puts Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"].gsub("$(libdir)", Config::MAKEFILE_CONFIG["libdir"]).gsub("$(RUBY_SO_NAME)", Config::MAKEFILE_CONFIG["RUBY_SO_NAME"]).gsub("$(DESTDIR)", "") + " " + Config::MAKEFILE_CONFIG["LIBS"]'`]

AC_MSG_CHECKING([$ruby_includes])
#AC_MSG_RESULT($ruby_includes)
AC_SUBST(ruby_includes)
AC_SUBST(ruby_ldflags)


###############################################################################
# END DAAP MONGREL RUBY VARIABLE

Return to bug 145448

Lines 808-823 Link Here

(-)amarok/configure.in.in.orig (-5 / +15 lines)
808	[build_libmtp=$withval],	808	[build_libmtp=$withval],
809	[build_libmtp=yes]	809	[build_libmtp=yes]
810	)	810	)
811
812	if test "$build_libmtp" != "no"; then	811	if test "$build_libmtp" != "no"; then
813	if test "$PKGCONFIGFOUND" = "yes" ; then	812	if test "$PKGCONFIGFOUND" = "yes" ; then
		813	have_libmtp=no
		814	LIBMTP_FRIENDLY_NAME=0
		815	PKG_CHECK_MODULES(LIBMTP, libmtp >= 0.0.12,
		816	[
		817	LIBMTP_FRIENDLY_NAME=1
		818	have_libmtp=yes
		819	],
		820	[
		821	PKG_CHECK_MODULES(LIBMTP, libmtp < 0.0.12, have_libmtp=yes, have_libmtp=no)
		822	])
814		823
815	# check for libmtp
816	have_libmtp=no
817
818	PKG_CHECK_MODULES(LIBMTP, libmtp, have_libmtp=yes,have_libmtp=no)
819	if test "x$have_libmtp" != "xno"; then	824	if test "x$have_libmtp" != "xno"; then
820	AC_DEFINE(HAVE_LIBMTP, 1, [have libmtp])	825	AC_DEFINE(HAVE_LIBMTP, 1, [have libmtp])
		826	AC_SUBST(LIBMTP_FRIENDLY_NAME)
821	fi	827	fi
822	fi	828	fi
823	fi	829	fi
Lines 1039-1047 Link Here
1039	###############################################################################	1045	###############################################################################
1040		1046
1041	ruby_includes=[`$RUBY -rrbconfig -e 'puts Config::MAKEFILE_CONFIG["topdir"]'`]	1047	ruby_includes=[`$RUBY -rrbconfig -e 'puts Config::MAKEFILE_CONFIG["topdir"]'`]
		1048	ruby_ldflags=[`$RUBY -rrbconfig -e 'puts Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"].gsub("$(libdir)", Config::MAKEFILE_CONFIG["libdir"]).gsub("$(RUBY_SO_NAME)", Config::MAKEFILE_CONFIG["RUBY_SO_NAME"]).gsub("$(DESTDIR)", "") + " " + Config::MAKEFILE_CONFIG["LIBS"]'`]
		1049
1042	AC_MSG_CHECKING([$ruby_includes])	1050	AC_MSG_CHECKING([$ruby_includes])
1043	#AC_MSG_RESULT($ruby_includes)	1051	#AC_MSG_RESULT($ruby_includes)
1044	AC_SUBST(ruby_includes)	1052	AC_SUBST(ruby_includes)
		1053	AC_SUBST(ruby_ldflags)
		1054
1045		1055
1046	###############################################################################	1056	###############################################################################
1047	# END DAAP MONGREL RUBY VARIABLE	1057	# END DAAP MONGREL RUBY VARIABLE