public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libmtp/files/, media-libs/libmtp/
@ 2015-10-21  9:35 Lars Wendler
  0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2015-10-21  9:35 UTC (permalink / raw
  To: gentoo-commits

commit:     8f6263fbcff56daf4786eb5c8df5456eba64e4c8
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 08:56:47 2015 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 09:35:49 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f6263fb

media-libs/libmtp: Removed old.

Package-Manager: portage-2.2.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/libmtp/Manifest                         |  1 -
 .../libmtp/files/libmtp-1.1.6-fbsdlibusb.patch     | 19 -------
 media-libs/libmtp/libmtp-1.1.6-r1.ebuild           | 66 ----------------------
 3 files changed, 86 deletions(-)

diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index e27efa9..c154e2a 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,4 +1,3 @@
 DIST libmtp-1.1.10.tar.gz 787654 SHA256 1eee8d4c052fe29e58a408fedc08a532e28626fa3e232157abd8fca063c90305 SHA512 7b0d06ac11a7476b6d8c84eb452c4abe08f8f61dafd8b1900e87f550665d5d3add182bbcba6d774426c8c9f6e978cef499a1f0d09283e5d6d02b812eb2eb3072 WHIRLPOOL 77df823382cb5756db4967e9131877888491eb11b9ef2ffdc8fecbb55a5f1df70223be54ef816899ddb0997bc73c8f445e25f2f8a22675da680d3017d2eb08df
-DIST libmtp-1.1.6.tar.gz 733519 SHA256 3a1c1c83af91de4052eb54feb795c141b4c04a252e0031954ebbf6175970cb0a SHA512 fe6d9bc0621d6ad2325164585ec5f3e20824add5ee763d6d14ba7dbea6d2aacd75afa450627f3a03691c33ffb92675abebce64c3f8e32e8c2db511e814207ab3 WHIRLPOOL 176f2d64241735f2de33da4d84142debb2343aeb3abbd27a2af8e2a1815aa239c5f4ed9f38316bd2a8deb9d8faad4e293a5abae46e54d9137bfe8fcba279b371
 DIST libmtp-1.1.8.tar.gz 757109 SHA256 3f9e87536aa40e560d0c153a505e38096b1df5ea15fad783691e9a8ca4dd2282 SHA512 34952fbe1ae1dcee456f4fc0d6208cf18e3ced22891bb748350927f06ee433f806e8339d6275085e70b6fd09a43eb0f18ac617e564c8d8162671245ecf0b8904 WHIRLPOOL 5ab0df9b566b7fe3193b0a09a0792eb2634d0775a8ee9a9358d13b2aeba4c82816f5ecb5e5d7355ed338d6171259b7a5c9802b4bc8ea2b0de3d4bbbd1aa8050c
 DIST libmtp-1.1.9.tar.gz 760593 SHA256 23f1d3c0b54107388bf2824d56415e9e087c980c86e5d179865652c022b6b189 SHA512 6be9f14602b05830ec01defaeb0f237ac4d021f76f4003d7178eda00d8bf86d7fbbeba0053dc111d2ab9eb32f1603c2dc4f2bc128f4cbe4819228486b9b85513 WHIRLPOOL d357c949907b69f3a40291a79e05cc75790d86abb7fa0ea787c5ef0cd666b7f9888f9441f9893824520345d25799142f70c0ba0b773267fb9b374bb0d8b833e6

diff --git a/media-libs/libmtp/files/libmtp-1.1.6-fbsdlibusb.patch b/media-libs/libmtp/files/libmtp-1.1.6-fbsdlibusb.patch
deleted file mode 100644
index e0360d8..0000000
--- a/media-libs/libmtp/files/libmtp-1.1.6-fbsdlibusb.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-FreeBSD installs its libusb-1.0 implementation in /usr/include. libmtp uses
-pkg-config to discover it which adds the correct -I flag, so just #include
-libusb.h to make it work with every implementation.
-
-https://sourceforge.net/p/libmtp/patches/52/
-
-Index: libmtp-1.1.6/src/libusb-glue.h
-===================================================================
---- libmtp-1.1.6.orig/src/libusb-glue.h
-+++ libmtp-1.1.6/src/libusb-glue.h
-@@ -32,7 +32,7 @@
- 
- #include "ptp.h"
- #ifdef HAVE_LIBUSB1
--#include <libusb-1.0/libusb.h>
-+#include <libusb.h>
- #endif
- #ifdef HAVE_LIBUSB0
- #include <usb.h>

diff --git a/media-libs/libmtp/libmtp-1.1.6-r1.ebuild b/media-libs/libmtp/libmtp-1.1.6-r1.ebuild
deleted file mode 100644
index 8e742c8..0000000
--- a/media-libs/libmtp/libmtp-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils udev user toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/libmtp/code"
-	EGIT_PROJECT="libmtp"
-	inherit git-2
-else
-	KEYWORDS="amd64 ~arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd"
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
-HOMEPAGE="http://libmtp.sourceforge.net/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+crypt doc examples static-libs"
-
-RDEPEND="virtual/libusb:1
-	crypt? ( dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS="AUTHORS ChangeLog README TODO"
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fbsdlibusb.patch
-	if [[ ${PV} == *9999* ]]; then
-		touch config.rpath # This is from upstream autogen.sh
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable doc doxygen) \
-		$(use_enable crypt mtpz) \
-		--with-udev="$(get_udevdir)" \
-		--with-udev-group=plugdev \
-		--with-udev-mode=0660
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,sh}
-	fi
-
-	sed -i -e '/^Unable to open/d' "${ED}/$(get_udevdir)"/rules.d/*-libmtp.rules || die #481666
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/libmtp/files/, media-libs/libmtp/
@ 2022-07-01 10:57 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2022-07-01 10:57 UTC (permalink / raw
  To: gentoo-commits

commit:     074bcd3fe7702e6ae1b62c38fdb62cd5d9acade7
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  1 10:56:49 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jul  1 10:56:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=074bcd3f

media-libs/libmtp: fixed doc installation path

Closes: https://bugs.gentoo.org/854810
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-libs/libmtp/files/libmtp-1.1.19-fix-docdir.patch      | 13 +++++++++++++
 .../{libmtp-1.1.19-r1.ebuild => libmtp-1.1.19-r2.ebuild}    |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/media-libs/libmtp/files/libmtp-1.1.19-fix-docdir.patch b/media-libs/libmtp/files/libmtp-1.1.19-fix-docdir.patch
new file mode 100644
index 000000000000..25450079d203
--- /dev/null
+++ b/media-libs/libmtp/files/libmtp-1.1.19-fix-docdir.patch
@@ -0,0 +1,13 @@
+diff --git a/doc/Makefile.in b/doc/Makefile.in
+index fede3e0..d801a47 100644
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -256,7 +256,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = Doxyfile.in examples.h mainpage.h
+-@HAVE_DOXYGEN_TRUE@pkgdocdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++@HAVE_DOXYGEN_TRUE@pkgdocdir = $(docdir)
+ @HAVE_DOXYGEN_TRUE@htmldocdir = $(pkgdocdir)/html
+ all: all-am
+ 

diff --git a/media-libs/libmtp/libmtp-1.1.19-r1.ebuild b/media-libs/libmtp/libmtp-1.1.19-r2.ebuild
similarity index 97%
rename from media-libs/libmtp/libmtp-1.1.19-r1.ebuild
rename to media-libs/libmtp/libmtp-1.1.19-r2.ebuild
index bf1575d7a256..fd347a6888d2 100644
--- a/media-libs/libmtp/libmtp-1.1.19-r1.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.19-r2.ebuild
@@ -33,6 +33,10 @@ BDEPEND="
 
 DOCS=( AUTHORS README TODO )
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-docdir.patch"
+)
+
 src_prepare() {
 	default
 


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-07-01 10:57 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-21  9:35 [gentoo-commits] repo/gentoo:master commit in: media-libs/libmtp/files/, media-libs/libmtp/ Lars Wendler
  -- strict thread matches above, loose matches on Subject: below --
2022-07-01 10:57 Miroslav Šulc

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox