debian: deb packaging

Put debian directory under source control for creating debs.

debian/.bzr-builddeb/default.conf

+[BUILDDEB]
+merge = True

debian/NEWS

+vlc (1.2.0-git) unstable; urgency=low
+
+  Use ffmpeg-mt threaded decoding for better loadbalancing on multi CPU systems.
+
+ -- Jean-Paul Saman <jpsaman@videolan.org>  Wed, 8 Sep 2010 16:52:04 +0200
+
+vlc (1.0.6-1) unstable; urgency=low
+
+  The rtmp access module has been removed by upstream as it is deemed too buggy.
+
+ -- Christophe Mutricy <xtophe@videolan.org>  Fri, 23 Apr 2010 11:49:18 +0200
+
+vlc (1.0.0~rc2-1) experimental; urgency=low
+
+  Important changes which migh affect your command lines and scripts
+
+    + Alsa and OSS audio capture has been splited out of the v4l and v4l2
+      accesses. Use --input-slave alsa:// or oss:// if needed.
+
+    + Image video output has been rewritten into a video-filter named 'scene'.
+ 
+  For other changes, see /usr/share/vlc-nox/NEWS.gz
+
+ -- Christophe Mutricy <xtophe@videolan.org>  Wed, 13 May 2009 14:36:54 +0200
+
+vlc (0.9.8a-2) unstable; urgency=low
+
+  HTTP interface:
+
+   The .hosts file used to control which remote hosts have access to the http
+  interface has been moved to /etc/vlc/http/hosts and is now a conffile.
+   If you do more change to the http interface, you need to do that out of
+  /usr/share/vlc/http and use --http-src option of vlc. If you don't, your
+  modifications will get lost at the next upgrade of vlc.
+
+  Running VLC as root:
+
+   Since 0.9.0, VLC can't be run as root. If you need realtime priority or if
+  you need to have VLC listening on a privileged port (<1024), then you need to
+  use vlc-wrapper.
+
+ -- Christophe Mutricy <xtophe@videolan.org>  Mon, 23 Feb 2009 22:41:46 +0000
+
+vlc (0.9.2-1) experimental; urgency=low
+
+  Important changes in this new upstream version:
+
+  * The HTTP interface is now only available on the local machine by default.
+    If you want to make it available from other machines, you will have to
+    edit the ".hosts" in /usr/share/vlc/http/ . If you're using the old http 
+    interface, it's located in /usr/share/vlc/http/old/.hosts
+ 
+  * The marq, mosaic and logo commands in the rc interface changed. They
+    now require a target name as their first argument. Example:
+    vlc --sub-filter "marq@test{marquee=Hello}" -I rc <somevideo>
+    You can then use commands like: @test marq-marquee Goodbye
+    If you didn't name the object using @test, its name will default to the
+    plugin name (hence 'marq') in this example.
+    These new commands are also available in the telnet interface.
+ 
+  * The "rtp" access output module has been removed.
+    Please use the RTP stream output instead, e.g.:
+      Old: '#std{access=rtp,mux=ts,dst=239.255.1.2:5004,sap}'
+      New: '#rtp{mux=ts,dst=239.255.1.2,port=5004,sap}'
+ 
+  * You now need to append --m3u-extvlcopt to your command line to enable
+    EXTVLCOPT options parsing in m3u playlists. Note that only a limited set
+    of options is available to m3u playlists (CVE-2007-6683).
+ 
+  * The old access:url syntax is no longer supported to resolve ambiguities
+    with some file names. Use access://url instead.
+     E.g.:  vlc:quit -> vlc://quit ;
+            udp:@239.255.12.12 -> udp://@239.255.12.12
+ 
+  * Croping and padding in transcode are now done using the croppadd video
+    filter. For example:
+    transcode{vcodec=mp2v,vfilter=croppadd{cropttop=20,cropbottom=30,paddleft=100+}}
+ 
+  * Canvas setting in transcode is now done using the canvas video filter.
+    For example:
+    transcode{vcodec=mp2v,vfilter=canvas{width=640,height=480}}
+ 
+  For more details, see the upstream NEWS file at 
+  http://git.videolan.org/gitweb.cgi?p=vlc.git;a=blob_plain;f=NEWS;h=89fc19a6
+
+ -- Christophe Mutricy <xtophe@videolan.org>  Wed, 03 Sep 2008 00:54:46 +0200

