(Makefile)

- Drop - libsamplerate: said as (DEPRECATED)
 - Add orc buildlink3.mk
 - Add DEPENDS+= to libasyncns
 - Add REPLACE_PYTHON= src/utils/qpaeq
 - Add include "lang/python/application.mk"

(options.mk, new options)
 - Enable GConf
 - Enable jack
 - Enable fftw

(PLIST.fftw, PLIST.jack, PLIST.gconf)
 - New files
This commit is contained in:
Makoto Fujiwara 2015-03-22 14:16:50 +00:00 committed by Thomas Klausner
parent 7a518181fd
commit a3d63eea3b
7 changed files with 71 additions and 38 deletions

15
pulseaudio/COMMIT_MSG Normal file
View file

@ -0,0 +1,15 @@
(Makefile)
- Drop - libsamplerate: said as (DEPRECATED)
- Add orc buildlink3.mk
- Add DEPENDS+= to libasyncns
- Add REPLACE_PYTHON= src/utils/qpaeq
- Add include "lang/python/application.mk"
(options.mk, new options)
- Enable GConf
- Enable jack
- Enable fftw
(PLIST.fftw, PLIST.jack, PLIST.gconf)
- New files

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.16 2015/03/22 09:31:40 makoto Exp $
# $NetBSD: Makefile,v 1.17 2015/03/22 14:16:50 makoto Exp $
DISTNAME= pulseaudio-6.0
CATEGORIES= audio
@ -18,6 +18,10 @@ USE_TOOLS+= aclocal autoheader autoconf automake gmake gm4 intltool msgfmt pkg-c
USE_LANGUAGES= c c++
REPLACE_BASH= shell-completion/bash/pulseaudio git-version-gen
REPLACE_PYTHON= src/utils/qpaeq
# Async DNS
DEPENDS+= libasyncns-[0-9]*:../../net/libasyncns
.include "../../mk/bsd.prefs.mk"
# Some tests are incompatible for NetBSD at least
@ -42,7 +46,8 @@ MAKE_ENV+= EGDIR=${EGDIR}
MAKE_FLAGS+= bashcompletiondir=${PREFIX}/share/bash-completion/completions
CONFIGURE_ARGS+= --enable-samplerate
# /usr/lib/libwrap.so: undefined reference to `deny_severity'
# /usr/lib/libwrap.so: undefined reference to `allow_severity'
CONFIGURE_ARGS+= --disable-tcpwrap
CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
@ -110,12 +115,13 @@ pre-configure:
.if ${OPSYS} != "Darwin"
.include "../../sysutils/consolekit/buildlink3.mk"
.endif
.include "../../audio/libsamplerate/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../audio/speexdsp/buildlink3.mk"
.include "../../databases/gdbm/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
.include "../../devel/orc/buildlink3.mk"
.include "../../lang/python/application.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../security/policykit/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"

View file

@ -23,9 +23,9 @@
Enable WaveOut: no
Enable GLib 2.0: yes
Enable Gtk+ 3.0: no
Enable GConf: no
Enable GConf: yes
Enable Avahi: yes
Enable Jack: no
Enable Jack: yes
Enable Async DNS: no
Enable LIRC: no
Enable Xen PV driver: no
@ -41,11 +41,11 @@
Login (Session Tracking): no
Journal (Logging): no
Enable TCP Wrappers: no
Enable libsamplerate: yes (DEPRECATED)
Enable libsamplerate: no
Enable IPv6: yes
Enable OpenSSL (for Airtunes): yes
Enable fftw: no
Enable orc: no
Enable fftw: yes
Enable orc: yes
Enable Adrian echo canceller: yes
Enable speex (resampler, AEC): yes
Enable WebRTC echo canceller: no

View file

