Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Jan 2014 08:53:59 +0000 (UTC)
From:      Martin Wilke <miwi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r340231 - in head/graphics/xmms-gdancer: . files
Message-ID:  <201401190853.s0J8rxPx011678@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: miwi
Date: Sun Jan 19 08:53:58 2014
New Revision: 340231
URL: http://svnweb.freebsd.org/changeset/ports/340231
QAT: https://qat.redports.org/buildarchive/r340231/

Log:
  - Fix build with clang
  
  PR:		185313
  Submitted by:	ports fury

Added:
  head/graphics/xmms-gdancer/files/
  head/graphics/xmms-gdancer/files/patch-src__image.c   (contents, props changed)
Modified:
  head/graphics/xmms-gdancer/Makefile   (contents, props changed)

Modified: head/graphics/xmms-gdancer/Makefile
==============================================================================
--- head/graphics/xmms-gdancer/Makefile	Sun Jan 19 05:57:29 2014	(r340230)
+++ head/graphics/xmms-gdancer/Makefile	Sun Jan 19 08:53:58 2014	(r340231)
@@ -11,20 +11,25 @@ DISTNAME=	gdancer-$(PORTVERSION)
 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>

Added: head/graphics/xmms-gdancer/files/patch-src__image.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/xmms-gdancer/files/patch-src__image.c	Sun Jan 19 08:53:58 2014	(r340231)
@@ -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;



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