From nobody Thu Apr 27 12:04:16 2023 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 4Q6ZCj23F5z474PJ; Thu, 27 Apr 2023 12:04:17 +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 4Q6ZCj1KP6z3m7C; Thu, 27 Apr 2023 12:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597057; 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=aUQin5D0hZoGJ7sv1MdcG85HZlgZXOqj/oUUm6pdq2Y=; b=U+gS+RjbyrD7lDax5+AzOmOi8O7Nq++1HhWtP2bc7crTUIJlCEnlMgrvsYW+GTIb2xM83j 0aQYug3K6RMaOygZ6lSqke9PmizE9htcdc7Y4kDEf1HWBtQPUvI6UsK694BoDYyxEQ/bE3 PB+8AdCGeFJWjhPDCceR5gqQ6STeQ30jenSgx45xNMtlWpkgOC6tVR270D+nLSR+zp9fCR kw9ipxyHlB7W878yo8Xt3r5KpHbLDymO+aQa4OgL+LbHiY55aYcmFm1fIHWE+Xb58I+WqL 5nK4+krigUZ7Rbytqz03EHzYE1BAVFmxW+2TmBXmw21AKCFHFoRv9IjL8YgwbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597057; 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=aUQin5D0hZoGJ7sv1MdcG85HZlgZXOqj/oUUm6pdq2Y=; b=ViAIaFWrNGKC1S9qmiklmuISOgZNYjjjWr+VGNyXkx5/FPo9TZPT/uH/EWshPQ/Pr+nxHD Mbyn2qtTFDMmb2fhiNacElPaVd1VBsVbrzNS6M/B4blVHRw9/SWnQ+l/lVXm6PeQ1ghtWX +Z5Aw+zoE1gGewnLoL/SQIPMlw8L2P4UwPfclpM36MKeW8xWKBjrAvl5O3FwYVjR8mW/or cfJqqyl07KK4Ig9IW95590M9/spxVq2Vt2f6YvYPx1PFA7IS+hOWtRw5Fq6LwKWMhBHZvv ueK7hzyLpVNQkd4HkxsWtFuAqxPChC4oenCXhR3sWsGaVCB6azJWJ2SjLphkUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597057; a=rsa-sha256; cv=none; b=TPfDYm/GVtc9ulu7IdR5pHOczBkxlN+mLpyjP5hKV4ZlRcriiPUpYccgUCPrePOwuvVCIM jxDc6/Avo1ExSQnHjXRTRNCPjOT9oLKaYCrB16/uV84yx1a9y/WYpj9ehzIcvrz0c7x+Qq cn6l2huDTYOntTK4PVCdtA9Z8IJ7Zlas5WBLlvXWSStHwBkMMWxMbvVqtYsbeRBZ339PFK RCxT1jd1QcdGHKHR7v6FKX49wQH2YnnfgUAlOIf8f/Q0iAVlc9kkbRYqDcVnVSXCUBCHwk MWdxX07Q05i9Y/YKUs9sBK+C66AlZv1UZ7CGwfAvvEufR/4P9nW4LS9+NMUf+w== 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 4Q6ZCj0LKQzH13; Thu, 27 Apr 2023 12:04:17 +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 33RC4Gia046493; Thu, 27 Apr 2023 12:04:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC4GfY046492; Thu, 27 Apr 2023 12:04:16 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:04:16 GMT Message-Id: <202304271204.33RC4GfY046492@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: 947cc0959eb7 - main - audio/spek: Update to 0.8.5 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 947cc0959eb798fb353dbc6096f53233631fd57d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=947cc0959eb798fb353dbc6096f53233631fd57d commit 947cc0959eb798fb353dbc6096f53233631fd57d Author: Daniel Engberg AuthorDate: 2023-04-27 10:34:36 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:44 +0000 audio/spek: Update to 0.8.5 Fixes build with FFmpeg 6 Changelog: https://github.com/alexkay/spek/releases/tag/v0.8.5 PR: 270193 Approved by: portmgr (maintainer timeout, 1+ month) --- audio/spek/Makefile | 15 +++------ audio/spek/distinfo | 5 +-- audio/spek/files/patch-src_spek-audio.cc | 58 -------------------------------- audio/spek/pkg-plist | 14 ++++++++ 4 files changed, 22 insertions(+), 70 deletions(-) diff --git a/audio/spek/Makefile b/audio/spek/Makefile index d71e1e24fe63..55e0baae5ee2 100644 --- a/audio/spek/Makefile +++ b/audio/spek/Makefile @@ -1,8 +1,7 @@ PORTNAME= spek -PORTVERSION= 0.8.2 -PORTREVISION= 18 +DISTVERSION= 0.8.5 CATEGORIES= audio -MASTER_SITES= https://github.com/alexkay/${PORTNAME}/releases/download/v${PORTVERSION}/ +MASTER_SITES= https://github.com/alexkay/${PORTNAME}/releases/download/v${DISTVERSION}/ MAINTAINER= alexander@kojevnikov.com COMMENT= Acoustic spectrum analyser @@ -12,10 +11,10 @@ LICENSE= GPLv3+ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg -USES= compiler:c++11-lib desktop-file-utils gmake gnome pkgconfig \ - tar:xz +USES= compiler:c++11-lib desktop-file-utils gmake gnome \ + localbase:ldflags pkgconfig tar:xz USE_GNOME= intltool -USE_WX= 3.0 +USE_WX= 3.2+ WX_CONF_ARGS= absolute GNU_CONFIGURE= yes @@ -24,8 +23,4 @@ OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -post-patch: - @${REINPLACE_CMD} -e "s,^itlocaledir =.*$$,itlocaledir = ${PREFIX}/share/locale,g" \ - ${WRKSRC}/po/Makefile.in.in - .include diff --git a/audio/spek/distinfo b/audio/spek/distinfo index dbbfeb6bc6bf..be19f0b996ac 100644 --- a/audio/spek/distinfo +++ b/audio/spek/distinfo @@ -1,2 +1,3 @@ -SHA256 (spek-0.8.2.tar.xz) = 59f69b41155ee1a4552eb9f66b602fc059de8f31e3f05889f24d362b3e6c78ae -SIZE (spek-0.8.2.tar.xz) = 171628 +TIMESTAMP = 1678742866 +SHA256 (spek-0.8.5.tar.xz) = 1bccf85a14a01af8f2f30476cbad004e8bf6031f500e562bbe5bbd1e5eb16c59 +SIZE (spek-0.8.5.tar.xz) = 430464 diff --git a/audio/spek/files/patch-src_spek-audio.cc b/audio/spek/files/patch-src_spek-audio.cc deleted file mode 100644 index b2fa0fad9051..000000000000 --- a/audio/spek/files/patch-src_spek-audio.cc +++ /dev/null @@ -1,58 +0,0 @@ -Fix build with ffmpeg 3.x. - ---- src/spek-audio.cc.orig 2016-12-28 01:32:07 UTC -+++ src/spek-audio.cc -@@ -199,7 +199,7 @@ AudioFileImpl::AudioFileImpl( - this->packet.data = nullptr; - this->packet.size = 0; - this->offset = 0; -- this->frame = avcodec_alloc_frame(); -+ this->frame = av_frame_alloc(); - this->buffer_size = 0; - this->buffer = nullptr; - this->frames_per_interval = 0; -@@ -215,7 +215,7 @@ AudioFileImpl::~AudioFileImpl() - if (this->frame) { - // TODO: Remove this check after Debian switches to libav 9. - #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0) -- avcodec_free_frame(&this->frame); -+ av_frame_free(&this->frame); - #else - av_freep(&this->frame); - #endif -@@ -224,7 +224,7 @@ AudioFileImpl::~AudioFileImpl() - this->packet.data -= this->offset; - this->packet.size += this->offset; - this->offset = 0; -- av_free_packet(&this->packet); -+ av_packet_unref(&this->packet); - } - if (this->format_context) { - if (this->audio_stream >= 0) { -@@ -255,7 +255,7 @@ int AudioFileImpl::read() - - for (;;) { - while (this->packet.size > 0) { -- avcodec_get_frame_defaults(this->frame); -+ av_frame_unref(this->frame); - auto codec_context = this->format_context->streams[this->audio_stream]->codec; - int got_frame = 0; - int len = avcodec_decode_audio4(codec_context, this->frame, &got_frame, &this->packet); -@@ -299,7 +299,7 @@ int AudioFileImpl::read() - this->packet.data -= this->offset; - this->packet.size += this->offset; - this->offset = 0; -- av_free_packet(&this->packet); -+ av_packet_unref(&this->packet); - } - - int res = 0; -@@ -307,7 +307,7 @@ int AudioFileImpl::read() - if (this->packet.stream_index == this->audio_stream) { - break; - } -- av_free_packet(&this->packet); -+ av_packet_unref(&this->packet); - } - if (res < 0) { - // End of file or error. diff --git a/audio/spek/pkg-plist b/audio/spek/pkg-plist index 7800824366ea..c4ec36e35814 100644 --- a/audio/spek/pkg-plist +++ b/audio/spek/pkg-plist @@ -7,21 +7,35 @@ share/icons/hicolor/24x24/apps/spek.png share/icons/hicolor/32x32/apps/spek.png share/icons/hicolor/48x48/apps/spek.png share/icons/hicolor/scalable/apps/spek.svg +%%NLS%%share/locale/bs/LC_MESSAGES/spek.mo +%%NLS%%share/locale/ca/LC_MESSAGES/spek.mo %%NLS%%share/locale/cs/LC_MESSAGES/spek.mo %%NLS%%share/locale/da/LC_MESSAGES/spek.mo %%NLS%%share/locale/de/LC_MESSAGES/spek.mo +%%NLS%%share/locale/el/LC_MESSAGES/spek.mo %%NLS%%share/locale/eo/LC_MESSAGES/spek.mo %%NLS%%share/locale/es/LC_MESSAGES/spek.mo +%%NLS%%share/locale/fi/LC_MESSAGES/spek.mo %%NLS%%share/locale/fr/LC_MESSAGES/spek.mo +%%NLS%%share/locale/gl/LC_MESSAGES/spek.mo +%%NLS%%share/locale/he/LC_MESSAGES/spek.mo +%%NLS%%share/locale/hr/LC_MESSAGES/spek.mo +%%NLS%%share/locale/hu/LC_MESSAGES/spek.mo %%NLS%%share/locale/it/LC_MESSAGES/spek.mo %%NLS%%share/locale/ja/LC_MESSAGES/spek.mo +%%NLS%%share/locale/ko/LC_MESSAGES/spek.mo +%%NLS%%share/locale/lv/LC_MESSAGES/spek.mo %%NLS%%share/locale/nb/LC_MESSAGES/spek.mo +%%NLS%%share/locale/nn/LC_MESSAGES/spek.mo %%NLS%%share/locale/nl/LC_MESSAGES/spek.mo %%NLS%%share/locale/pl/LC_MESSAGES/spek.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/spek.mo %%NLS%%share/locale/ru/LC_MESSAGES/spek.mo +%%NLS%%share/locale/sk/LC_MESSAGES/spek.mo +%%NLS%%share/locale/sr@latin/LC_MESSAGES/spek.mo %%NLS%%share/locale/sv/LC_MESSAGES/spek.mo %%NLS%%share/locale/tr/LC_MESSAGES/spek.mo +%%NLS%%share/locale/th/LC_MESSAGES/spek.mo %%NLS%%share/locale/uk/LC_MESSAGES/spek.mo %%NLS%%share/locale/vi/LC_MESSAGES/spek.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/spek.mo