dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-28 09:39:47 +00:00 · 2009-11-26 01:25:50 +00:00 · 2008-01-09 04:47:23 +00:00 · 2008-01-09 04:45:06 +00:00 · 2007-06-06 15:25:46 +00:00 · 2007-06-06 15:23:20 +00:00
8 changed files with 637 additions and 49 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +0,0 @@
-30375-akode-2.0.1.tar.bz2
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+30375-akode-2.0.2.tar.bz2
--- a/21
+++ b/21
@ -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)
--- a/akode-2.0.2-flac113-portable.patch
+++ b/akode-2.0.2-flac113-portable.patch
@ -0,0 +1,11 @@
+--- branches/kdesupport/3.5/kdesupport/akode/plugins/xiph_decoder/flac113_decoder.cpp	2007/04/14 22:11:43	654042
+++ branches/kdesupport/3.5/kdesupport/akode/plugins/xiph_decoder/flac113_decoder.cpp	2007/04/14 22:14:06	654043
+@@ -108,7 +108,7 @@
+ static FLAC__StreamDecoderReadStatus flac_read_callback(
+         const FLAC__StreamDecoder *,
+         FLAC__byte buffer[],
+-        unsigned *bytes,
+        size_t *bytes,
+         void *client_data)
+ {
+     FLACDecoder::private_data *data = (FLACDecoder::private_data*)client_data;
--- a/akode-2.0.2-multilib.patch
+++ b/akode-2.0.2-multilib.patch
@ -0,0 +1,65 @@
+diff -up /dev/null akode-2.0.2/akode/akode.pc.in
+--- /dev/null	2007-12-13 13:41:14.965729569 -0600
+++ akode-2.0.2/akode/akode.pc.in	2007-12-23 21:32:59.000000000 -0600
+@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: akode 
+Description: aKode is a simple audio-decoding frame-work 
+Version: 2.0.2 
+Libs: -L${libdir} -lakode
+Cflags: -I${includedir}
+
+diff -up akode-2.0.2/akode/configure.in.in.multilib akode-2.0.2/akode/configure.in.in
+--- akode-2.0.2/akode/configure.in.in.multilib	2007-12-23 21:32:59.000000000 -0600
+++ akode-2.0.2/akode/configure.in.in	2007-12-23 21:32:59.000000000 -0600
+@@ -1,5 +1,6 @@
+ dnl don't remove the below
+ dnl AC_OUTPUT(akode/akode-config)
+dnl AC_OUTPUT(akode/akode.pc)
+ 
+ AM_CONFIG_HEADER(akode/lib/akode_export.h)
+ 
+diff -up akode-2.0.2/akode/akode-config.in.multilib akode-2.0.2/akode/akode-config.in
+--- akode-2.0.2/akode/akode-config.in.multilib	2007-04-06 08:16:47.000000000 -0500
+++ akode-2.0.2/akode/akode-config.in	2007-12-23 21:37:40.000000000 -0600
+@@ -15,9 +15,8 @@ EOH
+ }
+ 
+ prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
+akode_libs="`pkg-config --libs akode`"
+akode_cflags="`pkg-config --cflags akode`"
+ 
+ flags=""
+ 
+@@ -29,10 +28,10 @@ while test $# -gt 0
+ do
+   case $1 in
+     --libs)
+-	  flags="$flags -L$libdir -lakode"
+	  flags="$flags $akode_libs"
+ 	  ;;
+     --cflags)
+-	  flags="$flags -I$includedir"
+	  flags="$flags $akode_cflags"
+ 	  ;;
+     --version)
+ 	  echo 2.0.2
+diff -up akode-2.0.2/akode/Makefile.am.multilib akode-2.0.2/akode/Makefile.am
+--- akode-2.0.2/akode/Makefile.am.multilib	2005-07-14 09:27:18.000000000 -0500
+++ akode-2.0.2/akode/Makefile.am	2007-12-23 21:32:59.000000000 -0600
+@@ -1,3 +1,8 @@
+ bin_SCRIPTS = akode-config
+ 
+ SUBDIRS= lib plugins akodeplay
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = akode.pc
+
+EXTRA_DIST = akode.pc.in
--- a/akode-pulseaudio.patch
+++ b/akode-pulseaudio.patch
@ -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)
--- a/akode.spec
+++ b/akode.spec
@ -1,22 +1,35 @@

 Summary: Audio-decoding framework 
 Name:	 akode 
-Version: 2.0.1
-Release: 2%{?dist}
-License: LGPL
+Version: 2.0.2
+Release: 4%{?dist}
+
+License: LGPLv2+
 Group: 	 System Environment/Libraries
 #URL:	 http://carewolf.com/akode/  
 URL:	 http://www.kde-apps.org/content/show.php?content=30375
-Source0: http://www.kde-apps.org/content/files/30375-akode-%{version}.tar.bz2
+Source0: http://www.kde-apps.org/CONTENT/content-files/30375-akode-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

-BuildRequires: automake
+Patch1: akode-pulseaudio.patch
+Patch2: akode-2.0.2-multilib.patch
+Patch3: akode-2.0.2-flac113-portable.patch
+
+%define _with_flac --with-flac
+%if 0%{?fedora} > 4
+%define _with_jack --with-jack
+%define _with_libsamplerate --with-libsamplerate
+%define _with_pulseaudio --with-pulseaudio
+%endif
+
+BuildRequires: automake libtool
 BuildRequires: alsa-lib-devel
-BuildRequires: flac-devel
-BuildRequires: libsamplerate-devel
-BuildRequires: speex-devel
+%{?_with_flac:BuildRequires: flac-devel}
+%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
+%{?_with_libsamplerate:BuildRequires: libsamplerate-devel}
 BuildRequires: libvorbis-devel