debian/README.Debian

+$Id: README.Debian 1436 2008-08-31 23:06:34Z xtophe-guest $
+
+Notes for anyone wanting to build Debian packages of VLC.
+
+ - Default configuration is supposed to be latest unstable.
+
+ - VLC does not link with libdvdcss by default, thus it will not depend
+   on the libdvdcss packages. However it will use libdvdread that can
+   optionally open libdvdcss if found. To build packages that link directly
+   against libdvdcss, remove the --without-dvdcss flag in debian/rules.
+

debian/README.source

+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+For more information about quilt, see /usr/share/doc/quilt/README.source
+
+Permanent patches
+0??-*.diff: Buildsystem
+1??-*.diff: Code
+2??-*.diff: Other
+3??-*.diff: "
+
+Temporary patches
+4??-*.diff: Bugs fix most likely taken from upstream Git
+CVE-*-*.diff: Security fix

debian/bug/control

+report-with: vlc vlc-nox libvlc2 libvlccore0
+package-status: libavutil50

debian/bug/presubj

+Debugging and bug reporting advices:
+
+VLC media player is highly modular. So in case a feature is not working
+at all, you need to check that the module handling it is present.
+
+
+ * Use "rm ~/.cache/vlc/plugins-*.dat" to remove your plugins cache.
+
+ * Check that modules are correctly loaded: "vlc -vvv --color --list"
+   If you have yellow warning lines at the top, that could well be the
+   problem
+
+ * If you have installed libraries from other repositories (e.g. to use
+   allegedly patent-encumbred encoders), revert to the official Debian
+   libraries before reporting a bug.
+
+The debug log of vlc ("vlc -vvv <your usual options>") is very useful for
+the developers, do include it in your report.
+

debian/compat

+7

debian/gbp.conf

+[DEFAULT]
+# the default branch for upstream sources
+upstream-branch=upstream
+# the default branch for the debian patch
+debian-branch=lucid
+#versioning conventions (defaults)
+upstream-tag = upstream/%(version)s
+debian-tag = debian/%(version)s
+# use pristine tar
+pristine-tar = True

debian/libvlc-dev.install

