Your message dated Sun, 14 Jan 2007 16:47:04 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#391238: fixed in xmms-wma 1.0.5-4
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--- Begin Message ---
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

--- End Message ---
--- Begin Message ---
Source: xmms-wma
Source-Version: 1.0.5-4

We believe that the bug you reported is fixed in the latest version of
xmms-wma, which is due to be installed in the Debian FTP archive:

beep-media-player-wma_1.0.5-4_i386.deb
  to pool/main/x/xmms-wma/beep-media-player-wma_1.0.5-4_i386.deb
xmms-wma_1.0.5-4.diff.gz
  to pool/main/x/xmms-wma/xmms-wma_1.0.5-4.diff.gz
xmms-wma_1.0.5-4.dsc
  to pool/main/x/xmms-wma/xmms-wma_1.0.5-4.dsc
xmms-wma_1.0.5-4_i386.deb
  to pool/main/x/xmms-wma/xmms-wma_1.0.5-4_i386.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Wei Mingzhi <[EMAIL PROTECTED]> (supplier of updated xmms-wma package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Tue, 14 Jan 2007 19:33:52 +0800
Source: xmms-wma
Binary: xmms-wma beep-media-player-wma
Architecture: source i386
Version: 1.0.5-4
Distribution: unstable
Urgency: low
Maintainer: Wei Mingzhi <[EMAIL PROTECTED]>
Changed-By: Wei Mingzhi <[EMAIL PROTECTED]>
Description: 
 beep-media-player-wma - WMA input plugin for Beep Media Player
 xmms-wma   - WMA input plugin for XMMS
Closes: 391238
Changes: 
 xmms-wma (1.0.5-4) unstable; urgency=low
 .
   * rules: Changed to use the FFmpeg in Debian. (closes: #391238)
   * patches/01-xmms-wma: Added, reason above.
   * patches/01-ffmpeg-arch.dpatch: Dropped.
Files: 
 6f0a73c27a4c559f5336ec60ea803b63 667 sound optional xmms-wma_1.0.5-4.dsc
 3115dcd291db990651936130a2f79e56 2775 sound optional xmms-wma_1.0.5-4.diff.gz
 53dc4cc18036e7cd04deb89ccc950c73 14290 sound optional xmms-wma_1.0.5-4_i386.deb
 c712138ca3c1b307c139516180658bf8 14546 sound optional 
beep-media-player-wma_1.0.5-4_i386.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFFqlyM+C5cwEsrK54RAoxkAKDPdqSiQuqrRMIFqZPXGD67ySkbhACfW3wS
4Fsc3eqNuejOMc6BGHF/vgM=
=toMQ
-----END PGP SIGNATURE-----


--- End Message ---

Reply via email to