-BuildRequires: libtool
+%{?_with_pulseaudio:BuildRequires: pulseaudio-lib-devel}
+BuildRequires: speex-devel

 %description
 aKode is a simple audio-decoding frame-work that provides a uniform
@ -28,27 +41,50 @@ aKode currently has the following decoder plugins:
 * xiph: Decodes FLAC, Ogg/FLAC, Speex and Ogg Vorbis audio. 

 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} 
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 %description devel
 %{summary}.

+%package jack 
+Summary: Jack audio output backend for %{name}
+Group:   Development/Libraries
+Requires: %{name} = %{version}-%{release}
+%description jack 
+%{summary}.
+
+%package pulseaudio
+Summary: Pulseaudio output backend for %{name}
+Group:   Development/Libraries
+Requires: %{name} = %{version}-%{release}
+%description pulseaudio
+%{summary}.
+Recommended for network transparent audio.
+
+# Packaged separately to keep main/core %{akode} package LGPL-clean.
+%package libsamplerate 
+Summary: Resampler based on libsamplerate for %{name}
+Group:   Development/Libraries
+License: GPLv2+
+Requires: %{name} = %{version}-%{release}
+%description libsamplerate 
+%{summary}.
+

 %prep
 %setup -q -n %{name}-%{version}%{?beta}

-[ ! -f configure ] && make -f Makefile.cvs
+%patch1 -p1 -b .pulseaudio
+%patch2 -p1 -b .multilib
+%patch3 -p4 -b .flac113_portable
+
+#[ ! -f configure ] && \
+make -f Makefile.cvs


 %build
@ -57,12 +93,13 @@ Requires: %{name} = %{version}-%{release}
  --disable-debug --disable-warnings --disable-dependency-tracking \
  --without-libltdl \
  --with-alsa \
-  --with-flac \
-  --with-libsamplerate \
+  --without-oss \
+  %{?_with_flac} %{!?_with_flac:--without-flac} \
+  %{?_with_jack} %{!?_with_jack:--without-jack} \
+  %{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \
+  %{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \
  --with-speex \
  --with-vorbis \
-  --without-jack \
-  --without-polypaudio \
  --without-ffmpeg \
  --without-libmad 

@ -70,12 +107,13 @@ make %{?_smp_mflags}


 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot} 

-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}

 # unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f %{buildroot}%{_libdir}/lib*.la
+#rm -f %{buildroot}%{_libdir}/libakode_oss_sink.so

 # rpmdocs
 for file in AUTHORS COPYING NEWS README TODO ; do
@ -84,7 +122,7 @@ done


 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot} 


 %post -p /sbin/ldconfig
@ -97,16 +135,73 @@ rm -rf $RPM_BUILD_ROOT
 %doc rpmdocs/* 
 %{_bindir}/akodeplay
 %{_libdir}/libakode.so.*
-%{_libdir}/libakode_*_*.so
+%{_libdir}/libakode_alsa_sink.so
+%{_libdir}/libakode_mpc_decoder.so
+%{_libdir}/libakode_xiph_decoder.so

 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/akode-config
 %{_includedir}/*
 %{_libdir}/libakode.so
+%{_libdir}/pkgconfig/*.pc
+
+%if "%{?_with_jack:1}" == "1"
+%files jack 
+%defattr(-,root,root,-)
+%{_libdir}/libakode_jack_sink.so
+%endif
+
+# License: GPLv2+
+%if "%{?_with_libsamplerate:1}" == "1"
+%files libsamplerate
+%defattr(-,root,root,-)
+%{_libdir}/libakode_src_resampler.so
+%endif
+
+%if "%{?_with_pulseaudio:1}" == "1"
+%files pulseaudio
+%defattr(-,root,root,-)
+%{_libdir}/libakode_polyp_sink.so
+%endif


 %changelog
+* Mon Jan 07 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-4
+- -Requires: %%name-pulseaudio (can be added to kde-settings-pulseaudio)
+
+* Sun Dec 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-3
+- fix flac113 support
+
+* Sun Dec 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-2
+- fix multilib conflicts (#340591)
+
+* Sun Dec 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-1
+- akode-2.0.2
+
+* Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-9
+- BR: pulseaudio-libs-devel
+
+* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-8
+- -libsamplerate: License: GPLv2+
+- omit oss_sink
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-7
+- Requires: %%{name}-pulseaudio (f8+)
+- License: LGPLv2+
+
+* Thu Feb 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-6
+- respin (for flac, fc7+)
+
+* Mon Feb 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-5
+- enable pulseaudio support
+- Requires: akode-pulseaudio (f7+)
+
+* 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

--- a/2
+++ b/2
@ -1 +1 @@
-94a10e7729b20b669bc5c7721f62e162  30375-akode-2.0.1.tar.bz2
+659ced0c9c735cb3e55b9138ff02342c  30375-akode-2.0.2.tar.bz2
Author	SHA1	Message	Date
Fedora Release Engineering	75e5f1fbcd	dist-git conversion	2010-07-28 09:39:47 +00:00
Bill Nottingham	77dc7b0bf7	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:25:50 +00:00
Rex Dieter	8aecdbdd3e	import awol patches	2008-01-09 04:47:23 +00:00
Rex Dieter	5552f437df	rawhide sync (akode-2.0.2)	2008-01-09 04:45:06 +00:00
Rex Dieter	7264f6679f	- make libsamplerate support fedora only	2007-06-06 15:25:46 +00:00
Rex Dieter	1a53b474d7	make libsamplerate support fedora-only (for now)	2007-06-06 15:23:20 +00:00
Dennis Gilmore	db290e04d3	Initialize branch EL-5 for akode	2007-03-26 12:41:20 +00:00
Rex Dieter	13c0a29525	- 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	2007-02-12 19:27:20 +00:00