20837N/A--- pulseaudio-0.9.22/src/utils/padsp.c-orig 2011-06-09 16:36:04.541707885 -0500

20837N/A+++ pulseaudio-0.9.22/src/utils/padsp.c 2011-06-09 16:36:39.028227979 -0500

20837N/A@@ -2224,6 +2224,7 @@ static int dsp_ioctl(fd_info *i, unsigne

20837N/A break;

20837N/A }

20837N/A

20837N/A+#if 0

20837N/A case SOUND_PCM_READ_RATE:

20837N/A debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_RATE\n");

20837N/A

20837N/A@@ -2247,6 +2248,7 @@ static int dsp_ioctl(fd_info *i, unsigne

20837N/A *(int*) argp = pa_sample_size(&i->sample_spec)*8;

20837N/A pa_threaded_mainloop_unlock(i->mainloop);

20837N/A break;

20837N/A+#endif

20837N/A

20837N/A case SNDCTL_DSP_GETOPTR: {

20837N/A count_info *info;

20837N/A@@ -2317,7 +2319,7 @@ fail:

20837N/A return ret;

20837N/A }

20837N/A

20837N/A-#ifdef sun

20837N/A+#ifdef __sun

20837N/A int ioctl(int fd, int request, ...) {

20837N/A #else

20837N/A int ioctl(int fd, unsigned long request, ...) {

20837N/A--- pulseaudio-0.9.22/src/modules/module-augment-properties.c-orig 2011-06-09 17:01:15.762102168 -0500

20837N/A+++ pulseaudio-0.9.22/src/modules/module-augment-properties.c 2011-06-09 17:02:40.207502312 -0500

20837N/A@@ -183,8 +183,8 @@ static void update_rule(struct rule *r)

20837N/A /* Let's try a more aggressive search, but only one level */

20837N/A if ((desktopfiles_dir = opendir(DESKTOPFILEDIR))) {

20837N/A while ((dir = readdir(desktopfiles_dir))) {

20837N/A- if (dir->d_type != DT_DIR

20837N/A- || strcmp(dir->d_name, ".") == 0

20837N/A+ if (/* dir->d_type != DT_DIR

20837N/A+ || */ strcmp(dir->d_name, ".") == 0

20837N/A || strcmp(dir->d_name, "..") == 0)

20837N/A continue;

20837N/A

20837N/A--- pulseaudio-0.99.2/m4/ax_tls.m4-orig 2011-09-15 17:31:43.061828358 -0500

20837N/A+++ pulseaudio-0.99.2/m4/ax_tls.m4 2011-09-15 17:31:46.884504041 -0500

20837N/A@@ -70,7 +70,7 @@ AC_DEFUN([AX_TLS], [

20837N/A

20837N/A AS_IF([test "$ac_cv_tls" != "none"],

20837N/A AC_DEFINE_UNQUOTED([TLS], $ac_cv_tls, [If the compiler supports a TLS storage class define it to that here])

20837N/A- m4_ifnblank([$1], [$1]),

20837N/A- m4_ifnblank([$2], [$2])

20837N/A+ m4_ifval( m4_normalize([$1], [$1]))

20837N/A+ m4_ifval( m4_normalize([$2], [$2]))

20837N/A )

20837N/A ])

20837N/A--- pulseaudio-0.99.2/configure.ac-orig 2011-09-19 11:46:56.537031090 -0500

20837N/A+++ pulseaudio-0.99.2/configure.ac 2011-09-19 11:45:16.405113983 -0500

20837N/A@@ -64,7 +64,7 @@ AS_IF([test "x$STOW" = "xyes" && test -d

20837N/A ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"

20837N/A ])

20837N/A

20837N/A-AM_SILENT_RULES([yes])

20837N/A+#AM_SILENT_RULES([yes])

20837N/A

20837N/A

20837N/A #### Checks for programs. ####

20837N/A@@ -147,14 +147,6 @@ case "$host_os" in

20837N/A ;;

20837N/A esac

20837N/A

20837N/A-

20837N/A-#### Compiler flags ####

20837N/A-

20837N/A-AX_APPEND_COMPILE_FLAGS(

20837N/A- [-Wall -W -Wextra -pipe -Wno-long-long -Wvla -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option],

20837N/A- [], [-pedantic -Werror])

20837N/A-

20837N/A-

20837N/A #### Linker flags ####

20837N/A

20837N/A # Check whether the linker supports the -version-script option.

20837N/A@@ -166,13 +158,13 @@ AC_SUBST([VERSIONING_LDFLAGS])

20837N/A

20837N/A # Use immediate (now) bindings; avoids the funky re-call in itself.

20837N/A # The -z now syntax is lifted from Sun's linker and works with GNU's too, other linkers might be added later.

20837N/A-AX_APPEND_LINK_FLAGS([-Wl,-z,now], [IMMEDIATE_LDFLAGS])

20837N/A+#AX_APPEND_LINK_FLAGS([-Wl,-z,now], [IMMEDIATE_LDFLAGS])

20837N/A AC_SUBST([IMMEDIATE_LDFLAGS])

20837N/A

20837N/A # On ELF systems we don't want the libraries to be unloaded since we don't clean them up properly,

20837N/A # so we request the nodelete flag to be enabled.

20837N/A # On other systems, we don't really know how to do that, but it's welcome if somebody can tell.

20837N/A-AX_APPEND_LINK_FLAGS([-Wl,-z,nodelete], [NODELETE_LDFLAGS])

20837N/A+#AX_APPEND_LINK_FLAGS([-Wl,-z,nodelete], [NODELETE_LDFLAGS])

20837N/A AC_SUBST([NODELETE_LDFLAGS])

20837N/A

20837N/A # Check for the proper way to build libraries that have no undefined symbols

20837N/A@@ -593,7 +585,7 @@ if test "x$need_libatomic_ops" = "xyes";

20837N/A [AC_MSG_ERROR([*** libatomic-ops headers not found])])

20837N/A

20837N/A # Win32 does not need the lib and breaks horribly if we try to include it

20837N/A- AS_IF([test "x$os_is_win32" != "x1"], [LIBS="$LIBS -latomic_ops"])

20837N/A+ AS_IF([test "x$os_is_win32" != "x1"], [LIBS="$LIBS -lbgc"])

20837N/A else

20837N/A AC_MSG_RESULT([no])

20837N/A fi

20837N/A--- pulseaudio-0.99.2/src/modules/module-rygel-media-server.c-orig 2011-09-19 12:12:03.799045520 -0500

20837N/A+++ pulseaudio-0.99.2/src/modules/module-rygel-media-server.c 2011-09-19 12:12:50.837188516 -0500

20837N/A@@ -615,7 +615,7 @@ static void append_sink_or_source_item_p

20837N/A }

20837N/A

20837N/A static const char *array_root_containers[] = { OBJECT_SINKS, OBJECT_SOURCES };

20837N/A-static const char *array_no_children[] = { };

20837N/A+static const char *array_no_children[];

20837N/A

20837N/A static DBusHandlerResult root_handler(DBusConnection *c, DBusMessage *m, void *userdata) {

20837N/A struct userdata *u = userdata;

20837N/A--- pulseaudio-0.99.4/src/pulsecore/ffmpeg/resample2.c-orig 2011-09-28 14:50:52.637441815 -0500

20837N/A+++ pulseaudio-0.99.4/src/pulsecore/ffmpeg/resample2.c 2011-09-28 15:02:26.272959989 -0500

20837N/A@@ -246,7 +246,7 @@ int av_resample(AVResampleContext *c, sh

20837N/A val += src[sample_index + i] * (FELEM2)filter[i];

20837N/A v2 += src[sample_index + i] * (FELEM2)filter[i + c->filter_length];

20837N/A }

20837N/A- val+=(v2-val)*(FELEML)frac / c->src_incr;

20837N/A+ val+=(v2-val)*(frac / c->src_incr);

20837N/A }else{

20837N/A for(i=0; i<c->filter_length; i++){

20837N/A val += src[sample_index + i] * (FELEM2)filter[i];