[SCM] mplayer2/master: remove patches, which all tweaked the now removed mplayer-build wrappers

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 19 09:30:09 UTC 2011


The following commit has been merged in the master branch:
commit 40858eb3c43d33680cdd2c61c942b1f18b688547
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jun 19 10:26:54 2011 +0200

    remove patches, which all tweaked the now removed mplayer-build wrappers
    
    fold the last remaining functional change, --enable-debug=3, into debian/rules

diff --git a/debian/patches/enable-debug.patch b/debian/patches/enable-debug.patch
deleted file mode 100644
index c8ef3fa..0000000
--- a/debian/patches/enable-debug.patch
+++ /dev/null
@@ -1,11 +0,0 @@
----
- common_options |    1 +
- 1 file changed, 1 insertion(+)
-
---- mplayer2.orig/common_options
-+++ mplayer2/common_options
-@@ -11,3 +11,4 @@
- # are ignored. The options do not need quoting, so you can have for example
- # --extra-libs=-lfoo -lbar
- # (and NOT --extra-libs='-lfoo -lbar').
-+--enable-debug=3
diff --git a/debian/patches/generic-build.patch b/debian/patches/generic-build.patch
deleted file mode 100644
index f15f5d2..0000000
--- a/debian/patches/generic-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Reinhard Tartler <siretart at tauware.de>
-Subject: drop build host specific optimizations
-
-The buildd host likely doesn't match the cpu configuration of our users
-
---- a/script/ffmpeg-config
-+++ b/script/ffmpeg-config
-@@ -31,8 +31,6 @@ def main():
- 
-     args = ['--prefix=%s/build_libs' % mydir,
-             '--enable-gpl',
--            '--cpu=host',
--            '--disable-debug',
-             '--enable-pthreads',
-             '--disable-shared', '--enable-static',
-             '--enable-postproc',
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7c7ab6f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-use-system-paths.patch
-enable-debug.patch
-generic-build.patch
diff --git a/debian/patches/use-system-paths.patch b/debian/patches/use-system-paths.patch
deleted file mode 100644
index a3f0d8c..0000000
--- a/debian/patches/use-system-paths.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Configure mplayer to use system paths
-Author: Reinhard Tartler <siretart at tauware.de>
-Forwarded: not-needed
----
- mplayer_options |    2 ++
- 1 file changed, 2 insertions(+)
-
-Index: mplayer2/mplayer_options
-===================================================================
---- mplayer2.orig/mplayer_options	2011-03-23 16:54:04.122109355 +0100
-+++ mplayer2/mplayer_options	2011-03-23 16:54:40.609611223 +0100
-@@ -4,3 +4,6 @@
- # are ignored. The options do not need quoting, so you can have for example
- # --extra-libs=-lfoo -lbar
- # (and NOT --extra-libs='-lfoo -lbar').
-+--prefix=/usr
-+--confdir=/etc/mplayer
-+--enable-translation
diff --git a/debian/rules b/debian/rules
index 89bd16a..39f818e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ endif
 	dh $@
 
 override_dh_auto_configure:
-	./configure --prefix=/usr --enable-translation --enable-runtime-cpudetection
+	./configure --prefix=/usr --enable-translation --enable-runtime-cpudetection --enable-debug=3
 
 override_dh_auto_build:
 	make V=1 $(NUMJOBS)

-- 
mplayer2 packaging



More information about the pkg-multimedia-commits mailing list