Skip to content

Commit

Permalink
- USE_LIBTOOL (no .la files installed)
Browse files Browse the repository at this point in the history
- Add patch to preload libstdc++ (LD_PRELOAD no longer needed) [1]
- Bump PORTREVISION

Suggested by:	kan [1]
  • Loading branch information
Max Khon authored and Max Khon committed Feb 4, 2004
1 parent 48176ee commit 39c6a7d
Showing 5 changed files with 27 additions and 50 deletions.
10 changes: 2 additions & 8 deletions audio/xmms-arts/Makefile
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@

PORTNAME= xmms-arts
PORTVERSION= 0.4
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://stukach.com/hosted/m.i.a/xmmsarts/
DISTNAME= ${PORTNAME:S/-//}-${PORTVERSION}
@@ -21,16 +21,10 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${X11BASE}/include"
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
PKGMESSAGE= ${WRKDIR}/pkg-message

post-install:
@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
<${FILESDIR}/pkg-message.in >${PKGMESSAGE}
@${CAT} ${PKGMESSAGE}

.include <bsd.port.mk>
25 changes: 25 additions & 0 deletions audio/xmms-arts/files/patch-init.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
--- init.c.orig Fri Sep 1 10:35:03 2000
+++ init.c Thu Feb 5 02:53:58 2004
@@ -20,6 +20,7 @@
*/

#include "artsout.h"
+#include <dlfcn.h>

aRtsConfig arts_cfg;

@@ -39,4 +40,14 @@
xmms_cfg_read_int(cfgfile, "aRts", "prebuffer", &arts_cfg.prebuffer);
xmms_cfg_free(cfgfile);
}
+
+ /*
+ * This is a hack to prevent unloading of libstdc++
+ * (required by arts libraries) in arts_free() but before
+ * this thread is terminated. libstdc++ registers thread cleanup
+ * handler and xmms crashes when this cleanup function is called
+ * on thread termination.
+ */
+ if (dlopen("libstdc++.so", RTLD_NOW | RTLD_GLOBAL) == NULL)
+ fprintf(stderr, "Failed to preload libstdc++.so\n");
}
25 changes: 0 additions & 25 deletions audio/xmms-arts/files/patch-ltmain.sh

This file was deleted.

16 changes: 0 additions & 16 deletions audio/xmms-arts/files/pkg-message.in

This file was deleted.

1 change: 0 additions & 1 deletion audio/xmms-arts/pkg-plist
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
lib/xmms/Output/libartsout.a
lib/xmms/Output/libartsout.la
lib/xmms/Output/libartsout.so
lib/xmms/Output/libartsout.so.0

0 comments on commit 39c6a7d

Please sign in to comment.