Compare commits
4 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
ac44b72134 | ||
|
11f1d5fc86 | ||
|
3fbed72ba5 | ||
|
ec7c2677ee |
4 changed files with 515 additions and 31 deletions
0
.cvsignore → .gitignore
vendored
0
.cvsignore → .gitignore
vendored
21
Makefile
21
Makefile
|
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: akode
|
||||
# $Id$
|
||||
NAME := akode
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
||||
438
akode-pulseaudio.patch
Normal file
438
akode-pulseaudio.patch
Normal file
|
|
@ -0,0 +1,438 @@
|
|||
diff -urN akode-2.0.1.orig/Makefile.in akode-2.0.1/Makefile.in
|
||||
--- akode-2.0.1.orig/Makefile.in 2006-07-23 00:17:11.000000000 +0200
|
||||
+++ akode-2.0.1/Makefile.in 2006-09-06 14:38:04.000000000 +0200
|
||||
@@ -169,9 +169,9 @@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
-POLYP_CFLAGS = @POLYP_CFLAGS@
|
||||
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
|
||||
-POLYP_LIBADD = @POLYP_LIBADD@
|
||||
+PULSE_CFLAGS = @PULSE_CFLAGS@
|
||||
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
|
||||
+PULSE_LIBADD = @PULSE_LIBADD@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
diff -urN akode-2.0.1.orig/akode/Makefile.in akode-2.0.1/akode/Makefile.in
|
||||
--- akode-2.0.1.orig/akode/Makefile.in 2006-07-23 00:17:11.000000000 +0200
|
||||
+++ akode-2.0.1/akode/Makefile.in 2006-09-06 14:38:04.000000000 +0200
|
||||
@@ -158,9 +158,9 @@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
-POLYP_CFLAGS = @POLYP_CFLAGS@
|
||||
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
|
||||
-POLYP_LIBADD = @POLYP_LIBADD@
|
||||
+PULSE_CFLAGS = @PULSE_CFLAGS@
|
||||
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
|
||||
+PULSE_LIBADD = @PULSE_LIBADD@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
diff -urN akode-2.0.1.orig/akode/akodeplay/Makefile.in akode-2.0.1/akode/akodeplay/Makefile.in
|
||||
--- akode-2.0.1.orig/akode/akodeplay/Makefile.in 2006-07-23 00:17:11.000000000 +0200
|
||||
+++ akode-2.0.1/akode/akodeplay/Makefile.in 2006-09-06 14:38:04.000000000 +0200
|
||||
@@ -170,9 +170,9 @@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
-POLYP_CFLAGS = @POLYP_CFLAGS@
|
||||
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
|
||||
-POLYP_LIBADD = @POLYP_LIBADD@
|
||||
+PULSE_CFLAGS = @PULSE_CFLAGS@
|
||||
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
|
||||
+PULSE_LIBADD = @PULSE_LIBADD@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
diff -urN akode-2.0.1.orig/akode/configure.in.in akode-2.0.1/akode/configure.in.in
|
||||
--- akode-2.0.1.orig/akode/configure.in.in 2005-10-27 17:12:36.000000000 +0200
|
||||
+++ akode-2.0.1/akode/configure.in.in 2006-09-06 14:45:46.000000000 +0200
|
||||
@@ -295,24 +295,24 @@
|
||||
AC_SUBST(JACK_LDFLAGS)
|
||||
fi
|
||||
|
||||
-AC_ARG_WITH(polypaudio,AC_HELP_STRING([--with-polypaudio],[Enable Polypaudio server support @<:@default=check@:>@]),[polypaudio_test="$withval"],[polypaudio_test="yes"])
|
||||
+AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"])
|
||||
|
||||
-if test "x$polypaudio_test" = "xyes" ; then
|
||||
-AC_MSG_CHECKING(for Polypaudio 0.7 or later)
|
||||
-if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then
|
||||
- POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`"
|
||||
- POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`"
|
||||
- POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`"
|
||||
- have_polyp=yes
|
||||
+if test "x$pulseaudio_test" = "xyes" ; then
|
||||
+AC_MSG_CHECKING(for PulseAudio 0.9.2 or later)
|
||||
+if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then
|
||||
+ PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`"
|
||||
+ PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`"
|
||||
+ PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`"
|
||||
+ have_pulse=yes
|
||||
AC_MSG_RESULT(yes)
|
||||
- AC_DEFINE(HAVE_LIBPOLYP, 1,
|
||||
- [Define if you have polyplib (required if you want Polypaudio server support)])
|
||||
+ AC_DEFINE(HAVE_LIBPULSE, 1,
|
||||
+ [Define if you have libpulse (required if you want PulseAudio server support)])
|
||||
else
|
||||
AC_MSG_RESULT(not installed)
|
||||
fi
|
||||
-AC_SUBST(POLYP_CFLAGS)
|
||||
-AC_SUBST(POLYP_LIBADD)
|
||||
-AC_SUBST(POLYP_LDFLAGS)
|
||||
+AC_SUBST(PULSE_CFLAGS)
|
||||
+AC_SUBST(PULSE_LIBADD)
|
||||
+AC_SUBST(PULSE_LDFLAGS)
|
||||
fi
|
||||
|
||||
AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=no@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="no"])
|
||||
@@ -507,7 +507,7 @@
|
||||
AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes)
|
||||
AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes)
|
||||
AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes)
|
||||
-AM_CONDITIONAL(include_polyp_sink, test x$have_polyp = xyes)
|
||||
+AM_CONDITIONAL(include_polyp_sink, test x$have_pulse = xyes)
|
||||
AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes)
|
||||
|
||||
AC_MSG_CHECKING(for compilable aKode)
|
||||
diff -urN akode-2.0.1.orig/akode/lib/Makefile.in akode-2.0.1/akode/lib/Makefile.in
|
||||
--- akode-2.0.1.orig/akode/lib/Makefile.in 2006-07-23 00:17:11.000000000 +0200
|
||||
+++ akode-2.0.1/akode/lib/Makefile.in 2006-09-06 14:38:04.000000000 +0200
|
||||
@@ -194,9 +194,9 @@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
-POLYP_CFLAGS = @POLYP_CFLAGS@
|
||||
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
|
||||
-POLYP_LIBADD = @POLYP_LIBADD@
|
||||
+PULSE_CFLAGS = @PULSE_CFLAGS@
|
||||
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
|
||||
+PULSE_LIBADD = @PULSE_LIBADD@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
diff -urN akode-2.0.1.orig/akode/plugins/Makefile.in akode-2.0.1/akode/plugins/Makefile.in
|
||||
--- akode-2.0.1.orig/akode/plugins/Makefile.in 2006-07-23 00:17:11.000000000 +0200
|
||||
+++ akode-2.0.1/akode/plugins/Makefile.in 2006-09-06 14:38:04.000000000 +0200
|
||||
@@ -154,9 +154,9 @@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
-POLYP_CFLAGS = @POLYP_CFLAGS@
|
||||
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
|
||||
-POLYP_LIBADD = @POLYP_LIBADD@
|
||||
+PULSE_CFLAGS = @PULSE_CFLAGS@
|
||||
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
|
||||
+PULSE_LIBADD = @PULSE_LIBADD@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
@@ -251,11 +251,11 @@
|
||||
@include_oss_sink_TRUE@AKODE_OSS_SINK = oss_sink
|
||||
@include_sun_sink_TRUE@AKODE_SUN_SINK = sun_sink
|
||||
@include_jack_sink_TRUE@AKODE_JACK_SINK = jack_sink
|
||||
-@include_polyp_sink_TRUE@AKODE_POLYP_SINK = polyp_sink
|
||||
+@include_polyp_sink_TRUE@AKODE_PULSE_SINK = polyp_sink
|
||||
SUBDIRS = $(AKODE_MPC_DECODER) $(AKODE_XIPH_DECODER) \
|
||||
$(AKODE_MPEG_DECODER) $(AKODE_FFMPEG_DECODER) \
|
||||
$(AKODE_ALSA_SINK) $(AKODE_OSS_SINK) $(AKODE_SUN_SINK) \
|
||||
- $(AKODE_JACK_SINK) $(AKODE_POLYP_SINK) \
|
||||
+ $(AKODE_JACK_SINK) $(AKODE_PULSE_SINK) \
|
||||
$(AKODE_SRC_RESAMPLER)
|
||||
|
||||
#>- all: all-recursive
|
||||
diff -urN akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in akode-2.0.1/akode/plugins/alsa_sink/Makefile.in
|
||||
--- akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200
|
||||
+++ akode-2.0.1/akode/plugins/alsa_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200
|
||||
@@ -177,9 +177,9 @@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
-POLYP_CFLAGS = @POLYP_CFLAGS@
|
||||
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
|
||||
-POLYP_LIBADD = @POLYP_LIBADD@
|
||||
+PULSE_CFLAGS = @PULSE_CFLAGS@
|
||||
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
|
||||
+PULSE_LIBADD = @PULSE_LIBADD@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
diff -urN akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in akode-2.0.1/akode/plugins/ffmpeg_decoder/Makefile.in
|
||||
--- akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200
|
||||
+++ akode-2.0.1/akode/plugins/ffmpeg_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200
|
||||
@@ -178,9 +178,9 @@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
-POLYP_CFLAGS = @POLYP_CFLAGS@
|
||||
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
|
||||
-POLYP_LIBADD = @POLYP_LIBADD@
|
||||
+PULSE_CFLAGS = @PULSE_CFLAGS@
|
||||
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
|
||||
+PULSE_LIBADD = @PULSE_LIBADD@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
diff -urN akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in akode-2.0.1/akode/plugins/jack_sink/Makefile.in
|
||||
--- akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200
|
||||
+++ akode-2.0.1/akode/plugins/jack_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200
|
||||
@@ -177,9 +177,9 @@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
-POLYP_CFLAGS = @POLYP_CFLAGS@
|
||||
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
|
||||
-POLYP_LIBADD = @POLYP_LIBADD@
|
||||
+PULSE_CFLAGS = @PULSE_CFLAGS@
|
||||
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
|
||||
+PULSE_LIBADD = @PULSE_LIBADD@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
diff -urN akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in akode-2.0.1/akode/plugins/mpc_decoder/Makefile.in
|
||||
--- akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200
|
||||
+++ akode-2.0.1/akode/plugins/mpc_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200
|
||||
@@ -191,9 +191,9 @@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
-POLYP_CFLAGS = @POLYP_CFLAGS@
|
||||
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
|
||||
-POLYP_LIBADD = @POLYP_LIBADD@
|
||||
+PULSE_CFLAGS = @PULSE_CFLAGS@
|
||||
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
|
||||
+PULSE_LIBADD = @PULSE_LIBADD@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
diff -urN akode-2.0.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in akode-2.0.1/akode/plugins/mpc_decoder/mppdec/Makefile.in
|
||||
--- akode-2.0.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in 2006-07-23 00:17:11.000000000 +0200
|
||||
+++ akode-2.0.1/akode/plugins/mpc_decoder/mppdec/Makefile.in 2006-09-06 14:38:04.000000000 +0200
|
||||
@@ -169,9 +169,9 @@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
-POLYP_CFLAGS = @POLYP_CFLAGS@
|
||||
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
|
||||
-POLYP_LIBADD = @POLYP_LIBADD@
|
||||
+PULSE_CFLAGS = @PULSE_CFLAGS@
|
||||
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
|
||||
+PULSE_LIBADD = @PULSE_LIBADD@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
diff -urN akode-2.0.1.orig/akode/plugins/mpeg_decoder/Makefile.in akode-2.0.1/akode/plugins/mpeg_decoder/Makefile.in
|
||||
--- akode-2.0.1.orig/akode/plugins/mpeg_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200
|
||||
+++ akode-2.0.1/akode/plugins/mpeg_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200
|
||||
@@ -178,9 +178,9 @@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
-POLYP_CFLAGS = @POLYP_CFLAGS@
|
||||
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
|
||||
-POLYP_LIBADD = @POLYP_LIBADD@
|
||||
+PULSE_CFLAGS = @PULSE_CFLAGS@
|
||||
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
|
||||
+PULSE_LIBADD = @PULSE_LIBADD@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
diff -urN akode-2.0.1.orig/akode/plugins/oss_sink/Makefile.in akode-2.0.1/akode/plugins/oss_sink/Makefile.in
|
||||
--- akode-2.0.1.orig/akode/plugins/oss_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200
|
||||
+++ akode-2.0.1/akode/plugins/oss_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200
|
||||
@@ -177,9 +177,9 @@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
-POLYP_CFLAGS = @POLYP_CFLAGS@
|
||||
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
|
||||
-POLYP_LIBADD = @POLYP_LIBADD@
|
||||
+PULSE_CFLAGS = @PULSE_CFLAGS@
|
||||
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
|
||||
+PULSE_LIBADD = @PULSE_LIBADD@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am akode-2.0.1/akode/plugins/polyp_sink/Makefile.am
|
||||
--- akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am 2005-07-15 13:20:03.000000000 +0200
|
||||
+++ akode-2.0.1/akode/plugins/polyp_sink/Makefile.am 2006-09-06 14:38:04.000000000 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
-INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes)
|
||||
+INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes)
|
||||
|
||||
lib_LTLIBRARIES = libakode_polyp_sink.la
|
||||
|
||||
libakode_polyp_sink_la_SOURCES = polyp_sink.cpp
|
||||
-libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(POLYP_LDFLAGS)
|
||||
-libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD)
|
||||
+libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS)
|
||||
+libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD)
|
||||
diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in akode-2.0.1/akode/plugins/polyp_sink/Makefile.in
|
||||
--- akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200
|
||||
+++ akode-2.0.1/akode/plugins/polyp_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200
|
||||
@@ -177,9 +177,9 @@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
-POLYP_CFLAGS = @POLYP_CFLAGS@
|
||||
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
|
||||
-POLYP_LIBADD = @POLYP_LIBADD@
|
||||
+PULSE_CFLAGS = @PULSE_CFLAGS@
|
||||
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
|
||||
+PULSE_LIBADD = @PULSE_LIBADD@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
@@ -265,13 +265,13 @@
|
||||
target_vendor = @target_vendor@
|
||||
unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
|
||||
unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
|
||||
-INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes)
|
||||
+INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes)
|
||||
lib_LTLIBRARIES = libakode_polyp_sink.la
|
||||
libakode_polyp_sink_la_SOURCES = polyp_sink.cpp
|
||||
-#>- libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(POLYP_LDFLAGS)
|
||||
+#>- libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS)
|
||||
#>+ 1
|
||||
-libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) $(POLYP_LDFLAGS)
|
||||
-libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD)
|
||||
+libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) $(PULSE_LDFLAGS)
|
||||
+libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD)
|
||||
#>- all: all-am
|
||||
#>+ 1
|
||||
all: docs-am all-am
|
||||
diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp akode-2.0.1/akode/plugins/polyp_sink/polyp_sink.cpp
|
||||
--- akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp 2005-10-20 22:54:12.000000000 +0200
|
||||
+++ akode-2.0.1/akode/plugins/polyp_sink/polyp_sink.cpp 2006-09-06 15:14:52.000000000 +0200
|
||||
@@ -25,7 +25,7 @@
|
||||
#elif defined(HAVE_INTTYPES_H)
|
||||
#include <inttypes.h>
|
||||
#endif
|
||||
-#include <polyp/polyplib-simple.h>
|
||||
+#include <pulse/simple.h>
|
||||
|
||||
#include "audioframe.h"
|
||||
#include "audiobuffer.h"
|
||||
@@ -59,7 +59,7 @@
|
||||
|
||||
bool PolypSink::open() {
|
||||
int error = 0;
|
||||
- m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 255, &error );
|
||||
+ m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 0, &error );
|
||||
if (!m_data->server || error != 0) {
|
||||
m_data->error = true;
|
||||
close();
|
||||
diff -urN akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in akode-2.0.1/akode/plugins/src_resampler/Makefile.in
|
||||
--- akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in 2006-07-23 00:17:11.000000000 +0200
|
||||
+++ akode-2.0.1/akode/plugins/src_resampler/Makefile.in 2006-09-06 14:38:04.000000000 +0200
|
||||
@@ -178,9 +178,9 @@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
-POLYP_CFLAGS = @POLYP_CFLAGS@
|
||||
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
|
||||
-POLYP_LIBADD = @POLYP_LIBADD@
|
||||
+PULSE_CFLAGS = @PULSE_CFLAGS@
|
||||
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
|
||||
+PULSE_LIBADD = @PULSE_LIBADD@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
diff -urN akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in akode-2.0.1/akode/plugins/sun_sink/Makefile.in
|
||||
--- akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200
|
||||
+++ akode-2.0.1/akode/plugins/sun_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200
|
||||
@@ -175,9 +175,9 @@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
-POLYP_CFLAGS = @POLYP_CFLAGS@
|
||||
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
|
||||
-POLYP_LIBADD = @POLYP_LIBADD@
|
||||
+PULSE_CFLAGS = @PULSE_CFLAGS@
|
||||
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
|
||||
+PULSE_LIBADD = @PULSE_LIBADD@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
diff -urN akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in akode-2.0.1/akode/plugins/xiph_decoder/Makefile.in
|
||||
--- akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200
|
||||
+++ akode-2.0.1/akode/plugins/xiph_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200
|
||||
@@ -185,9 +185,9 @@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
-POLYP_CFLAGS = @POLYP_CFLAGS@
|
||||
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
|
||||
-POLYP_LIBADD = @POLYP_LIBADD@
|
||||
+PULSE_CFLAGS = @PULSE_CFLAGS@
|
||||
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
|
||||
+PULSE_LIBADD = @PULSE_LIBADD@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
diff -urN akode-2.0.1.orig/config.h.in akode-2.0.1/config.h.in
|
||||
--- akode-2.0.1.orig/config.h.in 2006-07-23 00:17:04.000000000 +0200
|
||||
+++ akode-2.0.1/config.h.in 2006-09-06 14:44:55.000000000 +0200
|
||||
@@ -43,9 +43,9 @@
|
||||
/* Define if you have libOggFLAC (required for loading OggFLAC files) */
|
||||
#undef HAVE_LIBOGGFLAC
|
||||
|
||||
-/* Define if you have polyplib (required if you want Polypaudio server
|
||||
+/* Define if you have libpulse (required if you want PulseAudio server
|
||||
support) */
|
||||
-#undef HAVE_LIBPOLYP
|
||||
+#undef HAVE_LIBPULSE
|
||||
|
||||
/* defined if you have libsamplerate library and header */
|
||||
#undef HAVE_LIBSAMPLERATE
|
||||
diff -urN akode-2.0.1.orig/configure.in akode-2.0.1/configure.in
|
||||
--- akode-2.0.1.orig/configure.in 2006-07-23 00:16:52.000000000 +0200
|
||||
+++ akode-2.0.1/configure.in 2006-09-06 14:45:21.000000000 +0200
|
||||
@@ -400,24 +400,24 @@
|
||||
AC_SUBST(JACK_LDFLAGS)
|
||||
fi
|
||||
|
||||
-AC_ARG_WITH(polypaudio,AC_HELP_STRING([--with-polypaudio],[Enable Polypaudio server support @<:@default=check@:>@]),[polypaudio_test="$withval"],[polypaudio_test="yes"])
|
||||
+AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"])
|
||||
|
||||
-if test "x$polypaudio_test" = "xyes" ; then
|
||||
-AC_MSG_CHECKING(for Polypaudio 0.7 or later)
|
||||
-if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then
|
||||
- POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`"
|
||||
- POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`"
|
||||
- POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`"
|
||||
- have_polyp=yes
|
||||
+if test "x$pulseaudio_test" = "xyes" ; then
|
||||
+AC_MSG_CHECKING(for PulseAudio 0.9.2 or later)
|
||||
+if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then
|
||||
+ PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`"
|
||||
+ PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`"
|
||||
+ PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`"
|
||||
+ have_pulse=yes
|
||||
AC_MSG_RESULT(yes)
|
||||
- AC_DEFINE(HAVE_LIBPOLYP, 1,
|
||||
- [Define if you have polyplib (required if you want Polypaudio server support)])
|
||||
+ AC_DEFINE(HAVE_LIBPULSE, 1,
|
||||
+ [Define if you have libpulse (required if you want PulseAudio server support)])
|
||||
else
|
||||
AC_MSG_RESULT(not installed)
|
||||
fi
|
||||
-AC_SUBST(POLYP_CFLAGS)
|
||||
-AC_SUBST(POLYP_LIBADD)
|
||||
-AC_SUBST(POLYP_LDFLAGS)
|
||||
+AC_SUBST(PULSE_CFLAGS)
|
||||
+AC_SUBST(PULSE_LIBADD)
|
||||
+AC_SUBST(PULSE_LDFLAGS)
|
||||
fi
|
||||
|
||||
AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=no@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="no"])
|
||||
@@ -612,7 +612,7 @@
|
||||
AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes)
|
||||
AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes)
|
||||
AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes)
|
||||
-AM_CONDITIONAL(include_polyp_sink, test x$have_polyp = xyes)
|
||||
+AM_CONDITIONAL(include_polyp_sink, test x$have_pulse = xyes)
|
||||
AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes)
|
||||
|
||||
AC_MSG_CHECKING(for compilable aKode)
|
||||
87
akode.spec
87
akode.spec
|
|
@ -2,7 +2,7 @@
|
|||
Summary: Audio-decoding framework
|
||||
Name: akode
|
||||
Version: 2.0.1
|
||||
Release: 2%{?dist}
|
||||
Release: 5%{?dist}
|
||||
License: LGPL
|
||||
Group: System Environment/Libraries
|
||||
#URL: http://carewolf.com/akode/
|
||||
|
|
@ -10,6 +10,22 @@ URL: http://www.kde-apps.org/content/show.php?content=30375
|
|||
Source0: http://www.kde-apps.org/content/files/30375-akode-%{version}.tar.bz2
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Patch1: akode-pulseaudio.patch
|
||||
|
||||
#Conflicts: kdemultimedia < 6:3.5
|
||||
|
||||
%if 0%{?fedora} > 4
|
||||
%define _with_jack --with-jack
|
||||
%define _with_pulseaudio --with-pulseaudio
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} > 6
|
||||
%define _with_pulseaudio --with-pulseaudio
|
||||
# pulseaudio is/will-be the F7 default,
|
||||
Requires: %{name}-pulseaudio
|
||||
%endif
|
||||
|
||||
|
||||
BuildRequires: automake
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: flac-devel
|
||||
|
|
@ -17,6 +33,8 @@ BuildRequires: libsamplerate-devel
|
|||
BuildRequires: speex-devel
|
||||
BuildRequires: libvorbis-devel
|
||||
BuildRequires: libtool
|
||||
%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
|
||||
%{?_with_pulseaudio:BuildRequires: pulseaudio-devel}
|
||||
|
||||
%description
|
||||
aKode is a simple audio-decoding frame-work that provides a uniform
|
||||
|
|
@ -30,12 +48,6 @@ aKode currently has the following decoder plugins:
|
|||
aKode also has the following audio outputs:
|
||||
* oss: Outputs to the OSS (Open Sound System)
|
||||
* alsa: Outputs to ALSA (dmix is recommended).
|
||||
%if 0
|
||||
TODO
|
||||
* jack: Outputs using Jack audio backend.
|
||||
* polyp: Output to the polypaudio server. Recommended for network
|
||||
transparent audio.
|
||||
%endif
|
||||
|
||||
%package devel
|
||||
Summary: Headers for developing programs that will use %{name}
|
||||
|
|
@ -44,10 +56,36 @@ Requires: %{name} = %{version}-%{release}
|
|||
%description devel
|
||||
%{summary}.
|
||||
|
||||
%package jack
|
||||
Summary: Jack audio output backend for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%description jack
|
||||
%{summary}.
|
||||
|
||||
%package libsamplerate
|
||||
Summary: Resampler based on (GPL) libsamplerate for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%description libsamplerate
|
||||
%{summary}.
|
||||
Packaged separately to keep main/core %{akode} package LGPL-clean.
|
||||
|
||||
%package pulseaudio
|
||||
Summary: Pulseaudio output backend for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%description pulseaudio
|
||||
%{summary}.
|
||||
Recommended for network transparent audio.
|
||||
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}%{?beta}
|
||||
|
||||
%patch1 -p1 -b .pulseaudio
|
||||
|
||||
[ ! -f configure ] && make -f Makefile.cvs
|
||||
|
||||
|
||||
|
|
@ -58,11 +96,11 @@ Requires: %{name} = %{version}-%{release}
|
|||
--without-libltdl \
|
||||
--with-alsa \
|
||||
--with-flac \
|
||||
%{?_with_jack} %{!?_with_jack:--without-jack} \
|
||||
--with-libsamplerate \
|
||||
%{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \
|
||||
--with-speex \
|
||||
--with-vorbis \
|
||||
--without-jack \
|
||||
--without-polypaudio \
|
||||
--without-ffmpeg \
|
||||
--without-libmad
|
||||
|
||||
|
|
@ -97,7 +135,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%doc rpmdocs/*
|
||||
%{_bindir}/akodeplay
|
||||
%{_libdir}/libakode.so.*
|
||||
%{_libdir}/libakode_*_*.so
|
||||
%{_libdir}/libakode_alsa_sink.so
|
||||
%{_libdir}/libakode_oss_sink.so
|
||||
%{_libdir}/libakode_mpc_decoder.so
|
||||
%{_libdir}/libakode_xiph_decoder.so
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
|
|
@ -105,8 +146,34 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{_includedir}/*
|
||||
%{_libdir}/libakode.so
|
||||
|
||||
%if "%{?_with_jack:1}" == "1"
|
||||
%files jack
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/libakode_jack_sink.so
|
||||
%endif
|
||||
|
||||
%files libsamplerate
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/libakode_src_resampler.so
|
||||
|
||||
%if "%{?_with_pulseaudio:1}" == "1"
|
||||
%files pulseaudio
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/libakode_polyp_sink.so
|
||||
%endif
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Feb 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-5
|
||||
- enable pulseaudio support
|
||||
- Requires: akode-pulseaudio (fc7+)
|
||||
|
||||
* Thu Dec 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.1-4
|
||||
- enable jack support (subpkg)
|
||||
- package (GPL'd) libsamplerate-based resampler separately,
|
||||
to keep main pkg LGPL-clean
|
||||
|
||||
* Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.1-2
|
||||
- fc6 respin
|
||||
|
||||
|
|
|
|||
Reference in a new issue