diff --git a/helpers/make-mplayer b/helpers/make-mplayer index 68ed7d5..db32b61 100644 --- a/helpers/make-mplayer +++ b/helpers/make-mplayer @@ -17,23 +17,47 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=2 . ./config -rm ./TOOLS/w32codec_dl.pl ./TOOLS/binary_codecs.sh ./rpm/mplayer-codecs.spec +rm ./TOOLS/w32codec_dl.pl ./TOOLS/binary_codecs.sh +# Patch copyright file from removed files. +cat << EOF | patch --no-backup-if-mismatch -p1 +diff --git a/debian/copyright b/debian/copyright +index ed1aea5c..d269dec2 100644 +--- a/debian/copyright ++++ b/debian/copyright +@@ -138,7 +138,6 @@ Files: + TOOLS/asfinfo.c + TOOLS/avi-fix.c + TOOLS/avisubdump.c +- TOOLS/binary_codecs.sh + TOOLS/checktree.sh + TOOLS/compare.c + TOOLS/divx2svcd.sh +@@ -259,12 +258,6 @@ Copyright: + 1994 Sun Microsystems, Inc + License: other-1 + +-Files: TOOLS/w32codec_dl.pl +-Copyright: +- 2002 Tom Lees +-License: public-domain-tom +- By Tom Lees, 2002. I hereby place this script into the public domain. +- + Files: TOOLS/vobshift.py + Copyright: + Gábor Farkas +EOF cp $DATA/README ./TOOLS/README #sed -i /Win32/d debian/control sed -i /binary_codecs/d ./debian/mplayer.install -#sed -i '/w32codec/,/binary_codecs.sh\ uninstall/d' debian/copyright -sed -i 's/\(--disable-arts \\\)/\1\n\t--disable-win32dll \\/' debian/rules -sed -i 's/\(--disable-arts \\\)/\1\n\t--disable-qtx \\/' debian/rules -sed -i 's/\(--disable-arts \\\)/\1\n\t--disable-xanim \\/' debian/rules -sed -i 's/\(--disable-arts \\\)/\1\n\t--disable-real \\/' debian/rules - -# fix https://trac.mplayerhq.hu/ticket/2343 -sed -i 's/.*\#include.*/\#define _GNU_SOURCE\n\n&/' cpudetect.c +sed -i 's/\(--disable-arts \\\)/\1\n\t--disable-win32dll \\/' debian/rules +sed -i 's/\(--disable-arts \\\)/\1\n\t--disable-qtx \\/' debian/rules +sed -i 's/\(--disable-arts \\\)/\1\n\t--disable-xanim \\/' debian/rules +sed -i 's/\(--disable-arts \\\)/\1\n\t--disable-real \\/' debian/rules changelog "Removed references to non-free stuff"