[Midnightbsd-cvs] mports [18409] trunk/graphics/libvisual04: fix build of libvisual 04

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Mar 28 11:03:36 EDT 2015 

Revision: 18409
          http://svnweb.midnightbsd.org/mports/?rev=18409
Author:   laffer1
Date:     2015-03-28 11:03:36 -0400 (Sat, 28 Mar 2015)
Log Message:
-----------
fix build of libvisual 04

Modified Paths:
--------------
    trunk/graphics/libvisual04/Makefile
    trunk/graphics/libvisual04/distinfo
    trunk/graphics/libvisual04/pkg-plist

Added Paths:
-----------
    trunk/graphics/libvisual04/files/patch-libvisual-lv_defines.h
    trunk/graphics/libvisual04/files/patch-libvisual-lv_mem.h

Modified: trunk/graphics/libvisual04/Makefile
===================================================================
--- trunk/graphics/libvisual04/Makefile	2015-03-28 09:55:22 UTC (rev 18408)
+++ trunk/graphics/libvisual04/Makefile	2015-03-28 15:03:36 UTC (rev 18409)
@@ -1,14 +1,8 @@
-# New ports collection makefile for:	libvisual
-# Date created:		23 oktober 2004
-# Whom:			Koop Mast <kwm at FreeBSD.org>
-#
 # $MidnightBSD$
-# $FreeBSD: ports/graphics/libvisual04/Makefile,v 1.14 2008/06/06 13:34:42 edwin Exp $
-#
 
 PORTNAME=	libvisual
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX=	04
@@ -15,17 +9,17 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Abstraction library that sits between apps and visual plugin
-LICENSE=	lgpl
 
-USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack pkgconfig
-USE_GETTEXT=	yes
+LICENSE=	gpl2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		gettext libtool:keepla pathfix pkgconfig
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 USE_LDCONFIG=	yes
-PLIST_SUB=	VER=-0.4
+VER=		-0.4
+PLIST_SUB=	VER=${VER}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Wno-unused-variable||g;s|-O3|${CFLAGS}|g' \
@@ -32,5 +26,10 @@
 		${WRKSRC}/libvisual/Makefile.in
 	@${REINPLACE_CMD} -e 's|sys/sched.h||g' -e '/test.*==/s|==|=|g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e 's|$$<|$${.ALLSRC}|g'
+	@${FIND} ${WRKSRC} -name "*.h" | ${XARGS} ${REINPLACE_CMD} \
+		-e 's#include <libvisual/#include <libvisual${VER}/libvisual/#'
+	@${MKDIR} -p ${WRKSRC}/${PORTNAME}/${PORTNAME}${VER}
+	@${LN} -s ${WRKSRC}/${PORTNAME} \
+		${WRKSRC}/${PORTNAME}/${PORTNAME}${VER}/${PORTNAME}
 
 .include <bsd.port.mk>

Modified: trunk/graphics/libvisual04/distinfo
===================================================================
--- trunk/graphics/libvisual04/distinfo	2015-03-28 09:55:22 UTC (rev 18408)
+++ trunk/graphics/libvisual04/distinfo	2015-03-28 15:03:36 UTC (rev 18409)
@@ -1,3 +1,2 @@
 SHA256 (libvisual-0.4.0.tar.gz) = 0b4dfdb87125e129567752089e3c8b54cefed601eef169d2533d8659da8dc1d7
-RMD160 (libvisual-0.4.0.tar.gz) = df4fda944e84417def2817f248f587dea5b2d8f1
 SIZE (libvisual-0.4.0.tar.gz) = 583386

Added: trunk/graphics/libvisual04/files/patch-libvisual-lv_defines.h
===================================================================
--- trunk/graphics/libvisual04/files/patch-libvisual-lv_defines.h	                        (rev 0)
+++ trunk/graphics/libvisual04/files/patch-libvisual-lv_defines.h	2015-03-28 15:03:36 UTC (rev 18409)
@@ -0,0 +1,57 @@
+--- libvisual/lv_defines.h.orig	2006-01-22 14:23:37.000000000 +0100
++++ libvisual/lv_defines.h	2014-07-21 15:18:07.000000000 +0200
+@@ -38,15 +38,14 @@
+ # define VISUAL_END_DECLS
+ #endif /* __cplusplus */
+ 
+-#ifdef NULL
+-#undef NULL
++#ifndef NULL
++# ifndef __cplusplus
++#   define NULL ((void *) 0)
++# else
++#   define NULL 0
++# endif
+ #endif
+ 
+-/**
+- * NULL define.
+- */
+-#define NULL	((void *) 0)
+-
+ #ifndef FALSE
+ /**
+  * FALSE define.
+@@ -63,17 +62,21 @@
+ 
+ /* 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 */


Property changes on: trunk/graphics/libvisual04/files/patch-libvisual-lv_defines.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/libvisual04/files/patch-libvisual-lv_mem.h
===================================================================
--- trunk/graphics/libvisual04/files/patch-libvisual-lv_mem.h	                        (rev 0)
+++ trunk/graphics/libvisual04/files/patch-libvisual-lv_mem.h	2015-03-28 15:03:36 UTC (rev 18409)
@@ -0,0 +1,15 @@
+--- libvisual/lv_mem.h.orig	2014-06-24 19:51:48.637214311 +0100
++++ libvisual/lv_mem.h	2014-06-24 19:53:14.723215426 +0100
+@@ -76,9 +76,9 @@
+ 
+ /* 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: trunk/graphics/libvisual04/files/patch-libvisual-lv_mem.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/graphics/libvisual04/pkg-plist
===================================================================
--- trunk/graphics/libvisual04/pkg-plist	2015-03-28 09:55:22 UTC (rev 18408)
+++ trunk/graphics/libvisual04/pkg-plist	2015-03-28 15:03:36 UTC (rev 18409)
@@ -43,14 +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
- at dirrmtry share/locale/es_AR/LC_MESSAGES
- at dirrmtry share/locale/es_AR
- at dirrm include/libvisual%%VER%%/libvisual
- at dirrm include/libvisual%%VER%%

More information about the Midnightbsd-cvs mailing list