--- vlc-0.8.4.debian.orig/debian/control +++ vlc-0.8.4.debian/debian/control @@ -2,13 +2,13 @@ Section: graphics Priority: optional Maintainer: Sam Hocevar (Debian packages) -Build-Depends: debhelper (>= 4.0), dh-buildinfo, dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libasound2-dev (>= 0.9.0beta10a), libarts1-dev (>= 1.4.2-1), libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, libaa1-dev, libdvbpsi4-dev, mozilla-dev (>= 2:1.7.10-1), libidl0, libglib2.0-0, libxosd-dev (>= 2.2.4-1.3), libsvga1-dev [i386], libogg-dev, libvorbis-dev, libwxgtk2.6-dev, libdvdread3-dev, libflac-dev (>= 1.1.2-3), libimlib2-dev, libmatroska-dev (>= 0.7.7), libfreetype6-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.11.11a-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libxml2-dev, libid3tag0-dev, libtheora-dev, nasm, libmodplug-dev, libhal-dev, libtar-dev, libdvdnav-dev, libgnutls-dev (>= 1.2.8), libavcodec-dev (>= 0.cvs20050918-2), libavformat-dev (>= 0.cvs20050918-2), libpostproc-dev (>= 0.cvs20050918-2), libncurses5-dev, libpng12-dev, xlibmesa-gl-dev, libsmbclient-dev, gcc-snapshot [i386 amd64], yasm [amd64] +Build-Depends: debhelper (>= 4.0), dh-buildinfo, dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libasound2-dev (>= 0.9.0beta10a), libarts1-dev (>= 1.4.2-1), libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, libaa1-dev, libdvbpsi4-dev, mozilla-dev (>= 2:1.7.10-1), libidl0, libglib2.0-0, libxosd-dev (>= 2.2.4-1.3), libsvga1-dev [i386], libogg-dev, libvorbis-dev, libwxgtk2.6-dev, libdvdread3-dev, libflac-dev (>= 1.1.2-3), libimlib2-dev, libmatroska-dev (>= 0.7.7), libfreetype6-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.11.11a-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libxml2-dev, libid3tag0-dev, libtheora-dev, nasm, libmodplug-dev, libhal-dev, libtar-dev, libdvdnav-dev, libgnutls-dev (>= 1.2.8), libavcodec-dev (>= 0.cvs20050918-2), libavformat-dev (>= 0.cvs20050918-2), libpostproc-dev (>= 0.cvs20050918-2), libncurses5-dev, libpng12-dev, libgl1-mesa-dev | libgl-dev, libsmbclient-dev, gcc-snapshot [i386 amd64], yasm [amd64] Standards-Version: 3.6.2.1 Package: vlc Section: graphics Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, wxvlc, ttf-freefont +Depends: ${shlibs:Depends}, ${misc:Depends}, wxvlc, ttf-freefont, vlc-plugin-alsa Recommends: ttf-thryomanes, videolan-doc Suggests: vlc-plugin-alsa, mozilla-plugin-vlc Replaces: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0) --- vlc-0.8.4.debian.orig/debian/changelog +++ vlc-0.8.4.debian/debian/changelog @@ -1,3 +1,22 @@ +vlc (0.8.4.debian-1ubuntu2) dapper; urgency=low + + * Rebuild for new dbus. + + -- Daniel T Chen Thu, 22 Dec 2005 14:32:09 -0800 + +vlc (0.8.4.debian-1ubuntu1) dapper; urgency=low + + * Resynchronise with Debian: + - Fix build dependency on GL headers. + - Reintegrate patch for HAL 0.5 API in src/libvlc.c(Debian#332927), + fixing FTBFS. + - Fix broken mailcap entries in vlc.mime (Closes: Debian#340434, + Debian#339570). + - Make vlc depend on vlc-plugin-alsa (Closes: #3678, #4544). + - Fix unicast streaming (Closes: #4444). + + -- Daniel T Chen Sun, 27 Nov 2005 22:50:24 -0800 + vlc (0.8.4.debian-1) unstable; urgency=low * New upstream release. --- vlc-0.8.4.debian.orig/debian/vlc.mime +++ vlc-0.8.4.debian/debian/vlc.mime @@ -7,17 +7,17 @@ video/x-mpeg-system; vlc %s; description="MPEG Video"; test=test -n "$DISPLAY"; priority=7 video/x-mpeg-system; vlc -I rc -V caca %s; needsterminal; description="MPEG Video"; priority=4 -audio/x-wav; nametemplate=%s.wav; vlc %s; description="WAV Audio"; test=test -n "$DISPLAY"; priority=7 -audio/x-wav; nametemplate=%s.wav; vlc -I rc -V caca %s; needsterminal; description="WAV Audio"; priority=4 +audio/x-wav; vlc %s; nametemplate=%s.wav; description="WAV Audio"; test=test -n "$DISPLAY"; priority=7 +audio/x-wav; vlc -I rc -V caca %s; nametemplate=%s.wav; needsterminal; description="WAV Audio"; priority=4 video/mpeg4; vlc %s; description="MPEG-4 Video"; test=test -n "$DISPLAY"; priority=7 video/mpeg4; vlc -I rc -V caca %s; needsterminal; description="MPEG-4 Video"; priority=4 -audio/mpeg; nametemplate=%s.mpg; vlc %s; description="MPEG Audio"; test=test -n "$DISPLAY"; priority=7 -audio/mpeg; nametemplate=%s.mpg; vlc -I rc -V caca %s; needsterminal; description="MPEG Audio"; priority=4 -audio/mpegurl; nametemplate=%s.m3u; vlc %s; description="MPEG Audio URL"; test=test -n "$DISPLAY"; priority=7 -audio/mpegurl; nametemplate=%s.m3u; vlc -I rc -V caca %s; needsterminal; description="MPEG Audio URL"; priority=4 -audio/x-mp3; nametemplate=%s.mp3; vlc %s; description="MPEG Audio"; test=test -n "$DISPLAY"; priority=7 -audio/x-mp3; nametemplate=%s.mp3; vlc -I rc -V caca %s; needsterminal; description="MPEG Audio"; priority=4 +audio/mpeg; vlc %s; nametemplate=%s.mpg; description="MPEG Audio"; test=test -n "$DISPLAY"; priority=7 +audio/mpeg; vlc -I rc -V caca %s; nametemplate=%s.mpg; needsterminal; description="MPEG Audio"; priority=4 +audio/mpegurl; vlc %s; nametemplate=%s.m3u; description="MPEG Audio URL"; test=test -n "$DISPLAY"; priority=7 +audio/mpegurl; vlc -I rc -V caca %s; nametemplate=%s.m3u; needsterminal; description="MPEG Audio URL"; priority=4 +audio/x-mp3; vlc %s; nametemplate=%s.mp3; description="MPEG Audio"; test=test -n "$DISPLAY"; priority=7 +audio/x-mp3; vlc -I rc -V caca %s; nametemplate=%s.mp3; needsterminal; description="MPEG Audio"; priority=4 audio/mpeg4; vlc %s; description="MPEG-4 Audio"; test=test -n "$DISPLAY"; priority=7 audio/mpeg4; vlc -I rc -V caca %s; needsterminal; description="MPEG-4 Audio"; priority=4 application/mpeg4-iod; vlc %s; description="MPEG-4 Video"; test=test -n "$DISPLAY"; priority=7 @@ -31,10 +31,10 @@ video/quicktime; vlc %s; description="Apple Quicktime Video"; test=test -n "$DISPLAY"; priority=4 video/quicktime; vlc -I rc -V caca %s; needsterminal; description="Apple Quicktime Video"; priority=3 -application/ogg; nametemplate=%s.ogg; vlc %s; description="Ogg stream"; test=test -n "$DISPLAY"; priority=4 -application/ogg; nametemplate=%s.ogg; vlc -I rc -V caca %s; needsterminal; description="Ogg stream"; priority=3 -application/x-ogg; nametemplate=%s.ogg; vlc %s; description="Ogg stream"; test=test -n "$DISPLAY"; priority=4 -application/x-ogg; nametemplate=%s.ogg; vlc -I rc -V caca %s; needsterminal; description="Ogg stream"; priority=3 +application/ogg; vlc %s; nametemplate=%s.ogg; description="Ogg stream"; test=test -n "$DISPLAY"; priority=4 +application/ogg; vlc -I rc -V caca %s; nametemplate=%s.ogg; needsterminal; description="Ogg stream"; priority=3 +application/x-ogg; vlc %s; nametemplate=%s.ogg; description="Ogg stream"; test=test -n "$DISPLAY"; priority=4 +application/x-ogg; vlc -I rc -V caca %s; nametemplate=%s.ogg; needsterminal; description="Ogg stream"; priority=3 application/x-ms-asf-plugin; vlc %s; description="Windows Media Video"; test=test -n "$DISPLAY"; priority=4 application/x-ms-asf-plugin; vlc -I rc -V caca %s; needsterminal; description="Windows Media Video"; priority=3 --- vlc-0.8.4.debian.orig/debian/patches/00list +++ vlc-0.8.4.debian/debian/patches/00list @@ -1,2 +1,3 @@ +01_libhal_api-libvlc.c #20_no-wx-updates 20_osdmenu-paths --- vlc-0.8.4.debian.orig/debian/patches/01_libhal_api-libvlc.c.dpatch +++ vlc-0.8.4.debian/debian/patches/01_libhal_api-libvlc.c.dpatch @@ -0,0 +1,155 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_libhal_api-libvlc.c.dpatch by Daniel T Chen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use new HAL 0.5 API in src/libvlc.c + +@DPATCH@ + +--- vlc-0.8.4-svn20050920.orig/src/libvlc.c ++++ vlc-0.8.4-svn20050920/src/libvlc.c +@@ -2561,22 +2561,26 @@ + char *block_dev; + dbus_bool_t b_dvd; + +- if( ( ctx = hal_initialize( NULL, FALSE ) ) ) ++ if( ( ctx = libhal_ctx_init_direct( NULL ) ) ) + { +- if( ( devices = hal_get_all_devices( ctx, &i_devices ) ) ) ++ if( ( devices = libhal_get_all_devices( ctx, &i_devices, NULL ) ) ) + { + for( i = 0; i < i_devices; i++ ) + { +- if( !hal_device_property_exists( ctx, devices[ i ], +- "storage.cdrom.dvd" ) ) ++ if( !libhal_device_property_exists( ctx, devices[ i ], ++ "storage.cdrom.dvd", ++ NULL ) ) + { + continue; + } + +- b_dvd = hal_device_get_property_bool( ctx, devices[ i ], +- "storage.cdrom.dvd" ); +- block_dev = hal_device_get_property_string( ctx, devices[ i ], +- "block.device" ); ++ b_dvd = libhal_device_get_property_bool( ctx, devices[ i ], ++ "storage.cdrom.dvd", ++ NULL ); ++ block_dev = libhal_device_get_property_string( ctx, ++ devices[ i ], ++ "block.device", ++ NULL ); + + if( b_dvd ) + { +@@ -2586,12 +2586,12 @@ + config_PutPsz( p_vlc, "vcd", block_dev ); + config_PutPsz( p_vlc, "cd-audio", block_dev ); + +- hal_free_string( block_dev ); ++ libhal_free_string( block_dev ); + } +- hal_free_string_array( devices ); ++ libhal_free_string_array( devices ); + } + +- hal_shutdown( ctx ); ++ libhal_ctx_shutdown( ctx, NULL ); + } + #endif + } +--- vlc-0.8.4-svn20050920.orig/modules/services_discovery/hal.c ++++ vlc-0.8.4-svn20050920/modules/services_discovery/hal.c +@@ -106,7 +106,7 @@ + p_sd->pf_run = Run; + p_sd->p_sys = p_sys; + +- if( !( p_sys->p_ctx = hal_initialize( NULL, FALSE ) ) ) ++ if( !( p_sys->p_ctx = libhal_ctx_init_direct( NULL ) ) ) + { + free( p_sys ); + msg_Err( p_sd, "hal not available" ); +@@ -160,16 +160,17 @@ + services_discovery_sys_t *p_sys = p_sd->p_sys; + playlist_t *p_playlist; + playlist_item_t *p_item; +- psz_name = hal_device_get_property_string( p_sd->p_sys->p_ctx, +- psz_device, "volume.label" ); +- psz_blockdevice = hal_device_get_property_string( p_sd->p_sys->p_ctx, +- psz_device, "block.device" ); ++ psz_name = libhal_device_get_property_string( p_sd->p_sys->p_ctx, ++ psz_device, "volume.label", ++ NULL ); ++ psz_blockdevice = libhal_device_get_property_string( p_sd->p_sys->p_ctx, ++ psz_device, "block.device", NULL ); + asprintf( &psz_uri, "dvd://%s", psz_blockdevice ); + /* Create the playlist item here */ + p_item = playlist_ItemNew( p_sd, psz_uri, + psz_name ); + free( psz_uri ); +- hal_free_string( psz_device ); ++ libhal_free_string( psz_device ); + if( !p_item ) + { + return; +@@ -197,14 +198,14 @@ + services_discovery_sys_t *p_sys = p_sd->p_sys; + playlist_t *p_playlist; + playlist_item_t *p_item; +- psz_blockdevice = hal_device_get_property_string( p_sd->p_sys->p_ctx, +- psz_device, "block.device" ); ++ psz_blockdevice = libhal_device_get_property_string( p_sd->p_sys->p_ctx, ++ psz_device, "block.device", NULL ); + asprintf( &psz_uri, "cdda://%s", psz_blockdevice ); + /* Create the playlist item here */ + p_item = playlist_ItemNew( p_sd, psz_uri, + psz_name ); + free( psz_uri ); +- hal_free_string( psz_device ); ++ libhal_free_string( psz_device ); + if( !p_item ) + { + return; +@@ -229,24 +230,25 @@ + { + char *psz_disc_type; + services_discovery_sys_t *p_sys = p_sd->p_sys; +- if( hal_device_property_exists( p_sys->p_ctx, psz_device, +- "volume.disc.type" ) ) ++ if( libhal_device_property_exists( p_sys->p_ctx, psz_device, ++ "volume.disc.type", NULL ) ) + { +- psz_disc_type = hal_device_get_property_string( p_sys->p_ctx, +- psz_device, +- "volume.disc.type" ); ++ psz_disc_type = libhal_device_get_property_string( p_sys->p_ctx, ++ psz_device, ++ "volume.disc.type", ++ NULL ); + if( !strcmp( psz_disc_type, "dvd_rom" ) ) + { + AddDvd( p_sd, psz_device ); + } + else if( !strcmp( psz_disc_type, "cd_rom" ) ) + { +- if( hal_device_get_property_bool( p_sys->p_ctx, psz_device, "volume.disc.has_audio" ) ) ++ if( libhal_device_get_property_bool( p_sys->p_ctx, psz_device, "volume.disc.has_audio", NULL ) ) + { + AddCdda( p_sd, psz_device ); + } + } +- hal_free_string( psz_disc_type ); ++ libhal_free_string( psz_disc_type ); + } + } + +@@ -260,7 +262,7 @@ + services_discovery_sys_t *p_sys = p_sd->p_sys; + + /* parse existing devices first */ +- if( ( devices = hal_get_all_devices( p_sys->p_ctx, &i_devices ) ) ) ++ if( ( devices = libhal_get_all_devices( p_sys->p_ctx, &i_devices, NULL ) ) ) + { + for( i = 0; i < i_devices; i++ ) + {