pkgsrc-Users archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[PATCH] audio/portaudio-devel (Re: wip/fldigi has problem on Mac OS X 10.6.8
Thanks Greg, Thomas, and Obache,
I have another patch for audio/portaudio-devel.
(and I belive it is ready to commit :-),
Thanks,
---
Makoto Fujiwara
rm patches/patch-ac
Index: audio/portaudio-devel/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/portaudio-devel/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- audio/portaudio-devel/Makefile 2 Oct 2012 23:48:04 -0000 1.6
+++ audio/portaudio-devel/Makefile 8 Jan 2013 01:03:03 -0000
@@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.6 2012/10/02 23:48:04 asau Exp $
DISTNAME= pa_snapshot_v19
-PKGNAME= portaudio-devel-20060521
-PKGREVISION= 1
+PKGNAME= portaudio-devel-20111121
CATEGORIES= audio
MASTER_SITES= http://www.portaudio.com/archives/
DIST_SUBDIR= ${PKGNAME_NOREV}
+#LICENSE= # just copyrighted, no limition, See LICENSE.txt
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.portaudio.com/
@@ -16,6 +16,8 @@
USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
+# The part of following option is good for library, but wrong for pkg-config
+# See patches/patch-Makefile.in for another tweak
GNU_CONFIGURE_LIBSUBDIR=portaudio2
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/portaudio2
CONFIGURE_ARGS+= --without-alsa
Index: audio/portaudio-devel/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/portaudio-devel/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- audio/portaudio-devel/distinfo 11 Jan 2012 20:15:36 -0000 1.5
+++ audio/portaudio-devel/distinfo 8 Jan 2013 01:03:03 -0000
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.5 2012/01/11 20:15:36 hans Exp $
-SHA1 (portaudio-devel-20060521/pa_snapshot_v19.tar.gz) =
05c35c7add9f95c79491fbacb80b057be339ed6f
-RMD160 (portaudio-devel-20060521/pa_snapshot_v19.tar.gz) =
dea1e921189bd788815c3012498fc035f3df8bad
-Size (portaudio-devel-20060521/pa_snapshot_v19.tar.gz) = 722148 bytes
-SHA1 (patch-aa) = b29699d78e1216bb3d129f1736e8c7b56e8c322b
-SHA1 (patch-ac) = 6dece8b29f30465ad12404c87436e4530b723272
+SHA1 (portaudio-devel-20111121/pa_snapshot_v19.tar.gz) =
4920f7cdb44a62554a0b3a6b274d1ccdda97913d
+RMD160 (portaudio-devel-20111121/pa_snapshot_v19.tar.gz) =
0a9a91cb934f663f05e0f87f97186b3381c85ea2
+Size (portaudio-devel-20111121/pa_snapshot_v19.tar.gz) = 1130205 bytes
+SHA1 (patch-Makefile.in) = ebcbb313736a7722f86a0aa1387aa5f0535d85ab
+SHA1 (patch-aa) = 887095e9b7a42312e3967208c930db3572824586
Index: audio/portaudio-devel/patches/patch-Makefile.in
===================================================================
RCS file: audio/portaudio-devel/patches/patch-Makefile.in
diff -N audio/portaudio-devel/patches/patch-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ audio/portaudio-devel/patches/patch-Makefile.in 8 Jan 2013 01:03:03
-0000
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Correct install path for pkg-config
+ lib/portaudio2/pkgconfig/portaudio-2.0.pc
+ v
+ lib/pkgconfig/portaudio-2.0.pc
+
+--- Makefile.in.orig 2008-02-23 05:48:22.000000000 +0900
++++ Makefile.in 2013-01-08 09:18:17.000000000 +0900
+@@ -153,8 +153,8 @@
+ $(LIBTOOL) --mode=install $(INSTALL) lib/$(PALIB) $(DESTDIR)$(libdir)
+ $(INSTALL) -d $(DESTDIR)$(includedir)
+ $(INSTALL_DATA) -m 644 $(top_srcdir)/$(PAINC)
$(DESTDIR)$(includedir)/portaudio.h
+- $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
+- $(INSTALL) -m 644 portaudio-2.0.pc
$(DESTDIR)$(libdir)/pkgconfig/portaudio-2.0.pc
++ $(INSTALL) -d $(DESTDIR)${PREFIX}/lib/pkgconfig
++ $(INSTALL) -m 644 portaudio-2.0.pc
$(DESTDIR)${PREFIX}/lib/pkgconfig/portaudio-2.0.pc
+ @echo ""
+ @echo "------------------------------------------------------------"
+ @echo "PortAudio was successfully installed."
Index: audio/portaudio-devel/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/audio/portaudio-devel/patches/patch-aa,v
retrieving revision 1.2
diff -u -r1.2 patch-aa
--- audio/portaudio-devel/patches/patch-aa 6 Jun 2006 15:48:34 -0000
1.2
+++ audio/portaudio-devel/patches/patch-aa 8 Jan 2013 01:03:03 -0000
@@ -1,24 +1,17 @@
$NetBSD: patch-aa,v 1.2 2006/06/06 15:48:34 joerg Exp $
+Taking care pthread portability.
+
--- configure.orig 2006-05-19 16:20:07.000000000 +0000
+++ configure
-@@ -18957,7 +18957,7 @@ fi
-
-
-
--PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
-+have_jack=no
-
-
- echo "$as_me:$LINENO: checking for short" >&5
@@ -20503,13 +20503,13 @@ _ACEOF
irix* )
--echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS}
${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS}
${PTHREAD_LIBS}... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS}
${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS}
${PTHREAD_LIBS}... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -39,20 +32,20 @@
{ { echo "$as_me:$LINENO: error: IRIX posix thread library not found!" >&5
@@ -20746,20 +20746,20 @@ _ACEOF
- OTHER_OBJS="pa_sgi/pa_sgi.o src/os/unix/pa_unix_hostapis.o
src/os/unix/pa_unix_util.o";
+ OTHER_OBJS="pa_sgi/pa_sgi.o src/os/unix/pa_unix_hostapis.o
src/os/unix/pa_unix_util.o"
-- LIBS="-lm -ldmedia -laudio -lpthread";
-+ LIBS="-lm -ldmedia -laudio ${PTHREAD_LDFLAGS}
${PTHREAD_LIBS}";
- PADLL="libportaudio.so";
- SHARED_FLAGS="";
- ;;
+- LIBS="-lm -ldmedia -laudio -lpthread"
++ LIBS="-lm -ldmedia -laudio ${PTHREAD_LDFLAGS}
${PTHREAD_LIBS}";
+ PADLL="libportaudio.so"
+ SHARED_FLAGS=""
+ ;;
*)
-- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS}
${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS}
${PTHREAD_LIBS}... $ECHO_C" >&6
+- { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS}
${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS}
${PTHREAD_LIBS}... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -64,12 +57,12 @@
_ACEOF
@@ -20854,8 +20854,8 @@ _ACEOF
- fi
- THREAD_CFLAGS="-pthread"
-- DLL_LIBS="$DLL_LIBS -lm -lpthread";
-- LIBS="$LIBS -lm -lpthread";
+ fi
+
+- DLL_LIBS="$DLL_LIBS -lm -lpthread"
+- LIBS="$LIBS -lm -lpthread"
+ DLL_LIBS="$DLL_LIBS -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}";
+ LIBS="$LIBS -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}";
- PADLL="libportaudio.so";
- SHARED_FLAGS="-shared -fPIC";
+ PADLL="libportaudio.so"
+ ## support sun cc compiler flags
Home |
Main Index |
Thread Index |
Old Index