+usr/lib/libvlc.so
+usr/lib/libvlc.a
+usr/lib/pkgconfig/libvlc.pc
+usr/include/vlc/*.h
+#usr/include/vlc/common.h
+#usr/include/vlc/deprecated.h
+#usr/include/vlc/libvlc_events.h
+#usr/include/vlc/libvlc.h
+#usr/include/vlc/libvlc_media_list.h
+#usr/include/vlc/libvlc_structures.h
+#usr/include/vlc/libvlc_vlm.h
+#usr/include/vlc/mediacontrol.h
+#usr/include/vlc/mediacontrol_structures.h

debian/libvlc-dev.links

+/usr/share/doc/libvlc2 /usr/share/doc/libvlc-dev
+/usr/share/bug/libvlc2 /usr/share/bug/libvlc-dev

debian/libvlc2.install

+usr/lib/libvlc.so.*

debian/libvlc2.links

+/usr/share/doc/libvlccore2 /usr/share/doc/libvlc2
+/usr/share/bug/libvlccore2 /usr/share/bug/libvlc2

debian/libvlccore-dev.install

+usr/lib/libvlccore.so
+usr/lib/libvlccore.a
+usr/lib/pkgconfig/vlc-plugin.pc
+usr/include/vlc/plugins/*.h

debian/libvlccore-dev.links

+/usr/share/doc/libvlccore2 /usr/share/doc/libvlccore-dev
+/usr/share/bug/libvlccore2 /usr/share/bug/libvlccore-dev

debian/libvlccore2.install

+usr/lib/libvlccore.so.*

debian/libvlccore2.links

+/usr/share/doc/vlc-data /usr/share/doc/libvlccore2
+/usr/share/bug/vlc-data /usr/share/bug/libvlccore2

debian/mozilla-plugin-vlc.install

+usr/lib/mozilla

debian/mozilla-plugin-vlc.links

+/usr/share/doc/vlc /usr/share/doc/mozilla-plugin-vlc
+/usr/share/bug/vlc /usr/share/bug/mozilla-plugin-vlc
+/usr/lib/mozilla/plugins/libvlcplugin.so /usr/lib/mozilla-firefox/plugins/libvlcplugin.so
+/usr/lib/mozilla/plugins/libvlcplugin.so /usr/lib/xulrunner-addons/plugins/libvlcplugin.so

debian/patches/052_as-needed.diff

+Patch originally taken from the BTS #347650 and then adapted for 
+later libtool version
+
+Index: vlc-debian/autotools/ltmain.sh
+===================================================================
+--- vlc-debian.orig/autotools/ltmain.sh	2010-02-13 15:44:10.000000000 +0000
++++ vlc-debian/autotools/ltmain.sh	2010-02-13 15:44:27.000000000 +0000
+@@ -4716,6 +4716,11 @@
+ 	arg=$func_stripname_result
+ 	;;
+ 
++      -Wl,--as-needed)
++	deplibs="$deplibs $arg"
++	continue
++	;;
++      
+       -Wl,*)
+ 	func_stripname '-Wl,' '' "$arg"
+ 	args=$func_stripname_result
+@@ -5070,6 +5075,15 @@
+ 	lib=
+ 	found=no
+ 	case $deplib in
++	-Wl,--as-needed)
++	  if test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    deplibs="$deplib $deplibs"
++	  fi
++	  continue
++	  ;;
+ 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ 	  if test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$deplib $compile_deplibs"

debian/patches/101_certificates_paths.diff

+Add the certificates from the ca-certificates package to the path where gnutls
+look for certificates
+
+
+Index: vlc-debian/modules/misc/gnutls.c
+===================================================================
+--- vlc-debian.orig/modules/misc/gnutls.c	2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/misc/gnutls.c	2010-02-13 15:44:27.000000000 +0000
+@@ -698,6 +698,10 @@
+         sprintf (path, "%s/ssl/certs/ca-certificates.crt", confdir);
+         gnutls_Addx509File (VLC_OBJECT (p_session),
+                             p_sys->x509_cred, path, false);
++    gnutls_Addx509File( VLC_OBJECT(p_session),
++                        p_sys->x509_cred,
++                        "/etc/ssl/certs/ca-certificates.crt",false );
++
+     }
+     p_session->pf_handshake = gnutls_HandshakeAndValidate;
+     /*p_session->pf_handshake = gnutls_ContinueHandshake;*/

debian/patches/102_dejavu_font.diff

+Change the default font to one very likely to be present on a Debian box
+
+Index: vlc-debian/modules/misc/freetype.c
+===================================================================
+--- vlc-debian.orig/modules/misc/freetype.c	2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/misc/freetype.c	2010-02-13 15:44:27.000000000 +0000
+@@ -64,7 +64,7 @@
+ #define DEFAULT_FONT "" /* Default font found at run-time */
+ #define FC_DEFAULT_FONT "Arial"
+ #else
+-#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
++#define DEFAULT_FONT "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf"
+ #define FC_DEFAULT_FONT "Serif Bold"
+ #endif
+ 

debian/patches/104_notify.diff

+We don't install the icons where upstream expects them.
+so modify the code where needed.
+
+
+Index: vlc-debian/modules/misc/notify/notify.c
+===================================================================
+--- vlc-debian.orig/modules/misc/notify/notify.c	2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/misc/notify/notify.c	2010-02-13 15:44:27.000000000 +0000
+@@ -231,12 +231,7 @@
+     else /* else we show state-of-the art logo */
+     {
+         GError *p_error = NULL;
+-        char *psz_pixbuf;
+-        if( asprintf( &psz_pixbuf, "%s/vlc48x48.png", config_GetDataDir() ) >= 0 )
+-        {
+-            pix = gdk_pixbuf_new_from_file( psz_pixbuf, &p_error );
+-            free( psz_pixbuf );
+-        }
++        pix = gdk_pixbuf_new_from_file( "/usr/share/icons/hicolor/48x48/vlc.png", &p_error );
+     }
+ 
+     free( psz_arturl );

debian/patches/200_osdmenu_paths.diff

