diff --git a/media-libs/libmtp/libmtp-1.1.14.recipe b/media-libs/libmtp/libmtp-1.1.15.recipe similarity index 75% rename from media-libs/libmtp/libmtp-1.1.14.recipe rename to media-libs/libmtp/libmtp-1.1.15.recipe index f061e4ad7..5b1f8711f 100644 --- a/media-libs/libmtp/libmtp-1.1.14.recipe +++ b/media-libs/libmtp/libmtp-1.1.15.recipe @@ -10,8 +10,8 @@ COPYRIGHT="2006-2011 Linus Walleij 2006 Mariusz Woloszyn" LICENSE="GNU LGPL v2.1" REVISION="1" -SOURCE_URI="http://downloads.sourceforge.net/libmtp/libmtp-$portVersion.tar.gz" -CHECKSUM_SHA256="3817d3e296be8f1bc527385585780e70984e8e0d6a0d00349240d67e3df412e8" +SOURCE_URI="https://downloads.sourceforge.net/libmtp/libmtp-$portVersion.tar.gz" +CHECKSUM_SHA256="d040900b46757e311b1fb3bfa8c05db09c8b6811e044bce8c88c9f3f6d3a3021" PATCHES="libmtp-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -24,9 +24,12 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then commandBinDir=$prefix/bin fi +libVersion="9.4.0" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" libmtp$secondaryArchSuffix = $portVersion compat >= 1.0 - lib:libmtp$secondaryArchSuffix = 9.3.0 compat >= 9 + lib:libmtp$secondaryArchSuffix = $libVersionCompat cmd:mtp_albumart$commandSuffix = $portVersion cmd:mtp_albums$commandSuffix = $portVersion cmd:mtp_connect$commandSuffix = $portVersion @@ -60,7 +63,7 @@ REQUIRES=" PROVIDES_devel=" libmtp${secondaryArchSuffix}_devel = $portVersion compat >= 1.0 - devel:libmtp$secondaryArchSuffix = 9.3.0 compat >= 9 + devel:libmtp$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" libmtp$secondaryArchSuffix == $portVersion base @@ -89,6 +92,25 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " +defineDebugInfoPackage libmtp$secondaryArchSuffix \ + "$commandBinDir"/mtp-albumart \ + "$commandBinDir"/mtp-albums \ + "$commandBinDir"/mtp-connect \ + "$commandBinDir"/mtp-detect \ + "$commandBinDir"/mtp-emptyfolders \ + "$commandBinDir"/mtp-files \ + "$commandBinDir"/mtp-filetree \ + "$commandBinDir"/mtp-folders \ + "$commandBinDir"/mtp-format \ + "$commandBinDir"/mtp-getplaylist \ + "$commandBinDir"/mtp-newplaylist \ + "$commandBinDir"/mtp-playlists \ + "$commandBinDir"/mtp-reset \ + "$commandBinDir"/mtp-thumb \ + "$commandBinDir"/mtp-tracks \ + "$commandBinDir"/mtp-trexist \ + "$libDir"/libmtp.so.$libVersion + BUILD() { autoreconf -fi diff --git a/media-libs/libmtp/patches/libmtp-1.1.14.patchset b/media-libs/libmtp/patches/libmtp-1.1.15.patchset similarity index 83% rename from media-libs/libmtp/patches/libmtp-1.1.14.patchset rename to media-libs/libmtp/patches/libmtp-1.1.15.patchset index e436a51d3..9b3256cb5 100644 --- a/media-libs/libmtp/patches/libmtp-1.1.14.patchset +++ b/media-libs/libmtp/patches/libmtp-1.1.15.patchset @@ -5,10 +5,10 @@ Subject: fix configure.ac diff --git a/configure.ac b/configure.ac -index 600105b..c40c587 100644 +index 677c654..b3e80b7 100644 --- a/configure.ac +++ b/configure.ac -@@ -4,7 +4,7 @@ AC_INIT([libmtp], [1.1.12], [libmtp-discuss@lists.sourceforge.net]) +@@ -4,7 +4,7 @@ AC_INIT([libmtp], [1.1.15], [libmtp-discuss@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_SRCDIR([src/libmtp.c])