Package: vlc Version: 0.8.4-svn20050920-3 Please find attached the patch for the NMU that was uploaded to experimental. The second patch contains only the HAL-relevant parts, that should probably be merged upstream.
Regards, -- .''`. Josselin Mouette /\./\ : :' : [EMAIL PROTECTED] `. `' [EMAIL PROTECTED] `- Debian GNU/Linux -- The power of freedom
diff -u vlc-0.8.4-svn20050920/debian/changelog vlc-0.8.4-svn20050920/debian/changelog
--- vlc-0.8.4-svn20050920/debian/changelog
+++ vlc-0.8.4-svn20050920/debian/changelog
@@ -1,3 +1,13 @@
+vlc (0.8.4-svn20050920-3+hal0) experimental; urgency=low
+
+ * NMU in experimental with maintainer's approval.
+ * Rebuild against HAL 0.5.
+ * Build-depend on libhal-dev (>= 0.5).
+ * src/libvlc.c,modules/services_discovery/hal.c: use new HAL API.
+ * modules/gui/wxwidgets/open.cpp: compile fix from upstream SVN.
+
+ -- Josselin Mouette <[EMAIL PROTECTED]> Sat, 8 Oct 2005 21:37:39 +0200
+
vlc (0.8.4-svn20050920-3) unstable; urgency=low
* configure.ac:
diff -u vlc-0.8.4-svn20050920/debian/control vlc-0.8.4-svn20050920/debian/control
--- vlc-0.8.4-svn20050920/debian/control
+++ vlc-0.8.4-svn20050920/debian/control
@@ -2,7 +2,7 @@
Section: graphics
Priority: optional
Maintainer: Sam Hocevar (Debian packages) <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0), 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, libgnutls11-dev, 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), 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 (>= 0.5), libtar-dev, libdvdnav-dev, libgnutls11-dev, 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]
Standards-Version: 3.6.2.1
Package: vlc
only in patch2:
unchanged:
--- vlc-0.8.4-svn20050920.orig/src/libvlc.c
+++ vlc-0.8.4-svn20050920/src/libvlc.c
@@ -2549,22 +2549,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 )
{
@@ -2574,12 +2578,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
}
only in patch2:
unchanged:
--- vlc-0.8.4-svn20050920.orig/modules/gui/wxwidgets/open.cpp
+++ vlc-0.8.4-svn20050920/modules/gui/wxwidgets/open.cpp
@@ -1333,7 +1333,7 @@
{
char **ppsz_cd_drives;
const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(device);
- char *psz_device = (char *) tmp_buf;
+ char *psz_device = const_cast<char *>(tmp_buf.data());
if( IsDVD(psz_device) )
{
@@ -1403,7 +1403,7 @@
{
char *ppsz_device[2];
const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(device);
- char *psz_device = (char *) tmp_buf;
+ char *psz_device = const_cast<char *>(tmp_buf.data());
ppsz_device[0] = (device && *device) ? psz_device : NULL;
ppsz_device[1] = NULL;
return ProbeDevice(ppsz_device, CDIO_FS_AUDIO, false);
@@ -1416,7 +1416,7 @@
{
char *ppsz_device[2];
const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(device);
- char *psz_device = (char *) tmp_buf;
+ char *psz_device = const_cast<char *>(tmp_buf.data());
ppsz_device[0] = (device && *device) ? psz_device : NULL;
ppsz_device[1] = NULL;
return ProbeDevice(ppsz_device,
only in patch2:
unchanged:
--- 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++ )
{
--- vlc-0.8.4-svn20050920.orig/src/libvlc.c
+++ vlc-0.8.4-svn20050920/src/libvlc.c
@@ -2549,22 +2549,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 )
{
@@ -2574,12 +2578,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++ )
{
signature.asc
Description: This is a digitally signed message part
