Author: kolodko Date: Sun Apr 1 11:03:51 2007 GMT Module: SOURCES Tag: HEAD ---- Log message: - added patch
---- Files affected: SOURCES: xmms-wma-1.0.5-build.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/xmms-wma-1.0.5-build.patch diff -u /dev/null SOURCES/xmms-wma-1.0.5-build.patch:1.1 --- /dev/null Sun Apr 1 13:03:51 2007 +++ SOURCES/xmms-wma-1.0.5-build.patch Sun Apr 1 13:03:46 2007 @@ -0,0 +1,57 @@ +diff -Naupr xmms-wma-1.0.5.orig/ffmpeg-strip-wma/config.h xmms-wma-1.0.5/ffmpeg-strip-wma/config.h +--- xmms-wma-1.0.5.orig/ffmpeg-strip-wma/config.h 2004-02-19 01:08:56.000000000 +0100 ++++ xmms-wma-1.0.5/ffmpeg-strip-wma/config.h 2005-12-02 17:09:41.000000000 +0100 +@@ -1,8 +1,8 @@ + /* Automatically generated by configure - do not modify */ +-#define ARCH_X86 1 ++#undef ARCH_X86 + #define TUNECPU generic + #undef HAVE_MMX +-#define __CPU__ 586 ++#undef __CPU__ + #define HAVE_BUILTIN_VECTOR 1 + #define HAVE_LOCALTIME_R 1 + #define HAVE_LRINTF 1 +diff -Naupr xmms-wma-1.0.5.orig/ffmpeg-strip-wma/Makefile xmms-wma-1.0.5/ffmpeg-strip-wma/Makefile +--- xmms-wma-1.0.5.orig/ffmpeg-strip-wma/Makefile 2004-02-23 01:47:06.000000000 +0100 ++++ xmms-wma-1.0.5/ffmpeg-strip-wma/Makefile 2005-12-02 17:12:19.000000000 +0100 +@@ -6,7 +6,7 @@ + include config.mak + + # NOTE: -I.. is needed to include config.h +-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE ++CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fPIC + + OBJS= common.o utils.o mem.o allcodecs.o futils.o cutils.o os_support.o allformats.o parser.o \ + avio.o aviobuf.o file.o simple_idct.o dsputil.o fft.o mdct.o asf.o +diff -Naupr xmms-wma-1.0.5.orig/Makefile xmms-wma-1.0.5/Makefile +--- xmms-wma-1.0.5.orig/Makefile 2004-03-03 15:47:58.000000000 +0100 ++++ xmms-wma-1.0.5/Makefile 2005-12-02 17:10:48.000000000 +0100 +@@ -1,6 +1,6 @@ + .PHONY: all install install-home uninstall uninstall-home clean + +-INSTALL_DIR := /usr/lib/xmms/Input ++INSTALL_DIR := $(xmms-config --input-plugin-dir) + INSTALL_DIR_HOME := ~/.xmms/Plugins/Input + + export PLUGIN_FILE := libwma.so +@@ -13,7 +13,6 @@ export DEPS := $(SOURCES:%.c=$(DEPDIR)/% + all: + @cd ffmpeg-strip-wma; make; cd .. + @$(MAKE) --no-print-directory -f Makefile.inc +- @strip $(PLUGIN_FILE) + @echo "The plug-in has been compiled. Run one of the following:" + @echo "make install - for global (root) installation to $(INSTALL_DIR)" + @echo "make install-home - for installation to home directory $(INSTALL_DIR_HOME)" +diff -Naupr xmms-wma-1.0.5.orig/Makefile.inc xmms-wma-1.0.5/Makefile.inc +--- xmms-wma-1.0.5.orig/Makefile.inc 2005-09-05 14:48:20.000000000 +0200 ++++ xmms-wma-1.0.5/Makefile.inc 2005-12-02 17:16:01.000000000 +0100 +@@ -7,7 +7,7 @@ CFLAGS += `xmms-config --cflags` + LIBS := `xmms-config --libs` -L ffmpeg-strip-wma -lffwma + + $(PLUGIN_FILE): $(OBJECTS) +- $(CC) -o $@ $^ $(LIBS) -shared ++ $(CC) -o $@ $^ $(LIBS) -shared -fPIC + + $(OBJDIR)/%.o: %.c + $(CC) -c -o $@ $(CFLAGS) $< ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
