ports/98626: [PATCH] Port multimedia/vnc does not compile under FreeBSD 4.x

[Sven Berkvens-Matthijsse]

>Number:         98626
>Category:       ports
>Synopsis:       [PATCH] Port multimedia/vnc does not compile under FreeBSD 4.x
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 07 16:50:20 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Sven Berkvens-Matthijsse
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
ilse media BV
>Environment:
System: FreeBSD serv7.ilse.net 4.11-STABLE FreeBSD 4.11-STABLE #0: Mon May 22 17:02:01 CEST 2006 root at serv7.ilse.net:/extra1/usr_obj/extra1/usr_src/sys/BAROQUE i386


>Description:
	The port multimedia/vlc does not compile under FreeBSD 4.x due to the
	use of some C99 features in the source code.
>How-To-Repeat:
	Try to compile under FreeBSD 4.x.
>Fix:
	Installing the following extra patches solves the problem and does
	not break anything on other versions of FreeBSD.

Install as patch-modules_services_discovery_daap.c
=============================================================================
--- modules/services_discovery/daap.c.orig	Wed Jun  7 15:17:49 2006
+++ modules/services_discovery/daap.c	Wed Jun  7 15:18:35 2006
@@ -490,11 +490,12 @@
     int i_size = DAAP_ClientHost_GetSharename( p_host, NULL, 0 );
     vlc_bool_t b_found = VLC_FALSE;
     char *psz_buffer = (char *)malloc( i_size );
-    DAAP_ClientHost_GetSharename( p_host, psz_buffer, i_size );
 
     services_discovery_t *p_sd = (services_discovery_t *)p_context;
     services_discovery_sys_t *p_sys = p_sd->p_sys;
 
+    DAAP_ClientHost_GetSharename( p_host, psz_buffer, i_size );
+
     for( i = 0 ; i< p_sys->p_db->i_hosts; i++ )
     {
         if( !strcmp( p_sys->p_db->pp_hosts[i]->psz_name, psz_buffer ) )
@@ -522,6 +523,7 @@
 
 static void ProcessHost( services_discovery_t *p_sd, dhost_t *p_host )
 {
+    DAAP_ClientHost_Database *p_database;
     int i_dbsize, i_db, i, i_songsize, i_ret;
     int i_size = DAAP_ClientHost_GetSharename( p_host->p_host, NULL, 0 );
 
@@ -564,7 +566,7 @@
     /* Get DB */
     i_dbsize = DAAP_ClientHost_GetDatabases( p_host->p_host, NULL, NULL, 0 );
 
-    DAAP_ClientHost_Database *p_database = malloc( i_dbsize );
+    p_database = malloc( i_dbsize );
     DAAP_ClientHost_GetDatabases( p_host->p_host, p_database, &i_db, i_dbsize );
 
=============================================================================


 
Install as patch-modules_video_output_x11_xcommon.c
=============================================================================
--- modules/video_output/x11/xcommon.c.orig	Wed Jun  7 15:20:18 2006
+++ modules/video_output/x11/xcommon.c	Wed Jun  7 15:26:50 2006
@@ -1582,13 +1582,13 @@
         else
 #endif
         {
+            XF86VidModeModeLine mode;
+            int i_dummy;
+
             /* The window wasn't necessarily created at the requested size */
             p_vout->p_sys->p_win->i_x = p_vout->p_sys->p_win->i_y = 0;
 
 #ifdef HAVE_XF86VIDMODE
-            XF86VidModeModeLine mode;
-            int i_dummy;
-
             if( XF86VidModeGetModeLine( p_vout->p_sys->p_display,
                                         p_vout->p_sys->i_screen, &i_dummy,
                                         &mode ) )
=============================================================================



Install as patch-src_extras_libc.c
=============================================================================
--- src/extras/libc.c.orig	Wed Jun  7 15:34:16 2006
+++ src/extras/libc.c	Wed Jun  7 15:34:53 2006
@@ -346,7 +346,7 @@
 /*****************************************************************************
  * lldiv: returns quotient and remainder
  *****************************************************************************/
-#if defined(SYS_BEOS)
+#if defined(SYS_BEOS) || (defined(__FreeBSD__) && (__FreeBSD__ < 5))
 lldiv_t vlc_lldiv( long long numer, long long denom )
 {
     lldiv_t d;
=============================================================================
>Release-Note:
>Audit-Trail:
>Unformatted: