Package: xmms-wma Severity: important Hi,
your package can link dynamically against upstream ffmpeg and thus should do so because of e.g. security updates. I attached a patch to achieve this and a new rules file to use the changes. Please note that you still need to add build dependencies. HS -- System Information: Debian Release: testing/unstable APT prefers testing APT policy: (500, 'testing') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.18-wireless Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
--- xmms-wma-1.0.5.orig/Makefile.bmp +++ xmms-wma-1.0.5/Makefile.bmp @@ -11,7 +11,7 @@ export DEPS := $(SOURCES:%.c=$(DEPDIR)/%.d) all: - @cd ffmpeg-strip-wma; make; cd .. +# @cd ffmpeg-strip-wma; make; cd .. @$(MAKE) --no-print-directory -f Makefile.inc.bmp @strip $(PLUGIN_FILE) @echo "The plug-in has been compiled. Run one of the following:" @@ -40,5 +40,5 @@ @echo "The plug-in has been uninstalled." clean: - cd ffmpeg-strip-wma; make clean; cd .. +# cd ffmpeg-strip-wma; make clean; cd .. rm -f $(OBJECTS) $(DEPS) --- xmms-wma-1.0.5.orig/Makefile +++ xmms-wma-1.0.5/Makefile @@ -11,7 +11,7 @@ export DEPS := $(SOURCES:%.c=$(DEPDIR)/%.d) all: - @cd ffmpeg-strip-wma; make; cd .. +# @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:" @@ -40,5 +40,5 @@ @echo "The plug-in has been uninstalled." clean: - cd ffmpeg-strip-wma; make clean; cd .. +# cd ffmpeg-strip-wma; make clean; cd .. rm -f $(OBJECTS) $(DEPS) --- xmms-wma-1.0.5.orig/Makefile.inc.bmp +++ xmms-wma-1.0.5/Makefile.inc.bmp @@ -2,9 +2,8 @@ CFLAGS := -O2 -ffast-math -fomit-frame-pointer -fPIC #CFLAGS := -Wall -g -O3 CFLAGS += -DBMP -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -CFLAGS += -I ffmpeg-strip-wma -CFLAGS += `pkg-config bmp --cflags` -LIBS := `pkg-config bmp --libs` -L ffmpeg-strip-wma -lffwma +CFLAGS += $(shell pkg-config --cflags bmp libavformat libavcodec) +LIBS := $(shell pkg-config --libs bmp libavformat libavcodec) $(PLUGIN_FILE): $(OBJECTS) $(CC) -o $@ $^ $(LIBS) -shared --- xmms-wma-1.0.5.orig/Makefile.inc +++ xmms-wma-1.0.5/Makefile.inc @@ -2,9 +2,10 @@ CFLAGS := -O2 -ffast-math -fomit-frame-pointer -fPIC #CFLAGS := -Wall -g -O3 CFLAGS += -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -CFLAGS += -I ffmpeg-strip-wma -CFLAGS += `xmms-config --cflags` -LIBS := `xmms-config --libs` -L ffmpeg-strip-wma -lffwma +CFLAGS += $(shell xmms-config --cflags) +CFLAGS += $(shell pkg-config --cflags libavcodec libavformat) +LIBS := $(shell xmms-config --libs) +LIBS += $(shell pkg-config --libs libavcodec libavformat) $(PLUGIN_FILE): $(OBJECTS) $(CC) -o $@ $^ $(LIBS) -shared --- xmms-wma-1.0.5.orig/xmms-wma.c +++ xmms-wma-1.0.5/xmms-wma.c @@ -42,8 +42,8 @@ #undef HAVE_AV_CONFIG_H #endif -#include "avcodec.h" -#include "avformat.h" +#include <avcodec.h> +#include <avformat.h> #include "iir.h" #define ABOUT_TXT "Copyright (C) 2004,2005 Mokrushin I.V. aka McMCC ([EMAIL PROTECTED]).\n \
#!/usr/bin/make -f include /usr/share/dpatch/dpatch.make CFLAGS = -Wall -g -fPIC ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 -fomit-frame-pointer -ffast-math endif XMMS_OBJDIR = ./obj-xmms BMP_OBJDIR = ./obj-bmp XMMS_PLUGIN_FILE = $(XMMS_OBJDIR)/libwma.so BMP_PLUGIN_FILE = $(BMP_OBJDIR)/libwma.so build: build-stamp build-stamp: patch dh_testdir mkdir -p $(XMMS_OBJDIR) $(BMP_OBJDIR) $(MAKE) -f Makefile.inc OBJDIR=$(XMMS_OBJDIR) PLUGIN_FILE=$(XMMS_PLUGIN_FILE) $(MAKE) -f Makefile.inc.bmp OBJDIR=$(BMP_OBJDIR) PLUGIN_FILE=$(BMP_PLUGIN_FILE) touch $@ clean: unpatch dh_testdir dh_testroot rm -f build-stamp -rm -f $(XMMS_PLUGIN_FILE) $(BMP_PLUGIN_FILE) -rm -rf $(XMMS_OBJDIR) $(BMP_OBJDIR) dh_clean install: build dh_testdir dh_testroot dh_clean -k dh_installdirs install -D -m 644 $(CURDIR)/$(XMMS_PLUGIN_FILE) \ $(CURDIR)/debian/xmms-wma/usr/lib/xmms/Input/libwma.so install -D -m 644 $(CURDIR)/$(BMP_PLUGIN_FILE) \ $(CURDIR)/debian/beep-media-player-wma/usr/lib/bmp/Input/libwma.so binary-indep: build install binary-arch: build install dh_testdir dh_testroot dh_installchangelogs dh_installdocs dh_link dh_strip dh_compress dh_fixperms dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install
