Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Apr 2021 23:10:23 GMT
From:      Kevin Bowling <kbowling@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 6dd01d1520ee - main - audio/pulseaudio: update the port to 14.2
Message-ID:  <202104122310.13CNANa9099375@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by kbowling:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6dd01d1520ee30194d0493c1dea31bc71a12151d

commit 6dd01d1520ee30194d0493c1dea31bc71a12151d
Author:     Kevin Bowling <kbowling@FreeBSD.org>
AuthorDate: 2021-04-12 22:50:11 +0000
Commit:     Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2021-04-12 23:09:54 +0000

    audio/pulseaudio: update the port to 14.2
    
    PR:             252957
    Reported by:    Matthias Apitz <guru@unixarea.de>
    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 <sys/types.h>
  #include <sys/param.h>
  #include <machine/atomic.h>
- 
+-
 -#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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104122310.13CNANa9099375>