diff options
author | ryoon <ryoon@pkgsrc.org> | 2015-02-25 23:40:35 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2015-02-25 23:40:35 +0000 |
commit | e71e2c8b9027b9506d8e7f31c61e993294b4306d (patch) | |
tree | a35371055cf11c0a4d34c90594cca9b4f75fbaad /audio/pulseaudio | |
parent | c2e01c10fbe6c6bf567fd668bb54443f46ca5a1d (diff) | |
download | pkgsrc-e71e2c8b9027b9506d8e7f31c61e993294b4306d.tar.gz |
Fix git spam in different way.
Previous fix by tnn@ requires devel/gettext-tools.
It is too heavy.
Diffstat (limited to 'audio/pulseaudio')
-rw-r--r-- | audio/pulseaudio/Makefile | 10 | ||||
-rw-r--r-- | audio/pulseaudio/distinfo | 4 | ||||
-rw-r--r-- | audio/pulseaudio/patches/patch-configure.ac | 31 |
3 files changed, 27 insertions, 18 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 19fde86847c..1b225bb528c 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.96 2015/02/25 12:27:13 tnn Exp $ +# $NetBSD: Makefile,v 1.97 2015/02/25 23:40:35 ryoon Exp $ DISTNAME= pulseaudio-6.0 CATEGORIES= audio @@ -14,7 +14,7 @@ LIBTOOL_REQD= 2.4 GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_TOOLS+= aclocal autoheader autoconf automake gmake gm4 intltool msgfmt pkg-config bash +USE_TOOLS+= aclocal autoheader autoconf automake gmake gm4 intltool msgfmt pkg-config USE_LANGUAGES= c c++ REPLACE_BASH= shell-completion/bash/pulseaudio git-version-gen @@ -103,9 +103,9 @@ PKG_GROUPS+= ${PULSE_GROUP_REALTIME} PKG_GROUPS+= ${PULSE_GROUP_ACCESS} PKG_USERS= ${PULSE_USER}:${PULSE_GROUP} -pre-configure: replace-interpreter - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoreconf -if - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} intltoolize -f +pre-configure: + set -e; cd ${WRKSRC}; \ + aclocal; autoheader; automake -a --foreign -i; autoconf .if ${OPSYS} != "Darwin" .include "../../sysutils/consolekit/buildlink3.mk" diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo index d55555f2068..fdb87602922 100644 --- a/audio/pulseaudio/distinfo +++ b/audio/pulseaudio/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.49 2015/02/21 23:13:10 ryoon Exp $ +$NetBSD: distinfo,v 1.50 2015/02/25 23:40:35 ryoon 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) = e5c90f38f3d06af64579176495a4023281ac0699 +SHA1 (patch-configure.ac) = 10f976daa163b985312d4dc29933e87cf2e89c96 SHA1 (patch-src_Makefile.am) = debe40be5d1155f6cb0d5ae90119dece4e090b02 SHA1 (patch-src_Makefile.in) = acbd3abee7225a7b3f1c422e30d9efe2adb1253c SHA1 (patch-src_daemon_caps.c) = e819c26cd3d91d93ae5877725ed6a1b59183d89a diff --git a/audio/pulseaudio/patches/patch-configure.ac b/audio/pulseaudio/patches/patch-configure.ac index cd1b2bb1e27..98ff6563eba 100644 --- a/audio/pulseaudio/patches/patch-configure.ac +++ b/audio/pulseaudio/patches/patch-configure.ac @@ -1,4 +1,4 @@ -$NetBSD: patch-configure.ac,v 1.4 2015/01/27 04:04:50 dbj Exp $ +$NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $ * Don't assume sys/capability.h is guaranteed present on Linux. * Fix NetBSD detection for libatomics_ops check. @@ -8,9 +8,18 @@ $NetBSD: patch-configure.ac,v 1.4 2015/01/27 04:04:50 dbj Exp $ file framework will install them in the right place. * Avoid hardcoded SDK paths on Darwin. ---- configure.ac.orig 2014-02-15 08:33:32.000000000 +0000 +--- configure.ac.orig 2015-02-12 14:10:35.000000000 +0000 +++ configure.ac -@@ -130,7 +130,6 @@ AC_MSG_CHECKING([host operating system]) +@@ -21,7 +21,7 @@ + + AC_PREREQ(2.63) + +-AC_INIT([pulseaudio],[m4_esyscmd(./git-version-gen .tarball-version)],[pulseaudio-discuss (at) lists (dot) freedesktop (dot) org],[pulseaudio],[http://pulseaudio.org/]) ++AC_INIT([pulseaudio],[6.0],[pulseaudio-discuss (at) lists (dot) freedesktop (dot) org],[pulseaudio],[http://pulseaudio.org/]) + AC_CONFIG_SRCDIR([src/daemon/main.c]) + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_HEADERS([config.h]) +@@ -133,7 +133,6 @@ AC_MSG_CHECKING([host operating system]) case "$host_os" in linux*) AC_MSG_RESULT([linux]) @@ -18,7 +27,7 @@ $NetBSD: patch-configure.ac,v 1.4 2015/01/27 04:04:50 dbj Exp $ os_is_linux=1 ;; freebsd*) -@@ -251,6 +250,11 @@ else +@@ -260,6 +259,11 @@ else # HW specific atomic ops stuff AC_MSG_CHECKING([architecture for native atomic operations]) case $host in @@ -30,7 +39,7 @@ $NetBSD: patch-configure.ac,v 1.4 2015/01/27 04:04:50 dbj Exp $ arm*) AC_MSG_RESULT([arm]) AC_MSG_CHECKING([whether we can use Linux kernel helpers]) -@@ -286,10 +290,6 @@ else +@@ -295,10 +299,6 @@ else ]) fi ;; @@ -41,7 +50,7 @@ $NetBSD: patch-configure.ac,v 1.4 2015/01/27 04:04:50 dbj Exp $ *-freebsd*) AC_MSG_RESULT([yes]) need_libatomic_ops=no -@@ -478,14 +478,14 @@ AS_IF([test "$pulseaudio_cv__Bool" = "ye +@@ -488,14 +488,14 @@ AS_IF([test "$pulseaudio_cv__Bool" = "ye #### Thread support #### AX_TLS @@ -58,7 +67,7 @@ $NetBSD: patch-configure.ac,v 1.4 2015/01/27 04:04:50 dbj Exp $ AC_DEFINE([_POSIX_PTHREAD_SEMANTICS], 1, [Needed on Solaris])) -@@ -512,15 +512,9 @@ AC_SEARCH_LIBS([backtrace], [execinfo ub +@@ -522,15 +522,9 @@ AC_SEARCH_LIBS([backtrace], [execinfo ub if test "x$os_is_darwin" = "x1" ; then AC_MSG_CHECKING([looking for Apple CoreService Framework]) # How do I check a framework "library" - AC_CHECK_LIB prob. won't work??, just assign LIBS & hope @@ -76,7 +85,7 @@ $NetBSD: patch-configure.ac,v 1.4 2015/01/27 04:04:50 dbj Exp $ AC_DEFINE([HAVE_CLOCK_GETTIME], 1, [Using clock_gettime() replacement]) HAVE_BONJOUR=1 fi -@@ -988,7 +982,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE +@@ -1001,7 +995,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE PA_MACHINE_ID="${sysconfdir}/machine-id" AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file]) @@ -85,7 +94,7 @@ $NetBSD: patch-configure.ac,v 1.4 2015/01/27 04:04:50 dbj Exp $ AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK, [Fallback machine-id file]) -@@ -1234,9 +1228,9 @@ fi +@@ -1309,9 +1303,9 @@ fi PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse" AX_DEFINE_DIR(PA_SYSTEM_RUNTIME_PATH, PA_SYSTEM_RUNTIME_PATH, [System runtime dir]) @@ -97,7 +106,7 @@ $NetBSD: patch-configure.ac,v 1.4 2015/01/27 04:04:50 dbj Exp $ AX_DEFINE_DIR(PA_SYSTEM_STATE_PATH, PA_SYSTEM_STATE_PATH, [System state dir]) PA_BINARY=${bindir}/pulseaudio${EXEEXT} -@@ -1248,8 +1242,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY +@@ -1323,8 +1317,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY AC_SUBST(PA_SOEXT, [.so]) AC_DEFINE(PA_SOEXT, [".so"], [Shared object extension]) @@ -109,7 +118,7 @@ $NetBSD: patch-configure.ac,v 1.4 2015/01/27 04:04:50 dbj Exp $ #### Mac OSX specific stuff ##### -@@ -1265,17 +1260,6 @@ AC_ARG_WITH(mac-sysroot, +@@ -1340,17 +1335,6 @@ AC_ARG_WITH(mac-sysroot, AS_HELP_STRING([--with-mac-sysroot=<path>], [SDK basedir to use as the logical root directory for headers and libraries.]), mac_sysroot=$withval, mac_sysroot="/Developer/SDKs/MacOSX10.5.sdk") |