+Use the installed files for osdmenu rather than the ones in the current dir
+
+Index: vlc-debian/share/osdmenu/default.cfg
+===================================================================
+--- vlc-debian.orig/share/osdmenu/default.cfg	2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/share/osdmenu/default.cfg	2010-02-13 15:44:27.000000000 +0000
+@@ -1,4 +1,4 @@
+-dir share/osdmenu/default
++dir /usr/share/vlc/osdmenu/default
+ action	key-play-pause (0,0)
+ 	unselect unselected.png
+ 	select   selection/play_pause.png
+Index: vlc-debian/modules/video_filter/osdmenu.c
+===================================================================
+--- vlc-debian.orig/modules/video_filter/osdmenu.c	2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/video_filter/osdmenu.c	2010-02-13 15:44:27.000000000 +0000
+@@ -105,7 +105,7 @@
+ #if defined( WIN32 ) || defined( UNDER_CE )
+ #define OSD_DEFAULT_CFG "osdmenu/default.cfg"
+ #else
+-#define OSD_DEFAULT_CFG "share/osdmenu/default.cfg"
++#define OSD_DEFAULT_CFG "/usr/share/vlc/osdmenu/default.cfg"
+ #endif
+ 
+ #define OSD_UPDATE_MIN     0

debian/patches/300_manpage_syntax.diff

