Attachment 143930 Details for Bug 191189 – Fix installed headers issues with clang.

[patch] Fix installed headers issues with clang.

libvisual.diff (text/plain), 4.53 KB, created by Koop Mast on 2014-06-19 15:55:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koop Mast

Created: 2014-06-19 15:55:12 UTC

Size: 4.53 KB

patch

obsolete

>Index: graphics/libvisual04/Makefile
>===================================================================
>--- graphics/libvisual04/Makefile	(revision 357771)
>+++ graphics/libvisual04/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libvisual
> PORTVERSION=	0.4.0
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	graphics
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
> PKGNAMESUFFIX=	04
>@@ -14,8 +14,7 @@
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USE_AUTOTOOLS=	libtool
>-USES=		gettext pathfix pkgconfig
>+USES=		gettext libtool:keepla pathfix pkgconfig
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
> LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
>Index: graphics/libvisual04/files/patch-8970219
>===================================================================
>--- graphics/libvisual04/files/patch-8970219	(revision 0)
>+++ graphics/libvisual04/files/patch-8970219	(working copy)
>@@ -0,0 +1,85 @@
>+https://github.com/Libvisual/libvisual/commit/89702196c115b2cb27d90b123f8976aca110ade8
>+
>+--- libvisual/lv_defines.h.orig	2006-01-22 14:23:37.000000000 +0100
>++++ libvisual/lv_defines.h	2014-06-19 17:21:12.000000000 +0200
>+@@ -38,42 +38,39 @@
>+ # define VISUAL_END_DECLS
>+ #endif /* __cplusplus */
>+ 
>+-#ifdef NULL
>+-#undef NULL
>+-#endif
>+-
>+-/**
>+- * NULL define.
>+- */
>+-#define NULL	((void *) 0)
>++#ifndef NULL
>++# ifndef __cplusplus
>++#   define NULL ((void *) 0)
>++# else
>++#   define NULL 0
>++# endif
>++#endif /* NULL */
>+ 
>+ #ifndef FALSE
>+-/**
>+- * FALSE define.
>+- */
>+ #define FALSE	(0)
>+ #endif
>+ 
>+ #ifndef TRUE
>+-/**
>+- * TRUE define.
>+- */
>+-#define TRUE	(!FALSE)
>++#define TRUE	(1)
>+ #endif
>+ 
>+ /* 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)
>++# ifndef __cplusplus
>++#  define inline            inline __attribute__ ((always_inline))
>++# endif
>++# define VIS_ATTR_MALLOC    __attribute__ ((malloc))
>++# define VIS_ATTR_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)
>+-# define VIS_UNLIKELY(x)	(x)
>+-#endif
>++# ifndef __cplusplus
>++#  define inline            /* no inline */
>++# endif
>++# define VIS_ATTR_MALLOC    /* no malloc */
>++# define VIS_ATTR_PACKED    /* no packed */
>++# define VIS_LIKELY(x)      (x)
>++# define VIS_UNLIKELY(x)    (x)
>++#endif /* __GNUC__ >= 3 */
>+ 
>+ #endif /* _LV_DEFINES_H */
>+--- libvisual/lv_mem.h.orig	2006-01-22 14:23:37.000000000 +0100
>++++ libvisual/lv_mem.h	2014-06-19 17:22:37.000000000 +0200
>+@@ -76,9 +76,9 @@ typedef void *(*VisMemSet32Func)(void *d
>+ 
>+ /* prototypes */
>+ int visual_mem_initialize (void);
>+-void *visual_mem_malloc (visual_size_t nbytes) __malloc;
>+-void *visual_mem_malloc0 (visual_size_t nbytes) __malloc;
>+-void *visual_mem_realloc (void *ptr, visual_size_t nbytes) __malloc;
>++void *visual_mem_malloc (visual_size_t nbytes) VIS_ATTR_MALLOC;
>++void *visual_mem_malloc0 (visual_size_t nbytes) VIS_ATTR_MALLOC;
>++void *visual_mem_realloc (void *ptr, visual_size_t nbytes) VIS_ATTR_MALLOC;
>+ int visual_mem_free (void *ptr);
>+ 
>+ /* Optimal performance functions set by visual_mem_initialize(). */
>
>Property changes on: graphics/libvisual04/files/patch-8970219
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: graphics/libvisual04/pkg-plist
>===================================================================
>--- graphics/libvisual04/pkg-plist	(revision 357771)
>+++ graphics/libvisual04/pkg-plist	(working copy)
>@@ -43,10 +43,10 @@
> include/libvisual%%VER%%/libvisual/lv_utils.h
> include/libvisual%%VER%%/libvisual/lv_video.h
> include/libvisual%%VER%%/libvisual/lvconfig.h
>-lib/libvisual%%VER%%.a
> lib/libvisual%%VER%%.la
> lib/libvisual%%VER%%.so
> lib/libvisual%%VER%%.so.0
>+lib/libvisual%%VER%%.so.0.0.0
> libdata/pkgconfig/libvisual%%VER%%.pc
> share/locale/es_AR/LC_MESSAGES/libvisual%%VER%%.mo
> share/locale/es_ES/LC_MESSAGES/libvisual%%VER%%.mo

Actions: View | Diff

Attachments on bug 191189: 143930