Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 95462 Details for
Bug 145448
media-sound/amarok-1.4.2 released
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
amarok-1.4.2-mtp.patch
amarok-1.4.2-mtp.patch (text/plain), 2.53 KB, created by
Matteo Azzali (RETIRED)
on 2006-08-30 04:41:06 UTC
(
hide
)
Description:
amarok-1.4.2-mtp.patch
Filename:
MIME Type:
Creator:
Matteo Azzali (RETIRED)
Created:
2006-08-30 04:41:06 UTC
Size:
2.53 KB
patch
obsolete
>--- amarok/src/mediadevice/mtp/mtpmediadevice.cpp.orig 2006-08-21 21:49:32.000000000 +0200 >+++ amarok/src/mediadevice/mtp/mtpmediadevice.cpp 2006-08-29 14:28:57.000000000 +0200 >@@ -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() ) > { >--- amarok/src/mediadevice/mtp/Makefile.am.orig 2006-08-21 21:49:32.000000000 +0200 >+++ amarok/src/mediadevice/mtp/Makefile.am 2006-08-29 14:29:34.000000000 +0200 >@@ -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) > >--- amarok/configure.in.in.orig 2006-08-21 21:49:32.000000000 +0200 >+++ amarok/configure.in.in 2006-08-29 14:27:51.000000000 +0200 >@@ -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 >@@ -1039,9 +1045,13 @@ > ############################################################################### > > 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 145448
:
95388
|
95460
| 95462