+Add a note about the videolan-doc package (even if it's not really up-to-date)
+
+Index: vlc-debian/doc/vlc.1
+===================================================================
+--- vlc-debian.orig/doc/vlc.1	2010-02-13 15:44:11.000000000 +0000
++++ vlc-debian/doc/vlc.1	2010-02-13 15:44:27.000000000 +0000
+@@ -70,6 +70,11 @@
+ (close VLC).
+ 
+ .SH SEE ALSO
++The
++.B videolan-doc
++package contains comprehensive documents on how to use
++.B VLC
++both as a media player and as a streaming server.
+ Online documentation: http://www.videolan.org/doc/
+ .PP
+ .SH AUTHOR

debian/patches/401_i420_mmx_pic.diff

+Avoid non-PIC code in asm mmx chroma converter module by letting gcc manage the addressing.
+Patch from upstream trac ticket #1383. Thanks to Gentoo and Alexis Ballier
+
+
+
+Index: vlc-debian/modules/video_chroma/i420_rgb_mmx.h
+===================================================================
+--- vlc-debian.orig/modules/video_chroma/i420_rgb_mmx.h	2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/video_chroma/i420_rgb_mmx.h	2010-02-13 15:44:27.000000000 +0000
+@@ -34,18 +34,18 @@
+ #define USED_U64(foo) \
+     static const uint64_t foo __asm__ (#foo) __attribute__((unused))
+ #endif
+-USED_U64(mmx_80w)     = 0x0080008000800080ULL;
+-USED_U64(mmx_10w)     = 0x1010101010101010ULL;
+-USED_U64(mmx_00ffw)   = 0x00ff00ff00ff00ffULL;
+-USED_U64(mmx_Y_coeff) = 0x253f253f253f253fULL;
+-
+-USED_U64(mmx_U_green) = 0xf37df37df37df37dULL;
+-USED_U64(mmx_U_blue)  = 0x4093409340934093ULL;
+-USED_U64(mmx_V_red)   = 0x3312331233123312ULL;
+-USED_U64(mmx_V_green) = 0xe5fce5fce5fce5fcULL;
++USED_U64(mmx_80w)     = 0x0080008000800080ULL; /* Will be referenced as %4 in inline asm */
++USED_U64(mmx_10w)     = 0x1010101010101010ULL; /* -- as %5 */
++USED_U64(mmx_00ffw)   = 0x00ff00ff00ff00ffULL; /* -- as %6 */
++USED_U64(mmx_Y_coeff) = 0x253f253f253f253fULL; /* -- as %7 */
++
++USED_U64(mmx_U_green) = 0xf37df37df37df37dULL; /* -- as %8 */
++USED_U64(mmx_U_blue)  = 0x4093409340934093ULL; /* -- as %9 */
++USED_U64(mmx_V_red)   = 0x3312331233123312ULL; /* -- as %10 */
++USED_U64(mmx_V_green) = 0xe5fce5fce5fce5fcULL; /* -- as %11 */
+ 
+-USED_U64(mmx_mask_f8) = 0xf8f8f8f8f8f8f8f8ULL;
+-USED_U64(mmx_mask_fc) = 0xfcfcfcfcfcfcfcfcULL;
++USED_U64(mmx_mask_f8) = 0xf8f8f8f8f8f8f8f8ULL; /* -- as %12 */
++USED_U64(mmx_mask_fc) = 0xfcfcfcfcfcfcfcfcULL; /* -- as %13 */
+ #undef USED_U64
+ 
+ #if defined(CAN_COMPILE_MMX)
+@@ -59,18 +59,16 @@
+         MMX_INSTRUCTIONS                \
+         :                               \
+         : "r" (p_y), "r" (p_u),         \
+-          "r" (p_v), "r" (p_buffer) );  \
++          "r" (p_v), "r" (p_buffer),    \
++	  "m" (mmx_80w), "m" (mmx_10w), \
++	  "m" (mmx_00ffw), "m" (mmx_Y_coeff), \
++	  "m" (mmx_U_green), "m" (mmx_U_blue), \
++	  "m" (mmx_V_red), "m" (mmx_V_green), \
++	  "m" (mmx_mask_f8), "m" (mmx_mask_fc) );  \
+     } while(0)
+ 
+ #define MMX_END __asm__ __volatile__ ( "emms" )
+ 
+-/* Use RIP-relative code in PIC mode on amd64 */
+-#if defined(__x86_64__) && defined(__PIC__)
+-#   define G "(%%rip)"
+-#else
+-#   define G
+-#endif
+-
+ #define MMX_INIT_16 "                                                       \n\
+ movd       (%1), %%mm0      # Load 4 Cb       00 00 00 00 u3 u2 u1 u0       \n\
+ movd       (%2), %%mm1      # Load 4 Cr       00 00 00 00 v3 v2 v1 v0       \n\
+@@ -103,27 +101,27 @@
+ # convert the chroma part                                                   \n\
+ punpcklbw %%mm4, %%mm0          # scatter 4 Cb    00 u3 00 u2 00 u1 00 u0   \n\
+ punpcklbw %%mm4, %%mm1          # scatter 4 Cr    00 v3 00 v2 00 v1 00 v0   \n\
+-psubsw    mmx_80w"G", %%mm0     # Cb -= 128                                 \n\
+-psubsw    mmx_80w"G", %%mm1     # Cr -= 128                                 \n\
++psubsw    %4, %%mm0     # Cb -= 128                                 \n\
++psubsw    %4, %%mm1     # Cr -= 128                                 \n\
+ psllw     $3, %%mm0             # Promote precision                         \n\
+ psllw     $3, %%mm1             # Promote precision                         \n\
+ movq      %%mm0, %%mm2          # Copy 4 Cb       00 u3 00 u2 00 u1 00 u0   \n\
+ movq      %%mm1, %%mm3          # Copy 4 Cr       00 v3 00 v2 00 v1 00 v0   \n\
+-pmulhw    mmx_U_green"G", %%mm2 # Mul Cb with green coeff -> Cb green       \n\
+-pmulhw    mmx_V_green"G", %%mm3 # Mul Cr with green coeff -> Cr green       \n\
+-pmulhw    mmx_U_blue"G", %%mm0  # Mul Cb -> Cblue 00 b3 00 b2 00 b1 00 b0   \n\
+-pmulhw    mmx_V_red"G", %%mm1   # Mul Cr -> Cred  00 r3 00 r2 00 r1 00 r0   \n\
++pmulhw    %8, %%mm2 # Mul Cb with green coeff -> Cb green       \n\
++pmulhw    %11, %%mm3 # Mul Cr with green coeff -> Cr green       \n\
++pmulhw    %9, %%mm0  # Mul Cb -> Cblue 00 b3 00 b2 00 b1 00 b0   \n\
++pmulhw    %10, %%mm1   # Mul Cr -> Cred  00 r3 00 r2 00 r1 00 r0   \n\
+ paddsw    %%mm3, %%mm2          # Cb green + Cr green -> Cgreen             \n\
+                                                                             \n\
+ # convert the luma part                                                     \n\
+-psubusb   mmx_10w"G", %%mm6     # Y -= 16                                   \n\
++psubusb   %5, %%mm6     # Y -= 16                                   \n\
+ movq      %%mm6, %%mm7          # Copy 8 Y        Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0   \n\
+-pand      mmx_00ffw"G", %%mm6   # get Y even      00 Y6 00 Y4 00 Y2 00 Y0   \n\
++pand      %6, %%mm6   # get Y even      00 Y6 00 Y4 00 Y2 00 Y0   \n\
+ psrlw     $8, %%mm7             # get Y odd       00 Y7 00 Y5 00 Y3 00 Y1   \n\
+ psllw     $3, %%mm6             # Promote precision                         \n\
+ psllw     $3, %%mm7             # Promote precision                         \n\
+-pmulhw    mmx_Y_coeff"G", %%mm6 # Mul 4 Y even    00 y6 00 y4 00 y2 00 y0   \n\
+-pmulhw    mmx_Y_coeff"G", %%mm7 # Mul 4 Y odd     00 y7 00 y5 00 y3 00 y1   \n\
++pmulhw    %7, %%mm6 # Mul 4 Y even    00 y6 00 y4 00 y2 00 y0   \n\
++pmulhw    %7, %%mm7 # Mul 4 Y odd     00 y7 00 y5 00 y3 00 y1   \n\
+ "
+ 
+ /*
+@@ -168,14 +166,14 @@
+ 
+ #define MMX_YUV_GRAY "                                                      \n\
+ # convert the luma part                                                     \n\
+-psubusb   mmx_10w"G", %%mm6                                                 \n\
++psubusb   %5, %%mm6                                                 \n\
+ movq      %%mm6, %%mm7                                                      \n\
+-pand      mmx_00ffw"G", %%mm6                                               \n\
++pand      %6, %%mm6                                               \n\
+ psrlw     $8, %%mm7                                                         \n\
+ psllw     $3, %%mm6                                                         \n\
+ psllw     $3, %%mm7                                                         \n\
+-pmulhw    mmx_Y_coeff"G", %%mm6                                             \n\
+-pmulhw    mmx_Y_coeff"G", %%mm7                                             \n\
++pmulhw    %7, %%mm6                                             \n\
++pmulhw    %7, %%mm7                                             \n\
+ packuswb  %%mm6, %%mm6                                                      \n\
+ packuswb  %%mm7, %%mm7                                                      \n\
+ punpcklbw %%mm7, %%mm6                                                      \n\
+@@ -183,8 +181,8 @@
+ 
+ #define MMX_UNPACK_16_GRAY "                                                \n\
+ movq      %%mm6, %%mm5                                                      \n\
+-pand      mmx_mask_f8"G", %%mm6                                             \n\
+-pand      mmx_mask_fc"G", %%mm5                                             \n\
++pand      %12, %%mm6                                             \n\
++pand      %13, %%mm5                                             \n\
+ movq      %%mm6, %%mm7                                                      \n\
+ psrlw     $3, %%mm7                                                         \n\
+ pxor      %%mm3, %%mm3                                                      \n\
+@@ -213,10 +211,10 @@
+ 
+ #define MMX_UNPACK_15 "                                                     \n\
+ # mask unneeded bits off                                                    \n\
+-pand      mmx_mask_f8"G", %%mm0 # b7b6b5b4 b3______ b7b6b5b4 b3______       \n\
++pand      %12, %%mm0 # b7b6b5b4 b3______ b7b6b5b4 b3______       \n\
+ psrlw     $3,%%mm0              # ______b7 b6b5b4b3 ______b7 b6b5b4b3       \n\
+-pand      mmx_mask_f8"G", %%mm2 # g7g6g5g4 g3______ g7g6g5g4 g3______       \n\
+-pand      mmx_mask_f8"G", %%mm1 # r7r6r5r4 r3______ r7r6r5r4 r3______       \n\
++pand      %12, %%mm2 # g7g6g5g4 g3______ g7g6g5g4 g3______       \n\
++pand      %12, %%mm1 # r7r6r5r4 r3______ r7r6r5r4 r3______       \n\
+ psrlw     $1,%%mm1              # __r7r6r5 r4r3____ __r7r6r5 r4r3____       \n\
+ pxor      %%mm4, %%mm4          # zero mm4                                  \n\
+ movq      %%mm0, %%mm5          # Copy B7-B0                                \n\
+@@ -249,9 +247,9 @@
+ 
+ #define MMX_UNPACK_16 "                                                     \n\
+ # mask unneeded bits off                                                    \n\
+-pand      mmx_mask_f8"G", %%mm0 # b7b6b5b4 b3______ b7b6b5b4 b3______       \n\
+-pand      mmx_mask_fc"G", %%mm2 # g7g6g5g4 g3g2____ g7g6g5g4 g3g2____       \n\
+-pand      mmx_mask_f8"G", %%mm1 # r7r6r5r4 r3______ r7r6r5r4 r3______       \n\
++pand      %12, %%mm0 # b7b6b5b4 b3______ b7b6b5b4 b3______       \n\
++pand      %13, %%mm2 # g7g6g5g4 g3g2____ g7g6g5g4 g3g2____       \n\
++pand      %12, %%mm1 # r7r6r5r4 r3______ r7r6r5r4 r3______       \n\
+ psrlw     $3,%%mm0              # ______b7 b6b5b4b3 ______b7 b6b5b4b3       \n\
+ pxor      %%mm4, %%mm4          # zero mm4                                  \n\
+ movq      %%mm0, %%mm5          # Copy B7-B0                                \n\

debian/patches/501_decrease_alsa_buffer.diff

+Patch taken from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=472811
+
+also reported in ubuntu as lp #243152
+
+Index: vlc-debian/modules/audio_output/alsa.c
+===================================================================
+--- vlc-debian.orig/modules/audio_output/alsa.c	2010-02-13 15:44:11.000000000 +0000
++++ vlc-debian/modules/audio_output/alsa.c	2010-02-13 15:44:27.000000000 +0000
+@@ -78,7 +78,7 @@
+    number of channel(s) (eg. 2 for stereo) and the size of a sample (eg.
+    2 for int16_t). */
+ #define ALSA_DEFAULT_PERIOD_SIZE        1024
+-#define ALSA_DEFAULT_BUFFER_SIZE        ( ALSA_DEFAULT_PERIOD_SIZE << 8 )
++#define ALSA_DEFAULT_BUFFER_SIZE        ( ALSA_DEFAULT_PERIOD_SIZE << 4 )
+ #define ALSA_SPDIF_PERIOD_SIZE          A52_FRAME_NB
+ #define ALSA_SPDIF_BUFFER_SIZE          ( ALSA_SPDIF_PERIOD_SIZE << 4 )
+ /* Why << 4 ? --Meuuh */

