Attachment #179679 for bug #216847

Lines 2-9 Link Here

(-)Makefile (-3 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= wavpack	4	PORTNAME= wavpack
5	PORTVERSION= 4.60.1	5	PORTVERSION= 5.1.0
6	PORTREVISION= 3
7	CATEGORIES= audio	6	CATEGORIES= audio
8	MASTER_SITES= http://www.wavpack.com/	7	MASTER_SITES= http://www.wavpack.com/
9		8
Lines 11-17 Link Here
11	COMMENT= Audio codec for lossless, lossy, and hybrid compression	10	COMMENT= Audio codec for lossless, lossy, and hybrid compression
12		11
13	LICENSE= BSD3CLAUSE	12	LICENSE= BSD3CLAUSE
14	LICENSE_FILE= ${WRKSRC}/license.txt	13	LICENSE_FILE= ${WRKSRC}/COPYING
15		14
16	USES= iconv libtool pathfix pkgconfig tar:bzip2	15	USES= iconv libtool pathfix pkgconfig tar:bzip2
17	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (wavpack-4.60.1.tar.bz2) = 175ee4f2effd6f51e6ec487956f41177256bf892c2e8e07de5d27ed4ee6888c5	1	TIMESTAMP = 1486392068
2	SIZE (wavpack-4.60.1.tar.bz2) = 394434	2	SHA256 (wavpack-5.1.0.tar.bz2) = 1939627d5358d1da62bc6158d63f7ed12905552f3a799c799ee90296a7612944
		3	SIZE (wavpack-5.1.0.tar.bz2) = 824331




--- src/wavpack_local.h.orig	2009-12-01 04:24:50 UTC
+++ src/wavpack_local.h
@@ -11,6 +11,10 @@
 #ifndef WAVPACK_LOCAL_H
 #define WAVPACK_LOCAL_H
 
+#ifndef __has_builtin
+#define __has_builtin(x) 0
+#endif
+
 #if defined(WIN32)
 #define FASTCALL __fastcall
 #else
@@ -768,7 +772,7 @@ typedef short __m64_16 __attribute__ ((_
 #define _m_paddd(m1, m2) __builtin_ia32_paddd (m1, m2)
 #define _m_pcmpeqd(m1, m2) __builtin_ia32_pcmpeqd (m1, m2)
 
-#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) || __GNUC__ > 4
+#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) || __GNUC__ > 4 || __has_builtin(__builtin_ia32_pslldi)
 #	define _m_pslldi(m1, m2) __builtin_ia32_pslldi ((__m64)m1, m2)
 #	define _m_psradi(m1, m2) __builtin_ia32_psradi ((__m64)m1, m2)
 #	define _m_psrldi(m1, m2) __builtin_ia32_psrldi ((__m64)m1, m2)




bin/wavpack
bin/wvgain
bin/wvtag
bin/wvunpack
include/wavpack/wavpack.h
lib/libwavpack.a
lib/libwavpack.so
lib/libwavpack.so.1
lib/libwavpack.so.1.2.0
libdata/pkgconfig/wavpack.pc
man/man1/wavpack.1.gz
man/man1/wvgain.1.gz
man/man1/wvtag.1.gz
man/man1/wvunpack.1.gz

Return to bug 216847

Lines 1-22 Link Here

(-)files/patch-src_wavpack__local.h (-22 lines)
1	--- src/wavpack_local.h.orig 2009-12-01 04:24:50 UTC
2	+++ src/wavpack_local.h
3	@@ -11,6 +11,10 @@
4	#ifndef WAVPACK_LOCAL_H
5	#define WAVPACK_LOCAL_H
6
7	+#ifndef __has_builtin
8	+#define __has_builtin(x) 0
9	+#endif
10	+
11	#if defined(WIN32)
12	#define FASTCALL __fastcall
13	#else
14	@@ -768,7 +772,7 @@ typedef short __m64_16 __attribute__ ((_
15	#define _m_paddd(m1, m2) __builtin_ia32_paddd (m1, m2)
16	#define _m_pcmpeqd(m1, m2) __builtin_ia32_pcmpeqd (m1, m2)
17
18	-#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \|\| __GNUC__ > 4
19	+#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \|\| __GNUC__ > 4 \|\| __has_builtin(__builtin_ia32_pslldi)
20	# define _m_pslldi(m1, m2) __builtin_ia32_pslldi ((__m64)m1, m2)
21	# define _m_psradi(m1, m2) __builtin_ia32_psradi ((__m64)m1, m2)
22	# define _m_psrldi(m1, m2) __builtin_ia32_psrldi ((__m64)m1, m2)

Lines 1-12 Link Here

(-)pkg-plist (-1 / +3 lines)
1	bin/wavpack	1	bin/wavpack
2	bin/wvgain	2	bin/wvgain
		3	bin/wvtag
3	bin/wvunpack	4	bin/wvunpack
4	include/wavpack/wavpack.h	5	include/wavpack/wavpack.h
5	lib/libwavpack.a	6	lib/libwavpack.a
6	lib/libwavpack.so	7	lib/libwavpack.so
7	lib/libwavpack.so.1	8	lib/libwavpack.so.1
8	lib/libwavpack.so.1.1.4	9	lib/libwavpack.so.1.2.0
9	libdata/pkgconfig/wavpack.pc	10	libdata/pkgconfig/wavpack.pc
10	man/man1/wavpack.1.gz	11	man/man1/wavpack.1.gz
11	man/man1/wvgain.1.gz	12	man/man1/wvgain.1.gz
		13	man/man1/wvtag.1.gz
12	man/man1/wvunpack.1.gz	14	man/man1/wvunpack.1.gz