From nobody Thu Dec 5 19:03:49 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y43hP4dY3z5f0kP; Thu, 05 Dec 2024 19:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y43hP3pfMz4MQl; Thu, 5 Dec 2024 19:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733425429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/cJFoyMJGs0QmfKk9vzBuLoHNUbLGSdaq/UGqhN58WA=; b=KvrNcNw5DwKFKd2PjddT2yv4BdF9s3OM5IWOWxHCLYiREc7hQNKMqJwC8KUTVAx7lCH198 YICxbU+BxASOuLqfYhw5L8hYHmihUxDioq3HDoWa5lVp3MZ+DnMtbezzQNFqZqPzecreMC la6yjes4d3ErOzdfyMVfN+gCrtPi0ymxbYXAu6Scy5GK7nRz99QSDAfHIcfW9zuqtjPNtK zBORaJSLNqHN2ryt8CwCjas/yzCViP1kGf2We4f//SQsJ4xzBEx3DT3pAVZ0Dmx2csP9WT Ds9Mq71RRO1xYnxgAmEkBQnww/v6UAFmkOwRQ0/3VB36XCgpQ0rDtisNHKuGjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733425429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/cJFoyMJGs0QmfKk9vzBuLoHNUbLGSdaq/UGqhN58WA=; b=dHFVlw/+e3UVrL8IF50Ec7FdC7GeLErjOWF6dpXwX1DPmVo1Rp4B6Kz22QFcbIIzOKfel+ Hn3NSW+pgzzCOIDex9wM1W/fLUWSCDZnn3meXoHm0IWlFmvw+pd8itwfSQ3GIMQ7aa9Qma KbvNaO/mSNruobuESADV8ffJnt4GHIolLfxZSqfGRNzs92apWZVnRz566wPe4woIkKsOQt i81TqLmwge2eIlDrxiCDP0yoJmUBBi39MtV5H8se0B+BvoXYGL0amBr8+3PTHDZtLeHCFN h7PiG53CjyBZ5JV9EUpoak1nl9ftM8ULYwYtu/jfp185bR2xqr9EjMLuyZRgyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733425429; a=rsa-sha256; cv=none; b=xdoNr1lBCpYL/VRpph7LlsAtbDDg/Lt8JQ6djvf8Zr0/cIPY2/GAH7r9v7VPVptZQ16s8r OXvy19WAP8Ey1aekoOUc8MJdBGIR36xIrr+oOgHD556EFB8oP3WZzhTrMx31tkwUL5HyGs YTCido4xzeNeReF5U0B35k5xWj3l5h/NFhM/rQnR8DOL+90pl/CB0eFd/A2z2LmvNKTUKQ QzsKu7Z5hNoqQJEASh5wG9zqTNiGYkXhgInsJN54l2txU93meV7JltVzI2N5UC0wOs79XF cIOpPYNAWOdzdLFho4EFmLi7Hb1khXgDQhER53aXSK35AiMpQqVpXnEMljEE6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y43hP3PmBz153d; Thu, 5 Dec 2024 19:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B5J3nD6014077; Thu, 5 Dec 2024 19:03:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B5J3n3R014074; Thu, 5 Dec 2024 19:03:49 GMT (envelope-from git) Date: Thu, 5 Dec 2024 19:03:49 GMT Message-Id: <202412051903.4B5J3n3R014074@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 4e60b6b06e2e - main - multimedia/libmtp: Update to 1.1.22 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e60b6b06e2ecec0824f5afbceabe98bf1ce0ea5 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=4e60b6b06e2ecec0824f5afbceabe98bf1ce0ea5 commit 4e60b6b06e2ecec0824f5afbceabe98bf1ce0ea5 Author: Daniel Engberg AuthorDate: 2024-12-05 19:01:55 +0000 Commit: Daniel Engberg CommitDate: 2024-12-05 19:03:40 +0000 multimedia/libmtp: Update to 1.1.22 * Revert upstream commit aa45292de4e9047ff38bb5da79f896709aa0293a as new API isn't implemented in FreeBSD's libusb * Do some slight rearrangement of port Makefile PR: 283020 Approved by: desktop (arrowd) --- multimedia/libmtp/Makefile | 23 +++++++++++++++-------- multimedia/libmtp/distinfo | 6 +++--- multimedia/libmtp/files/patch-src_libusb1-glue.c | 17 ++++++++++++++--- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/multimedia/libmtp/Makefile b/multimedia/libmtp/Makefile index 38b43d29b727..15f222210651 100644 --- a/multimedia/libmtp/Makefile +++ b/multimedia/libmtp/Makefile @@ -1,28 +1,35 @@ PORTNAME= libmtp -PORTVERSION= 1.1.18 +DISTVERSION= 1.1.22 CATEGORIES= multimedia audio -MASTER_SITES= SF +MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \ + SF MAINTAINER= desktop@FreeBSD.org COMMENT= Media Transfer Protocol (MTP) library -WWW= https://libmtp.sourceforge.net/ +WWW= https://github.com/libmtp/libmtp LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS_INSTALL=libosmo-sccp # lib/libmtp.a -USES= cpe iconv libtool localbase pathfix pkgconfig +USES= cpe gmake iconv libtool localbase pathfix pkgconfig +CPE_VENDOR= libmtp_project +USE_LDCONFIG= yes + GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-doxygen + INSTALL_TARGET= install-strip -USE_LDCONFIG= yes -CPE_VENDOR= libmtp_project + +CONFIGURE_ARGS= --disable-doxygen \ + --disable-rpath OPTIONS_DEFINE= MTPZ OPTIONS_DEFAULT=MTPZ MTPZ_DESC= Enable functionality to connect to MTPZ devices -MTPZ_CONFIGURE_ENABLE= mtpz + MTPZ_LIB_DEPENDS= libgcrypt.so:security/libgcrypt +MTPZ_CONFIGURE_ENABLE= mtpz .include diff --git a/multimedia/libmtp/distinfo b/multimedia/libmtp/distinfo index 18a8542b0115..f3b91a9f7126 100644 --- a/multimedia/libmtp/distinfo +++ b/multimedia/libmtp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1602415737 -SHA256 (libmtp-1.1.18.tar.gz) = 7280fe50c044c818a06667f45eabca884deab3193caa8682e0b581e847a281f0 -SIZE (libmtp-1.1.18.tar.gz) = 832463 +TIMESTAMP = 1732363669 +SHA256 (libmtp-1.1.22.tar.gz) = c3fcf411aea9cb9643590cbc9df99fa5fe30adcac695024442973d76fa5f87bc +SIZE (libmtp-1.1.22.tar.gz) = 900914 diff --git a/multimedia/libmtp/files/patch-src_libusb1-glue.c b/multimedia/libmtp/files/patch-src_libusb1-glue.c index 28dedb101563..b5bb895d541d 100644 --- a/multimedia/libmtp/files/patch-src_libusb1-glue.c +++ b/multimedia/libmtp/files/patch-src_libusb1-glue.c @@ -2,14 +2,25 @@ Reset libusb_context for successive init_usb() calls instead of error https://github.com/phatina/simple-mtpfs/issues/37 ---- src/libusb1-glue.c.orig 2015-04-09 21:10:06 UTC +--- src/libusb1-glue.c.orig 2023-12-21 08:27:04 UTC +++ src/libusb1-glue.c -@@ -142,7 +142,7 @@ static LIBMTP_error_number_t init_usb() +@@ -153,7 +153,7 @@ static LIBMTP_error_number_t init_usb() * We use the same level debug between MTP and USB. */ if (libusb1_initialized) - return LIBMTP_ERROR_NONE; + libusb_exit(NULL); - if (libusb_init(NULL) < 0) { + if (libusb_init(&libmtp_libusb_context) < 0) { LIBMTP_ERROR("Libusb1 init failed\n"); +@@ -163,8 +163,8 @@ static LIBMTP_error_number_t init_usb() + libusb1_initialized = 1; + + if ((LIBMTP_debug & LIBMTP_DEBUG_USB) != 0) +- /*libusb_set_debug(libmtp_libusb_context,9);*/ +- libusb_set_option(libmtp_libusb_context, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_DEBUG ); /* highest level */ ++ libusb_set_debug(libmtp_libusb_context,9); ++ // libusb_set_option(libmtp_libusb_context, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_DEBUG ); /* highest level */ + return LIBMTP_ERROR_NONE; + } +