[SCM] mplayer packaging branch, master, updated. upstream/0.svn20090303-68-gdae3a89
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Thu Mar 5 07:13:51 UTC 2009
The following commit has been merged in the master branch:
commit b3b056459bd907a77e89b512fa63794e9aa24f29
Author: Reinhard Tartler <siretart at tauware.de>
Date: Wed Mar 4 20:21:16 2009 +0100
convert patches to quilt
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ba808c7..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-11configure-mktemp.dpatch
-22disable-xscreensaver.dpatch
-# mplayer-debug-printf.dpatch
-# shared_linking_to_ffmpeg.dpatch
diff --git a/debian/patches/11configure-mktemp.dpatch b/debian/patches/11configure-mktemp.dpatch
deleted file mode 100755
index 7e52699..0000000
--- a/debian/patches/11configure-mktemp.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01configure-mktemp.diff.dpatch by <debdev at pingu>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: use mktemp for temp files
-
- at DPATCH@
-diff -urNad mplayer-1.0~rc2~/configure mplayer-1.0~rc2/configure
---- mplayer-1.0~rc2~/configure
-+++ mplayer-1.0~rc2/configure
-@@ -1357,6 +1357,10 @@
- test "$I" && break
- done
-
-+if which mktemp >/dev/null 2>/dev/null; then
-+ # BSD/Debian/etc. mktemp avoids symlink attacks etc.
-+ I=`mktemp -d "$I"/mplayer.XXXXXX` || exit 1
-+fi
-
- TMPLOG="configure.log"
- TMPC="$I/mplayer-conf-$RANDOM-$$.c"
diff --git a/debian/patches/11configure-mktemp.patch b/debian/patches/11configure-mktemp.patch
new file mode 100644
index 0000000..2229bd6
--- /dev/null
+++ b/debian/patches/11configure-mktemp.patch
@@ -0,0 +1,15 @@
+Author: <debdev at pingu>
+Description: use mktemp for temp files
+--- a/configure
++++ b/configure
+@@ -1477,6 +1477,10 @@ for I in "$TMPDIR" "$TEMPDIR" "/tmp" ; d
+ test "$I" && break
+ done
+
++if which mktemp >/dev/null 2>/dev/null; then
++ # BSD/Debian/etc. mktemp avoids symlink attacks etc.
++ I=`mktemp -d "$I"/mplayer.XXXXXX` || exit 1
++fi
+
+ TMPLOG="configure.log"
+ TMPC="$I/mplayer-conf-$RANDOM-$$.c"
diff --git a/debian/patches/22disable-xscreensaver.dpatch b/debian/patches/22disable-xscreensaver.patch
old mode 100755
new mode 100644
similarity index 65%
rename from debian/patches/22disable-xscreensaver.dpatch
rename to debian/patches/22disable-xscreensaver.patch
index 094180b..a88dc78
--- a/debian/patches/22disable-xscreensaver.dpatch
+++ b/debian/patches/22disable-xscreensaver.patch
@@ -1,14 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 22disable-xscreensaver.dpatch by <mennucc1 at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This patch avoids xscreensaver from blanking onto your favorite movie ; it was made by me, based on code posted in mplayer-dev-eng by Adam Tlałka
-
- at DPATCH@
-diff -urNad mplayer-1.0~rc2~/libvo/x11_common.c mplayer-1.0~rc2/libvo/x11_common.c
---- mplayer-1.0~rc2~/libvo/x11_common.c 2007-10-07 21:49:28.000000000 +0200
-+++ mplayer-1.0~rc2/libvo/x11_common.c 2007-10-18 19:56:06.000000000 +0200
-@@ -161,6 +161,9 @@
+Author: <mennucc1 at debian.org>
+Description: This patch avoids xscreensaver from blanking onto your favorite movie ; it was made by me, based on code posted in mplayer-dev-eng by Adam Tlałka
+--- a/libvo/x11_common.c
++++ b/libvo/x11_common.c
+@@ -177,6 +177,9 @@ void vo_x11_ewmh_fullscreen(int action)
}
}
@@ -18,7 +12,7 @@ diff -urNad mplayer-1.0~rc2~/libvo/x11_common.c mplayer-1.0~rc2/libvo/x11_common
void vo_hidecursor(Display * disp, Window win)
{
Cursor no_ptr;
-@@ -180,6 +183,7 @@
+@@ -196,6 +199,7 @@ void vo_hidecursor(Display * disp, Windo
bm_no = XCreateBitmapFromData(disp, win, bm_no_data, 8, 8);
no_ptr = XCreatePixmapCursor(disp, bm_no, bm_no, &black, &black, 0, 0);
XDefineCursor(disp, win, no_ptr);
@@ -26,7 +20,7 @@ diff -urNad mplayer-1.0~rc2~/libvo/x11_common.c mplayer-1.0~rc2/libvo/x11_common
XFreeCursor(disp, no_ptr);
if (bm_no != None)
XFreePixmap(disp, bm_no);
-@@ -191,6 +195,7 @@
+@@ -207,6 +211,7 @@ void vo_showcursor(Display * disp, Windo
if (WinID == 0)
return;
XDefineCursor(disp, win, 0);
@@ -34,7 +28,7 @@ diff -urNad mplayer-1.0~rc2~/libvo/x11_common.c mplayer-1.0~rc2/libvo/x11_common
}
static int x11_errorhandler(Display * display, XErrorEvent * event)
-@@ -1010,6 +1015,7 @@
+@@ -805,6 +810,7 @@ void vo_x11_uninit(void)
static unsigned int mouse_timer;
static int mouse_waiting_hide;
@@ -42,7 +36,7 @@ diff -urNad mplayer-1.0~rc2~/libvo/x11_common.c mplayer-1.0~rc2/libvo/x11_common
int vo_x11_check_events(Display * mydisplay)
{
-@@ -1097,7 +1103,9 @@
+@@ -878,7 +884,9 @@ int vo_x11_check_events(Display * mydisp
sprintf(cmd_str,"set_mouse_pos %i %i",Event.xmotion.x, Event.xmotion.y);
mp_input_queue_cmd(mp_input_parse_cmd(cmd_str));
}
@@ -53,9 +47,9 @@ diff -urNad mplayer-1.0~rc2~/libvo/x11_common.c mplayer-1.0~rc2/libvo/x11_common
if (vo_mouse_autohide)
{
vo_showcursor(mydisplay, vo_window);
-@@ -1678,6 +1686,16 @@
- XSync(mDisplay, False);
- XSetErrorHandler(old_handler);
+@@ -1437,6 +1445,16 @@ void xscreensaver_heartbeat(void)
+
+ XResetScreenSaver(mDisplay);
}
+
+ static unsigned int last_warp_time = 0;
@@ -69,4 +63,4 @@ diff -urNad mplayer-1.0~rc2~/libvo/x11_common.c mplayer-1.0~rc2/libvo/x11_common
+ }
}
- static void xscreensaver_disable(Display * dpy)
+ static int xss_suspend(Bool suspend)
diff --git a/debian/patches/23mplayer-debug-printf.patch b/debian/patches/23mplayer-debug-printf.patch
new file mode 100644
index 0000000..d52838c
--- /dev/null
+++ b/debian/patches/23mplayer-debug-printf.patch
@@ -0,0 +1,12 @@
+--- a/mplayer.c
++++ b/mplayer.c
+@@ -801,6 +801,9 @@ static void exit_sighandler(int x){
+ mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGSEGV_SIGFPE);
+ default:
+ mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGCRASH);
++ printf(" [ This binary of MPlayer in Debian is currently compiled with\n"
++ " '--enable-debug'; the debugging symbols are in the package\n"
++ " 'mplayer-dbg'.]\n");
+ #ifdef CONFIG_CRASH_DEBUG
+ if (crash_debug) {
+ int gdb_pid;
diff --git a/debian/patches/30link-system-ffmpeg.patch b/debian/patches/30link-system-ffmpeg.patch
new file mode 100644
index 0000000..a6074a6
--- /dev/null
+++ b/debian/patches/30link-system-ffmpeg.patch
@@ -0,0 +1,19 @@
+--- a/Makefile
++++ b/Makefile
+@@ -701,11 +701,11 @@ SRCS_COMMON += $(SRCS_COMMON-yes) $(SR
+ SRCS_MENCODER += $(SRCS_MENCODER-yes)
+ SRCS_MPLAYER += $(SRCS_MPLAYER-yes)
+
+-COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a
+-COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a
+-COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a
+-COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a
+-COMMON_LIBS-$(LIBSWSCALE_A) += libswscale/libswscale.a
++COMMON_LIBS-$(LIBAVFORMAT_A) += /usr/lib/libavformat.so
++COMMON_LIBS-$(LIBAVCODEC_A) += /usr/lib/libavcodec.so
++COMMON_LIBS-$(LIBAVUTIL_A) += /usr/lib/libavutil.so
++COMMON_LIBS-$(LIBPOSTPROC_A) += /usr/lib/libpostproc.so
++COMMON_LIBS-$(LIBSWSCALE_A) += /usr/lib/libswscale.so
+ COMMON_LIBS += $(COMMON_LIBS-yes)
+
+ OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON)))
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8a7fe5b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+11configure-mktemp.patch
+22disable-xscreensaver.patch
+23mplayer-debug-printf.patch
+30link-system-ffmpeg.patch
diff --git a/debian/patches/shared_linking_to_ffmpeg.dpatch b/debian/patches/shared_linking_to_ffmpeg.dpatch
deleted file mode 100644
index 8868cfa..0000000
--- a/debian/patches/shared_linking_to_ffmpeg.dpatch
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## shared_linking_to_ffmpeg.dpatch by <mennucc1 at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: can link with ffmpeg-free
-
- at DPATCH@
-diff -ru mplayer-1.0~rc2~patched~/libmpdemux/demux_mkv.c mplayer-1.0~rc2~linked~/libmpdemux/demux_mkv.c
---- mplayer-1.0~rc2~patched~/libmpdemux/demux_mkv.c 2007-10-07 21:49:33.000000000 +0200
-+++ mplayer-1.0~rc2~linked~/libmpdemux/demux_mkv.c 2008-06-18 14:37:59.000000000 +0200
-@@ -40,7 +40,7 @@
-
- #ifdef USE_LIBAVUTIL_SO
- #include <ffmpeg/lzo.h>
--#include <ffmpeg/intreadwrite.h>
-+#include <libavutil/intreadwrite.h>
- #else
- #include "libavutil/lzo.h"
- #include "libavutil/intreadwrite.h"
-diff -ru mplayer-1.0~rc2~patched~/spudec.c mplayer-1.0~rc2~linked~/spudec.c
---- mplayer-1.0~rc2~patched~/spudec.c 2007-10-07 21:49:33.000000000 +0200
-+++ mplayer-1.0~rc2~linked~/spudec.c 2008-06-18 12:24:05.000000000 +0200
-@@ -25,10 +25,12 @@
- #include "spudec.h"
- #ifdef USE_LIBAVUTIL_SO
- #include <ffmpeg/avutil.h>
-+#include "ffmpeg/swscale.h"
- #else
- #include "avutil.h"
--#endif
- #include "libswscale/swscale.h"
-+#endif
-+
-
- /* Valid values for spu_aamode:
- 0: none (fastest, most ugly)
---- mplayer-1.0~rc2-12/Makefile 2007-10-07 21:49:33.000000000 +0200
-+++ mplayer-1.0~rc2-14/Makefile 2008-06-23 13:29:45.000000000 +0200
-@@ -53,13 +53,14 @@
- libaf/libaf.a \
- libmpdemux/libmpdemux.a \
- stream/stream.a \
-- libswscale/libswscale.a \
-+ /usr/lib/libswscale.so \
- libvo/libosd.a \
-
--COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a
--COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a
--COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a
--COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a
-+COMMON_LIBS-$(LIBAVFORMAT_A) += /usr/lib/libavformat.so
-+COMMON_LIBS-$(LIBAVCODEC_A) += /usr/lib/libavcodec.so
-+COMMON_LIBS-$(LIBAVUTIL_A) += /usr/lib/libavutil.so
-+COMMON_LIBS-$(LIBPOSTPROC_A) += /usr/lib/libpostproc.so
-+
- COMMON_LIBS-$(WIN32DLL) += loader/libloader.a
- COMMON_LIBS-$(MP3LIB) += mp3lib/libmp3.a
- COMMON_LIBS-$(LIBA52) += liba52/liba52.a
--
mplayer packaging
More information about the pkg-multimedia-commits
mailing list