@ -1,10 +1,11 @@
$NetBSD: distinfo,v 1.16 2015/03/22 09:31:40 makoto Exp $
$NetBSD: distinfo,v 1.17 2015/03/22 14:16:50 makoto Exp $
SHA1 (pulseaudio-6.0.tar.xz) = 3607d523fb270d9b68463de30f5d9e17957f1088
RMD160 (pulseaudio-6.0.tar.xz) = a3f96cabc2872646c34ba581d6044dc4a6513fd9
Size (pulseaudio-6.0.tar.xz) = 1469248 bytes
SHA1 (patch-aa) = 4e8a38810453d0efad287528b7f18c056a5cdd8b
SHA1 (patch-configure.ac) = 10f976daa163b985312d4dc29933e87cf2e89c96
SHA1 (patch-configure_ac) = ea98bafbc739eba77642d6ca24823da85eed755a
SHA1 (patch-src_Makefile.am) = debe40be5d1155f6cb0d5ae90119dece4e090b02
SHA1 (patch-src_Makefile.in) = acbd3abee7225a7b3f1c422e30d9efe2adb1253c
SHA1 (patch-src_daemon_caps.c) = e819c26cd3d91d93ae5877725ed6a1b59183d89a
@ -12,7 +13,7 @@ SHA1 (patch-src_daemon_main.c) = 8cdabd3c631cc5e7c7f370e364d9511b23f88668
SHA1 (patch-src_modules_module-detect.c) = 25c803ee2d5addf9dbf522d81bd422dc201d4550
SHA1 (patch-src_modules_module-solaris.c) = 03ea8912da4bb76294ca23271e47d40a8c9a61a7
SHA1 (patch-src_modules_oss_module-oss.c) = 399ac178ae832619253ce8dd985edbed23db86e7
SHA1 (patch-src_pulsecore_mix__neon.c) = 6f6d33d38024d65045d637d48276e1ba92b81342
SHA1 (patch-src_pulsecore_mix__neon.c) = 4e807415c1ba914a40beac953b5cbd781d2355fe
SHA1 (patch-src_pulsecore_sample-util.h) = b6bd83cfdc1c337453d9a728f07205a2cf0af831
SHA1 (patch-src_pulsecore_svolume__mmx.c) = c34d153e3bfdb812eb7bd70fa330a9ec674c2dc2
SHA1 (patch-src_pulsecore_svolume__sse.c) = 47c97c1af947133f2a7b330aed38792bb0e7ef09

View file

@ -1,11 +1,12 @@
# $NetBSD: options.mk,v 1.5 2014/01/19 14:42:14 makoto Exp $
# $NetBSD: options.mk,v 1.6 2015/03/22 14:16:50 makoto Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.pulseaudio
PKG_SUPPORTED_OPTIONS= avahi x11
PKG_SUGGESTED_OPTIONS= avahi x11
PKG_SUPPORTED_OPTIONS= avahi x11 fftw gconf jack
PKG_SUGGESTED_OPTIONS= avahi x11 fftw gconf jack
PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
.include "../../mk/bsd.options.mk"
PLIST_SRC+= ${PKGDIR}/PLIST
###
### avahi
###
@ -16,6 +17,36 @@ PLIST.avahi= yes
CONFIGURE_ARGS+= --disable-avahi
.endif
###
### fftw ( buildlink to fftwf )
###
.if !empty(PKG_OPTIONS:Mfftw)
.include "../../math/fftwf/buildlink3.mk"
PLIST_SRC+= ${PKGDIR}/PLIST.fftwf
.else
CONFIGURE_ARGS+= --disable-fftw
.endif
###
### gconf
###
.if !empty(PKG_OPTIONS:Mgconf)
.include "../../devel/GConf/buildlink3.mk"
PLIST_SRC+= ${PKGDIR}/PLIST.gconf
.else
CONFIGURE_ARGS+= --disable-gconf
.endif
###
### jack
###
.if !empty(PKG_OPTIONS:Mjack)
.include "../../audio/jack/buildlink3.mk"
PLIST_SRC+= ${PKGDIR}/PLIST.jack
.else
CONFIGURE_ARGS+= --disable-jack
.endif
###
### X11
###

View file

@ -1,24 +0,0 @@
$NetBSD: patch-configure,v 1.6 2014/11/24 22:40:15 makoto Exp $
ERROR: [check-portability.awk]
--- configure~ 2014-11-25 01:15:48.000000000 +0900
+++ configure 2014-11-25 01:16:48.000000000 +0900
@@ -21249,7 +21249,7 @@ _ACEOF
fi
-if test "$ac_cv_tls" == "__thread"; then :
+if test "$ac_cv_tls" = "__thread"; then :
$as_echo "#define SUPPORT_TLS___THREAD 1" >>confdefs.h
@@ -21670,7 +21670,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-if test "x$ax_pthread_ok" == "xyes"; then :
+if test "x$ax_pthread_ok" = "xyes"; then :
$as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h

View file

@ -1,4 +1,8 @@
$NetBSD: patch-src_pulsecore_mix__neon.c,v 1.1 2015/03/22 09:31:40 makoto Exp $
$NetBSD: patch-src_pulsecore_mix__neon.c,v 1.2 2015/03/22 14:16:50 makoto Exp $
Use NEON intrinsics in Clang to avoid the unsupported assembler
modifiers. It is beyond common sense why pulseaudio devs considered the
mechanical conversion to inline asm an improvement...
--- src/pulsecore/mix_neon.c.orig 2015-02-25 15:03:12.000000000 +0000
+++ src/pulsecore/mix_neon.c