summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2017-10-04 14:58:19 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-10-04 15:22:17 +0200
commitf283ec7d7a5a6bd482abf07fcb405518c4aaa43d (patch)
tree9d3a9a9722d0800f41888c605d00afd2efc94435
parenta26b917ed4a8d9471fc087ff24c0ce6212c33835 (diff)
downloadmedia-f283ec7d7a5a6bd482abf07fcb405518c4aaa43d.tar.gz
media-f283ec7d7a5a6bd482abf07fcb405518c4aaa43d.tar.xz
libmtp: version bump to 1.1.14
Change-Id: I7ad25dd45d25150a49a66cf4fbd8c00d4cdb6aee Reviewed-on: https://galileo.mailstation.de/gerrit/10186 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--packages/media-libs/libmtp/files/libmtp-Don-t-hard-code-pkg-config.patch36
-rw-r--r--packages/media-libs/libmtp/libmtp-1.1.14.exheres-0 (renamed from packages/media-libs/libmtp/libmtp-1.1.13.exheres-0)6
2 files changed, 0 insertions, 42 deletions
diff --git a/packages/media-libs/libmtp/files/libmtp-Don-t-hard-code-pkg-config.patch b/packages/media-libs/libmtp/files/libmtp-Don-t-hard-code-pkg-config.patch
deleted file mode 100644
index 3b559b1..0000000
--- a/packages/media-libs/libmtp/files/libmtp-Don-t-hard-code-pkg-config.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Upstream: yes
-
-From 6fea1d9b1fe5a67eba60674491758d734b6bd944 Mon Sep 17 00:00:00 2001
-From: Marcus Meissner <marcus@jet.franken.de>
-Date: Tue, 9 May 2017 08:35:11 +0200
-Subject: [PATCH] use $PKG_CONFIG instead of pkg-config
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0377d61..3dcb0f0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -114,7 +114,7 @@ AM_CONDITIONAL(MS_LIB_EXE, test x$ms_lib_exe = xyes)
-
- # Check for libusb-1.0
- PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.0,[
-- LIBUSB_VER=`pkg-config --modversion libusb-1.0`
-+ LIBUSB_VER=`$PKG_CONFIG --modversion libusb-1.0`
- LIBUSB_REQUIRES='libusb-1.0'
- AC_DEFINE(HAVE_LIBUSB1, [], [Have libusb 1.0])
- found_libusb1_pkg=yes
-@@ -125,7 +125,7 @@ PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.0,[
- LIBUSB_VER=1.0
- ],[
- PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.8, [
-- LIBUSB_VER=`pkg-config --modversion libusb`
-+ LIBUSB_VER=`$PKG_CONFIG --modversion libusb`
- LIBUSB_REQUIRES='libusb'
- AC_DEFINE(HAVE_LIBUSB0, [], [Have libusb 0.x])
- found_libusb0_pkg=yes
---
-2.13.0
-
diff --git a/packages/media-libs/libmtp/libmtp-1.1.13.exheres-0 b/packages/media-libs/libmtp/libmtp-1.1.14.exheres-0
index 0b763f1..f2dd41e 100644
--- a/packages/media-libs/libmtp/libmtp-1.1.13.exheres-0
+++ b/packages/media-libs/libmtp/libmtp-1.1.14.exheres-0
@@ -2,8 +2,6 @@
# Distributed under the terms of the GNU General Public License v2
require sourceforge [ suffix=tar.gz ] udev-rules
-# ${PN}-Don-t-hard-code-pkg-config.patch
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
SUMMARY="An implementation of Microsoft's Media Transfer Protocol (MTP)"
@@ -29,10 +27,6 @@ DEPENDENCIES="
providers:systemd? ( sys-apps/systemd )
"
-DEFAULT_SRC_PREPARE_PATCHES+=(
- "${FILES}"/${PN}-Don-t-hard-code-pkg-config.patch
-)
-
DEFAULT_SRC_CONFIGURE_PARAMS=(
--disable-static
--with-udev=${UDEVDIR}