[SCM] mplayer packaging branch, master, updated. debian/1.0.rc3+svn20090426-1ubuntu14-16-gda51fea

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a5f87ecab2cf26da75cc572205d13e6cb68762bd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Apr 22 20:44:20 2010 +0200

    Revert obscure hack that disables the malloc.h check on certain BSD platforms. Closes: #578622

diff --git a/debian/patches/61-malloc-bsd.patch b/debian/patches/61-malloc-bsd.patch
new file mode 100644
index 0000000..3ecaacb
--- /dev/null
+++ b/debian/patches/61-malloc-bsd.patch
@@ -0,0 +1,33 @@
+From: diego <subversion at mplayerhq.hu>
+Subject: r31054 - trunk/configure
+Newsgroups: gmane.comp.video.mplayer.cvs
+To: mplayer-cvslog at mplayerhq.hu
+Date: Wed, 21 Apr 2010 14:43:16 +0200 (CEST)
+Reply-To: MPlayer CVS changelogs and discussion <mplayer-cvslog at mplayerhq.hu>
+
+Author: diego
+Date: Wed Apr 21 14:43:16 2010
+New Revision: 31054
+
+Log:
+Revert obscure hack that disables the malloc.h check on certain BSD platforms.
+
+It's unclear what disabling the result of the check is good for and why it is
+necessary.  Just avoiding a warning is not a good enough reason.  Furthermore
+this hack introduces problems on 64 bit (k)FreeBSD, as reported in Debian bug
+#578622, which indicates it might never have been a good idea at all.
+
+Modified:
+   trunk/configure
+
+Modified: trunk/configure
+==============================================================================
+--- trunk/configure	Tue Apr 20 22:25:35 2010	(r31053)
++++ trunk/configure	Wed Apr 21 14:43:16 2010	(r31054)
+@@ -3444,8 +3444,6 @@ if test "$_malloc" = yes ; then
+ else
+   def_malloc_h='#define HAVE_MALLOC_H 0'
+ fi
+-# malloc.h emits a warning in FreeBSD and OpenBSD
+-freebsd || openbsd || dragonfly && def_malloc_h='#define HAVE_MALLOC_H 0'
+ echores "$_malloc"
diff --git a/debian/patches/series b/debian/patches/series
index 3901c1b..a66b833 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 50_fix_initial_volume_setting_pulse_output.patch
 50_fix_crashes_with_invalid_SDPs.patch
 60_backport_x264_wrapper.patch
+61-malloc-bsd.patch

-- 
mplayer packaging