pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/arts Update arts to 1.2.0. Part of KDE 3.2.
details: https://anonhg.NetBSD.org/pkgsrc/rev/fd9eff75c243
branches: trunk
changeset: 467632:fd9eff75c243
user: markd <markd%pkgsrc.org@localhost>
date: Wed Feb 04 13:35:51 2004 +0000
description:
Update arts to 1.2.0. Part of KDE 3.2.
Arts specific changes unspecified.
diffstat:
audio/arts/Makefile | 7 +++--
audio/arts/PLIST | 11 ++++++---
audio/arts/buildlink2.mk | 4 ++-
audio/arts/buildlink3.mk | 3 +-
audio/arts/distinfo | 8 +++---
audio/arts/patches/patch-ab | 46 ++++++++++++++++++++++----------------------
6 files changed, 43 insertions(+), 36 deletions(-)
diffs (238 lines):
diff -r 3e9fff9a3a6a -r fd9eff75c243 audio/arts/Makefile
--- a/audio/arts/Makefile Wed Feb 04 13:34:53 2004 +0000
+++ b/audio/arts/Makefile Wed Feb 04 13:35:51 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2004/01/15 09:37:27 markd Exp $
+# $NetBSD: Makefile,v 1.23 2004/02/04 13:35:51 markd Exp $
-DISTNAME= arts-1.1.5
+DISTNAME= arts-1.2.0
CATEGORIES= audio
COMMENT= Analog Real-Time Synthesizer
@@ -12,7 +12,7 @@
USE_PERL5= build
LIBTOOL_OVERRIDE+= ${WRKSRC}/libtool ${WRKSRC}/libltdl/libtool
-CONFIGURE_ENV+= ac_cv_path_PKG_CONFIG=no
+BUILD_DEPENDS+= pkgconfig>=0.15.0:../../devel/pkgconfig
# Ensure we export symbols in the linked shared object.
LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
@@ -20,6 +20,7 @@
.include "../../audio/libaudiofile/buildlink2.mk"
.include "../../audio/libogg/buildlink2.mk"
.include "../../audio/libvorbis/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
.include "../../meta-pkgs/kde3/buildlink2.mk"
.include "../../mk/ossaudio.buildlink2.mk"
.include "../../mk/pthread.buildlink2.mk"
diff -r 3e9fff9a3a6a -r fd9eff75c243 audio/arts/PLIST
--- a/audio/arts/PLIST Wed Feb 04 13:34:53 2004 +0000
+++ b/audio/arts/PLIST Wed Feb 04 13:35:51 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/07/07 20:51:53 skrll Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/02/04 13:35:51 markd Exp $
bin/artsc-config
bin/artscat
bin/artsd
@@ -8,7 +8,6 @@
bin/artsshell
bin/artswrapper
bin/mcopidl
-bin/testdhandle
include/arts/anyref.h
include/arts/artsflow.h
include/arts/artsflow.idl
@@ -37,7 +36,7 @@
include/arts/factory.h
include/arts/fft.h
include/arts/flowsystem.h
-include/arts/gsl/gslartsthreads.h
+include/arts/giomanager.h
include/arts/gsl/gslcommon.h
include/arts/gsl/gslconfig.h
include/arts/gsl/gslconvert.h
@@ -50,7 +49,6 @@
include/arts/gsl/gslengine.h
include/arts/gsl/gslfft.h
include/arts/gsl/gslfilter.h
-include/arts/gsl/gslglib.h
include/arts/gsl/gslieee754.h
include/arts/gsl/gslloader.h
include/arts/gsl/gslmagic.h
@@ -60,6 +58,7 @@
include/arts/gsl/gslsignal.h
include/arts/gsl/gslwavechunk.h
include/arts/gsl/gslwaveosc.h
+include/arts/gslschedule.h
include/arts/idlfilereg.h
include/arts/ifacerepo_impl.h
include/arts/iomanager.h
@@ -122,6 +121,10 @@
lib/libartswavplayobject.so
lib/libartswavplayobject.so.0
lib/libartswavplayobject.so.0.0
+lib/libgmcop.la
+lib/libgmcop.so
+lib/libgmcop.so.1
+lib/libgmcop.so.1.0
lib/libkmedia2.la
lib/libkmedia2.so
lib/libkmedia2.so.1
diff -r 3e9fff9a3a6a -r fd9eff75c243 audio/arts/buildlink2.mk
--- a/audio/arts/buildlink2.mk Wed Feb 04 13:34:53 2004 +0000
+++ b/audio/arts/buildlink2.mk Wed Feb 04 13:35:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.14 2003/12/08 14:41:38 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.15 2004/02/04 13:35:51 markd Exp $
#
# This Makefile fragment is included by packages that use arts.
@@ -23,6 +23,7 @@
BUILDLINK_FILES.arts+= lib/libartsflow_idl.*
BUILDLINK_FILES.arts+= lib/libartsgslplayobject.*
BUILDLINK_FILES.arts+= lib/libartswavplayobject.*
+BUILDLINK_FILES.arts+= lib/libgmcop.*
BUILDLINK_FILES.arts+= lib/libkmedia2.*
BUILDLINK_FILES.arts+= lib/libkmedia2_idl.*
BUILDLINK_FILES.arts+= lib/libmcop.*
@@ -60,6 +61,7 @@
.include "../../audio/libaudiofile/buildlink2.mk"
.include "../../audio/libogg/buildlink2.mk"
.include "../../audio/libvorbis/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
.include "../../mk/ossaudio.buildlink2.mk"
BUILDLINK_TARGETS+= arts-buildlink
diff -r 3e9fff9a3a6a -r fd9eff75c243 audio/arts/buildlink3.mk
--- a/audio/arts/buildlink3.mk Wed Feb 04 13:34:53 2004 +0000
+++ b/audio/arts/buildlink3.mk Wed Feb 04 13:35:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/02/04 13:35:51 markd Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ARTS_BUILDLINK3_MK:= ${ARTS_BUILDLINK3_MK}+
@@ -15,6 +15,7 @@
. include "../../audio/libaudiofile/buildlink3.mk"
. include "../../audio/libogg/buildlink3.mk"
. include "../../audio/libvorbis/buildlink3.mk"
+. include "../../devel/glib2/buildlink2.mk"
. include "../../mk/ossaudio.buildlink3.mk"
.endif # ARTS_BUILDLINK3_MK
diff -r 3e9fff9a3a6a -r fd9eff75c243 audio/arts/distinfo
--- a/audio/arts/distinfo Wed Feb 04 13:34:53 2004 +0000
+++ b/audio/arts/distinfo Wed Feb 04 13:35:51 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2004/01/15 09:37:27 markd Exp $
+$NetBSD: distinfo,v 1.18 2004/02/04 13:35:51 markd Exp $
-SHA1 (arts-1.1.5.tar.bz2) = e91a701a8846fbf412cb83b8834171880f88726b
-Size (arts-1.1.5.tar.bz2) = 989305 bytes
-SHA1 (patch-ab) = 06265879020edf24ff51403565fd422c3b7a17e5
+SHA1 (arts-1.2.0.tar.bz2) = 90fdc6d9dc7cb3e55a60e4dc557a548d8f590a55
+Size (arts-1.2.0.tar.bz2) = 993338 bytes
+SHA1 (patch-ab) = 73c4ec5360ce671f69b6de4e226cda9478d098ee
SHA1 (patch-ac) = de22843493a184f4aa8c20e011aa2a73ad794728
SHA1 (patch-af) = 9a130ccd7f56656bb55e2c5edf223c38c69be591
SHA1 (patch-ag) = 30177e80960a2877fb69cb5ffaadc4aa0d0783fc
diff -r 3e9fff9a3a6a -r fd9eff75c243 audio/arts/patches/patch-ab
--- a/audio/arts/patches/patch-ab Wed Feb 04 13:34:53 2004 +0000
+++ b/audio/arts/patches/patch-ab Wed Feb 04 13:35:51 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2002/10/03 10:22:35 jlam Exp $
+$NetBSD: patch-ab,v 1.5 2004/02/04 13:35:52 markd Exp $
---- artsc/artsdsp.c.orig Mon Jun 24 09:55:50 2002
+--- artsc/artsdsp.c.orig 2003-07-17 07:18:09.000000000 +1200
+++ artsc/artsdsp.c
-@@ -127,6 +127,14 @@ int munmap(void *start, size_t length);
+@@ -133,6 +133,14 @@ int munmap(void *start, size_t length);
static void artsdsp_doinit()
{
@@ -17,45 +17,48 @@
const char *env;
artsdsp_init = 1;
-@@ -139,14 +147,29 @@ static void artsdsp_doinit()
+@@ -145,15 +153,31 @@ static void artsdsp_doinit()
mmapemu = env && !strcmp(env,"1");
/* resolve original symbols */
- orig_open = (orig_open_ptr)dlsym(RTLD_NEXT,"open");
- orig_close = (orig_close_ptr)dlsym(RTLD_NEXT,"close");
- orig_write = (orig_write_ptr)dlsym(RTLD_NEXT,"write");
+- orig_read = (orig_read_ptr)dlsym(RTLD_NEXT,"read");
- orig_ioctl = (orig_ioctl_ptr)dlsym(RTLD_NEXT,"ioctl");
- orig_mmap = (orig_mmap_ptr)dlsym(RTLD_NEXT,"mmap");
- orig_munmap = (orig_munmap_ptr)dlsym(RTLD_NEXT,"munmap");
- orig_fopen = (orig_fopen_ptr)dlsym(RTLD_NEXT,"fopen");
- orig_access = (orig_access_ptr)dlsym(RTLD_NEXT,"access");
+#if defined(__NetBSD__) && !defined(OPEN_SOUND_SYSTEM)
-+ handle = dlopen(NULL, DL_LAZY);
++ handle = dlopen(NULL, DL_LAZY);
+ orig_open = (orig_open_ptr)dlsym(handle,"open");
+ orig_close = (orig_close_ptr)dlsym(handle,"close");
+ orig_write = (orig_write_ptr)dlsym(handle,"write");
-+ orig_ioctl = (orig_ioctl_ptr)dlsym(handle,"_oss_ioctl");
-+ orig_mmap = (orig_mmap_ptr)dlsym(handle,"mmap");
-+ orig_munmap = (orig_munmap_ptr)dlsym(handle,"munmap");
-+ orig_fopen = (orig_fopen_ptr)dlsym(handle,"fopen");
-+ orig_access = (orig_access_ptr)dlsym(handle,"access");
-+ (void) dlclose(handle);
-+#else
-+ OPEN_GLOBAL();
-+ orig_open = (orig_open_ptr)dlsym(handle,"open");
-+ orig_close = (orig_close_ptr)dlsym(handle,"close");
-+ orig_write = (orig_write_ptr)dlsym(handle,"write");
++ orig_read = (orig_read_ptr)dlsym(handle,"read");
+ orig_ioctl = (orig_ioctl_ptr)dlsym(handle,"ioctl");
+ orig_mmap = (orig_mmap_ptr)dlsym(handle,"mmap");
+ orig_munmap = (orig_munmap_ptr)dlsym(handle,"munmap");
+ orig_fopen = (orig_fopen_ptr)dlsym(handle,"fopen");
+ orig_access = (orig_access_ptr)dlsym(handle,"access");
-+ CLOSE_GLOBAL();
++ (void) dlclose(handle);
++#else
++ OPEN_GLOBAL();
++ orig_open = (orig_open_ptr)dlsym(handle,"open");
++ orig_close = (orig_close_ptr)dlsym(handle,"close");
++ orig_write = (orig_write_ptr)dlsym(handle,"write");
++ orig_read = (orig_read_ptr)dlsym(handle,"read");
++ orig_ioctl = (orig_ioctl_ptr)dlsym(handle,"ioctl");
++ orig_mmap = (orig_mmap_ptr)dlsym(handle,"mmap");
++ orig_munmap = (orig_munmap_ptr)dlsym(handle,"munmap");
++ orig_fopen = (orig_fopen_ptr)dlsym(handle,"fopen");
++ orig_access = (orig_access_ptr)dlsym(handle,"access");
++ CLOSE_GLOBAL();
+#endif
}
- static void artsdspdebug(const char *fmt,...)
-@@ -231,13 +254,18 @@ int open (const char *pathname, int flag
+ static void
+@@ -258,10 +282,15 @@ int open (const char *pathname, int flag
return sndfd;
}
@@ -65,16 +68,13 @@
int ioctl (int fd, ioctl_request_t request, ...)
+#endif
{
- static int channels;
- static int bits;
- static int speed;
int space, size, latency, odelay;
+#if !defined(__NetBSD__) || defined(OPEN_SOUND_SYSTEM)
/*
* FreeBSD needs ioctl with varargs. However I have no idea how to "forward"
* the variable args ioctl to the orig_ioctl routine. So I expect the ioctl
-@@ -249,6 +277,7 @@ int ioctl (int fd, ioctl_request_t reque
+@@ -273,6 +302,7 @@ int ioctl (int fd, ioctl_request_t reque
va_start(args,request);
argp = va_arg(args, void *);
va_end(args);
Home |
Main Index |
Thread Index |
Old Index