summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorjoerg <joerg>2013-06-13 14:25:30 +0000
committerjoerg <joerg>2013-06-13 14:25:30 +0000
commitaebe05e64e9e316fc00af477181955bd2da42cc2 (patch)
tree56a815e4b4190152383dba8d4c07366b4f46ecc6 /audio
parent21e29105d5f8e721352f674f2897767117b5ce06 (diff)
downloadpkgsrc-aebe05e64e9e316fc00af477181955bd2da42cc2.tar.gz
Don't mess with inline, it breaks inline namespaces in C++.
Bump revision.
Diffstat (limited to 'audio')
-rw-r--r--audio/libvisual/Makefile4
-rw-r--r--audio/libvisual/distinfo3
-rw-r--r--audio/libvisual/patches/patch-libvisual_lv__defines.h18
3 files changed, 22 insertions, 3 deletions
diff --git a/audio/libvisual/Makefile b/audio/libvisual/Makefile
index d5cbbcb4e1c..197224a9e7c 100644
--- a/audio/libvisual/Makefile
+++ b/audio/libvisual/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2013/04/06 03:45:06 rodent Exp $
+# $NetBSD: Makefile,v 1.24 2013/06/13 14:25:30 joerg Exp $
#
DISTNAME= libvisual-0.4.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= audio graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libvisual/}
diff --git a/audio/libvisual/distinfo b/audio/libvisual/distinfo
index f08f5e629ce..18c478590eb 100644
--- a/audio/libvisual/distinfo
+++ b/audio/libvisual/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2012/03/10 09:19:32 sbd Exp $
+$NetBSD: distinfo,v 1.13 2013/06/13 14:25:30 joerg Exp $
SHA1 (libvisual-0.4.0.tar.gz) = bd21d621f1d54134c26138e19eaae46c5aeaec00
RMD160 (libvisual-0.4.0.tar.gz) = df4fda944e84417def2817f248f587dea5b2d8f1
@@ -7,4 +7,5 @@ SHA1 (patch-ab) = 2493f145d37c6de8dc37beb22e788c628d43342e
SHA1 (patch-ac) = ad124820a2a20550bf85181be284c1e000114ddd
SHA1 (patch-ad) = e7b2493cf5880cea7497a1d8d6fb1ce4f856ba6d
SHA1 (patch-ae) = 72affdd9a1302a16efe5f4ecaafbc37061e4db0c
+SHA1 (patch-libvisual_lv__defines.h) = 9b14140411ae426226318a0ccdbe64d905b7710c
SHA1 (patch-libvisual_lv__types.h) = 3f2baa4861b50d3359cd9cdfa75898dfc6b5895d
diff --git a/audio/libvisual/patches/patch-libvisual_lv__defines.h b/audio/libvisual/patches/patch-libvisual_lv__defines.h
new file mode 100644
index 00000000000..7f1bbba8233
--- /dev/null
+++ b/audio/libvisual/patches/patch-libvisual_lv__defines.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-libvisual_lv__defines.h,v 1.1 2013/06/13 14:25:30 joerg Exp $
+
+--- libvisual/lv_defines.h.orig 2013-06-12 21:45:45.000000000 +0000
++++ libvisual/lv_defines.h
+@@ -63,13 +63,11 @@
+
+ /* Compiler specific optimalization macros */
+ #if __GNUC__ >= 3
+-# define inline inline __attribute__ ((always_inline))
+ # define __malloc __attribute__ ((malloc))
+ # define __packed __attribute__ ((packed))
+ # define VIS_LIKELY(x) __builtin_expect (!!(x), 1)
+ # define VIS_UNLIKELY(x) __builtin_expect (!!(x), 0)
+ #else
+-# define inline /* no inline */
+ # define __malloc /* no malloc */
+ # define __packed /* no packed */
+ # define VIS_LIKELY(x) (x)