Attachment 1871 Details for Bug 11177 – Patch

[patch] Patch

xmms-1.2.10-alt-unresolved.patch (text/plain), 8.75 KB, created by Igor Zubkov on 2007-03-21 22:06:18 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Zubkov

Created: 2007-03-21 22:06:18 MSK

Size: 8.75 KB

patch

obsolete

>diff -urN xmms-1.2.10.orig/Effect/echo_plugin/Makefile.am xmms-1.2.10/Effect/echo_plugin/Makefile.am
>--- xmms-1.2.10.orig/Effect/echo_plugin/Makefile.am	2003-05-20 00:22:06 +0300
>+++ xmms-1.2.10/Effect/echo_plugin/Makefile.am	2007-03-21 20:45:01 +0200
>@@ -3,7 +3,7 @@
> libdir = $(plugindir)/$(EFFECT_PLUGIN_DIR)
> 
> libecho_la_LDFLAGS = @PLUGIN_LDFLAGS@
>-libecho_la_LIBADD = @GTK_LIBS@
>+libecho_la_LIBADD = @GTK_LIBS@ ../../libxmms/libxmms.la
> 
> libecho_la_SOURCES =    \
> echo.c \
>diff -urN xmms-1.2.10.orig/Effect/stereo_plugin/Makefile.am xmms-1.2.10/Effect/stereo_plugin/Makefile.am
>--- xmms-1.2.10.orig/Effect/stereo_plugin/Makefile.am	2003-05-20 00:22:06 +0300
>+++ xmms-1.2.10/Effect/stereo_plugin/Makefile.am	2007-03-21 20:45:40 +0200
>@@ -3,7 +3,7 @@
> libdir = $(plugindir)/$(EFFECT_PLUGIN_DIR)
> 
> libstereo_la_LDFLAGS = @PLUGIN_LDFLAGS@
>-libstereo_la_LIBADD = @GTK_LIBS@
>+libstereo_la_LIBADD = @GTK_LIBS@ ../../libxmms/libxmms.la
> 
> libstereo_la_SOURCES = 	\
> stereo.c
>diff -urN xmms-1.2.10.orig/Effect/voice/Makefile.am xmms-1.2.10/Effect/voice/Makefile.am
>--- xmms-1.2.10.orig/Effect/voice/Makefile.am	2003-05-20 00:22:06 +0300
>+++ xmms-1.2.10/Effect/voice/Makefile.am	2007-03-21 20:46:12 +0200
>@@ -3,7 +3,7 @@
> libdir = $(plugindir)/$(EFFECT_PLUGIN_DIR)
> 
> libvoice_la_LDFLAGS = @PLUGIN_LDFLAGS@
>-libvoice_la_LIBADD = @GTK_LIBS@
>+libvoice_la_LIBADD = @GTK_LIBS@ ../../libxmms/libxmms.la
> 
> libvoice_la_SOURCES = 	\
> about.c \
>diff -urN xmms-1.2.10.orig/General/ir/Makefile.am xmms-1.2.10/General/ir/Makefile.am
>--- xmms-1.2.10.orig/General/ir/Makefile.am	2003-05-20 00:22:06 +0300
>+++ xmms-1.2.10/General/ir/Makefile.am	2007-03-21 20:39:31 +0200
>@@ -3,7 +3,7 @@
> libdir = $(plugindir)/$(GENERAL_PLUGIN_DIR)
> 
> libir_la_LDFLAGS = @PLUGIN_LDFLAGS@
>-libir_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@
>+libir_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ ../../libxmms/libxmms.la
> 
> libir_la_SOURCES =    \
> ir.c \
>diff -urN xmms-1.2.10.orig/General/joystick/Makefile.am xmms-1.2.10/General/joystick/Makefile.am
>--- xmms-1.2.10.orig/General/joystick/Makefile.am	2003-05-20 00:22:06 +0300
>+++ xmms-1.2.10/General/joystick/Makefile.am	2007-03-21 20:40:58 +0200
>@@ -20,7 +20,7 @@
> libdir = $(plugindir)/$(GENERAL_PLUGIN_DIR)
> 
> libjoy_la_LDFLAGS = @PLUGIN_LDFLAGS@
>-libjoy_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@
>+libjoy_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ ../../libxmms/libxmms.la
> 
> libjoy_la_SOURCES = $(joysources)
> 
>diff -urN xmms-1.2.10.orig/General/song_change/Makefile.am xmms-1.2.10/General/song_change/Makefile.am
>--- xmms-1.2.10.orig/General/song_change/Makefile.am	2003-05-20 00:22:06 +0300
>+++ xmms-1.2.10/General/song_change/Makefile.am	2007-03-21 20:40:24 +0200
>@@ -3,7 +3,7 @@
> libdir = $(plugindir)/$(GENERAL_PLUGIN_DIR)
> 
> libsong_change_la_LDFLAGS = @PLUGIN_LDFLAGS@
>-libsong_change_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@
>+libsong_change_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ ../../libxmms/libxmms.la
> 
> libsong_change_la_SOURCES = song_change.c
> 
>diff -urN xmms-1.2.10.orig/Input/cdaudio/Makefile.am xmms-1.2.10/Input/cdaudio/Makefile.am
>--- xmms-1.2.10.orig/Input/cdaudio/Makefile.am	2003-08-08 20:10:40 +0300
>+++ xmms-1.2.10/Input/cdaudio/Makefile.am	2007-03-21 20:46:46 +0200
>@@ -28,6 +28,6 @@
> 
> INCLUDES = @GTK_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
> libcdaudio_la_LDFLAGS = @PLUGIN_LDFLAGS@
>-libcdaudio_la_LIBADD = @GTK_LIBS@
>+libcdaudio_la_LIBADD = @GTK_LIBS@ ../../libxmms/libxmms.la
> libcdaudio_la_SOURCES = $(cdaudiobuildsources)
> 
>diff -urN xmms-1.2.10.orig/Input/mikmod/Makefile.am xmms-1.2.10/Input/mikmod/Makefile.am
>--- xmms-1.2.10.orig/Input/mikmod/Makefile.am	2003-05-20 00:22:06 +0300
>+++ xmms-1.2.10/Input/mikmod/Makefile.am	2007-03-21 20:47:29 +0200
>@@ -9,7 +9,7 @@
> INCLUDES = @GTK_CFLAGS@ @LIBMIKMOD_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
> libmikmod_la_LDFLAGS = @PLUGIN_LDFLAGS@
> libmikmod_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ \
>-@LIBMIKMOD_LIBS@ @LIBMIKMOD_LDADD@ 
>+@LIBMIKMOD_LIBS@ @LIBMIKMOD_LDADD@ ../../libxmms/libxmms.la
> 
> libmikmod_la_SOURCES = drv_xmms.c mikmod-plugin.h plugin.c mikmod.xpm
> 
>diff -urN xmms-1.2.10.orig/Input/tonegen/Makefile.am xmms-1.2.10/Input/tonegen/Makefile.am
>--- xmms-1.2.10.orig/Input/tonegen/Makefile.am	2003-05-20 00:22:06 +0300
>+++ xmms-1.2.10/Input/tonegen/Makefile.am	2007-03-21 20:48:58 +0200
>@@ -3,6 +3,7 @@
> libdir = $(plugindir)/$(INPUT_PLUGIN_DIR)
> 
> libtonegen_la_LDFLAGS = @PLUGIN_LDFLAGS@
>+libtonegen_la_LIBADD = ../../libxmms/libxmms.la
> 
> libtonegen_la_SOURCES = tonegen.c
> INCLUDES = @GTK_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
>diff -urN xmms-1.2.10.orig/Input/vorbis/Makefile.am xmms-1.2.10/Input/vorbis/Makefile.am
>--- xmms-1.2.10.orig/Input/vorbis/Makefile.am	2003-05-20 00:22:06 +0300
>+++ xmms-1.2.10/Input/vorbis/Makefile.am	2007-03-21 20:49:35 +0200
>@@ -9,7 +9,7 @@
> INCLUDES = @GTK_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
> libvorbis_la_LDFLAGS = @PLUGIN_LDFLAGS@
> libvorbis_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @VORBISFILE_LIBS@ \
>-@LTLIBICONV@
>+@LTLIBICONV@ ../../libxmms/libxmms.la
> 
> libvorbis_la_SOURCES = \
> vorbis.c vorbis.h \
>diff -urN xmms-1.2.10.orig/Input/wav/Makefile.am xmms-1.2.10/Input/wav/Makefile.am
>--- xmms-1.2.10.orig/Input/wav/Makefile.am	2003-05-20 00:22:06 +0300
>+++ xmms-1.2.10/Input/wav/Makefile.am	2007-03-21 20:50:26 +0200
>@@ -3,6 +3,7 @@
> libdir = $(plugindir)/$(INPUT_PLUGIN_DIR)
> 
> libwav_la_LDFLAGS = @PLUGIN_LDFLAGS@
>+libwav_la_LIBADD = ../../libxmms/libxmms.la
> 
> libwav_la_SOURCES = 	\
> wav.c \
>diff -urN xmms-1.2.10.orig/Output/alsa/Makefile.am xmms-1.2.10/Output/alsa/Makefile.am
>--- xmms-1.2.10.orig/Output/alsa/Makefile.am	2003-08-08 20:10:41 +0300
>+++ xmms-1.2.10/Output/alsa/Makefile.am	2007-03-21 20:51:52 +0200
>@@ -24,6 +24,6 @@
> libdir = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
> 
> libALSA_la_LDFLAGS = @PLUGIN_LDFLAGS@
>-libALSA_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ @ALSA_LIBS@
>+libALSA_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ @ALSA_LIBS@ ../../libxmms/libxmms.la
> libALSA_la_SOURCES= $(alsabuildsources)
> INCLUDES = @GTK_CFLAGS@ @ALSA_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
>diff -urN xmms-1.2.10.orig/Output/disk_writer/Makefile.am xmms-1.2.10/Output/disk_writer/Makefile.am
>--- xmms-1.2.10.orig/Output/disk_writer/Makefile.am	2003-05-20 00:22:06 +0300
>+++ xmms-1.2.10/Output/disk_writer/Makefile.am	2007-03-21 20:52:32 +0200
>@@ -3,7 +3,7 @@
> libdir = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
> 
> libdisk_writer_la_LDFLAGS = @PLUGIN_LDFLAGS@
>-libdisk_writer_la_LIBADD = @GTK_LIBS@
>+libdisk_writer_la_LIBADD = @GTK_LIBS@ ../../libxmms/libxmms.la
> libdisk_writer_la_SOURCES= disk_writer.c
> 
> INCLUDES = @GTK_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
>diff -urN xmms-1.2.10.orig/Output/esd/Makefile.am xmms-1.2.10/Output/esd/Makefile.am
>--- xmms-1.2.10.orig/Output/esd/Makefile.am	2003-05-20 00:22:06 +0300
>+++ xmms-1.2.10/Output/esd/Makefile.am	2007-03-21 20:53:03 +0200
>@@ -22,6 +22,6 @@
> 
> INCLUDES = @GTK_CFLAGS@ @ESD_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
> libesdout_la_LDFLAGS = @PLUGIN_LDFLAGS@
>-libesdout_la_LIBADD = @GTK_LIBS@ @ESD_LIBS@
>+libesdout_la_LIBADD = @GTK_LIBS@ @ESD_LIBS@ ../../libxmms/libxmms.la
> 
> libesdout_la_SOURCES= $(esdsources)
>diff -urN xmms-1.2.10.orig/Output/OSS/Makefile.am xmms-1.2.10/Output/OSS/Makefile.am
>--- xmms-1.2.10.orig/Output/OSS/Makefile.am	2003-07-03 01:18:08 +0300
>+++ xmms-1.2.10/Output/OSS/Makefile.am	2007-03-21 20:51:13 +0200
>@@ -27,6 +27,6 @@
> libdir = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
> 
> libOSS_la_LDFLAGS = @PLUGIN_LDFLAGS@
>-libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@
>+libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ ../../libxmms/libxmms.la
> libOSS_la_SOURCES= $(ossbuildsources)
> INCLUDES = @GTK_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
>diff -urN xmms-1.2.10.orig/Visualization/blur_scope/Makefile.am xmms-1.2.10/Visualization/blur_scope/Makefile.am
>--- xmms-1.2.10.orig/Visualization/blur_scope/Makefile.am	2003-05-20 00:22:07 +0300
>+++ xmms-1.2.10/Visualization/blur_scope/Makefile.am	2007-03-21 20:53:45 +0200
>@@ -3,7 +3,7 @@
> libdir = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
> 
> libbscope_la_LDFLAGS = @PLUGIN_LDFLAGS@
>-libbscope_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@
>+libbscope_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ ../../libxmms/libxmms.la
> 
> COMMON_SRC = blur_scope.c blur_scope.h config.c
> 
>diff -urN xmms-1.2.10.orig/Visualization/opengl_spectrum/Makefile.am xmms-1.2.10/Visualization/opengl_spectrum/Makefile.am
>--- xmms-1.2.10.orig/Visualization/opengl_spectrum/Makefile.am	2003-05-20 00:22:07 +0300
>+++ xmms-1.2.10/Visualization/opengl_spectrum/Makefile.am	2007-03-21 20:54:21 +0200
>@@ -17,7 +17,7 @@
> libdir = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
> 
> libogl_spectrum_la_LDFLAGS = @PLUGIN_LDFLAGS@
>-libogl_spectrum_la_LIBADD = @GTK_LIBS@ @OPENGL_LIBS@
>+libogl_spectrum_la_LIBADD = @GTK_LIBS@ @OPENGL_LIBS@ ../../libxmms/libxmms.la
> 
> libogl_spectrum_la_SOURCES = $(oglspectrumsources)
> INCLUDES = @GTK_CFLAGS@ @XMMS_DEFINES@ -I$(top_builddir)/intl -I$(top_srcdir)

Actions: View | Diff

Attachments on bug 11177: 1871