Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 31 Dec 2013 05:47:50 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/185313: graphics/xmms-gdancer: Fix build with clang
Message-ID:  <20131231054750.564832173e552144235b48e0@yahoo.com>
Resent-Message-ID: <201312302110.rBULA1CA098576@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         185313
>Category:       ports
>Synopsis:       graphics/xmms-gdancer: Fix build with clang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 30 21:10:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Add LICENSE

New file:
files/patch-src__image.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/xmms-gdancer/Makefile graphics/xmms-gdancer/Makefile
--- /usr/ports/graphics/xmms-gdancer/Makefile	2013-11-06 22:01:52.000000000 +0900
+++ graphics/xmms-gdancer/Makefile	2013-12-31 00:00:00.000000000 +0900
@@ -11,20 +11,25 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XMMS Visualization plugin, displays dancing figures
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LICENSE=	GPLv2 # (or later)
 
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
+
+USES=		gmake
 USE_GNOME=	gtk12
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_CSTD=	gnu89
+USE_AUTOTOOLS=	libtool
 
 PLIST_FILES=	lib/xmms/Visualization/gdancer.so
 
-NO_STAGE=	yes
 post-patch:
-	@${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|-O2|@CFLAGS@| ; \
+		 s|@GDK_PIXBUF_LIBS@||' ${WRKSRC}/src/Makefile.in
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/src/.libs/gdancer.so ${PREFIX}/lib/xmms/Visualization
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xmms/Visualization
+	(cd ${WRKSRC}/src/.libs && ${INSTALL_LIB} gdancer.so \
+		${STAGEDIR}${PREFIX}/lib/xmms/Visualization)
 
 .include <bsd.port.mk>
diff -urN /usr/ports/graphics/xmms-gdancer/files/patch-src__image.c graphics/xmms-gdancer/files/patch-src__image.c
--- /usr/ports/graphics/xmms-gdancer/files/patch-src__image.c	1970-01-01 09:00:00.000000000 +0900
+++ graphics/xmms-gdancer/files/patch-src__image.c	2013-12-31 00:00:00.000000000 +0900
@@ -0,0 +1,37 @@
+--- src/image.c.orig
++++ src/image.c
+@@ -1,5 +1,6 @@
+ #include <gtk/gtk.h>
+ #include <unistd.h>
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
+@@ -12,6 +13,9 @@
+ #include "../pics/neutral.xpm"	// *neutralimage[]
+ #include "../pics/treble.xpm"	// *trebleimage[]
+ 
++void gd_image_change (GDancer *, enum gd_freq_type, gboolean);
++void load_images (GDancer *);
++
+ // Clears the pixmaps from memory
+ void clear_images_sub (frame *frame)
+ {
+@@ -109,7 +113,7 @@
+ 	}
+ }
+ 
+-gint load_images (GDancer *dancer)
++void load_images (GDancer *dancer)
+ {
+ 	if (dancer->window == NULL) return; // Make sure dancer exists
+ 	
+@@ -183,7 +187,7 @@
+ 	gd_move_window (dancer);
+ }
+ 
+-gint gd_image_change (GDancer *dancer, enum gd_freq_type newtype, gboolean always_draw)
++void gd_image_change (GDancer *dancer, enum gd_freq_type newtype, gboolean always_draw)
+ {
+ 	static frame *oldtype = NULL;
+ 	frame *type;
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131231054750.564832173e552144235b48e0>