[SCM] mplayer packaging branch, master, updated. debian/1.0.rc3+svn20090426-1ubuntu16-18-g4858f16
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun May 2 06:08:04 UTC 2010
The following commit has been merged in the master branch:
commit e86c394ed7dc8f285d17d06d7dcd7fb898ab0855
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat May 1 21:19:31 2010 +0200
remove patches applied upstream:
24_enable_fontconfig_by_default.diff
30_add_gmplayer_man_rules.diff
40_improve_desktop_file.patch
41_fix_forcedsubsonly.patch
50_fix_crashes_with_invalid_SDPs.patch
50_fix_initial_volume_setting_pulse_output.patch
61-malloc-bsd.patch
62-disable-vidix-on-kfreebsd-amd64.patch
63-sys-kd-include.patch
diff --git a/debian/patches/24_enable_fontconfig_by_default.diff b/debian/patches/24_enable_fontconfig_by_default.diff
deleted file mode 100644
index 1544c05..0000000
--- a/debian/patches/24_enable_fontconfig_by_default.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Enable fontconfig support by default.
-
-taken from upstream:
-
-------------------------------------------------------------------------
-r29370 | siretart | 2009-06-17 11:16:19 +0200 (Mi, 17. Jun 2009) | 8 lines
-
-Enable fontconfig support by default. This change takes only in effect,
-if fontconfig support is actually compiled in. If freetype is not
-enabled, this patch should have no effect as well.
-
-The visible result of this patch is to avoid the warning about a missing
-~/.mplayer/subfont.ttf when starting mplayer (or gmplayer) without
-parameters, like done from the .desktop file.
-
-------------------------------------------------------------------------
-
---- mplayer.orig/libvo/font_load_ft.c
-+++ mplayer/libvo/font_load_ft.c
-@@ -71,7 +71,7 @@
- int force_load_font;
-
- int using_freetype = 0;
--int font_fontconfig = 0;
-+int font_fontconfig = 1;
-
- //// constants
- static unsigned int const colors = 256;
diff --git a/debian/patches/30_add_gmplayer_man_rules.diff b/debian/patches/30_add_gmplayer_man_rules.diff
deleted file mode 100644
index 08de055..0000000
--- a/debian/patches/30_add_gmplayer_man_rules.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-enhance upstream Makefile to install gmplayer manpages
-
-the debian package used to install gmplayer symlinks with custom ln
-calls. It is way more convenient to implement this in the upstream
-Makefile.
-
-This patch should be ready to be applied upstream.
-
-diff --git a/Makefile b/Makefile
-index 263f3cd..f285283 100644
---- a/Makefile
-+++ b/Makefile
-@@ -899,6 +899,7 @@ install-gui: install-mplayer
-
- install-mencoder-man: $(foreach lang,$(MAN_LANGS),install-mencoder-man-$(lang))
- install-mplayer-man: $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang))
-+install-mplayer-gui-man: $(foreach lang,$(MAN_LANGS),install-mplayer-gui-man-$(lang))
-
- install-mencoder-man-en: install-mplayer-man-en
- cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1
-@@ -918,8 +919,17 @@ install-mplayer-man-$(lang):
- $(INSTALL) -m 644 DOCS/man/$(lang)/mplayer.1 $(MANDIR)/$(lang)/man1/
- endef
-
-+define MPLAYER_GUI_MAN_RULE
-+install-mplayer-gui-man-$(lang): install-mplayer-man-$(lang)
-+ cd $(MANDIR)/$(lang)/man1/ && ln -sf mplayer.1 gmplayer.1
-+endef
-+
-+install-mplayer-gui-man-en: install-mplayer-man-en
-+ cd $(MANDIR)/man1/ && ln -sf mplayer.1 gmplayer.1
-+
- $(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MENCODER_MAN_RULE)))
- $(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MPLAYER_MAN_RULE)))
-+$(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MPLAYER_GUI_MAN_RULE)))
-
- uninstall:
- rm -f $(BINDIR)/mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
diff --git a/debian/patches/40_improve_desktop_file.patch b/debian/patches/40_improve_desktop_file.patch
deleted file mode 100644
index bf29dfc..0000000
--- a/debian/patches/40_improve_desktop_file.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Author: Siegfried Gevatter <rainct at ubuntu.com>, Reinhard Tartler <siretart at tauware.de>
-Comment: improve file to conform (more) to the desktop file specification
-
-diff --git a/etc/mplayer.desktop b/etc/mplayer.desktop
-index 0ef3ce7..9f092c3 100644
---- a/etc/mplayer.desktop
-+++ b/etc/mplayer.desktop
-@@ -1,17 +1,18 @@
- [Desktop Entry]
- Type=Application
--Encoding=UTF-8
--Name=MPlayer
-+Name=MPlayer Media Player
-+Name[ca]=Reproductor multimèdia MPlayer
- GenericName=Multimedia player
--Comment=Multimedia player
--Comment[de]=Multimedia-Player
--Comment[es]=Reproductor multimedia
-+Comment=Play movies and songs
-+Comment[ca]=Reproduïu vídeos i cançons
-+Comment[de]=Spiele Filme und Musik
-+Comment[es]=Reproduzca vídeos y canciones
- Comment[fr]=Lecteur multimédia
- Comment[it]=Lettore multimediale
- Comment[zh]=多媒体播放器
- Icon=mplayer
- TryExec=gmplayer
--Exec=gmplayer %F
-+Exec=gmplayer %F
- Terminal=false
- Categories=GTK;AudioVideo;Audio;Video;Player;TV;
- MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-theora;video/x-matroska;
diff --git a/debian/patches/41_fix_forcedsubsonly.patch b/debian/patches/41_fix_forcedsubsonly.patch
deleted file mode 100644
index 0bc8475..0000000
--- a/debian/patches/41_fix_forcedsubsonly.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Description: fix the forcedsubsonly option
-# Upstream: http://lists.mplayerhq.hu/pipermail/mplayer-users/2009-March/076362.html
-# Patch: http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/2009-March/036924.html
-#
-diff -Nur mplayer-1.0~rc3+svn20090426/mencoder.c mplayer-1.0~rc3+svn20090426.new/mencoder.c
---- mplayer-1.0~rc3+svn20090426/mencoder.c 2009-02-10 10:34:44.000000000 -0500
-+++ mplayer-1.0~rc3+svn20090426.new/mencoder.c 2009-11-01 19:39:50.000000000 -0500
-@@ -698,6 +698,8 @@
- sh_video->disp_w, sh_video->disp_h, NULL, 0);
- }
- #endif
-+if (vo_spudec)
-+ spudec_set_forced_subs_only(vo_spudec, forced_subs_only);
- }
-
- ostream = open_output_stream(out_filename, 0);
-diff -Nur mplayer-1.0~rc3+svn20090426/mplayer.c mplayer-1.0~rc3+svn20090426.new/mplayer.c
---- mplayer-1.0~rc3+svn20090426/mplayer.c 2009-11-01 19:37:44.000000000 -0500
-+++ mplayer-1.0~rc3+svn20090426.new/mplayer.c 2009-11-01 19:39:22.000000000 -0500
-@@ -1128,8 +1128,10 @@
- spudec_set_font_factor(vo_spudec,font_factor);
- }
-
-- if (vo_spudec!=NULL)
-+ if (vo_spudec!=NULL) {
- initialized_flags|=INITIALIZED_SPUDEC;
-+ mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx);
-+ }
- }
-
- /*
-@@ -3069,6 +3071,7 @@
- if(vo_vobsub){
- initialized_flags|=INITIALIZED_VOBSUB;
- vobsub_set_from_lang(vo_vobsub, dvdsub_lang);
-+ mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx);
-
- // setup global sub numbering
- mpctx->global_sub_indices[SUB_SOURCE_VOBSUB] = mpctx->global_sub_size; // the global # of the first vobsub.
diff --git a/debian/patches/50_fix_crashes_with_invalid_SDPs.patch b/debian/patches/50_fix_crashes_with_invalid_SDPs.patch
deleted file mode 100644
index 30dff57..0000000
--- a/debian/patches/50_fix_crashes_with_invalid_SDPs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
-Subject: Fix possible crashes with invalid SDPs that result in stream descriptions not being initialized.
-
-------------------------------------------------------------------------
-r29626 | reimar | 2009-09-02 12:55:36 +0200 (Mi, 02 Sep 2009) | 3 lines
-
-Fix possible crashes with invalid SDPs that result in stream descriptions
-not being initialized.
-
---- a/stream/realrtsp/real.c
-+++ b/stream/realrtsp/real.c
-@@ -235,6 +235,8 @@ static rmff_header_t *real_parse_sdp(cha
- char b[64];
- int rulematches[MAX_RULEMATCHES];
-
-+ if (!desc->stream[i])
-+ continue;
- #ifdef LOG
- printf("calling asmrp_match with:\n%s\n%u\n", desc->stream[i]->asm_rule_book, bandwidth);
- #endif
diff --git a/debian/patches/50_fix_initial_volume_setting_pulse_output.patch b/debian/patches/50_fix_initial_volume_setting_pulse_output.patch
deleted file mode 100644
index 12475e5..0000000
--- a/debian/patches/50_fix_initial_volume_setting_pulse_output.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Marcus Blumhagen <marcus.blumhagen at web.de>
-Comment: Fixes LP: #482408 where the stream volume would erroneously be set to max for each new mplayer invocation
-
-Index: mplayer-1.0~rc3+svn20090426/libao2/ao_pulse.c
-===================================================================
---- mplayer-1.0~rc3+svn20090426.orig/libao2/ao_pulse.c 2009-11-18 19:31:12.000000000 -0500
-+++ mplayer-1.0~rc3+svn20090426/libao2/ao_pulse.c 2009-11-18 19:31:54.000000000 -0500
-@@ -221,7 +221,7 @@
- pa_stream_set_write_callback(stream, stream_request_cb, NULL);
- pa_stream_set_latency_update_callback(stream, stream_latency_update_cb, NULL);
-
-- if (pa_stream_connect_playback(stream, sink, NULL, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, &volume, NULL) < 0)
-+ if (pa_stream_connect_playback(stream, sink, NULL, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL) < 0)
- goto unlock_and_fail;
-
- /* Wait until the stream is ready */
diff --git a/debian/patches/61-malloc-bsd.patch b/debian/patches/61-malloc-bsd.patch
deleted file mode 100644
index 3ecaacb..0000000
--- a/debian/patches/61-malloc-bsd.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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/62-disable-vidix-on-kfreebsd-amd64.patch b/debian/patches/62-disable-vidix-on-kfreebsd-amd64.patch
deleted file mode 100644
index 4d420cd..0000000
--- a/debian/patches/62-disable-vidix-on-kfreebsd-amd64.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: diego <subversion at mplayerhq.hu>
-Subject: r31057 - trunk/configure
-Newsgroups: gmane.comp.video.mplayer.cvs
-To: mplayer-cvslog at mplayerhq.hu
-Date: Thu, 22 Apr 2010 16:02:20 +0200 (CEST)
-Reply-To: MPlayer CVS changelogs and discussion <mplayer-cvslog at mplayerhq.hu>
-
-Author: diego
-Date: Thu Apr 22 16:02:20 2010
-New Revision: 31057
-
-Log:
-VIDIX only works for Linux on the x86_64 architecture, not on other OSes.
-Fixes Debian bug #578622.
-
-Modified:
- trunk/configure
-
-adapted for rc3 by siretart at tauware.de
-
-Modified: trunk/configure
-==============================================================================
---- a/configure
-+++ b/configure
-@@ -4537,7 +4537,7 @@ if test "$_vidix" = auto ; then
- _vidix=no
- x86 && (linux || freebsd || netbsd || openbsd || dragonfly || sunos || win32) \
- && _vidix=yes
-- (ppc || alpha) && linux && _vidix=yes
-+ x86_64 && ! linux && _vidix=no
- fi
- echores "$_vidix"
-
diff --git a/debian/patches/63-sys-kd-include.patch b/debian/patches/63-sys-kd-include.patch
deleted file mode 100644
index 12ac891..0000000
--- a/debian/patches/63-sys-kd-include.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: siretart <subversion at mplayerhq.hu>
-Subject: r31058 - trunk/libvo/vo_directfb2.c
-Newsgroups: gmane.comp.video.mplayer.cvs
-To: mplayer-cvslog at mplayerhq.hu
-Date: Fri, 23 Apr 2010 12:04:56 +0200 (CEST)
-Reply-To: MPlayer CVS changelogs and discussion <mplayer-cvslog at mplayerhq.hu>
-
-Author: siretart
-Date: Fri Apr 23 12:04:56 2010
-New Revision: 31058
-
-Log:
-include sys/kd.h on non-Linux architectures correctly
-
-Modified:
- trunk/libvo/vo_directfb2.c
-
-Modified: trunk/libvo/vo_directfb2.c
-==============================================================================
---- trunk/libvo/vo_directfb2.c Thu Apr 22 16:02:20 2010 (r31057)
-+++ trunk/libvo/vo_directfb2.c Fri Apr 23 12:04:56 2010 (r31058)
-@@ -35,9 +35,9 @@
- #include <string.h>
-
- #ifdef __linux__
--#include <sys/kd.h>
--#else
- #include <linux/kd.h>
-+#else
-+#include <sys/kd.h>
- #endif
-
- #include "config.h"
diff --git a/debian/patches/64-rename-struct-keymap.patch b/debian/patches/64-rename-struct-keymap.patch
deleted file mode 100644
index 5a0e80d..0000000
--- a/debian/patches/64-rename-struct-keymap.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From: siretart <subversion at mplayerhq.hu>
-Subject: r31059 - in trunk/libvo: osx_common.c video_out.c video_out.h vo_kva.c w32_common.c x11_common.c
-Newsgroups: gmane.comp.video.mplayer.cvs
-To: mplayer-cvslog at mplayerhq.hu
-Date: Fri, 23 Apr 2010 12:22:44 +0200 (CEST)
-Reply-To: MPlayer CVS changelogs and discussion <mplayer-cvslog at mplayerhq.hu>
-
-Author: siretart
-Date: Fri Apr 23 12:22:44 2010
-New Revision: 31059
-
-Log:
-rename 'struct keymap' -> 'struct mp_keymap'
-
-This avoids the compilation failure on kFreeBSD (at least amd64):
-
- In file included from libvo/vo_directfb2.c:44:
- libvo/video_out.h:267: error: redefinition of 'struct keymap'
-
-This is because libvo/vo_directfb2.c #includes sys/kd.h, which in turn
-includes sys/kbio.h, which defines another 'struct keymap'.
-
-Modified:
- trunk/libvo/osx_common.c
- trunk/libvo/video_out.c
- trunk/libvo/video_out.h
- trunk/libvo/vo_kva.c
- trunk/libvo/w32_common.c
- trunk/libvo/x11_common.c
-
---- a/libvo/video_out.c
-+++ b/libvo/video_out.c
-@@ -358,7 +358,7 @@ int config_video_out(const vo_functions_
- * \result translation corresponding to key or "to" value of last mapping
- * if not found.
- */
--int lookup_keymap_table(const struct keymap *map, int key) {
-+int lookup_keymap_table(const struct mp_keymap *map, int key) {
- while (map->from && map->from != key) map++;
- return map->to;
- }
---- a/libvo/video_out.h
-+++ b/libvo/video_out.h
-@@ -264,11 +264,11 @@ extern char *monitor_hfreq_str;
- extern char *monitor_vfreq_str;
- extern char *monitor_dotclock_str;
-
--struct keymap {
-+struct mp_keymap {
- int from;
- int to;
- };
--int lookup_keymap_table(const struct keymap *map, int key);
-+int lookup_keymap_table(const struct mp_keymap *map, int key);
- struct vo_rect {
- int left, right, top, bottom, width, height;
- };
---- a/libvo/vo_kva.c
-+++ b/libvo/vo_kva.c
-@@ -70,7 +70,7 @@ LIBVO_EXTERN(kva)
-
- #define HWNDFROMWINID(wid) ((wid) + 0x80000000UL)
-
--static const struct keymap m_vk_map[] = {
-+static const struct mp_keymap m_vk_map[] = {
- {VK_NEWLINE, KEY_ENTER}, {VK_TAB, KEY_TAB}, {VK_SPACE, ' '},
-
- // control keys
-@@ -92,7 +92,7 @@ static const struct keymap m_vk_map[] =
- {0, 0}
- };
-
--static const struct keymap m_keypad_map[] = {
-+static const struct mp_keymap m_keypad_map[] = {
- // keypad keys
- {0x52, KEY_KP0}, {0x4F, KEY_KP1}, {0x50, KEY_KP2}, {0x51, KEY_KP3},
- {0x4B, KEY_KP4}, {0x4C, KEY_KP5}, {0x4D, KEY_KP6}, {0x47, KEY_KP7},
-@@ -101,7 +101,7 @@ static const struct keymap m_keypad_map[
- {0, 0}
- };
-
--static const struct keymap m_mouse_map[] = {
-+static const struct mp_keymap m_mouse_map[] = {
- {WM_BUTTON1DOWN, MOUSE_BTN0},
- {WM_BUTTON3DOWN, MOUSE_BTN1},
- {WM_BUTTON2DOWN, MOUSE_BTN2},
---- a/libvo/w32_common.c
-+++ b/libvo/w32_common.c
-@@ -58,7 +58,7 @@ static HMONITOR (WINAPI* myMonitorFromWi
- static BOOL (WINAPI* myGetMonitorInfo)(HMONITOR, LPMONITORINFO);
- static BOOL (WINAPI* myEnumDisplayMonitors)(HDC, LPCRECT, MONITORENUMPROC, LPARAM);
-
--static const struct keymap vk_map[] = {
-+static const struct mp_keymap vk_map[] = {
- // special keys
- {VK_ESCAPE, KEY_ESC}, {VK_BACK, KEY_BS}, {VK_TAB, KEY_TAB}, {VK_CONTROL, KEY_CTRL},
-
---- a/libvo/x11_common.c
-+++ b/libvo/x11_common.c
-@@ -566,7 +566,7 @@ void vo_uninit(void)
- #include "wskeys.h"
-
- #ifdef XF86XK_AudioPause
--static const struct keymap keysym_map[] = {
-+static const struct mp_keymap keysym_map[] = {
- {XF86XK_MenuKB, KEY_MENU},
- {XF86XK_AudioPlay, KEY_PLAY}, {XF86XK_AudioPause, KEY_PAUSE}, {XF86XK_AudioStop, KEY_STOP},
- {XF86XK_AudioPrev, KEY_PREV}, {XF86XK_AudioNext, KEY_NEXT},
-@@ -582,7 +582,7 @@ static void vo_x11_putkey_ext(int keysym
- }
- #endif
-
--static const struct keymap keymap[] = {
-+static const struct mp_keymap keymap[] = {
- // special keys
- {wsEscape, KEY_ESC}, {wsBackSpace, KEY_BS}, {wsTab, KEY_TAB}, {wsEnter, KEY_ENTER},
-
diff --git a/debian/patches/series b/debian/patches/series
index a54ac60..fd0f501 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,14 +1,4 @@
11configure-mktemp.patch
22disable-xscreensaver.patch
23mplayer-debug-printf.patch
-24_enable_fontconfig_by_default.diff
-30_add_gmplayer_man_rules.diff
-40_improve_desktop_file.patch
-41_fix_forcedsubsonly.patch
-50_fix_initial_volume_setting_pulse_output.patch
-50_fix_crashes_with_invalid_SDPs.patch
60_backport_x264_wrapper.patch
-61-malloc-bsd.patch
-62-disable-vidix-on-kfreebsd-amd64.patch
-63-sys-kd-include.patch
-64-rename-struct-keymap.patch
--
mplayer packaging
More information about the pkg-multimedia-commits
mailing list