From owner-dev-commits-ports-main@freebsd.org Tue Apr 13 09:06:29 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 72BD45D8AAC; Tue, 13 Apr 2021 09:06:29 +0000 (UTC) (envelope-from rhurlin@gwdg.de) Received: from imailer.gwdg.de (imailer.gwdg.de [134.76.11.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FKKTx1Jrkz4Tg9; Tue, 13 Apr 2021 09:06:28 +0000 (UTC) (envelope-from rhurlin@gwdg.de) Received: from excmbx-03.um.gwdg.de ([134.76.9.218] helo=email.gwdg.de) by mailer.gwdg.de with esmtp (GWDG Mailer) (envelope-from ) id 1lWF06-0004HB-QK; Tue, 13 Apr 2021 11:06:26 +0200 Received: from krabat.raven.hur (10.250.9.199) by EXCMBX-03.um.gwdg.de (134.76.9.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Tue, 13 Apr 2021 11:06:26 +0200 Subject: Re: git: 6dd01d1520ee - main - audio/pulseaudio: update the port to 14.2 To: Dima Panov References: <202104122310.13CNANa9099375@gitrepo.freebsd.org> <0c51e367-a4f3-4f5c-b335-3e63e30811de@Canary> CC: , , , Kevin Bowling Reply-To: From: Rainer Hurling Message-ID: Date: Tue, 13 Apr 2021 11:06:21 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.9.1 MIME-Version: 1.0 In-Reply-To: <0c51e367-a4f3-4f5c-b335-3e63e30811de@Canary> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 8bit X-Originating-IP: [10.250.9.199] X-ClientProxiedBy: excmbx-21.um.gwdg.de (134.76.9.231) To EXCMBX-03.um.gwdg.de (134.76.9.218) X-Virus-Scanned: (clean) by clamav X-Rspamd-Queue-Id: 4FKKTx1Jrkz4Tg9 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Apr 2021 09:06:29 -0000 Moin Dima, Am 13.04.21 um 10:50 schrieb Dima Panov: > Moin! > > > Kevin, did you run ‘poudriere testport’ before commit? It have a bad plist. > > package building without tests enabled will pass but priduce incomplete > package > > > ===>  Building package for pulseaudio-14.2 > pkg-static: Unable to access file > /wrkdirs/usr/ports/audio/pulseaudio/work/stage/usr/local/share/pulseaudio/alsa-mixer/paths/steelseries-arctis-5-output-chat.conf:No > such file or directory > pkg-static: Unable to access file > /wrkdirs/usr/ports/audio/pulseaudio/work/stage/usr/local/share/pulseaudio/alsa-mixer/paths/steelseries-arctis-5-output-game.conf:No > such file or directory > pkg-static: Unable to access file > /wrkdirs/usr/ports/audio/pulseaudio/work/stage/usr/local/share/pulseaudio/alsa-mixer/paths/steelseries-arctis-7-input.conf:No > such file or directory > pkg-static: Unable to access file > /wrkdirs/usr/ports/audio/pulseaudio/work/stage/usr/local/share/pulseaudio/alsa-mixer/paths/steelseries-arctis-7-output-mono.conf:No > such file or directory > pkg-static: Unable to access file > /wrkdirs/usr/ports/audio/pulseaudio/work/stage/usr/local/share/pulseaudio/alsa-mixer/paths/steelseries-arctis-7-output-stereo.conf:No > such file or directory > pkg-static: Unable to access file > /wrkdirs/usr/ports/audio/pulseaudio/work/stage/usr/local/share/pulseaudio/alsa-mixer/profile-sets/steelseries-arctis-5-usb-audio.conf:No > such file or directory > pkg-static: Unable to access file > /wrkdirs/usr/ports/audio/pulseaudio/work/stage/usr/local/share/pulseaudio/alsa-mixer/profile-sets/steelseries-arctis-7-usb-audio.conf:No > such file or directory > *** Error code 1 > > > --  > Dima. (desktop, kde, x11, office, ports-secteam)@FreeBSD team > (fluffy@FreeBSD.org, https://t.me/dima_panov) > > On Tuesday, Apr 13, 2021 at 9:10 AM, Kevin Bowling > > wrote: > The branch main has been updated by kbowling: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=6dd01d1520ee30194d0493c1dea31bc71a12151d > > > commit 6dd01d1520ee30194d0493c1dea31bc71a12151d > Author: Kevin Bowling > AuthorDate: 2021-04-12 22:50:11 +0000 > Commit: Kevin Bowling > CommitDate: 2021-04-12 23:09:54 +0000 > > audio/pulseaudio: update the port to 14.2 > > PR: 252957 > Reported by: Matthias Apitz > Reviewed by: daniel.engberg.lists@pyret.net > Approved by: tcberner (previous version) > Obtained from: > https://github.com/freebsd/freebsd-ports-kde/tree/pulseaudio-14 > --- > audio/pulseaudio/Makefile | 9 +++------ > audio/pulseaudio/distinfo | 4 ++-- > audio/pulseaudio/files/patch-src_pulsecore_atomic.h | 18 > +++++++++--------- > audio/pulseaudio/pkg-plist | 6 ++++-- > 4 files changed, 18 insertions(+), 19 deletions(-) > > diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile > index c8bd6229525f..649ae556d34c 100644 > --- a/audio/pulseaudio/Makefile > +++ b/audio/pulseaudio/Makefile > @@ -4,10 +4,9 @@ > # PORTREVISION bumps of depending ports. > > PORTNAME= pulseaudio > -PORTVERSION= 13.0 > -PORTREVISION= 2 > +DISTVERSION= 14.2 > CATEGORIES= audio > -MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/ > +MASTER_SITES= https://freedesktop.org/software/pulseaudio/releases/ > > MAINTAINER= desktop@FreeBSD.org > COMMENT= Sound server for UNIX > @@ -23,7 +22,7 @@ LIB_DEPENDS= libsndfile.so:audio/libsndfile \ > libltdl.so:devel/libltdl \ > libck-connector.so:sysutils/consolekit2 > > -USES= compiler:c11 cpe gettext gmake gnome iconv libtool \ > +USES= compiler:c11 cpe gettext gmake gnome iconv libtool > localbase:ldflags \ > pathfix pkgconfig python:run shebangfix ssl tar:xz xorg > > USE_GNOME= glib20 > @@ -35,8 +34,6 @@ CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" \ > OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \ > LIBS="-lm -lintl" \ > ac_cv_header_linux_input_h="" > -CPPFLAGS+= -I${LOCALBASE}/include > -LDFLAGS+= -L${LOCALBASE}/lib > INSTALL_TARGET= install-strip > > SHEBANG_FILES= shell-completion/bash/pulseaudio \ > diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo > index 94d6e430289a..57149305e726 100644 > --- a/audio/pulseaudio/distinfo > +++ b/audio/pulseaudio/distinfo > @@ -1,3 +1,3 @@ > TIMESTAMP = 1568380928 > -SHA256 (pulseaudio-13.0.tar.xz) = > 961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057 > -SIZE (pulseaudio-13.0.tar.xz) = 1901768 > +SHA256 (pulseaudio-14.2.tar.xz) = > 75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1 > +SIZE (pulseaudio-14.2.tar.xz) = 1951300 > diff --git a/audio/pulseaudio/files/patch-src_pulsecore_atomic.h > b/audio/pulseaudio/files/patch-src_pulsecore_atomic.h > index 342b1568af0c..a7304b23ca3e 100644 > --- a/audio/pulseaudio/files/patch-src_pulsecore_atomic.h > +++ b/audio/pulseaudio/files/patch-src_pulsecore_atomic.h > @@ -1,18 +1,19 @@ > ---- src/pulsecore/atomic.h.orig 2019-09-13 13:10:23 UTC > -+++ src/pulsecore/atomic.h > -@@ -117,7 +117,7 @@ static inline void* pa_atomic_ptr_load(c > +--- src/pulsecore/atomic.h.orig 2020-07-17 12:11:11.000000000 +0200 > ++++ src/pulsecore/atomic.h 2021-01-23 21:16:28.683759000 +0100 > +@@ -117,7 +117,7 @@ > } > > static inline void pa_atomic_ptr_store(pa_atomic_ptr_t *a, void* p) { > -- __atomic_store_n(&a->value, p, __ATOMIC_SEQ_CST); > -+ __atomic_store_n(&a->value, (uintptr_t)p, __ATOMIC_SEQ_CST); > +- __atomic_store_n(&a->value, (unsigned long) p, __ATOMIC_SEQ_CST); > ++ __atomic_store_n(&a->value, (uintptr_t) p, __ATOMIC_SEQ_CST); > } > > #else > -@@ -218,39 +218,6 @@ static inline bool pa_atomic_ptr_cmpxchg > +@@ -217,39 +217,6 @@ > + #include > #include > #include > - > +- > -#if __FreeBSD_version < 600000 > -#if defined(__i386__) || defined(__amd64__) > -#if defined(__amd64__) > @@ -45,7 +46,6 @@ > -} > -#endif > -#endif > -- > + > typedef struct pa_atomic { > volatile unsigned long value; > - } pa_atomic_t; > diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist > index 284cba2ab33f..c517247f348b 100644 > --- a/audio/pulseaudio/pkg-plist > +++ b/audio/pulseaudio/pkg-plist > @@ -63,13 +63,13 @@ lib/cmake/PulseAudio/PulseAudioConfig.cmake > lib/cmake/PulseAudio/PulseAudioConfigVersion.cmake > lib/libpulse-mainloop-glib.so > lib/libpulse-mainloop-glib.so.0 > -lib/libpulse-mainloop-glib.so.0.0.5 > +lib/libpulse-mainloop-glib.so.0.0.6 > lib/libpulse-simple.so > lib/libpulse-simple.so.0 > lib/libpulse-simple.so.0.1.1 > lib/libpulse.so > lib/libpulse.so.0 > -lib/libpulse.so.0.21.1 > +lib/libpulse.so.0.23.0 > %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so > lib/pulse-%%PULSE_VERSION%%/modules/module-allow-passthrough.so > lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so > @@ -242,6 +242,7 @@ share/zsh/site-functions/_pulseaudio > share/locale/af/LC_MESSAGES/pulseaudio.mo > share/locale/as/LC_MESSAGES/pulseaudio.mo > share/locale/be/LC_MESSAGES/pulseaudio.mo > +share/locale/bg/LC_MESSAGES/pulseaudio.mo > share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo > share/locale/ca/LC_MESSAGES/pulseaudio.mo > share/locale/cs/LC_MESSAGES/pulseaudio.mo > @@ -261,6 +262,7 @@ share/locale/hu/LC_MESSAGES/pulseaudio.mo > share/locale/id/LC_MESSAGES/pulseaudio.mo > share/locale/it/LC_MESSAGES/pulseaudio.mo > share/locale/ja/LC_MESSAGES/pulseaudio.mo > +share/locale/kk/LC_MESSAGES/pulseaudio.mo > share/locale/kn/LC_MESSAGES/pulseaudio.mo > share/locale/ko/LC_MESSAGES/pulseaudio.mo > share/locale/lt/LC_MESSAGES/pulseaudio.mo > I sent a patch in the original, now closed PR [1], which works for me. [1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252957#c15