Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

12 files changed, 2 insertions, 1511 deletions

diff --git a/redhat/extras/akode/akode-14.0.0-ftbfs.patch b/redhat/extras/akode/akode-14.0.0-ftbfs.patch
deleted file mode 100644
index df4fe0981..000000000
--- a/redhat/extras/akode/akode-14.0.0-ftbfs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- akode-2.0.2/configure.in.in.ORI	2013-08-10 11:51:41.617074169 +0200
-+++ akode-2.0.2/configure.in.in	2013-08-10 11:51:49.295565706 +0200
-@@ -55,7 +55,7 @@
- 
- dnl without this order in this file, automake will be confused!
- dnl
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
- 
- dnl checks for programs.
- dnl first check for c/c++ compilers
---- akode-2.0.2/akode/configure.in.in.ORI	2013-08-10 11:53:11.355740687 +0200
-+++ akode-2.0.2/akode/configure.in.in	2013-08-10 11:53:18.498367142 +0200
-@@ -2,7 +2,7 @@
- dnl AC_OUTPUT(akode/akode-config)
- dnl AC_OUTPUT(akode/akode.pc)
- 
--AM_CONFIG_HEADER(akode/lib/akode_export.h)
-+AC_CONFIG_HEADER(akode/lib/akode_export.h)
- 
- AC_DEFUN([AC_CHECK_LIBFLAC],
- [
diff --git a/redhat/extras/akode/akode-14.0.0.spec b/redhat/extras/akode/akode-14.0.0.spec
index d86574a30..18c1cfa60 100644
--- a/redhat/extras/akode/akode-14.0.0.spec
+++ b/redhat/extras/akode/akode-14.0.0.spec
@@ -28,25 +28,12 @@ Group: 		System Environment/Libraries
 #URL:		http://carewolf.com/akode/  
 URL:		http://www.kde-apps.org/content/show.php?content=30375
 
-Source0:	akode-2.0.2.tar.bz2
-Source1:	admin-14.0.0.tar.gz
+Source0:	akode-14.0.0.tar.gz
 
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
-# Legacy Fedora 9 patches
-Patch1: akode-pulseaudio.patch
-Patch2: akode-2.0.2-multilib.patch
-Patch3: akode-2.0.2-flac113-portable.patch
-Patch4: akode-2.0.2-gcc43.patch
-
-# New patches
-Patch10: akode-autotools.patch
-Patch11: akode-2.0.2-fix_ffmpeg_include.patch
-Patch12: akode-2.0.2-fix_ftbfs.patch
-Patch13: akode-14.0.0-ftbfs.patch
-
 # FLAC support
 %define _with_flac --with-flac
 %if 0%{?mgaversion} || 0%{?mdkversion}
@@ -284,21 +271,7 @@ Requires: %{name} = %{version}-%{release}
 ##########
 
 %prep
-%setup -q -n akode-%{version}
-%__rm -rf admin
-tar xfz %{SOURCE1}
-
-%patch1 -p1 -b .pulseaudio
-%patch2 -p1 -b .multilib
-%patch3 -p4 -b .flac113_portable
-%patch4 -p1 -b .gcc43
-
-#patch10 -p1 -b .autotools
-%patch11 -p1 -b .ffmpeg
-%patch12 -p1 -b .ftbfs
-%patch13 -p1 -b .ftbfs
-
-%__rm -f libtool acinclude.m4 configure.in Makefile.cvs aclocal.m4
+%setup -q -n akode-2.0.2
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
diff --git a/redhat/extras/akode/akode-2.0.2-fix_ffmpeg_include.patch b/redhat/extras/akode/akode-2.0.2-fix_ffmpeg_include.patch
deleted file mode 100644
index d16411ed7..000000000
--- a/redhat/extras/akode/akode-2.0.2-fix_ffmpeg_include.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp.ORI	2012-08-04 22:36:12.435734576 +0200
-+++ a/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp	2012-08-04 22:37:20.153030459 +0200
-@@ -26,9 +26,9 @@
- #include "decoder.h"
- 
- #include <assert.h>
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
--#include <ffmpeg/avio.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libavformat/avio.h>
- 
- #include "ffmpeg_decoder.h"
- #include <iostream>
diff --git a/redhat/extras/akode/akode-2.0.2-fix_ftbfs.patch b/redhat/extras/akode/akode-2.0.2-fix_ftbfs.patch
deleted file mode 100644
index 96aa0f38f..000000000
--- a/redhat/extras/akode/akode-2.0.2-fix_ftbfs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./akode/lib/akodelib.h.ORI	2013-07-25 11:49:19.524457787 +0200
-+++ ./akode/lib/akodelib.h	2013-07-25 11:49:23.056360414 +0200
-@@ -34,13 +34,13 @@
- #include <inttypes.h>
- #else
- typedef signed char int8_t;
--typedef unsigned char int8_t;
-+typedef unsigned char uint8_t;
- typedef signed short int16_t;
--typedef unsigned short int16_t;
-+typedef unsigned short uint16_t;
- typedef signed int int32_t;
- typedef unsigned int uint32_t;
--typedef signed long long int64_t;
--typedef unsigned long long uint64_t;
-+typedef signed long int64_t;
-+typedef unsigned long uint64_t;
- #endif
- 
- #endif
diff --git a/redhat/extras/akode/akode-2.0.2-flac113-portable.patch b/redhat/extras/akode/akode-2.0.2-flac113-portable.patch
deleted file mode 100644
index 4c5a26119..000000000
--- a/redhat/extras/akode/akode-2.0.2-flac113-portable.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
diff --git a/redhat/extras/akode/akode-2.0.2-gcc43.patch b/redhat/extras/akode/akode-2.0.2-gcc43.patch
deleted file mode 100644
index b4491eb3e..000000000
--- a/redhat/extras/akode/akode-2.0.2-gcc43.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -up akode-2.0.2/akode/akodeplay/akodeplay.cpp.gcc43 akode-2.0.2/akode/akodeplay/akodeplay.cpp
---- akode-2.0.2/akode/akodeplay/akodeplay.cpp.gcc43	2006-11-06 07:20:52.000000000 -0600
-+++ akode-2.0.2/akode/akodeplay/akodeplay.cpp	2008-02-12 17:28:00.000000000 -0600
-@@ -25,6 +25,7 @@
- #include "../lib/sink.h"
- #include "../lib/decoder.h"
- 
-+#include <stdlib.h>
- #ifdef HAVE_GNU_GETOPT
-   #include <getopt.h>
- #else
-diff -up akode-2.0.2/akode/lib/player.cpp.gcc43 akode-2.0.2/akode/lib/player.cpp
---- akode-2.0.2/akode/lib/player.cpp.gcc43	2006-11-05 08:37:48.000000000 -0600
-+++ akode-2.0.2/akode/lib/player.cpp	2008-02-12 17:10:58.000000000 -0600
-@@ -21,6 +21,7 @@
- #include <pthread.h>
- #include <semaphore.h>
- #include <assert.h>
-+#include <string.h>
- 
- #include "audioframe.h"
- #include "audiobuffer.h"
-diff -up akode-2.0.2/akode/lib/magic.cpp.gcc43 akode-2.0.2/akode/lib/magic.cpp
---- akode-2.0.2/akode/lib/magic.cpp.gcc43	2008-02-12 16:52:26.000000000 -0600
-+++ akode-2.0.2/akode/lib/magic.cpp	2008-02-12 17:16:54.000000000 -0600
-@@ -21,6 +21,8 @@
- #include "akodelib.h"
- #include "magic.h"
- #include "file.h"
-+#include <stdlib.h>
-+#include <string.h>
- #include <iostream>
- using std::cerr;
- 
-diff -up akode-2.0.2/akode/lib/akode_export.h.in.gcc43 akode-2.0.2/akode/lib/akode_export.h.in
-diff -up akode-2.0.2/akode/lib/auto_sink.cpp.gcc43 akode-2.0.2/akode/lib/auto_sink.cpp
---- akode-2.0.2/akode/lib/auto_sink.cpp.gcc43	2005-10-26 08:50:29.000000000 -0500
-+++ akode-2.0.2/akode/lib/auto_sink.cpp	2008-02-12 16:57:18.000000000 -0600
-@@ -21,6 +21,7 @@
- #include "audioframe.h"
- #include "auto_sink.h"
- 
-+#include <stdlib.h>
- #include <iostream>
- 
- namespace aKode {
diff --git a/redhat/extras/akode/akode-2.0.2-multilib.patch b/redhat/extras/akode/akode-2.0.2-multilib.patch
deleted file mode 100644
index c3832a960..000000000
--- a/redhat/extras/akode/akode-2.0.2-multilib.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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
diff --git a/redhat/extras/akode/akode-2.0.2.tar.bz2 b/redhat/extras/akode/akode-2.0.2.tar.bz2
deleted file mode 100644
index 3947de626..000000000
--- a/redhat/extras/akode/akode-2.0.2.tar.bz2
+++ /dev/null
diff --git a/redhat/extras/akode/akode-autotools.patch b/redhat/extras/akode/akode-autotools.patch
deleted file mode 100644
index d08ac3446..000000000
--- a/redhat/extras/akode/akode-autotools.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- akode-2.0.2/akode/lib/Makefile.am.ORI	2012-01-16 19:17:09.849211160 +0100
-+++ akode-2.0.2/akode/lib/Makefile.am	2012-01-16 19:17:24.496410002 +0100
-@@ -12,6 +12,7 @@
-                       player.cpp magic.cpp
- 
- AM_CPPFLAGS = -DAKODE_SEARCHDIR=\"$(libdir)\"
-+AM_CXXFLAGS = -fPIC
- 
- libakode_la_LDFLAGS = -no-undefined -version-info 2:0:0 $(all_libraries)
- libakode_la_LIBADD =  $(LIBPTHREAD) $(AKODE_LIBDL) $(LIBSEM)
---- akode-2.0.2/configure.in.in.ORI	2013-05-19 23:25:31.450512262 +0200
-+++ akode-2.0.2/configure.in.in	2013-05-19 23:25:37.156390421 +0200
-@@ -55,7 +55,7 @@
- 
- dnl without this order in this file, automake will be confused!
- dnl
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
- 
- dnl checks for programs.
- dnl first check for c/c++ compilers
---- akode-2.0.2/admin/configure.in.min~	2013-05-19 23:35:21.532965131 +0200
-+++ akode-2.0.2/admin/configure.in.min	2013-05-19 23:34:19.011289846 +0200
-@@ -41,7 +41,7 @@
- KDE_SET_PREFIX
- 
- dnl generate the config header
--AM_CONFIG_HEADER(config.h) dnl at the distribution this done
-+AC_CONFIG_HEADER(config.h) dnl at the distribution this done
- 
- dnl Checks for programs.
- AC_CHECK_COMPILERS
---- akode-2.0.2/admin/cvs.sh.autotools	2007-01-15 10:06:45.000000000 +0100
-+++ akode-2.0.2/admin/cvs.sh	2013-05-19 23:37:14.145581582 +0200
-@@ -68,7 +68,7 @@
-     echo "*** KDE requires automake $required_automake_version"
-     exit 1
-     ;;
--  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
-+  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]*)
-     echo "*** $AUTOMAKE_STRING found."
-     UNSERMAKE=no
-     ;;
-@@ -128,7 +128,7 @@
- echo "*** Creating configure"
- call_and_fix_autoconf
- 
--if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
-+if egrep "^AC_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
-   echo "*** Creating config.h template"
-   $AUTOHEADER || exit 1
-   touch config.h.in
-@@ -184,7 +184,7 @@
-   fi
- fi
- $ACLOCAL $ACLOCALFLAGS
--if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
-+if egrep "^AC_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
-   echo "*** Creating config.h template"
-   $AUTOHEADER || exit 1
-   touch config.h.in
---- akode-2.0.2/akode/configure.in.in.ORI	2013-05-19 23:39:02.874283156 +0200
-+++ akode-2.0.2/akode/configure.in.in	2013-05-19 23:39:13.381061201 +0200
-@@ -2,7 +2,7 @@
- dnl AC_OUTPUT(akode/akode-config)
- dnl AC_OUTPUT(akode/akode.pc)
- 
--AM_CONFIG_HEADER(akode/lib/akode_export.h)
-+AC_CONFIG_HEADER(akode/lib/akode_export.h)
- 
- AC_DEFUN([AC_CHECK_LIBFLAC],
- [
diff --git a/redhat/extras/akode/akode-pulseaudio.patch b/redhat/extras/akode/akode-pulseaudio.patch
deleted file mode 100644
index 6c226144f..000000000
--- a/redhat/extras/akode/akode-pulseaudio.patch
+++ /dev/null
@@ -1,438 +0,0 @@
-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.2/akode/configure.in.in.pulseaudio	2007-02-06 22:47:43.000000000 +0100
-+++ akode-2.0.2/akode/configure.in.in	2012-01-13 19:32:55.027887451 +0100
-@@ -270,24 +270,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=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"])
-@@ -482,7 +482,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.2/configure.in.pulseaudio	2007-04-06 15:23:11.000000000 +0200
-+++ akode-2.0.2/configure.in	2012-01-13 19:39:23.676340535 +0100
-@@ -375,24 +375,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=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"])
-@@ -587,7 +587,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 --git a/redhat/extras/jpegint.h.el5 b/redhat/extras/jpegint.h.el5
deleted file mode 100644
index 95b00d405..000000000
--- a/redhat/extras/jpegint.h.el5
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * jpegint.h
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file provides common declarations for the various JPEG modules.
- * These declarations are considered internal to the JPEG library; most
- * applications using the library shouldn't need to include this file.
- */
-
-
-/* Declarations for both compression & decompression */
-
-typedef enum {			/* Operating modes for buffer controllers */
-	JBUF_PASS_THRU,		/* Plain stripwise operation */
-	/* Remaining modes require a full-image buffer to have been created */
-	JBUF_SAVE_SOURCE,	/* Run source subobject only, save output */
-	JBUF_CRANK_DEST,	/* Run dest subobject only, using saved data */
-	JBUF_SAVE_AND_PASS	/* Run both subobjects, save output */
-} J_BUF_MODE;
-
-/* Values of global_state field (jdapi.c has some dependencies on ordering!) */
-#define CSTATE_START	100	/* after create_compress */
-#define CSTATE_SCANNING	101	/* start_compress done, write_scanlines OK */
-#define CSTATE_RAW_OK	102	/* start_compress done, write_raw_data OK */
-#define CSTATE_WRCOEFS	103	/* jpeg_write_coefficients done */
-#define DSTATE_START	200	/* after create_decompress */
-#define DSTATE_INHEADER	201	/* reading header markers, no SOS yet */
-#define DSTATE_READY	202	/* found SOS, ready for start_decompress */
-#define DSTATE_PRELOAD	203	/* reading multiscan file in start_decompress*/
-#define DSTATE_PRESCAN	204	/* performing dummy pass for 2-pass quant */
-#define DSTATE_SCANNING	205	/* start_decompress done, read_scanlines OK */
-#define DSTATE_RAW_OK	206	/* start_decompress done, read_raw_data OK */
-#define DSTATE_BUFIMAGE	207	/* expecting jpeg_start_output */
-#define DSTATE_BUFPOST	208	/* looking for SOS/EOI in jpeg_finish_output */
-#define DSTATE_RDCOEFS	209	/* reading file in jpeg_read_coefficients */
-#define DSTATE_STOPPING	210	/* looking for EOI in jpeg_finish_decompress */
-
-
-/* Declarations for compression modules */
-
-/* Master control module */
-struct jpeg_comp_master {
-  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
-  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
-  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
-
-  /* State variables made visible to other modules */
-  boolean call_pass_startup;	/* True if pass_startup must be called */
-  boolean is_last_pass;		/* True during last pass */
-};
-
-/* Main buffer control (downsampled-data buffer) */
-struct jpeg_c_main_controller {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, process_data, (j_compress_ptr cinfo,
-			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
-			       JDIMENSION in_rows_avail));
-};
-
-/* Compression preprocessing (downsampling input buffer control) */
-struct jpeg_c_prep_controller {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
-				   JSAMPARRAY input_buf,
-				   JDIMENSION *in_row_ctr,
-				   JDIMENSION in_rows_avail,
-				   JSAMPIMAGE output_buf,
-				   JDIMENSION *out_row_group_ctr,
-				   JDIMENSION out_row_groups_avail));
-};
-
-/* Coefficient buffer control */
-struct jpeg_c_coef_controller {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
-				   JSAMPIMAGE input_buf));
-};
-
-/* Colorspace conversion */
-struct jpeg_color_converter {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
-				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
-				JDIMENSION output_row, int num_rows));
-};
-
-/* Downsampling */
-struct jpeg_downsampler {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  JMETHOD(void, downsample, (j_compress_ptr cinfo,
-			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
-			     JSAMPIMAGE output_buf,
-			     JDIMENSION out_row_group_index));
-
-  boolean need_context_rows;	/* TRUE if need rows above & below */
-};
-
-/* Forward DCT (also controls coefficient quantization) */
-struct jpeg_forward_dct {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  /* perhaps this should be an array??? */
-  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
-			      jpeg_component_info * compptr,
-			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
-			      JDIMENSION start_row, JDIMENSION start_col,
-			      JDIMENSION num_blocks));
-};
-
-/* Entropy encoding */
-struct jpeg_entropy_encoder {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
-  JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
-  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
-};
-
-/* Marker writing */
-struct jpeg_marker_writer {
-  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
-  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
-  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
-  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
-  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
-  /* These routines are exported to allow insertion of extra markers */
-  /* Probably only COM and APPn markers should be written this way */
-  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
-				      unsigned int datalen));
-  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
-};
-
-
-/* Declarations for decompression modules */
-
-/* Master control module */
-struct jpeg_decomp_master {
-  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
-
-  /* State variables made visible to other modules */
-  boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
-};
-
-/* Input control module */
-struct jpeg_input_controller {
-  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
-  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
-  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
-
-  /* State variables made visible to other modules */
-  boolean has_multiple_scans;	/* True if file has multiple scans */
-  boolean eoi_reached;		/* True when EOI has been consumed */
-};
-
-/* Main buffer control (downsampled-data buffer) */
-struct jpeg_d_main_controller {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
-			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-			       JDIMENSION out_rows_avail));
-};
-
-/* Coefficient buffer control */
-struct jpeg_d_coef_controller {
-  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
-  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
-  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
-				 JSAMPIMAGE output_buf));
-  /* Pointer to array of coefficient virtual arrays, or NULL if none */
-  jvirt_barray_ptr *coef_arrays;
-};
-
-/* Decompression postprocessing (color quantization buffer control) */
-struct jpeg_d_post_controller {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
-				    JSAMPIMAGE input_buf,
-				    JDIMENSION *in_row_group_ctr,
-				    JDIMENSION in_row_groups_avail,
-				    JSAMPARRAY output_buf,
-				    JDIMENSION *out_row_ctr,
-				    JDIMENSION out_rows_avail));
-};
-
-/* Marker reading & parsing */
-struct jpeg_marker_reader {
-  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
-  /* Read markers until SOS or EOI.
-   * Returns same codes as are defined for jpeg_consume_input:
-   * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
-   */
-  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
-  /* Read a restart marker --- exported for use by entropy decoder only */
-  jpeg_marker_parser_method read_restart_marker;
-
-  /* State of marker reader --- nominally internal, but applications
-   * supplying COM or APPn handlers might like to know the state.
-   */
-  boolean saw_SOI;		/* found SOI? */
-  boolean saw_SOF;		/* found SOF? */
-  int next_restart_num;		/* next restart number expected (0-7) */
-  unsigned int discarded_bytes;	/* # of bytes skipped looking for a marker */
-};
-
-/* Entropy decoding */
-struct jpeg_entropy_decoder {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
-				JBLOCKROW *MCU_data));
-
-  /* This is here to share code between baseline and progressive decoders; */
-  /* other modules probably should not use it */
-  boolean insufficient_data;	/* set TRUE after emitting warning */
-};
-
-/* Inverse DCT (also performs dequantization) */
-typedef JMETHOD(void, inverse_DCT_method_ptr,
-		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		 JCOEFPTR coef_block,
-		 JSAMPARRAY output_buf, JDIMENSION output_col));
-
-struct jpeg_inverse_dct {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  /* It is useful to allow each component to have a separate IDCT method. */
-  inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
-};
-
-/* Upsampling (note that upsampler must also call color converter) */
-struct jpeg_upsampler {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
-			   JSAMPIMAGE input_buf,
-			   JDIMENSION *in_row_group_ctr,
-			   JDIMENSION in_row_groups_avail,
-			   JSAMPARRAY output_buf,
-			   JDIMENSION *out_row_ctr,
-			   JDIMENSION out_rows_avail));
-
-  boolean need_context_rows;	/* TRUE if need rows above & below */
-};
-
-/* Colorspace conversion */
-struct jpeg_color_deconverter {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
-				JSAMPIMAGE input_buf, JDIMENSION input_row,
-				JSAMPARRAY output_buf, int num_rows));
-};
-
-/* Color quantization or color precision reduction */
-struct jpeg_color_quantizer {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
-  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
-				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
-				 int num_rows));
-  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
-};
-
-
-/* Miscellaneous useful macros */
-
-#undef MAX
-#define MAX(a,b)	((a) > (b) ? (a) : (b))
-#undef MIN
-#define MIN(a,b)	((a) < (b) ? (a) : (b))
-
-
-/* We assume that right shift corresponds to signed division by 2 with
- * rounding towards minus infinity.  This is correct for typical "arithmetic
- * shift" instructions that shift in copies of the sign bit.  But some
- * C compilers implement >> with an unsigned shift.  For these machines you
- * must define RIGHT_SHIFT_IS_UNSIGNED.
- * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity.
- * It is only applied with constant shift counts.  SHIFT_TEMPS must be
- * included in the variables of any routine using RIGHT_SHIFT.
- */
-
-#ifdef RIGHT_SHIFT_IS_UNSIGNED
-#define SHIFT_TEMPS	INT32 shift_temp;
-#define RIGHT_SHIFT(x,shft)  \
-	((shift_temp = (x)) < 0 ? \
-	 (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \
-	 (shift_temp >> (shft)))
-#else
-#define SHIFT_TEMPS
-#define RIGHT_SHIFT(x,shft)	((x) >> (shft))
-#endif
-
-
-/* Short forms of external names for systems with brain-damaged linkers. */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jinit_compress_master	jICompress
-#define jinit_c_master_control	jICMaster
-#define jinit_c_main_controller	jICMainC
-#define jinit_c_prep_controller	jICPrepC
-#define jinit_c_coef_controller	jICCoefC
-#define jinit_color_converter	jICColor
-#define jinit_downsampler	jIDownsampler
-#define jinit_forward_dct	jIFDCT
-#define jinit_huff_encoder	jIHEncoder
-#define jinit_phuff_encoder	jIPHEncoder
-#define jinit_marker_writer	jIMWriter
-#define jinit_master_decompress	jIDMaster
-#define jinit_d_main_controller	jIDMainC
-#define jinit_d_coef_controller	jIDCoefC
-#define jinit_d_post_controller	jIDPostC
-#define jinit_input_controller	jIInCtlr
-#define jinit_marker_reader	jIMReader
-#define jinit_huff_decoder	jIHDecoder
-#define jinit_phuff_decoder	jIPHDecoder
-#define jinit_inverse_dct	jIIDCT
-#define jinit_upsampler		jIUpsampler
-#define jinit_color_deconverter	jIDColor
-#define jinit_1pass_quantizer	jI1Quant
-#define jinit_2pass_quantizer	jI2Quant
-#define jinit_merged_upsampler	jIMUpsampler
-#define jinit_memory_mgr	jIMemMgr
-#define jdiv_round_up		jDivRound
-#define jround_up		jRound
-#define jcopy_sample_rows	jCopySamples
-#define jcopy_block_row		jCopyBlocks
-#define jzero_far		jZeroFar
-#define jpeg_zigzag_order	jZIGTable
-#define jpeg_natural_order	jZAGTable
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/* Compression module initialization routines */
-EXTERN(void) jinit_compress_master JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_c_master_control JPP((j_compress_ptr cinfo,
-					 boolean transcode_only));
-EXTERN(void) jinit_c_main_controller JPP((j_compress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_c_prep_controller JPP((j_compress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_c_coef_controller JPP((j_compress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_color_converter JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_downsampler JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_forward_dct JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_huff_encoder JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_phuff_encoder JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_marker_writer JPP((j_compress_ptr cinfo));
-/* Decompression module initialization routines */
-EXTERN(void) jinit_master_decompress JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_d_main_controller JPP((j_decompress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_d_coef_controller JPP((j_decompress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_d_post_controller JPP((j_decompress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_input_controller JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_marker_reader JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_huff_decoder JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_phuff_decoder JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_inverse_dct JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_upsampler JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_color_deconverter JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_1pass_quantizer JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_2pass_quantizer JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_merged_upsampler JPP((j_decompress_ptr cinfo));
-/* Memory manager initialization */
-EXTERN(void) jinit_memory_mgr JPP((j_common_ptr cinfo));
-
-/* Utility routines in jutils.c */
-EXTERN(long) jdiv_round_up JPP((long a, long b));
-EXTERN(long) jround_up JPP((long a, long b));
-EXTERN(void) jcopy_sample_rows JPP((JSAMPARRAY input_array, int source_row,
-				    JSAMPARRAY output_array, int dest_row,
-				    int num_rows, JDIMENSION num_cols));
-EXTERN(void) jcopy_block_row JPP((JBLOCKROW input_row, JBLOCKROW output_row,
-				  JDIMENSION num_blocks));
-EXTERN(void) jzero_far JPP((void FAR * target, size_t bytestozero));
-/* Constant tables in jutils.c */
-#if 0				/* This table is not actually needed in v6a */
-extern const int jpeg_zigzag_order[]; /* natural coef order to zigzag order */
-#endif
-extern const int jpeg_natural_order[]; /* zigzag coef order to natural order */
-
-/* Suppress undefined-structure complaints if necessary. */
-
-#ifdef INCOMPLETE_TYPES_BROKEN
-#ifndef AM_MEMORY_MANAGER	/* only jmemmgr.c defines these */
-struct jvirt_sarray_control { long dummy; };
-struct jvirt_barray_control { long dummy; };
-#endif
-#endif /* INCOMPLETE_TYPES_BROKEN */
diff --git a/redhat/extras/jpegint.h.el6 b/redhat/extras/jpegint.h.el6
deleted file mode 100644
index 78717482e..000000000
--- a/redhat/extras/jpegint.h.el6
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
- * jpegint.h
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * Modified 1997-2009 by Guido Vollbeding.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file provides common declarations for the various JPEG modules.
- * These declarations are considered internal to the JPEG library; most
- * applications using the library shouldn't need to include this file.
- */
-
-
-/* Declarations for both compression & decompression */
-
-typedef enum {			/* Operating modes for buffer controllers */
-	JBUF_PASS_THRU,		/* Plain stripwise operation */
-	/* Remaining modes require a full-image buffer to have been created */
-	JBUF_SAVE_SOURCE,	/* Run source subobject only, save output */
-	JBUF_CRANK_DEST,	/* Run dest subobject only, using saved data */
-	JBUF_SAVE_AND_PASS	/* Run both subobjects, save output */
-} J_BUF_MODE;
-
-/* Values of global_state field (jdapi.c has some dependencies on ordering!) */
-#define CSTATE_START	100	/* after create_compress */
-#define CSTATE_SCANNING	101	/* start_compress done, write_scanlines OK */
-#define CSTATE_RAW_OK	102	/* start_compress done, write_raw_data OK */
-#define CSTATE_WRCOEFS	103	/* jpeg_write_coefficients done */
-#define DSTATE_START	200	/* after create_decompress */
-#define DSTATE_INHEADER	201	/* reading header markers, no SOS yet */
-#define DSTATE_READY	202	/* found SOS, ready for start_decompress */
-#define DSTATE_PRELOAD	203	/* reading multiscan file in start_decompress*/
-#define DSTATE_PRESCAN	204	/* performing dummy pass for 2-pass quant */
-#define DSTATE_SCANNING	205	/* start_decompress done, read_scanlines OK */
-#define DSTATE_RAW_OK	206	/* start_decompress done, read_raw_data OK */
-#define DSTATE_BUFIMAGE	207	/* expecting jpeg_start_output */
-#define DSTATE_BUFPOST	208	/* looking for SOS/EOI in jpeg_finish_output */
-#define DSTATE_RDCOEFS	209	/* reading file in jpeg_read_coefficients */
-#define DSTATE_STOPPING	210	/* looking for EOI in jpeg_finish_decompress */
-
-
-/* Declarations for compression modules */
-
-/* Master control module */
-struct jpeg_comp_master {
-  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
-  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
-  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
-
-  /* State variables made visible to other modules */
-  boolean call_pass_startup;	/* True if pass_startup must be called */
-  boolean is_last_pass;		/* True during last pass */
-};
-
-/* Main buffer control (downsampled-data buffer) */
-struct jpeg_c_main_controller {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, process_data, (j_compress_ptr cinfo,
-			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
-			       JDIMENSION in_rows_avail));
-};
-
-/* Compression preprocessing (downsampling input buffer control) */
-struct jpeg_c_prep_controller {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
-				   JSAMPARRAY input_buf,
-				   JDIMENSION *in_row_ctr,
-				   JDIMENSION in_rows_avail,
-				   JSAMPIMAGE output_buf,
-				   JDIMENSION *out_row_group_ctr,
-				   JDIMENSION out_row_groups_avail));
-};
-
-/* Coefficient buffer control */
-struct jpeg_c_coef_controller {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
-				   JSAMPIMAGE input_buf));
-};
-
-/* Colorspace conversion */
-struct jpeg_color_converter {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
-				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
-				JDIMENSION output_row, int num_rows));
-};
-
-/* Downsampling */
-struct jpeg_downsampler {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  JMETHOD(void, downsample, (j_compress_ptr cinfo,
-			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
-			     JSAMPIMAGE output_buf,
-			     JDIMENSION out_row_group_index));
-
-  boolean need_context_rows;	/* TRUE if need rows above & below */
-};
-
-/* Forward DCT (also controls coefficient quantization) */
-struct jpeg_forward_dct {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  /* perhaps this should be an array??? */
-  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
-			      jpeg_component_info * compptr,
-			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
-			      JDIMENSION start_row, JDIMENSION start_col,
-			      JDIMENSION num_blocks));
-};
-
-/* Entropy encoding */
-struct jpeg_entropy_encoder {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
-  JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
-  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
-};
-
-/* Marker writing */
-struct jpeg_marker_writer {
-  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
-  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
-  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
-  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
-  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
-  /* These routines are exported to allow insertion of extra markers */
-  /* Probably only COM and APPn markers should be written this way */
-  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
-				      unsigned int datalen));
-  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
-};
-
-
-/* Declarations for decompression modules */
-
-/* Master control module */
-struct jpeg_decomp_master {
-  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
-
-  /* State variables made visible to other modules */
-  boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
-};
-
-/* Input control module */
-struct jpeg_input_controller {
-  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
-  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
-  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
-
-  /* State variables made visible to other modules */
-  boolean has_multiple_scans;	/* True if file has multiple scans */
-  boolean eoi_reached;		/* True when EOI has been consumed */
-};
-
-/* Main buffer control (downsampled-data buffer) */
-struct jpeg_d_main_controller {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
-			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-			       JDIMENSION out_rows_avail));
-};
-
-/* Coefficient buffer control */
-struct jpeg_d_coef_controller {
-  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
-  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
-  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
-				 JSAMPIMAGE output_buf));
-  /* Pointer to array of coefficient virtual arrays, or NULL if none */
-  jvirt_barray_ptr *coef_arrays;
-};
-
-/* Decompression postprocessing (color quantization buffer control) */
-struct jpeg_d_post_controller {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
-				    JSAMPIMAGE input_buf,
-				    JDIMENSION *in_row_group_ctr,
-				    JDIMENSION in_row_groups_avail,
-				    JSAMPARRAY output_buf,
-				    JDIMENSION *out_row_ctr,
-				    JDIMENSION out_rows_avail));
-};
-
-/* Marker reading & parsing */
-struct jpeg_marker_reader {
-  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
-  /* Read markers until SOS or EOI.
-   * Returns same codes as are defined for jpeg_consume_input:
-   * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
-   */
-  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
-  /* Read a restart marker --- exported for use by entropy decoder only */
-  jpeg_marker_parser_method read_restart_marker;
-
-  /* State of marker reader --- nominally internal, but applications
-   * supplying COM or APPn handlers might like to know the state.
-   */
-  boolean saw_SOI;		/* found SOI? */
-  boolean saw_SOF;		/* found SOF? */
-  int next_restart_num;		/* next restart number expected (0-7) */
-  unsigned int discarded_bytes;	/* # of bytes skipped looking for a marker */
-};
-
-/* Entropy decoding */
-struct jpeg_entropy_decoder {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
-				JBLOCKROW *MCU_data));
-
-  /* This is here to share code between baseline and progressive decoders; */
-  /* other modules probably should not use it */
-  boolean insufficient_data;	/* set TRUE after emitting warning */
-};
-
-/* Inverse DCT (also performs dequantization) */
-typedef JMETHOD(void, inverse_DCT_method_ptr,
-		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		 JCOEFPTR coef_block,
-		 JSAMPARRAY output_buf, JDIMENSION output_col));
-
-struct jpeg_inverse_dct {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  /* It is useful to allow each component to have a separate IDCT method. */
-  inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
-};
-
-/* Upsampling (note that upsampler must also call color converter) */
-struct jpeg_upsampler {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
-			   JSAMPIMAGE input_buf,
-			   JDIMENSION *in_row_group_ctr,
-			   JDIMENSION in_row_groups_avail,
-			   JSAMPARRAY output_buf,
-			   JDIMENSION *out_row_ctr,
-			   JDIMENSION out_rows_avail));
-
-  boolean need_context_rows;	/* TRUE if need rows above & below */
-};
-
-/* Colorspace conversion */
-struct jpeg_color_deconverter {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
-				JSAMPIMAGE input_buf, JDIMENSION input_row,
-				JSAMPARRAY output_buf, int num_rows));
-};
-
-/* Color quantization or color precision reduction */
-struct jpeg_color_quantizer {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
-  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
-				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
-				 int num_rows));
-  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
-};
-
-
-/* Miscellaneous useful macros */
-
-#undef MAX
-#define MAX(a,b)	((a) > (b) ? (a) : (b))
-#undef MIN
-#define MIN(a,b)	((a) < (b) ? (a) : (b))
-
-
-/* We assume that right shift corresponds to signed division by 2 with
- * rounding towards minus infinity.  This is correct for typical "arithmetic
- * shift" instructions that shift in copies of the sign bit.  But some
- * C compilers implement >> with an unsigned shift.  For these machines you
- * must define RIGHT_SHIFT_IS_UNSIGNED.
- * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity.
- * It is only applied with constant shift counts.  SHIFT_TEMPS must be
- * included in the variables of any routine using RIGHT_SHIFT.
- */
-
-#ifdef RIGHT_SHIFT_IS_UNSIGNED
-#define SHIFT_TEMPS	INT32 shift_temp;
-#define RIGHT_SHIFT(x,shft)  \
-	((shift_temp = (x)) < 0 ? \
-	 (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \
-	 (shift_temp >> (shft)))
-#else
-#define SHIFT_TEMPS
-#define RIGHT_SHIFT(x,shft)	((x) >> (shft))
-#endif
-
-
-/* Short forms of external names for systems with brain-damaged linkers. */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jinit_compress_master	jICompress
-#define jinit_c_master_control	jICMaster
-#define jinit_c_main_controller	jICMainC
-#define jinit_c_prep_controller	jICPrepC
-#define jinit_c_coef_controller	jICCoefC
-#define jinit_color_converter	jICColor
-#define jinit_downsampler	jIDownsampler
-#define jinit_forward_dct	jIFDCT
-#define jinit_huff_encoder	jIHEncoder
-#define jinit_phuff_encoder	jIPHEncoder
-#define jinit_arith_encoder	jIAEncoder
-#define jinit_marker_writer	jIMWriter
-#define jinit_master_decompress	jIDMaster
-#define jinit_d_main_controller	jIDMainC
-#define jinit_d_coef_controller	jIDCoefC
-#define jinit_d_post_controller	jIDPostC
-#define jinit_input_controller	jIInCtlr
-#define jinit_marker_reader	jIMReader
-#define jinit_huff_decoder	jIHDecoder
-#define jinit_phuff_decoder	jIPHDecoder
-#define jinit_arith_decoder	jIADecoder
-#define jinit_inverse_dct	jIIDCT
-#define jinit_upsampler		jIUpsampler
-#define jinit_color_deconverter	jIDColor
-#define jinit_1pass_quantizer	jI1Quant
-#define jinit_2pass_quantizer	jI2Quant
-#define jinit_merged_upsampler	jIMUpsampler
-#define jinit_memory_mgr	jIMemMgr
-#define jdiv_round_up		jDivRound
-#define jround_up		jRound
-#define jcopy_sample_rows	jCopySamples
-#define jcopy_block_row		jCopyBlocks
-#define jzero_far		jZeroFar
-#define jpeg_zigzag_order	jZIGTable
-#define jpeg_natural_order	jZAGTable
-#define jpeg_aritab		jAriTab
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/* Compression module initialization routines */
-EXTERN(void) jinit_compress_master JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_c_master_control JPP((j_compress_ptr cinfo,
-					 boolean transcode_only));
-EXTERN(void) jinit_c_main_controller JPP((j_compress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_c_prep_controller JPP((j_compress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_c_coef_controller JPP((j_compress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_color_converter JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_downsampler JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_forward_dct JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_huff_encoder JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_phuff_encoder JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_arith_encoder JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_marker_writer JPP((j_compress_ptr cinfo));
-/* Decompression module initialization routines */
-EXTERN(void) jinit_master_decompress JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_d_main_controller JPP((j_decompress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_d_coef_controller JPP((j_decompress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_d_post_controller JPP((j_decompress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_input_controller JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_marker_reader JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_huff_decoder JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_phuff_decoder JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_arith_decoder JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_inverse_dct JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_upsampler JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_color_deconverter JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_1pass_quantizer JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_2pass_quantizer JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_merged_upsampler JPP((j_decompress_ptr cinfo));
-/* Memory manager initialization */
-EXTERN(void) jinit_memory_mgr JPP((j_common_ptr cinfo));
-
-/* Utility routines in jutils.c */
-EXTERN(long) jdiv_round_up JPP((long a, long b));
-EXTERN(long) jround_up JPP((long a, long b));
-EXTERN(void) jcopy_sample_rows JPP((JSAMPARRAY input_array, int source_row,
-				    JSAMPARRAY output_array, int dest_row,
-				    int num_rows, JDIMENSION num_cols));
-EXTERN(void) jcopy_block_row JPP((JBLOCKROW input_row, JBLOCKROW output_row,
-				  JDIMENSION num_blocks));
-EXTERN(void) jzero_far JPP((void FAR * target, size_t bytestozero));
-/* Constant tables in jutils.c */
-#if 0				/* This table is not actually needed in v6a */
-extern const int jpeg_zigzag_order[]; /* natural coef order to zigzag order */
-#endif
-extern const int jpeg_natural_order[]; /* zigzag coef order to natural order */
-
-/* Arithmetic coding probability estimation tables in jaricom.c */
-extern const INT32 jpeg_aritab[];
-
-/* Suppress undefined-structure complaints if necessary. */
-
-#ifdef INCOMPLETE_TYPES_BROKEN
-#ifndef AM_MEMORY_MANAGER	/* only jmemmgr.c defines these */
-struct jvirt_sarray_control { long dummy; };
-struct jvirt_barray_control { long dummy; };
-#endif
-#endif /* INCOMPLETE_TYPES_BROKEN */