Attachment 105480 Details for Bug 145965 – alsa-plugins.txt

alsa-plugins.txt

alsa-plugins.txt (text/plain), 8.92 KB, created by Aragon Gouveia on 2010-05-10 23:19:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aragon Gouveia

Created: 2010-05-10 23:19:04 UTC

Size: 8.92 KB

patch

obsolete

>diff -uNr alsa-plugins.orig/Makefile alsa-plugins/Makefile
>--- alsa-plugins.orig/Makefile	2010-05-11 00:16:43.000000000 +0200
>+++ alsa-plugins/Makefile	2010-05-10 23:57:17.000000000 +0200
>@@ -20,4 +20,17 @@
> CONFIGURE_ARGS+=	--disable-jack --disable-pulseaudio --disable-samplerate
> CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
> 
>+OPTIONS=	SPEEX "Speex plugin" Off
>+
>+.include <bsd.port.options.mk>
>+
>+.if defined(WITH_SPEEX)
>+CONFIGURE_ARGS+=	--with-speex=lib
>+LIB_DEPENDS+=		speex:${PORTSDIR}/audio/speex
>+PLIST_SUB+=		SPEEX=""
>+.else
>+CONFIGURE_ARGS+=	--without-speex
>+PLIST_SUB+=		SPEEX="@comment "
>+.endif
>+
> .include <bsd.port.mk>
>diff -uNr alsa-plugins.orig/files/patch-alsa-plugins alsa-plugins/files/patch-alsa-plugins
>--- alsa-plugins.orig/files/patch-alsa-plugins	2010-05-11 00:16:43.000000000 +0200
>+++ alsa-plugins/files/patch-alsa-plugins	2010-05-11 00:12:51.000000000 +0200
>@@ -18,72 +18,6 @@
>  	$(am__append_2) $(am__append_3) $(am__append_4) \
>  	$(am__append_5) $(am__append_6) $(am__append_7)
>  EXTRA_DIST = gitcompile version COPYING.GPL m4/attributes.m4
>---- configure.orig	2009-08-31 21:16:47.000000000 +0800
>-+++ configure	2009-09-14 21:59:12.000000000 +0800
>-@@ -9645,7 +9645,7 @@
>-   echo $ECHO_N "(cached) $ECHO_C" >&6
>- else
>-   ac_check_lib_save_LIBS=$LIBS
>--LIBS="-ldl  $LIBS"
>-+LIBS="$LIBS"
>- cat >conftest.$ac_ext <<_ACEOF
>- /* confdefs.h.  */
>- _ACEOF
>-@@ -9717,7 +9717,7 @@
>- { echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
>- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
>- if test $ac_cv_lib_dl_dlopen = yes; then
>--  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
>-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs=""
>- else
>- 
>-     lt_cv_dlopen="dyld"
>-@@ -10015,7 +10015,7 @@
>-   echo $ECHO_N "(cached) $ECHO_C" >&6
>- else
>-   ac_check_lib_save_LIBS=$LIBS
>--LIBS="-ldl  $LIBS"
>-+LIBS="$LIBS"
>- cat >conftest.$ac_ext <<_ACEOF
>- /* confdefs.h.  */
>- _ACEOF
>-@@ -10087,7 +10087,7 @@
>- { echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
>- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
>- if test $ac_cv_lib_dl_dlopen = yes; then
>--  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
>-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs=""
>- else
>-   { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
>- echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
>-@@ -20270,7 +20270,7 @@
>-   echo $ECHO_N "(cached) $ECHO_C" >&6
>- else
>-   ac_check_lib_save_LIBS=$LIBS
>--LIBS="-lasound -ldl $LIBS"
>-+LIBS="-lasound $LIBS"
>- cat >conftest.$ac_ext <<_ACEOF
>- /* confdefs.h.  */
>- _ACEOF
>-@@ -21493,7 +21493,7 @@
>- echo "${ECHO_T}$SND_PLUGINS_VERSION" >&6; }
>- 
>- 
>--ac_config_files="$ac_config_files Makefile oss/Makefile pph/Makefile jack/Makefile pulse/Makefile mix/Makefile rate/Makefile a52/Makefile rate-lavc/Makefile maemo/Makefile doc/Makefile usb_stream/Makefile speex/Makefile arcam-av/Makefile"
>-+ac_config_files="$ac_config_files Makefile oss/Makefile pph/Makefile jack/Makefile pulse/Makefile mix/Makefile rate/Makefile a52/Makefile rate-lavc/Makefile maemo/Makefile doc/Makefile speex/Makefile"
>- 
>- cat >confcache <<\_ACEOF
>- # This file is a shell script that caches the results of configure
>-@@ -22134,9 +22134,7 @@
>-     "rate-lavc/Makefile") CONFIG_FILES="$CONFIG_FILES rate-lavc/Makefile" ;;
>-     "maemo/Makefile") CONFIG_FILES="$CONFIG_FILES maemo/Makefile" ;;
>-     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
>--    "usb_stream/Makefile") CONFIG_FILES="$CONFIG_FILES usb_stream/Makefile" ;;
>-     "speex/Makefile") CONFIG_FILES="$CONFIG_FILES speex/Makefile" ;;
>--    "arcam-av/Makefile") CONFIG_FILES="$CONFIG_FILES arcam-av/Makefile" ;;
>- 
>-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
>- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
> --- jack/pcm_jack.c.orig	2009-09-16 04:33:36.000000000 +0800
> +++ jack/pcm_jack.c	2009-09-16 04:33:55.000000000 +0800
> @@ -20,7 +20,9 @@
>diff -uNr alsa-plugins.orig/files/patch-configure alsa-plugins/files/patch-configure
>--- alsa-plugins.orig/files/patch-configure	1970-01-01 02:00:00.000000000 +0200
>+++ alsa-plugins/files/patch-configure	2010-05-11 00:13:47.000000000 +0200
>@@ -0,0 +1,128 @@
>+--- configure.orig	2010-04-16 13:18:56.000000000 +0200
>++++ configure	2010-05-11 00:08:29.000000000 +0200
>+@@ -9645,7 +9645,7 @@
>+   echo $ECHO_N "(cached) $ECHO_C" >&6
>+ else
>+   ac_check_lib_save_LIBS=$LIBS
>+-LIBS="-ldl  $LIBS"
>++LIBS="$LIBS"
>+ cat >conftest.$ac_ext <<_ACEOF
>+ /* confdefs.h.  */
>+ _ACEOF
>+@@ -9717,7 +9717,7 @@
>+ { echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
>+ echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
>+ if test $ac_cv_lib_dl_dlopen = yes; then
>+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
>++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs=""
>+ else
>+ 
>+     lt_cv_dlopen="dyld"
>+@@ -10015,7 +10015,7 @@
>+   echo $ECHO_N "(cached) $ECHO_C" >&6
>+ else
>+   ac_check_lib_save_LIBS=$LIBS
>+-LIBS="-ldl  $LIBS"
>++LIBS="$LIBS"
>+ cat >conftest.$ac_ext <<_ACEOF
>+ /* confdefs.h.  */
>+ _ACEOF
>+@@ -10087,7 +10087,7 @@
>+ { echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
>+ echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
>+ if test $ac_cv_lib_dl_dlopen = yes; then
>+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
>++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs=""
>+ else
>+   { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
>+ echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
>+@@ -20270,7 +20270,7 @@
>+   echo $ECHO_N "(cached) $ECHO_C" >&6
>+ else
>+   ac_check_lib_save_LIBS=$LIBS
>+-LIBS="-lasound -ldl $LIBS"
>++LIBS="-lasound $LIBS"
>+ cat >conftest.$ac_ext <<_ACEOF
>+ /* confdefs.h.  */
>+ _ACEOF
>+@@ -21249,6 +21249,20 @@
>+ 
>+ 
>+ 
>++
>++
>++
>++# Check whether --with-speex was given.
>++if test "${with_speex+set}" = set; then
>++  withval=$with_speex; PPH=$withval
>++else
>++  PPH="lib"
>++fi
>++
>++
>++USE_LIBSPEEX=""
>++HAVE_SPEEXDSP=""
>++if test "$PPH" = "lib"; then
>+ pkg_failed=no
>+ { echo "$as_me:$LINENO: checking for speexdsp" >&5
>+ echo $ECHO_N "checking for speexdsp... $ECHO_C" >&6; }
>+@@ -21319,26 +21333,6 @@
>+ fi
>+ 
>+ 
>+-if test "$HAVE_SPEEXDSP" = "yes"; then
>+-  HAVE_SPEEXDSP_TRUE=
>+-  HAVE_SPEEXDSP_FALSE='#'
>+-else
>+-  HAVE_SPEEXDSP_TRUE='#'
>+-  HAVE_SPEEXDSP_FALSE=
>+-fi
>+-
>+-
>+-
>+-# Check whether --with-speex was given.
>+-if test "${with_speex+set}" = set; then
>+-  withval=$with_speex; PPH=$withval
>+-else
>+-  PPH="lib"
>+-fi
>+-
>+-
>+-USE_LIBSPEEX=""
>+-if test "$PPH" = "lib"; then
>+ 	if test "$HAVE_SPEEXDSP" = "yes"; then
>+ 		{ echo "$as_me:$LINENO: checking for speex_resampler_init in -lspeexdsp" >&5
>+ echo $ECHO_N "checking for speex_resampler_init in -lspeexdsp... $ECHO_C" >&6; }
>+@@ -21437,6 +21431,13 @@
>+ fi
>+ 
>+ 
>++if test "$HAVE_SPEEXDSP" = "yes"; then
>++  HAVE_SPEEXDSP_TRUE=
>++  HAVE_SPEEXDSP_FALSE='#'
>++else
>++  HAVE_SPEEXDSP_TRUE='#'
>++  HAVE_SPEEXDSP_FALSE=
>++fi
>+ 
>+ if test "$PPH" = "builtin" -o "$PPH" = "lib"; then
>+   HAVE_PPH_TRUE=
>+@@ -21493,7 +21493,7 @@
>+ echo "${ECHO_T}$SND_PLUGINS_VERSION" >&6; }
>+ 
>+ 
>+-ac_config_files="$ac_config_files Makefile oss/Makefile pph/Makefile jack/Makefile pulse/Makefile mix/Makefile rate/Makefile a52/Makefile rate-lavc/Makefile maemo/Makefile doc/Makefile usb_stream/Makefile speex/Makefile arcam-av/Makefile"
>++ac_config_files="$ac_config_files Makefile oss/Makefile pph/Makefile jack/Makefile pulse/Makefile mix/Makefile rate/Makefile a52/Makefile rate-lavc/Makefile maemo/Makefile doc/Makefile speex/Makefile"
>+ 
>+ cat >confcache <<\_ACEOF
>+ # This file is a shell script that caches the results of configure
>+@@ -22134,9 +22134,7 @@
>+     "rate-lavc/Makefile") CONFIG_FILES="$CONFIG_FILES rate-lavc/Makefile" ;;
>+     "maemo/Makefile") CONFIG_FILES="$CONFIG_FILES maemo/Makefile" ;;
>+     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
>+-    "usb_stream/Makefile") CONFIG_FILES="$CONFIG_FILES usb_stream/Makefile" ;;
>+     "speex/Makefile") CONFIG_FILES="$CONFIG_FILES speex/Makefile" ;;
>+-    "arcam-av/Makefile") CONFIG_FILES="$CONFIG_FILES arcam-av/Makefile" ;;
>+ 
>+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
>+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
>diff -uNr alsa-plugins.orig/pkg-plist alsa-plugins/pkg-plist
>--- alsa-plugins.orig/pkg-plist	2010-05-11 00:16:43.000000000 +0200
>+++ alsa-plugins/pkg-plist	2010-05-10 23:55:28.000000000 +0200
>@@ -6,10 +6,9 @@
> lib/alsa-lib/libasound_module_pcm_upmix.la
> lib/alsa-lib/libasound_module_pcm_vdownmix.so
> lib/alsa-lib/libasound_module_pcm_vdownmix.la
>-lib/alsa-lib/libasound_module_rate_speexrate_best.so
>-lib/alsa-lib/libasound_module_rate_speexrate_medium.so
>-lib/alsa-lib/libasound_module_rate_speexrate.so
>-lib/alsa-lib/libasound_module_rate_speexrate.la
>-lib/alsa-lib/libasound_module_pcm_speex.so
>-lib/alsa-lib/libasound_module_pcm_speex.la
>-@dirrm lib/alsa-lib
>+%%SPEEX%%lib/alsa-lib/libasound_module_rate_speexrate_best.so
>+%%SPEEX%%lib/alsa-lib/libasound_module_rate_speexrate_medium.so
>+%%SPEEX%%lib/alsa-lib/libasound_module_rate_speexrate.so
>+%%SPEEX%%lib/alsa-lib/libasound_module_rate_speexrate.la
>+%%SPEEX%%lib/alsa-lib/libasound_module_pcm_speex.so
>+%%SPEEX%%lib/alsa-lib/libasound_module_pcm_speex.la

Actions: View

Attachments on bug 145965: 105479 | 105480 | 105481