debian/patches/520-Don-t-hardcode-OJI-define-deprecated-xith-libxul-1.9.patch

+From 6dbe4986f7c11370c2bc275491d4502f5f4c3c60 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart@gmail.com>
+Date: Mon, 29 Mar 2010 23:45:46 +0200
+Subject: [PATCH] - Don't hardcode OJI define - deprecated xith libxul 1.9.2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
+---
+ projects/mozilla/support/npunix.c |    1 -
+ projects/mozilla/vlcshell.cpp     |    2 ++
+ projects/mozilla/vlcshell.h       |    3 +++
+ 3 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/projects/mozilla/support/npunix.c b/projects/mozilla/support/npunix.c
+index 9596c27..9eb851c 100644
+--- a/projects/mozilla/support/npunix.c
++++ b/projects/mozilla/support/npunix.c
+@@ -46,7 +46,6 @@
+ #include "config.h"
+ 
+ #define XP_UNIX 1
+-#define OJI 1
+ 
+ #include <npapi.h>
+ #if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+diff --git a/projects/mozilla/vlcshell.cpp b/projects/mozilla/vlcshell.cpp
+index bff669d..5de1ed0 100644
+--- a/projects/mozilla/vlcshell.cpp
++++ b/projects/mozilla/vlcshell.cpp
+@@ -272,10 +272,12 @@ NPError NPP_Initialize( void )
+     return NPERR_NO_ERROR;
+ }
+ 
++#ifdef OJI
+ jref NPP_GetJavaClass( void )
+ {
+     return NULL;
+ }
++#endif
+ 
+ void NPP_Shutdown( void )
+ {
+diff --git a/projects/mozilla/vlcshell.h b/projects/mozilla/vlcshell.h
+index 6dd1561..114865a 100644
+--- a/projects/mozilla/vlcshell.h
++++ b/projects/mozilla/vlcshell.h
+@@ -27,7 +27,10 @@
+ char * NPP_GetMIMEDescription( void );
+ 
+ NPError NPP_Initialize( void );
++
++#ifdef OJI 
+ jref NPP_GetJavaClass( void );
++#endif
+ void NPP_Shutdown( void );
+ 
+ NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
+-- 
+1.7.0
+

debian/patches/522-Mozilla-do-not-hard-code-autoconf-file-descriptors.patch

+Original Patch From 9eb581755a1502c5d8fde90355c134fea9668f5d Mon Sep 17 00:00:00 2001
+Refreshed against vlc 1.0.5 by Micah Gersten <micahg@ubuntu.com>
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
+Date: Sat, 10 Apr 2010 16:38:52 +0300
+Subject: [PATCH] Mozilla: do not hard-code autoconf file descriptors
+
+---
+ configure.ac |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: vlc-1.0.5/configure.ac
+===================================================================
+--- vlc-1.0.5.orig/configure.ac
++++ vlc-1.0.5/configure.ac
+@@ -5621,21 +5621,21 @@
+     AC_MSG_NOTICE([Checking for Mozilla])
+     found=0
+     if test -n "$MOZILLA_CFLAGS" -a -n "$MOZILLA_LIBS"
+     then
+       found=1
+     else
+       if test -n "$PKG_CONFIG"; then
+ 	for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do
+-	  echo "Trying to find $i.pc files" >&5
+-	  if $PKG_CONFIG --exists --print-errors "$i" 2>&5
++	  echo "Trying to find $i package" >&AS_MESSAGE_LOG_FD
++	  if $PKG_CONFIG --exists --print-errors "$i" 2>&AS_MESSAGE_LOG_FD
+ 	  then
+-            echo "Using $i.pc files." >&5
+-            echo "Using $i.pc files." >&6
++            echo "Using $i pkg-config package." >&AS_MESSAGE_LOG_FD
++            echo "Using $i package." >&AS_MESSAGE_FD
+ 	    found=1
+ 	    MOZILLA_CFLAGS=$(eval $PKG_CONFIG --cflags "$i" )
+ 	    MOZILLA_LIBS=$(eval $PKG_CONFIG --libs "$i" )
+ 	    break
+ 	  fi
+ 	done
+       fi
+     fi

debian/patches/525-Mozilla-more-fixes.patch

+From 2903fb7906863ef1344f4b62228875952aa64497 Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Kempf <jb@videolan.org>
+Date: Sat, 10 Apr 2010 16:22:30 +0200
+Subject: [PATCH 521/522] Mozilla: more fixes
+
+---
+ projects/mozilla/vlcplugin.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp
+index 48a287b..7e4a88d 100644
+--- a/projects/mozilla/vlcplugin.cpp
++++ b/projects/mozilla/vlcplugin.cpp
+@@ -47,6 +47,7 @@
+ 
+ #include <stdio.h>
+ #include <assert.h>
++#include <stdlib.h>
+ 
+ /*****************************************************************************
+  * utilitiy functions
+-- 
+1.7.0
+

debian/vlc-data.install

+usr/share/doc
+usr/share/locale
+usr/share/vlc
+usr/share/icons

debian/vlc-dbg.links

+/usr/share/doc/vlc-nox /usr/share/doc/vlc-dbg
+/usr/share/bug/vlc-nox /usr/share/bug/vlc-dbg

debian/vlc-nox.links

+/usr/share/man/man1/vlc.1.gz /usr/share/man/man1/cvlc.1.gz
+/usr/share/man/man1/vlc.1.gz /usr/share/man/man1/rvlc.1.gz
+/usr/share/man/man1/vlc.1.gz /usr/share/man/man1/nvlc.1.gz

debian/vlc-plugin-ggi.install

+usr/lib/vlc/video_output/libggi_plugin.so

debian/vlc-plugin-pulse.install

+usr/lib/vlc/audio_output/libpulse_plugin.so