From nobody Fri Dec 08 07:42:07 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 4SmjlM5whGz53WfB; Fri, 8 Dec 2023 07:42:07 +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 4SmjlM58sTz3RnG; Fri, 8 Dec 2023 07:42:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702021327; 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=uMfG/ck+C1TbXMB+7uccfVvedS6Ucyy5D+2V5CTKAbs=; b=rZp9BupfD2eTyUkdywWpLcjk2agjKIr0TjUYY76B1tGNmjde3Xvog8/OOcSYdrskOrmujg uJ+W6VWAo4o1qf1FpW5TZ7Q/6Z1sAyUkvRCTDorAWsShT9Cc+9y5S4Nsx0FxhXBrq0BOph /a6Z5KdrrHD8r+pCLxY04Sj6DtO9RZeHP81j30LmhXRmctw0ELdZSmcwxUjK7AfxG8ad3w JjCx/Odl4uIPHKw4Bkeu8cH5jGUssZD2LR75YMWtsICQbJFodJJGRUB2shwzd3DQkdVY5S R1eWWkCfMNG8Y3Mi+iw2fbuNvh0LCgYdTGq8CWlYJ8f+Y5PqQ/T9QjImSfGDGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702021327; a=rsa-sha256; cv=none; b=fnbGY79RaATl3GyPRM2OTfP2JJDyK4/Jdi9BKUeQFexsIsCYfqLo4q/iIK2048YWVg3+8r XPJEZNxKzZtSjR4HW2ZFrZGECgAKnyb/Kf0k/uKcB80okOHXSCP/34LODmq8Ldur97rREn xTN6D1r4vVF4PHTStnMBw69DjORT+eQiCoTlcrXZESD1bxBR5h6HM0JUKVr6ThPQ59ROya 6vbM3BiTvSqpquJRoEZBkjuSdyf2M3aoMXklPQIQrv/j0GtYZXaiEDUnkbC1sqROjYfhIG PpTUOfhC06mvcre9MC1y04xpzmlT1SY3NTGYD/KGv6F2Jb9w2VzNmUHFSUwLAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702021327; 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=uMfG/ck+C1TbXMB+7uccfVvedS6Ucyy5D+2V5CTKAbs=; b=HRl8lvLcEsU2Nwn9S9nwQmn/VNK0LpXlUq+ptoOqHsSyh4EPledlQZAJiTVBX0Rnh4tAj3 8gfg7LnRBERpj6TVjGb4jnm68sRdWhZ9JbF8wD3ZWFH1HyY4xLUlwvt6GNHYEEbyRAecdu izoXjcUL0h5J2LaUt30EQc0/aybF2g9Hv+e6ivmbWjvKG8WIc5dxpst0ZgbF3p9ZenPj/M l2cxmLoLOf4CpIwBaIa2c8brlnj8HslWYtzGyFZrbAjQz9qevNDUIBHGKh8rOEyeGj5o96 CWy0DsGS0rmSVfnfKt/pJxkfKwfzfLshiHtwiwCnvKPR+UMdsKYHWRWoNVXhKg== 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 4SmjlM4FgRz1Bby; Fri, 8 Dec 2023 07:42:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B87g7kA078626; Fri, 8 Dec 2023 07:42:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B87g7nk078623; Fri, 8 Dec 2023 07:42:07 GMT (envelope-from git) Date: Fri, 8 Dec 2023 07:42:07 GMT Message-Id: <202312080742.3B87g7nk078623@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rodrigo Osorio Subject: git: 6dfdfcacf42d - 2023Q4 - audio/lmms: Fix plist 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: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 6dfdfcacf42d2127429c3cd0c08ead428685dedd Auto-Submitted: auto-generated The branch 2023Q4 has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=6dfdfcacf42d2127429c3cd0c08ead428685dedd commit 6dfdfcacf42d2127429c3cd0c08ead428685dedd Author: Rodrigo Osorio AuthorDate: 2023-11-02 10:28:50 +0000 Commit: Rodrigo Osorio CommitDate: 2023-12-08 07:34:35 +0000 audio/lmms: Fix plist Remove missing libgigplayer.so file from plist Add missing dependecy to audio/lame reported by testport Do some cleanup to make linters happy. PR: 263355 Reported by: Alastair Hogge (cherry picked from commit 11b1ba4c7ae5ba77ace0a8dacb5140ecaa60bceb) --- audio/lmms/Makefile | 38 +++++++++++++++++--------------------- audio/lmms/pkg-plist | 1 - 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile index a856b1797fc0..93e0cf90db53 100644 --- a/audio/lmms/Makefile +++ b/audio/lmms/Makefile @@ -1,7 +1,7 @@ PORTNAME= lmms DISTVERSIONPREFIX= v DISTVERSION= 1.2.2 -PORTREVISION= 8 +PORTREVISION= 9 PORTEPOCH= 2 CATEGORIES= audio @@ -13,21 +13,22 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa -LIB_DEPENDS= libFLAC.so:audio/flac \ - libfluidsynth.so:audio/fluidsynth \ - libfontconfig.so:x11-fonts/fontconfig \ - libsamplerate.so:audio/libsamplerate \ - libsndfile.so:audio/libsndfile \ - libvorbis.so:audio/libvorbis \ - libogg.so:audio/libogg \ +LIB_DEPENDS= libcarla_utils.so:audio/carla \ libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ + libFLAC.so:audio/flac \ libfltk.so:x11-toolkits/fltk \ - libcarla_utils.so:audio/carla \ + libfluidsynth.so:audio/fluidsynth \ + libfontconfig.so:x11-fonts/fontconfig \ + libmp3lame.so:audio/lame \ + libogg.so:audio/libogg \ + libQt5X11Extras.so:x11/qt5-x11extras \ libQt5Xml.so:textproc/qt5-xml \ - libQt5X11Extras.so:x11/qt5-x11extras -RUN_DEPENDS= ${LOCALBASE}/share/ladspa/rdf/caps.rdf:audio/caps-plugins \ - ${LOCALBASE}/lib/ladspa/cmt.so:audio/cmt \ + libsamplerate.so:audio/libsamplerate \ + libsndfile.so:audio/libsndfile \ + libvorbis.so:audio/libvorbis +RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/cmt.so:audio/cmt \ + ${LOCALBASE}/share/ladspa/rdf/caps.rdf:audio/caps-plugins \ ${LOCALBASE}/share/ladspa/rdf/swh-plugins.rdf:audio/swhplugins \ ${LOCALBASE}/share/ladspa/rdf/tap-plugins.rdf:audio/tap-plugins @@ -38,14 +39,15 @@ GH_ACCOUNT= LMMS GH_TUPLE= mjansson:rpmalloc:1.4.0:rpmalloc/src/3rdparty/rpmalloc/rpmalloc \ lukas-w:qt5-x11embed:ec77d4ba40bebc0c53a016adb646b6fa65dd5faf:qt5x11embed/src/3rdparty/qt5-x11embed USE_LDCONFIG= yes -USE_QT= core gui widgets x11extras xml buildtools:build linguisttools:build qmake:build +USE_QT= core gui widgets x11extras xml buildtools:build \ + linguisttools:build qmake:build USE_XORG= xcursor xext xfixes xft xinerama xrender CMAKE_ON= WANT_QT5 -CMAKE_OFF= WANT_ALSA WANT_CALF WANT_CAPS WANT_CMT WANT_SWH WANT_STK \ +CMAKE_OFF= WANT_ALSA WANT_CALF WANT_CAPS WANT_CMT WANT_STK WANT_SWH \ WANT_TAP WANT_VST -OPTIONS_DEFINE= OSS JACK PULSEAUDIO PORTAUDIO SDL SNDIO +OPTIONS_DEFINE= JACK OSS PORTAUDIO PULSEAUDIO SDL SNDIO OPTIONS_DEFAULT= OSS JACK_LIB_DEPENDS= libjack.so:audio/jack @@ -62,12 +64,6 @@ SNDIO_CMAKE_BOOL= WANT_SNDIO .include -.if ${ARCH} == amd64 || ${ARCH} == i386 -PLIST_SUB= LINUXSAMPLER="" -.else -PLIST_SUB= LINUXSAMPLER="@comment " -.endif - post-patch: @${REINPLACE_CMD} 's|/usr|${LOCALBASE}|g' ${WRKSRC}/src/core/ConfigManager.cpp @${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' \ diff --git a/audio/lmms/pkg-plist b/audio/lmms/pkg-plist index 647a1d02fe59..0daa909e3f2c 100644 --- a/audio/lmms/pkg-plist +++ b/audio/lmms/pkg-plist @@ -246,7 +246,6 @@ lib/lmms/libdualfilter.so lib/lmms/libdynamicsprocessor.so lib/lmms/libeq.so lib/lmms/libflanger.so -%%LINUXSAMPLER%%lib/lmms/libgigplayer.so lib/lmms/libhydrogenimport.so lib/lmms/libkicker.so lib/lmms/libladspabrowser.so