Bug 185313

Summary: graphics/xmms-gdancer: Fix build with clang
Product: Ports & Packages Reporter: tkato432
Component: Individual Port(s)Assignee: freebsd-ports-bugs (Nobody) <ports-bugs>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description tkato432 2013-12-30 21:10:01 UTC 
- Fix build with clang
- Add LICENSE

New file:
files/patch-src__image.c
Comment 1 dfilter service freebsd_committer freebsd_triage 2014-01-19 08:54:07 UTC 
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;
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2014-01-19 08:54:11 UTC 
State Changed
From-To: open->closed

Committed. Thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2014-01-19 08:55:09 UTC 
Author: miwi
Date: Sun Jan 19 08:55:01 2014
New Revision: 340232
URL: http://svnweb.freebsd.org/changeset/ports/340232
QAT: https://qat.redports.org/buildarchive/r340232/

Log:
  - Fix build with clang
  
  PR:		185313
  Submitted by:	Ports Fury

Added:
  head/audio/xmms-modplug/files/
  head/audio/xmms-modplug/files/patch-modplugxmms__modplugxmms.h   (contents, props changed)
Modified:
  head/audio/xmms-modplug/Makefile   (contents, props changed)

Modified: head/audio/xmms-modplug/Makefile
==============================================================================
--- head/audio/xmms-modplug/Makefile	Sun Jan 19 08:53:58 2014	(r340231)
+++ head/audio/xmms-modplug/Makefile	Sun Jan 19 08:55:01 2014	(r340232)
@@ -12,21 +12,23 @@ DISTNAME=	${PORTNAME}${PKGNAMEPREFIX}2.0
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ModPlug-based plugin for XMMS
 
-LIB_DEPENDS?=	libxmms.so:${PORTSDIR}/multimedia/xmms
-LIB_DEPENDS+=	modplug:${PORTSDIR}/audio/libmodplug
+BUILD_DEPENDS=	xmms>0:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+RUN_DEPENDS=	xmms>0:${PORTSDIR}/multimedia/xmms
 
 USES=		pkgconfig
-NO_STAGE=	yes
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-HAS_CONFIGURE=	yes
-PLUGDIR?=	lib/xmms/Input
-PLIST_FILES=	${PLUGDIR}/libmodplugxmms.so
+
+PLIST_FILES=	lib/xmms/Input/libmodplugxmms.so
 
 post-patch:
-	@${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|-lstdc++||' ${WRKSRC}/modplugxmms/Makefile.in
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/modplugxmms/.libs/libmodplugxmms.so \
-		${PREFIX}/${PLUGDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xmms/Input
+	(cd ${WRKSRC}/modplugxmms/.libs && ${INSTALL_LIB} libmodplugxmms.so \
+		${STAGEDIR}${PREFIX}/lib/xmms/Input)
 
 .include <bsd.port.mk>

Added: head/audio/xmms-modplug/files/patch-modplugxmms__modplugxmms.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/xmms-modplug/files/patch-modplugxmms__modplugxmms.h	Sun Jan 19 08:55:01 2014	(r340232)
@@ -0,0 +1,10 @@
+--- modplugxmms/modplugxmms.h.orig
++++ modplugxmms/modplugxmms.h
+@@ -8,6 +8,7 @@
+ #define __MODPLUGXMMS_CMODPLUGXMMS_H_INCLUDED__
+ 
+ #include <string>
++#include <pthread.h>
+ 
+ #ifndef __MODPLUGXMMS_STDDEFS_H__INCLUDED__
+ #include "stddefs.h"
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 dfilter service freebsd_committer freebsd_triage 2014-01-25 10:37:39 UTC 
Author: miwi
Date: Sat Jan 25 10:37:27 2014
New Revision: 341004
URL: http://svnweb.freebsd.org/changeset/ports/341004
QAT: https://qat.redports.org/buildarchive/r341004/

Log:
  MFH: r340232
  
  - Fix build with clang
  
  PR:		185313
  Submitted by:	Ports Fury

Added:
  branches/2014Q1/audio/xmms-modplug/files/
     - copied from r340232, head/audio/xmms-modplug/files/
Modified:
  branches/2014Q1/audio/xmms-modplug/Makefile   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/audio/xmms-modplug/Makefile
==============================================================================
--- branches/2014Q1/audio/xmms-modplug/Makefile	Sat Jan 25 10:35:51 2014	(r341003)
+++ branches/2014Q1/audio/xmms-modplug/Makefile	Sat Jan 25 10:37:27 2014	(r341004)
@@ -12,21 +12,23 @@ DISTNAME=	${PORTNAME}${PKGNAMEPREFIX}2.0
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ModPlug-based plugin for XMMS
 
-LIB_DEPENDS?=	libxmms.so:${PORTSDIR}/multimedia/xmms
-LIB_DEPENDS+=	modplug:${PORTSDIR}/audio/libmodplug
+BUILD_DEPENDS=	xmms>0:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+RUN_DEPENDS=	xmms>0:${PORTSDIR}/multimedia/xmms
 
 USES=		pkgconfig
-NO_STAGE=	yes
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-HAS_CONFIGURE=	yes
-PLUGDIR?=	lib/xmms/Input
-PLIST_FILES=	${PLUGDIR}/libmodplugxmms.so
+
+PLIST_FILES=	lib/xmms/Input/libmodplugxmms.so
 
 post-patch:
-	@${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|-lstdc++||' ${WRKSRC}/modplugxmms/Makefile.in
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/modplugxmms/.libs/libmodplugxmms.so \
-		${PREFIX}/${PLUGDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xmms/Input
+	(cd ${WRKSRC}/modplugxmms/.libs && ${INSTALL_LIB} libmodplugxmms.so \
+		${STAGEDIR}${PREFIX}/lib/xmms/Input)
 
 .include <bsd.port.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"