summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorjperkin <jperkin>2016-06-03 15:45:43 +0000
committerjperkin <jperkin>2016-06-03 15:45:43 +0000
commit4eda22612e62feb9327d62943ae3f1b7aa6cc864 (patch)
tree449a2e7e036657f655ef8bbbf0f753c434bc47ff /audio
parentc6b02bc2cba1073033207fc920d440135b6dd74b (diff)
downloadpkgsrc-4eda22612e62feb9327d62943ae3f1b7aa6cc864.tar.gz
Fix build on SunOS.
Diffstat (limited to 'audio')
-rw-r--r--audio/alsa-lib/Makefile11
-rw-r--r--audio/alsa-lib/distinfo4
-rw-r--r--audio/alsa-lib/patches/patch-ae23
3 files changed, 28 insertions, 10 deletions
diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index 20190515f25..8ce7017da1e 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/04/15 08:47:50 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2016/06/03 15:45:43 jperkin Exp $
DISTNAME= alsa-lib-1.1.1
CATEGORIES= audio
@@ -11,6 +11,7 @@ COMMENT= Advanced Linux Sound Architecture (ALSA)
LICENSE= gnu-lgpl-v2.1
GNU_CONFIGURE= yes
+USE_LANGUAGES= c99
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config gmake
@@ -18,17 +19,17 @@ PKGCONFIG_OVERRIDE+= utils/alsa.pc.in
CONFIGURE_ARGS+= --disable-python
-LIBS.SunOS+= -lsocket -lnsl
-CPPFLAGS.SunOS+= -std=c99 -D_POSIX_C_SOURCE=200112L
CPPFLAGS.SunOS+= -D__EXTENSIONS__ -DBSD_COMP -DMAP_FILE=0
+CPPFLAGS.SunOS+= -D_XOPEN_SOURCE=600
CPPFLAGS.SunOS+= -Du_int8_t=uint8_t -Du_int16_t=uint16_t
CPPFLAGS.SunOS+= -Du_int32_t=uint32_t -Du_int64_t=uint64_t
-CPPFLAGS.SunOS+= -D__u32=uint32_t -D__u64=uint64_t
-CPPFLAGS.SunOS+= -Dbswap_64=BSWAP_64 -Dbswap_32=BSWAP_32 -Dbswap_16=BSWAP_16
+CPPFLAGS.SunOS+= -D__u32=uint32_t -D__u64=uint64_t
CPPFLAGS.NetBSD+= -D__u32=uint32_t -D__u64=uint64_t
CPPFLAGS.FreeBSD+= -D__u32=uint32_t -D__u64=uint64_t
+LIBS.SunOS+= -lsocket -lnsl
+
CONFIGURE_ARGS.SunOS+= --without-versioned
BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=Versions
diff --git a/audio/alsa-lib/distinfo b/audio/alsa-lib/distinfo
index 7d064444384..0d84a6b943a 100644
--- a/audio/alsa-lib/distinfo
+++ b/audio/alsa-lib/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.21 2016/04/15 08:47:50 wiz Exp $
+$NetBSD: distinfo,v 1.22 2016/06/03 15:45:43 jperkin Exp $
SHA1 (alsa-lib-1.1.1.tar.bz2) = 09f7e9b2d88287e04a4bb0d56e0cbc9018e524ec
RMD160 (alsa-lib-1.1.1.tar.bz2) = 619a6c224cb52b9013e59c2f167e4375651ae03e
SHA512 (alsa-lib-1.1.1.tar.bz2) = dacd0a74adc682ac0034cbeba2de3d1a141e0ac2e564c9e04dae202ffaf87ef3a1e01307afc2fd2d9cfe679e5b101c379f9b6ea5f7ccceeed14a427bd5232bc7
Size (alsa-lib-1.1.1.tar.bz2) = 932105 bytes
SHA1 (patch-ad) = 79a0f048751899247ec12990cd02332b977af248
-SHA1 (patch-ae) = 65e20f89ba847625b7632e62a787147c5138a300
+SHA1 (patch-ae) = 7ad3a3c3ee4be2c80fa6b0a2ea28563efd399a60
SHA1 (patch-af) = 257b06f10616c04c2724e30777b027e5e7e443f9
SHA1 (patch-ah) = 4dd4e27d0dfb6cedf79775b6d01a0b8c6617cdf0
SHA1 (patch-aq) = 4cfecee96f04bd6efa5c8078916672b0b9623fa4
diff --git a/audio/alsa-lib/patches/patch-ae b/audio/alsa-lib/patches/patch-ae
index 50148174cb0..b2a8e41f459 100644
--- a/audio/alsa-lib/patches/patch-ae
+++ b/audio/alsa-lib/patches/patch-ae
@@ -1,10 +1,27 @@
-$NetBSD: patch-ae,v 1.8 2016/04/15 08:47:50 wiz Exp $
+$NetBSD: patch-ae,v 1.9 2016/06/03 15:45:44 jperkin Exp $
- Don't assert GNU ld on Solaris, where it might not be true.
+ - Add endian compat.
---- include/local.h.orig 2016-02-29 14:44:47.000000000 +0000
+--- include/local.h.orig 2016-03-31 13:10:39.000000000 +0000
+++ include/local.h
-@@ -253,7 +253,9 @@ extern snd_lib_error_handler_t snd_err_m
+@@ -43,6 +43,15 @@
+ #ifndef __BIG_ENDIAN
+ #define __BIG_ENDIAN BIG_ENDIAN
+ #endif
++#elif defined(__sun)
++#include <sys/byteorder.h>
++#define __LITTLE_ENDIAN 1234
++#define __BIG_ENDIAN 4321
++#ifdef _BIG_ENDIAN
++#define __BYTE_ORDER __BIG_ENDIAN
++#else
++#define __BYTE_ORDER __LITTLE_ENDIAN
++#endif
+ #else
+ #error Header defining endianness not defined
+ #endif
+@@ -253,7 +262,9 @@ extern snd_lib_error_handler_t snd_err_m
/*
*/