Compare commits
4 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
15592122a5 | ||
|
4dc49c7427 | ||
|
85ba152d7b | ||
|
1807eeab62 |
4 changed files with 153 additions and 170 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)
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
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 @@
|
||||
diff -up akode-2.0.2/akode/akodeplay/Makefile.in.pulseaudio akode-2.0.2/akode/akodeplay/Makefile.in
|
||||
--- akode-2.0.2/akode/akodeplay/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400
|
||||
+++ akode-2.0.2/akode/akodeplay/Makefile.in 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -172,9 +172,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
|
|
@ -14,42 +14,10 @@ diff -urN akode-2.0.1.orig/Makefile.in akode-2.0.1/Makefile.in
|
|||
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 @@
|
||||
diff -up akode-2.0.2/akode/configure.in.in.pulseaudio akode-2.0.2/akode/configure.in.in
|
||||
--- akode-2.0.2/akode/configure.in.in.pulseaudio 2007-02-06 16:47:43.000000000 -0500
|
||||
+++ akode-2.0.2/akode/configure.in.in 2008-09-26 13:35:25.000000000 -0400
|
||||
@@ -270,24 +270,24 @@ AC_SUBST(JACK_LIBADD)
|
||||
AC_SUBST(JACK_LDFLAGS)
|
||||
fi
|
||||
|
||||
|
|
@ -86,8 +54,8 @@ diff -urN akode-2.0.1.orig/akode/configure.in.in akode-2.0.1/akode/configure.in.
|
|||
+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 @@
|
||||
AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"])
|
||||
@@ -482,7 +482,7 @@ AM_CONDITIONAL(include_alsa_sink, test x
|
||||
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)
|
||||
|
|
@ -96,10 +64,10 @@ diff -urN akode-2.0.1.orig/akode/configure.in.in akode-2.0.1/akode/configure.in.
|
|||
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 @@
|
||||
diff -up akode-2.0.2/akode/lib/Makefile.in.pulseaudio akode-2.0.2/akode/lib/Makefile.in
|
||||
--- akode-2.0.2/akode/lib/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400
|
||||
+++ akode-2.0.2/akode/lib/Makefile.in 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -196,9 +196,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
|
|
@ -112,10 +80,10 @@ diff -urN akode-2.0.1.orig/akode/lib/Makefile.in akode-2.0.1/akode/lib/Makefile.
|
|||
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 @@
|
||||
diff -up akode-2.0.2/akode/Makefile.in.pulseaudio akode-2.0.2/akode/Makefile.in
|
||||
--- akode-2.0.2/akode/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400
|
||||
+++ akode-2.0.2/akode/Makefile.in 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -160,9 +160,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
|
|
@ -128,7 +96,71 @@ diff -urN akode-2.0.1.orig/akode/plugins/Makefile.in akode-2.0.1/akode/plugins/M
|
|||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
@@ -251,11 +251,11 @@
|
||||
diff -up akode-2.0.2/akode/plugins/alsa_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/alsa_sink/Makefile.in
|
||||
--- akode-2.0.2/akode/plugins/alsa_sink/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400
|
||||
+++ akode-2.0.2/akode/plugins/alsa_sink/Makefile.in 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -179,9 +179,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
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 -up akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.in
|
||||
--- akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400
|
||||
+++ akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.in 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -180,9 +180,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
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 -up akode-2.0.2/akode/plugins/jack_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/jack_sink/Makefile.in
|
||||
--- akode-2.0.2/akode/plugins/jack_sink/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400
|
||||
+++ akode-2.0.2/akode/plugins/jack_sink/Makefile.in 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -179,9 +179,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
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 -up akode-2.0.2/akode/plugins/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/Makefile.in
|
||||
--- akode-2.0.2/akode/plugins/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400
|
||||
+++ akode-2.0.2/akode/plugins/Makefile.in 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -156,9 +156,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
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@
|
||||
@@ -257,11 +257,11 @@ AKODE_MPC_DECODER = mpc_decoder
|
||||
@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
|
||||
|
|
@ -142,10 +174,10 @@ diff -urN akode-2.0.1.orig/akode/plugins/Makefile.in akode-2.0.1/akode/plugins/M
|
|||
$(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 @@
|
||||
diff -up akode-2.0.2/akode/plugins/mpc_decoder/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/mpc_decoder/Makefile.in
|
||||
--- akode-2.0.2/akode/plugins/mpc_decoder/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400
|
||||
+++ akode-2.0.2/akode/plugins/mpc_decoder/Makefile.in 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -193,9 +193,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
|
|
@ -158,10 +190,10 @@ diff -urN akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in akode-2.0.1/akode
|
|||
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 @@
|
||||
diff -up akode-2.0.2/akode/plugins/mpc_decoder/mppdec/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/mpc_decoder/mppdec/Makefile.in
|
||||
--- akode-2.0.2/akode/plugins/mpc_decoder/mppdec/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400
|
||||
+++ akode-2.0.2/akode/plugins/mpc_decoder/mppdec/Makefile.in 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -171,9 +171,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
|
|
@ -174,10 +206,10 @@ diff -urN akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in akode-2.0.1/
|
|||
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 @@
|
||||
diff -up akode-2.0.2/akode/plugins/mpeg_decoder/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/mpeg_decoder/Makefile.in
|
||||
--- akode-2.0.2/akode/plugins/mpeg_decoder/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400
|
||||
+++ akode-2.0.2/akode/plugins/mpeg_decoder/Makefile.in 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -180,9 +180,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
|
|
@ -190,10 +222,10 @@ diff -urN akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in akode-2.0.1/akode
|
|||
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 @@
|
||||
diff -up akode-2.0.2/akode/plugins/oss_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/oss_sink/Makefile.in
|
||||
--- akode-2.0.2/akode/plugins/oss_sink/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400
|
||||
+++ akode-2.0.2/akode/plugins/oss_sink/Makefile.in 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -179,9 +179,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
|
|
@ -206,57 +238,9 @@ diff -urN akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in akode-2.0.1/ako
|
|||
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
|
||||
diff -up akode-2.0.2/akode/plugins/polyp_sink/Makefile.am.pulseaudio akode-2.0.2/akode/plugins/polyp_sink/Makefile.am
|
||||
--- akode-2.0.2/akode/plugins/polyp_sink/Makefile.am.pulseaudio 2005-07-15 07:20:03.000000000 -0400
|
||||
+++ akode-2.0.2/akode/plugins/polyp_sink/Makefile.am 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -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)
|
||||
|
|
@ -268,10 +252,10 @@ diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am akode-2.0.1/akod
|
|||
-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 @@
|
||||
diff -up akode-2.0.2/akode/plugins/polyp_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/polyp_sink/Makefile.in
|
||||
--- akode-2.0.2/akode/plugins/polyp_sink/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400
|
||||
+++ akode-2.0.2/akode/plugins/polyp_sink/Makefile.in 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -179,9 +179,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
|
|
@ -284,7 +268,7 @@ diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in akode-2.0.1/akod
|
|||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
@@ -265,13 +265,13 @@
|
||||
@@ -271,13 +271,13 @@ target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
|
||||
unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
|
||||
|
|
@ -302,9 +286,9 @@ diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in akode-2.0.1/akod
|
|||
#>- 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
|
||||
diff -up akode-2.0.2/akode/plugins/polyp_sink/polyp_sink.cpp.pulseaudio akode-2.0.2/akode/plugins/polyp_sink/polyp_sink.cpp
|
||||
--- akode-2.0.2/akode/plugins/polyp_sink/polyp_sink.cpp.pulseaudio 2005-10-20 16:54:12.000000000 -0400
|
||||
+++ akode-2.0.2/akode/plugins/polyp_sink/polyp_sink.cpp 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -25,7 +25,7 @@
|
||||
#elif defined(HAVE_INTTYPES_H)
|
||||
#include <inttypes.h>
|
||||
|
|
@ -314,7 +298,7 @@ diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp akode-2.0.1/a
|
|||
|
||||
#include "audioframe.h"
|
||||
#include "audiobuffer.h"
|
||||
@@ -59,7 +59,7 @@
|
||||
@@ -59,7 +59,7 @@ PolypSink::PolypSink()
|
||||
|
||||
bool PolypSink::open() {
|
||||
int error = 0;
|
||||
|
|
@ -323,10 +307,10 @@ diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp akode-2.0.1/a
|
|||
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 @@
|
||||
diff -up akode-2.0.2/akode/plugins/src_resampler/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/src_resampler/Makefile.in
|
||||
--- akode-2.0.2/akode/plugins/src_resampler/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400
|
||||
+++ akode-2.0.2/akode/plugins/src_resampler/Makefile.in 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -180,9 +180,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
|
|
@ -339,10 +323,10 @@ diff -urN akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in akode-2.0.1/a
|
|||
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 @@
|
||||
diff -up akode-2.0.2/akode/plugins/sun_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/sun_sink/Makefile.in
|
||||
--- akode-2.0.2/akode/plugins/sun_sink/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400
|
||||
+++ akode-2.0.2/akode/plugins/sun_sink/Makefile.in 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -177,9 +177,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
|
|
@ -355,10 +339,10 @@ diff -urN akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in akode-2.0.1/akode/
|
|||
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 @@
|
||||
diff -up akode-2.0.2/akode/plugins/xiph_decoder/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/xiph_decoder/Makefile.in
|
||||
--- akode-2.0.2/akode/plugins/xiph_decoder/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400
|
||||
+++ akode-2.0.2/akode/plugins/xiph_decoder/Makefile.in 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -189,9 +189,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
|
|
@ -371,9 +355,9 @@ diff -urN akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in akode-2.0.1/ak
|
|||
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
|
||||
diff -up akode-2.0.2/config.h.in.pulseaudio akode-2.0.2/config.h.in
|
||||
--- akode-2.0.2/config.h.in.pulseaudio 2007-04-06 09:23:23.000000000 -0400
|
||||
+++ akode-2.0.2/config.h.in 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -43,9 +43,9 @@
|
||||
/* Define if you have libOggFLAC (required for loading OggFLAC files) */
|
||||
#undef HAVE_LIBOGGFLAC
|
||||
|
|
@ -386,10 +370,10 @@ diff -urN akode-2.0.1.orig/config.h.in akode-2.0.1/config.h.in
|
|||
|
||||
/* 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 @@
|
||||
diff -up akode-2.0.2/configure.in.pulseaudio akode-2.0.2/configure.in
|
||||
--- akode-2.0.2/configure.in.pulseaudio 2007-04-06 09:23:11.000000000 -0400
|
||||
+++ akode-2.0.2/configure.in 2008-09-26 13:37:25.000000000 -0400
|
||||
@@ -375,24 +375,24 @@ AC_SUBST(JACK_LIBADD)
|
||||
AC_SUBST(JACK_LDFLAGS)
|
||||
fi
|
||||
|
||||
|
|
@ -426,8 +410,8 @@ diff -urN akode-2.0.1.orig/configure.in akode-2.0.1/configure.in
|
|||
+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 @@
|
||||
AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"])
|
||||
@@ -587,7 +587,7 @@ AM_CONDITIONAL(include_alsa_sink, test x
|
||||
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)
|
||||
|
|
@ -436,3 +420,19 @@ diff -urN akode-2.0.1.orig/configure.in akode-2.0.1/configure.in
|
|||
AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes)
|
||||
|
||||
AC_MSG_CHECKING(for compilable aKode)
|
||||
diff -up akode-2.0.2/Makefile.in.pulseaudio akode-2.0.2/Makefile.in
|
||||
--- akode-2.0.2/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400
|
||||
+++ akode-2.0.2/Makefile.in 2008-09-26 13:32:59.000000000 -0400
|
||||
@@ -171,9 +171,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
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@
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
Summary: Audio-decoding framework
|
||||
Name: akode
|
||||
Version: 2.0.2
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
|
||||
License: LGPLv2+
|
||||
Group: System Environment/Libraries
|
||||
|
|
@ -90,6 +90,7 @@ make -f Makefile.cvs
|
|||
|
||||
|
||||
%build
|
||||
|
||||
%configure \
|
||||
--disable-static \
|
||||
--disable-debug --disable-warnings --disable-dependency-tracking \
|
||||
|
|
@ -169,6 +170,9 @@ rm -rf %{buildroot}
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Sep 26 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.2-6
|
||||
- fix pulseaudio patch to apply without fuzz
|
||||
|
||||
* Tue Feb 12 2008 Rex Dieter <rdieter@fedoraproject.org> 2.0.2-5
|
||||
- gcc43 patch
|
||||
|
||||
|
|
|
|||
Reference in a new issue