[SCM] VLC media player packaging branch, experimental, updated. debian/0.9.9a-1-36-g4dae45f
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Fri May 29 23:40:38 UTC 2009
The following commit has been merged in the experimental branch:
commit e8de277dbd9afca4b4e28b61b3ef9626746d3ddc
Author: Christophe Mutricy <xtophe at videolan.org>
Date: Wed May 13 12:05:09 2009 +0200
Delete patches which were picked from upstream
diff --git a/debian/patches/401_detect_xinerama_fullscreen.diff b/debian/patches/401_detect_xinerama_fullscreen.diff
deleted file mode 100644
index 0c9ebb7..0000000
--- a/debian/patches/401_detect_xinerama_fullscreen.diff
+++ /dev/null
@@ -1,135 +0,0 @@
-From: Ilkka Ollakka <ileoo at videolan.org>
-Date: Wed, 15 Oct 2008 17:56:56 +0000 (+0300)
-Subject: Calculate position for videowindow to use current screen in xinerama-setup also.
-X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=a0a1a207bfd38f497d490a5b1086a0f0bdd5427d;hp=70c75214fa2cac6b5b4775eb627dc7c68825a2fc
-
-Calculate position for videowindow to use current screen in xinerama-setup also.
-
-Basicly same as mplayer/libvo/x11_common.c does.
----
-
-diff --git a/modules/video_output/x11/glx.c b/modules/video_output/x11/glx.c
-index f151a64..8e56c54 100644
---- a/modules/video_output/x11/glx.c
-+++ b/modules/video_output/x11/glx.c
-@@ -130,7 +130,7 @@ vlc_module_begin();
- add_bool( "glx-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true );
- #endif
- #ifdef HAVE_XINERAMA
-- add_integer ( "glx-xineramascreen", 0, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true );
-+ add_integer ( "glx-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true );
- #endif
- vlc_module_end();
-
-diff --git a/modules/video_output/x11/x11.c b/modules/video_output/x11/x11.c
-index 9da6f10..a67a264 100644
---- a/modules/video_output/x11/x11.c
-+++ b/modules/video_output/x11/x11.c
-@@ -76,7 +76,7 @@ vlc_module_begin();
- add_bool( "x11-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true );
- #endif
- #ifdef HAVE_XINERAMA
-- add_integer ( "x11-xineramascreen", 0, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true );
-+ add_integer ( "x11-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true );
- #endif
- set_description( N_("X11 video output") );
- set_capability( "video output", 70 );
-diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
-index 28f2ddc..4f47435 100644
---- a/modules/video_output/x11/xcommon.c
-+++ b/modules/video_output/x11/xcommon.c
-@@ -2094,6 +2094,39 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
- {
- msg_Dbg( p_vout, "entering fullscreen mode" );
-
-+ /* Getting current window position */
-+ Window root_win;
-+ Window* child_windows;
-+ int num_child_windows;
-+ Window parent_win;
-+ Window child_win;
-+ XWindowAttributes win_attr;
-+ int screen_x,screen_y;
-+
-+ XGetWindowAttributes(
-+ p_vout->p_sys->p_display,
-+ p_vout->p_sys->p_win->video_window,
-+ &win_attr);
-+
-+ XQueryTree(
-+ p_vout->p_sys->p_display,
-+ p_vout->p_sys->p_win->video_window,
-+ &root_win,
-+ &parent_win,
-+ &child_windows,
-+ &num_child_windows);
-+ XFree(child_windows);
-+
-+ XTranslateCoordinates(
-+ p_vout->p_sys->p_display,
-+ parent_win, win_attr.root,
-+ win_attr.x,win_attr.y,
-+ &screen_x,&screen_y,
-+ &child_win);
-+
-+ msg_Dbg( p_vout, "X %d/%d Y %d/%d", win_attr.x,screen_x,win_attr.y,screen_y);
-+ /* screen_x and screen_y are current position */
-+
- p_vout->p_sys->b_altfullscreen =
- config_GetInt( p_vout, MODULE_STRING "-altfullscreen" );
-
-@@ -2190,11 +2223,26 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
- SCREEN = config_GetInt( p_vout,
- MODULE_STRING "-xineramascreen" );
-
-- /* just check that user has entered a good value */
-+ /* just check that user has entered a good value,
-+ * otherwise use that screen where window is */
- if( SCREEN >= i_num_screens || SCREEN < 0 )
- {
- msg_Dbg( p_vout, "requested screen number invalid (%d/%d)", SCREEN, i_num_screens );
-- SCREEN = 0;
-+#define left screens[SCREEN].x_org
-+#define right left + screens[SCREEN].width
-+#define top screens[SCREEN].y_org
-+#define bottom top + screens[SCREEN].height
-+
-+ for( SCREEN = i_num_screens-1; SCREEN > 0; SCREEN--)
-+ {
-+ if( left <= screen_x && screen_x <= right &&
-+ top <= screen_y && screen_y <= bottom )
-+ break;
-+ }
-+#undef bottom
-+#undef top
-+#undef right
-+#undef left
- }
-
- /* Get the X/Y upper left corner coordinate of the above screen */
-diff --git a/modules/video_output/x11/xvideo.c b/modules/video_output/x11/xvideo.c
-index 787a9df..2b05b97 100644
---- a/modules/video_output/x11/xvideo.c
-+++ b/modules/video_output/x11/xvideo.c
-@@ -89,7 +89,7 @@ vlc_module_begin();
- add_bool( "xvideo-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true );
- #endif
- #ifdef HAVE_XINERAMA
-- add_integer ( "xvideo-xineramascreen", 0, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true );
-+ add_integer ( "xvideo-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true );
- #endif
-
- set_description( N_("XVideo extension video output") );
-diff --git a/modules/video_output/x11/xvmc.c b/modules/video_output/x11/xvmc.c
-index 03c0a49..166ef6e 100644
---- a/modules/video_output/x11/xvmc.c
-+++ b/modules/video_output/x11/xvmc.c
-@@ -143,7 +143,7 @@ vlc_module_begin();
- add_bool( "xvmc-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true );
- #endif
- #ifdef HAVE_XINERAMA
-- add_integer ( "xvmc-xineramascreen", 0, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true );
-+ add_integer ( "xvmc-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true );
- #endif
- add_string( "xvmc-deinterlace-mode", "bob", NULL, MODE_TEXT, MODE_LONGTEXT, false );
- add_string( "xvmc-crop-style", "eq", NULL, CROP_TEXT, CROP_LONGTEXT, false );
diff --git a/debian/patches/402_fortune_pruning.diff b/debian/patches/402_fortune_pruning.diff
deleted file mode 100644
index 7bffa1e..0000000
--- a/debian/patches/402_fortune_pruning.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-commit 7bbb46c1e2d22e7a144bcca18f6e0ca1e0eaf8e2
-Author: Jean-Baptiste Kempf <jb at videolan.org>
-Date: Thu Mar 5 12:11:43 2009 +0100
-
- Remove insult in the fortunes...
-
- This doesn't mean I don't share the opinion, but let's try to ease the work for packagers that get bugs on that part.
- And of course VLC + debian-multimedia in debian is still completly broken...
-
-diff --git a/doc/fortunes.txt b/doc/fortunes.txt
-index 9406996..2ee386f 100644
---- a/doc/fortunes.txt
-+++ b/doc/fortunes.txt
-@@ -76,20 +76,6 @@
-
- -- #videolan
- %
--<sam> CHRISTIAN
--<sam> MARILLAT
--<sam> IS
--<sam> A
--<sam> COMPLETE
--<sam> ____ ___ ____ _ ___ _ _____ _ ____ _
--<sam> | _ \_ _/ ___| |/ / | | | ____| / \ | _ \ | |
--<sam> | | | | | | | ' /| |_| | _| / _ \ | | | | | |
--<sam> | |_| | | |___| . \| _ | |___ / ___ \| |_| | |_|
--<sam> |____/___\____|_|\_\_| |_|_____/_/ \_\____/ (_)
--<sam>
--
-- -- #videolan
--%
- <bozo> you really shouldn't have touched a computer when you were a little boy
- <stef> _it_ came to me
-
diff --git a/debian/patches/403_http_hosts.diff b/debian/patches/403_http_hosts.diff
deleted file mode 100644
index d03f032..0000000
--- a/debian/patches/403_http_hosts.diff
+++ /dev/null
@@ -1,69 +0,0 @@
-commit cd4a14e2c43a3aadc63c2244932dca478ad75b18
-Author: Rémi Denis-Courmont <remi at remlab.net>
-Date: Sun Apr 5 21:19:42 2009 +0300
-
- Typo
- (cherry picked from commit 50c4f646fd5b8cf39a600681a2ae988fae2b40fd)
-
- Signed-off-by: Christophe Mutricy <xtophe at videolan.org>
-
-diff --git a/share/http/old/.hosts b/share/http/old/.hosts
-index 7996904..6f54ae0 100644
---- a/share/http/old/.hosts
-+++ b/share/http/old/.hosts
-@@ -1,5 +1,5 @@
- #
--# Default access-list for VLC HTTP interface
-+# Access-list for VLC HTTP interface
- # $Id$
- #
-
-@@ -16,9 +16,9 @@
- #10.0.0.0/8
- #172.16.0.0/12
- #192.168.0.0/16
-+#169.254.0.0/16
-
--# The world
--# (comment this out to obtain a safe default)
--::/0
--0.0.0.0/0
-+# The world (uncommenting these 2 lines is not quite safe)
-+#::/0
-+#0.0.0.0/0
-
-commit c5f355b77a5f11f7a75e7de2e485fab25ad638df
-Author: Christophe Mutricy <xtophe at videolan.org>
-Date: Sun Apr 5 22:19:52 2009 +0100
-
- Revert "Safe default ACL also for the old HTTP interface"
-
- This was the opposite of what was intended
-
- This reverts commit 1d82f475bda7f36a3d1927ab9a1d9afeb6a0df80.
-
-diff --git a/share/http/.hosts b/share/http/.hosts
-index 7996904..6f54ae0 100644
---- a/share/http/.hosts
-+++ b/share/http/.hosts
-@@ -1,5 +1,5 @@
- #
--# Default access-list for VLC HTTP interface
-+# Access-list for VLC HTTP interface
- # $Id$
- #
-
-@@ -16,9 +16,9 @@
- #10.0.0.0/8
- #172.16.0.0/12
- #192.168.0.0/16
-+#169.254.0.0/16
-
--# The world
--# (comment this out to obtain a safe default)
--::/0
--0.0.0.0/0
-+# The world (uncommenting these 2 lines is not quite safe)
-+#::/0
-+#0.0.0.0/0
-
diff --git a/debian/patches/series b/debian/patches/series
index c0e9ea4..00cc70a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,3 @@
104_notify.diff
200_osdmenu_paths.diff
300_manpage_syntax.diff
-401_detect_xinerama_fullscreen.diff
-402_fortune_pruning.diff
-403_http_hosts.diff
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list