diff -uNr mplayer-1.0~rc1-0ubuntu9.1/debian/changelog mplayer-1.0~rc1-0ubuntu9.2/debian/changelog --- mplayer-1.0~rc1-0ubuntu9.1/debian/changelog 2007-08-15 20:19:18.000000000 -0300 +++ mplayer-1.0~rc1-0ubuntu9.2/debian/changelog 2007-08-15 20:41:13.000000000 -0300 @@ -1,3 +1,12 @@ +mplayer (2:1.0~rc1-0ubuntu9.2) feisty; urgency=low + + * Removed ac=mad from etc/examples.conf and added a global + /etc/mplayer/codecs.conf, making mad default to mp3. This should fix + fix things globaly to both mplayer and mencoder, also fixing some other + tools such as Devede (LP: #85751). + + -- Fabio Pugliese Ornellas Wed, 15 Aug 2007 20:55:23 -0300 + mplayer (2:1.0~rc1-0ubuntu9.1) feisty-security; urgency=low * SECURITY UPDATE: buffer overrun in cddb code (LP: #118855). diff -uNr mplayer-1.0~rc1-0ubuntu9.1/debian/patches/00list mplayer-1.0~rc1-0ubuntu9.2/debian/patches/00list --- mplayer-1.0~rc1-0ubuntu9.1/debian/patches/00list 1969-12-31 21:00:00.000000000 -0300 +++ mplayer-1.0~rc1-0ubuntu9.2/debian/patches/00list 2007-08-15 20:33:41.000000000 -0300 @@ -0,0 +1 @@ +01_mad diff -uNr mplayer-1.0~rc1-0ubuntu9.1/debian/patches/01_mad mplayer-1.0~rc1-0ubuntu9.2/debian/patches/01_mad --- mplayer-1.0~rc1-0ubuntu9.1/debian/patches/01_mad 1969-12-31 21:00:00.000000000 -0300 +++ mplayer-1.0~rc1-0ubuntu9.2/debian/patches/01_mad 2007-08-15 20:33:41.000000000 -0300 @@ -0,0 +1,49 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_mad.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make libMAD default to decode MP3 instead of mp3lib, since it is broken +## DP: on some cases. + +@DPATCH@ + +--- mplayer.orig/etc/codecs.conf 2007-02-03 02:00:01.000000000 -0200 ++++ mplayer/etc/mplayer/codecs.conf 2007-08-05 23:27:25.000000000 -0300 +@@ -2496,6 +2496,18 @@ + driver acm + dll "msadp32.acm" + ++audiocodec mad ++ info "libMAD MPEG layer 1-2-3" ++ status working ++ format 0x50 ++ format 0x55 ++ format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files) ++ fourcc ".mp3" ; CBR/VBR MP3 (MOV files) ++ fourcc "MP3 " ; used in .nsv files ++ fourcc "LAME" ; used in mythtv .nuv files ++ driver libmad ++ dll "libmad" ++ + audiocodec mp3 + info "mp3lib MPEG layer-2, layer-3" + status working +@@ -2586,18 +2598,6 @@ + driver ffmpeg + dll "mp2" + +-audiocodec mad +- info "libMAD MPEG layer 1-2-3" +- status working +- format 0x50 +- format 0x55 +- format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files) +- fourcc ".mp3" ; CBR/VBR MP3 (MOV files) +- fourcc "MP3 " ; used in .nsv files +- fourcc "LAME" ; used in mythtv .nuv files +- driver libmad +- dll "libmad" +- + audiocodec mp3acm + info "MPEG layer-3" + status working diff -uNr mplayer-1.0~rc1-0ubuntu9.1/debian/rules mplayer-1.0~rc1-0ubuntu9.2/debian/rules --- mplayer-1.0~rc1-0ubuntu9.1/debian/rules 2007-08-15 20:19:18.000000000 -0300 +++ mplayer-1.0~rc1-0ubuntu9.2/debian/rules 2007-08-15 20:33:41.000000000 -0300 @@ -62,7 +62,7 @@ echo 'TARGET_BUILTIN_3DNOW = yes' >> config.mak endif -build: +build: patch build-gui: build-gui-stamp build-gui-stamp: @@ -105,6 +105,7 @@ cp etc/example.conf etc/mplayer.conf dh_install -pmplayer etc/mplayer.conf etc/mplayer rm -f etc/mplayer.conf + dh_install -pmplayer etc/codecs.conf etc/mplayer dh_install -pmplayer etc/input.conf etc/mplayer dh_install -pmplayer etc/menu.conf etc/mplayer dh_installexamples -pmplayer -X.libdeps etc @@ -126,12 +127,13 @@ cp etc/example.conf etc/mplayer.conf dh_install -pmplayer-nogui etc/mplayer.conf etc/mplayer rm -f etc/mplayer.conf + dh_install -pmplayer-nogui etc/codecs.conf etc/mplayer dh_install -pmplayer-nogui etc/input.conf etc/mplayer dh_install -pmplayer-nogui etc/menu.conf etc/mplayer dh_installexamples -pmplayer-nogui -X.libdeps etc dh_install -pmplayer-nogui -clean:: +clean:: clean-patched unpatch dh_testdir dh_testroot -$(MAKE) distclean @@ -177,6 +179,21 @@ dh_md5sums dh_builddeb +clean-patched: + $(testdir) + $(testroot) + ${MAKE} distclean + rm -rf debian/files debian/mencoder debian/mencoder.substvars debian/mplayer debian/mplayer-doc debian/mplayer-nogui debian/mplayer-nogui.substvars debian/mplayer.substvars + +patch: patch-stamp +patch-stamp: + dpatch apply-all + dpatch cat-all >patch-stamp + +unpatch: + dpatch deapply-all + rm -rf patch-stamp debian/patched + #greatly inspired by the mplayer package of Dariush Pietrzak UPVERSION := 1.0pre7try2 DEBIANVERSION := 0.99+1.0pre7try2 diff -uNr mplayer-1.0~rc1-0ubuntu9.1/etc/example.conf mplayer-1.0~rc1-0ubuntu9.2/etc/example.conf --- mplayer-1.0~rc1-0ubuntu9.1/etc/example.conf 2007-08-15 20:19:18.000000000 -0300 +++ mplayer-1.0~rc1-0ubuntu9.2/etc/example.conf 2007-08-15 20:34:29.000000000 -0300 @@ -82,9 +82,6 @@ # Resample the sound to 44100Hz with the lavcresample audio filter. #af=lavcresample=44100 -# Specify default audio codec (see -ac help for a list). -ac=mad, - ################## # other settings #