From nobody Mon May 30 11:47:30 2022 X-Original-To: dev-commits-ports-all@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 BC5BF10FF560; Mon, 30 May 2022 11:47:30 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LBYYZ4v4fz4vg5; Mon, 30 May 2022 11:47:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653911250; 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=KatmetA1OwD/YjuNPLmhWDSu3V4ytfRN3HRhkvKhM2Y=; b=GvSnrsuNOs8Wb4eMRYwJPQIp+41a69oQzpj+CfBe1I1QEbLrzTN8nOAA/p3E9Bl9d0jVOw hh5Pqb4eExHDAfQuJ7S2ufJScS+4DxCw4UbRnN0e2LIfePo5hOEd9YsT+blirqgLeYUHoO fRAVNIvpyyJ7EmB1YxEJL/xbtJdIxYkJizzqXLkiqVnH+BL9oO3oE4dG0ktUg/91eaPgAI Jtm5FwMf413+Gi4poXfba6mxK2HNyu92geAoTYDRiIruUc+WwrCQysGUY5W6GoNCMvWv7L /UJF67s1MsSc7LLP1r/r8+ucH6fDsGHUqoNKOlFpBjSjHi/czWa3SVQeI05HHA== 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 8822016C02; Mon, 30 May 2022 11:47:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24UBlUSK034557; Mon, 30 May 2022 11:47:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24UBlUYQ034556; Mon, 30 May 2022 11:47:30 GMT (envelope-from git) Date: Mon, 30 May 2022 11:47:30 GMT Message-Id: <202205301147.24UBlUYQ034556@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: bcd33cb43741 - main - audio/mpz: the port had been updated to version 1.0.20 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcd33cb437416f93f50d7f19d310ca8c8173f945 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653911250; 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=KatmetA1OwD/YjuNPLmhWDSu3V4ytfRN3HRhkvKhM2Y=; b=sDfbTq/JZx7A28tJJPpmIVg4JVNdSdAkuFPWYB/yzhUEu4qVb8imUg5c8EgiiSF3I2OZX/ UhYlgx3jUnQRaba2BE1NBLWwQoDTtLBth25n/DZAkALrBiwGVO3U7P1X/pAF2q9Cg2qqrQ slYM4BRoXfe44R6GdWpc9wKi2ISkqIFawEWBqBBeBCL0k9XPTeqEJ+fJ1F4uNaMFp9goSw QOhM1iNgKQOUisGPPwAe7VHX/wnvcXXS6J/zYor3Ha444Nec8GXWIKi6Xc0L05zI6+RCxq NwCgnDqfD/8dZFSXgLDw8x8JHyUkXgULxN/LUpuyr6BJ4iVHdXeAhHZrMv4fTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653911250; a=rsa-sha256; cv=none; b=aldeOvssQLITNE7kB3R9wQ/ASY5/Ei1Vdlaud5BlCW/iCHlqDx/DlIzg+7CeRt3byZ5ulQ cHpZMu2UaAFceUWk0scvBh+v4InPFr1mfoJS9Zq5IjL0oy7oNxNSwdB7fmxye32qCDCjbL 2vmTpt1ZvpNI5q/BsaQIFo0CsrvBz6tqO2zImraMdvXMnMSSTVHnpcGfgOPadU6Cz8sqgU OvbDOArXZfmD+JseIM2aYNrgQGd6nRdjorrc20ArfCRcFyQ9tKribamXHUTmiremlSvZgN V6kMsiqx/1xR0yflbStYdQOk/+gC+rg2vbw1yHp9IL60Vbjtazn+Y0mjE4evTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=bcd33cb437416f93f50d7f19d310ca8c8173f945 commit bcd33cb437416f93f50d7f19d310ca8c8173f945 Author: Alexey Dokuchaev AuthorDate: 2022-05-30 11:46:42 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-05-30 11:46:42 +0000 audio/mpz: the port had been updated to version 1.0.20 Now has better support building itself against system dependencies (less patching required). Reported by: portscout --- audio/mpz/Makefile | 4 +++- audio/mpz/distinfo | 6 +++--- audio/mpz/files/patch-app_app.pro | 25 ++++--------------------- audio/mpz/files/patch-app_coverart_embedded.cpp | 25 ------------------------- audio/mpz/files/patch-mpz.pro | 13 +++---------- 5 files changed, 13 insertions(+), 60 deletions(-) diff --git a/audio/mpz/Makefile b/audio/mpz/Makefile index b0df07bb32dc..3a48092b8a9f 100644 --- a/audio/mpz/Makefile +++ b/audio/mpz/Makefile @@ -1,7 +1,7 @@ # Created by: Alexey Dokuchaev PORTNAME= mpz -PORTVERSION= 1.0.19 +PORTVERSION= 1.0.20 CATEGORIES= audio MAINTAINER= danfe@FreeBSD.org @@ -20,6 +20,8 @@ USE_GSTREAMER= flac libav mpg123 ogg opus vorbis USE_QT= buildtools_build concurrent core dbus gui multimedia \ network widgets x11extras +QMAKE_ARGS= DEFINES+=USE_SYSTEM_TAGLIB DEFINES+=USE_SYSTEM_YAMLCPP + post-extract: @${RM} -r ${WRKSRC}/libs/taglib ${WRKSRC}/libs/yaml-cpp diff --git a/audio/mpz/distinfo b/audio/mpz/distinfo index 9e6b794ac9af..b12c8e1a2448 100644 --- a/audio/mpz/distinfo +++ b/audio/mpz/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1638963522 -SHA256 (olegantonyan-mpz-1.0.19_GH0.tar.gz) = 2496d849d953eaae911a7bfb10006d7e31118df33666fe01a9fbb6fae1a5f697 -SIZE (olegantonyan-mpz-1.0.19_GH0.tar.gz) = 2700174 +TIMESTAMP = 1653719700 +SHA256 (olegantonyan-mpz-1.0.20_GH0.tar.gz) = bd4d14e1cb2207745dd022f9633671a904ae3ef60a9f8ef3005939413213a86c +SIZE (olegantonyan-mpz-1.0.20_GH0.tar.gz) = 2702505 diff --git a/audio/mpz/files/patch-app_app.pro b/audio/mpz/files/patch-app_app.pro index 28b6191706ac..134401c52986 100644 --- a/audio/mpz/files/patch-app_app.pro +++ b/audio/mpz/files/patch-app_app.pro @@ -1,28 +1,11 @@ ---- app/app.pro.orig 2021-12-08 11:38:42 UTC +--- app/app.pro.orig 2022-05-28 06:35:00 UTC +++ app/app.pro -@@ -171,16 +171,12 @@ contains(DEFINES, MPRIS_ENABLE) { - - # Libraries - INCLUDEPATH += \ -- ../libs/taglib/taglib-1.12/taglib \ -- ../libs/taglib/taglib-1.12/taglib/toolkit \ -- ../libs/taglib/taglib-1.12/taglib/mpeg/id3v2 \ -- ../libs/yaml-cpp/yaml-cpp-0.7.0/include \ -+ ${LOCALBASE}/include/taglib \ - ../libs/qtwaitingspinner \ - ../libs/qhotkey/QHotkey-1.5.0 - - LIBS += \ -- -L../libs/taglib -ltaglib \ -- -L../libs/yaml-cpp -lyaml-cpp \ -+ -L${LOCALBASE}/lib -ltag -lyaml-cpp \ - -L../libs/qtwaitingspinner -lqtwaitingspinner \ - -L../libs/qhotkey -lqhotkey - -@@ -191,5 +187,5 @@ RESOURCES += \ +@@ -205,7 +205,7 @@ RESOURCES += \ ../resources.qrc # make install -target.path = /usr/bin/ +target.path = $$PREFIX/bin/ INSTALLS += target + + TRANSLATIONS += \ diff --git a/audio/mpz/files/patch-app_coverart_embedded.cpp b/audio/mpz/files/patch-app_coverart_embedded.cpp deleted file mode 100644 index 3c0a2a5b7f8f..000000000000 --- a/audio/mpz/files/patch-app_coverart_embedded.cpp +++ /dev/null @@ -1,25 +0,0 @@ ---- app/coverart/embedded.cpp.orig 2021-12-08 11:38:42 UTC -+++ app/coverart/embedded.cpp -@@ -1,14 +1,14 @@ - #include "coverart/embedded.h" - - #include "tag.h" --#include "mp4/mp4file.h" --#include "mpeg/id3v2/id3v2.h" --#include "mpeg/id3v2/id3v2frame.h" --#include "mpeg/id3v2/frames/attachedpictureframe.h" --#include "mpeg/id3v2/id3v2tag.h" --#include "mpeg/mpegfile.h" --#include "flac/flacfile.h" --#include"flac/flacpicture.h" -+#include "mp4file.h" -+#include "id3v2.h" -+#include "id3v2frame.h" -+#include "attachedpictureframe.h" -+#include "id3v2tag.h" -+#include "mpegfile.h" -+#include "flacfile.h" -+#include "flacpicture.h" - #include "fileref.h" - #include "tag.h" - #include "tpropertymap.h" diff --git a/audio/mpz/files/patch-mpz.pro b/audio/mpz/files/patch-mpz.pro index c599bf0b3cf4..4bd016476340 100644 --- a/audio/mpz/files/patch-mpz.pro +++ b/audio/mpz/files/patch-mpz.pro @@ -1,14 +1,7 @@ ---- mpz.pro.orig 2020-10-22 11:15:32 UTC +--- mpz.pro.orig 2022-05-28 06:35:00 UTC +++ mpz.pro -@@ -2,39 +2,37 @@ TEMPLATE = subdirs - CONFIG += ordered - - SUBDIRS = \ -- libs/taglib \ -- libs/yaml-cpp \ - libs/qtwaitingspinner \ - libs/qhotkey \ - app +@@ -13,32 +13,32 @@ SUBDIRS += app + SUBDIRS += app # make install -desktop.path = /usr/share/applications/