This commit was manufactured by cvs2git to create branch 'AC-branch'.

Sprout from master 2006-12-03 21:34:37 UTC grzegol <grzegol@pld-linux.org> '- updated to 1.1.3'
Cherrypick from master 2005-03-18 17:04:25 UTC blekot <blekot@pld-linux.org> '- patch for xmms plugin (bug: xmms with flac plugin doesn't run)':
    flac-plugin_xmms.patch -> 1.1
    flac-read_only_relocs.patch -> 1.2

diff --git a/flac-plugin_xmms.patch b/flac-plugin_xmms.patch
new file mode 100644 (file)
index 0000000..357e89c
--- /dev/null
+++ b/flac-plugin_xmms.patch
@@ -0,0 +1,10 @@
+--- flac-1.1.2.orig/src/plugin_xmms/configure.c 2005-01-25 07:26:29 +0300
++++ flac-1.1.2/src/plugin_xmms/configure.c      2005-02-24 12:40:37 +0300
+@@ -61,7 +61,7 @@
+               "", /* proxy_user */
+               "", /* proxy_pass */
+               FALSE, /* save_http_stream */
+-              "", /* save_http_path */
++              FALSE, /* save_http_path */
+               FALSE, /* cast_title_streaming */
+               FALSE /* use_udp_channel */

diff --git a/flac-read_only_relocs.patch b/flac-read_only_relocs.patch
new file mode 100644 (file)
index 0000000..0f1047c
--- /dev/null
+++ b/flac-read_only_relocs.patch
@@ -0,0 +1,11 @@
+--- flac-1.1.2.orig/src/libFLAC/Makefile.am    2005-02-03 05:58:13.000000000 +0100
++++ flac-1.1.2/src/libFLAC/Makefile.am 2005-03-14 14:08:14.768151672 +0100
+@@ -64,7 +64,7 @@
+ libFLAC_la_LIBADD = ppc/gas/libFLAC-asm.la
+ endif
+ endif
+-LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
++LOCAL_EXTRA_LDFLAGS = ""
+ endif
+ endif
+