From idefix at helixcommunity.org  Fri Jan  4 00:33:28 2008
From: idefix at helixcommunity.org (idefix@helixcommunity.org)
Date: Thu Jan  3 23:55:03 2008
Subject: [Video-cvs] sitelib/platform/unix unixsurf.cpp,1.6.6.1,1.6.6.2
Message-ID: 

Update of /cvsroot/video/sitelib/platform/unix
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv16132/sitelib/platform/unix

Modified Files:
      Tag: hxclient_1_5_0_cayenne
	unixsurf.cpp 
Log Message:
Modified by: chris.wang@sun.com

Date: 12:28:2007
Project: Porting solaris
Overview:
This patch has already  been in 144 branch, the purpose of this patch is to build code in video/sitelib directory in Solaris platform. In 150 branch, we also need this patch. so move it to 150 branch



Files Modified:
video/site/unix.pcf
video/sitelib/platform/unix/unixsurf.cpp
video/sitelib/pub/platform/unix/unixsurf.h

Platforms and Profiles Affected:
Solaris

Distribution Libraries Affected:
realplay.bin

Distribution library impact and planned action:
no

Platforms and Profiles Build Verified:
Have verified on solaris 11 x86 , with
SYSTEM_ID=sunos-5.10-i386-studio10, profile as player-all


BIF : reaplayer_gtk_current
Profile: helix_client_all_defines
Branch :  hxclient_1_5_0_cayenne
Copyright assignment:
1. My company (sun.com) submits this code under the terms
of a commercial contribution agreement with RealNetworks,
and I am authorized to contribute this code under said agreement.



Index: unixsurf.cpp
===================================================================
RCS file: /cvsroot/video/sitelib/platform/unix/unixsurf.cpp,v
retrieving revision 1.6.6.1
retrieving revision 1.6.6.2
diff -u -d -r1.6.6.1 -r1.6.6.2

--- unixsurf.cpp	7 Mar 2007 20:56:20 -0000	1.6.6.1
+++ unixsurf.cpp	4 Jan 2008 08:33:25 -0000	1.6.6.2
@@ -65,7 +65,7 @@
 #include "basesite.h"
 #include "shmhelp.h"
 
-#if defined(_LINUX) && defined(_OVERLAY)
+#if (defined(_LINUX) || defined(_SOLARIS)) && defined(_OVERLAY)
 #include "hxprefs.h"
 CUnixSurf* CUnixSurf::zm_pXvOwner     = NULL;
 #endif
@@ -73,7 +73,7 @@
 
 CUnixSurf::CUnixSurf( IUnknown* pContext, CHXBaseSite* pSite )
     : CBaseSurface( pContext, pSite )
-#if defined(_LINUX) && defined(_OVERLAY)
+#if (defined(_LINUX) || defined(_SOLARIS)) && defined(_OVERLAY)
     , m_bWallPaperMode(FALSE)
     , m_nPortID(-1)
     , m_bPaintClipList(TRUE)
@@ -109,7 +109,7 @@
 {
     int i=0;
 
-#if defined(_LINUX) && defined(_OVERLAY)
+#if (defined(_LINUX) || defined(_SOLARIS)) && defined(_OVERLAY)
     HX_ASSERT( m_pContext );
     IHXPreferences* pPreferences = NULL;
     if( m_pContext && HXR_OK == m_pContext->QueryInterface( IID_IHXPreferences, (void **) &pPreferences))
@@ -223,7 +223,7 @@
         m_GC=0;
     }
 
-#if defined(_LINUX) && defined(_OVERLAY)
+#if (defined(_LINUX) || defined(_SOLARIS)) && defined(_OVERLAY)
 
     if( m_pXvImage )
     {
@@ -291,7 +291,7 @@
 void CUnixSurf::_CreateBuffer()
 {
     int i = 0;
-#if defined(_LINUX) && defined(_OVERLAY)
+#if (defined(_LINUX) || defined(_SOLARIS)) && defined(_OVERLAY)
     //Clean up the old stuff....
     if( m_pcVideoBuf != NULL )
     {
@@ -428,7 +428,7 @@
 {
     BOOL bRetVal = FALSE;
 
-#if defined(_LINUX) && defined(_OVERLAY)
+#if (defined(_LINUX) || defined(_SOLARIS)) && defined(_OVERLAY)
     if( !m_bUseOverlays )
     {
         return bRetVal;
@@ -601,7 +601,7 @@
         x = (x&~15)+16;
     }
 
-#if defined(_LINUX) && defined(_OVERLAY)
+#if (defined(_LINUX) || defined(_SOLARIS)) && defined(_OVERLAY)
     if( bOverlay )
     {
         int  nPortID    = 0;
@@ -761,7 +761,7 @@
     {
         for( int y=top; y<=bottom-1; y++ )
         {
-#if defined _LINUX &&  defined _OVERLAY
+#if (defined (_LINUX) || defined(_SOLARIS)) &&  defined _OVERLAY
             XPutPixel( (XImage*)hxxDC, x, y, m_ulColorKey );
 #endif
         }
@@ -795,7 +795,7 @@
 
 void CUnixSurf::_SetColorKey(INT32 nColorSpaceLowValue,INT32 nColorSpaceHighValue)
 {
-#if defined(_LINUX) && defined(_OVERLAY)
+#if (defined(_LINUX) || defined(_SOLARIS)) && defined(_OVERLAY)
     static BOOL bDoneItAlready = FALSE;
 
     if( m_atomColorKey != None && !bDoneItAlready)
@@ -914,7 +914,7 @@
 
     HX_ASSERT( m_nMultiBufferCount );
 
-#if defined(_LINUX) && defined(_OVERLAY)
+#if (defined(_LINUX) || defined(_SOLARIS)) && defined(_OVERLAY)
 
     m_ulLastOverlayUpdateTime = HX_GET_TICKCOUNT();
 
@@ -1066,7 +1066,7 @@
 {
     int i=0;
 
-#if defined(_LINUX) && defined(_OVERLAY)
+#if (defined(_LINUX) || defined(_SOLARIS)) && defined(_OVERLAY)
     //Release all of our overlay resources.....
     if( m_nPortID!=-1 )
     {


From idefix at helixcommunity.org  Fri Jan  4 00:33:29 2008
From: idefix at helixcommunity.org (idefix@helixcommunity.org)
Date: Thu Jan  3 23:55:03 2008
Subject: [Video-cvs] sitelib/pub/platform/unix unixsurf.h,1.4.6.1,1.4.6.2
Message-ID: 

Update of /cvsroot/video/sitelib/pub/platform/unix
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv16132/sitelib/pub/platform/unix

Modified Files:
      Tag: hxclient_1_5_0_cayenne
	unixsurf.h 
Log Message:
Modified by: chris.wang@sun.com

Date: 12:28:2007
Project: Porting solaris
Overview:
This patch has already  been in 144 branch, the purpose of this patch is to build code in video/sitelib directory in Solaris platform. In 150 branch, we also need this patch. so move it to 150 branch



Files Modified:
video/site/unix.pcf
video/sitelib/platform/unix/unixsurf.cpp
video/sitelib/pub/platform/unix/unixsurf.h

Platforms and Profiles Affected:
Solaris

Distribution Libraries Affected:
realplay.bin

Distribution library impact and planned action:
no

Platforms and Profiles Build Verified:
Have verified on solaris 11 x86 , with
SYSTEM_ID=sunos-5.10-i386-studio10, profile as player-all


BIF : reaplayer_gtk_current
Profile: helix_client_all_defines
Branch :  hxclient_1_5_0_cayenne
Copyright assignment:
1. My company (sun.com) submits this code under the terms
of a commercial contribution agreement with RealNetworks,
and I am authorized to contribute this code under said agreement.



Index: unixsurf.h
===================================================================
RCS file: /cvsroot/video/sitelib/pub/platform/unix/unixsurf.h,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -d -r1.4.6.1 -r1.4.6.2
--- unixsurf.h	6 Mar 2007 09:23:26 -0000	1.4.6.1
+++ unixsurf.h	4 Jan 2008 08:33:26 -0000	1.4.6.2
@@ -151,7 +151,7 @@
    CUnixSurf( const CUnixSurf& );
    CUnixSurf& operator=(const CUnixSurf& it );
 
-#if defined(_LINUX) && defined(_OVERLAY)
+#if (defined(_LINUX) || defined(_SOLARIS)) && defined(_OVERLAY)
    static CUnixSurf* zm_pXvOwner;
    
    BOOL        m_bWallPaperMode;


From idefix at helixcommunity.org  Fri Jan  4 00:33:28 2008
From: idefix at helixcommunity.org (idefix@helixcommunity.org)
Date: Thu Jan  3 23:55:03 2008
Subject: [Video-cvs] site unix.pcf,1.4.6.1,1.4.6.2
Message-ID: 

Update of /cvsroot/video/site
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv16132/site

Modified Files:
      Tag: hxclient_1_5_0_cayenne
	unix.pcf 
Log Message:
Modified by: chris.wang@sun.com

Date: 12:28:2007
Project: Porting solaris
Overview:
This patch has already  been in 144 branch, the purpose of this patch is to build code in video/sitelib directory in Solaris platform. In 150 branch, we also need this patch. so move it to 150 branch



Files Modified:
video/site/unix.pcf
video/sitelib/platform/unix/unixsurf.cpp
video/sitelib/pub/platform/unix/unixsurf.h

Platforms and Profiles Affected:
Solaris

Distribution Libraries Affected:
realplay.bin

Distribution library impact and planned action:
no

Platforms and Profiles Build Verified:
Have verified on solaris 11 x86 , with
SYSTEM_ID=sunos-5.10-i386-studio10, profile as player-all


BIF : reaplayer_gtk_current
Profile: helix_client_all_defines
Branch :  hxclient_1_5_0_cayenne
Copyright assignment:
1. My company (sun.com) submits this code under the terms
of a commercial contribution agreement with RealNetworks,
and I am authorized to contribute this code under said agreement.



Index: unix.pcf
===================================================================
RCS file: /cvsroot/video/site/unix.pcf,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -d -r1.4.6.1 -r1.4.6.2
--- unix.pcf	6 Mar 2007 09:02:20 -0000	1.4.6.1
+++ unix.pcf	4 Jan 2008 08:33:25 -0000	1.4.6.2
@@ -61,6 +61,7 @@
 # Add in the XVideo lib if we are on linux and not building the mini
 # site. Right now I have only turned on XVideo for linux.
 if( ('HELIX_FEATURE_MINI_SITE' not in project.defines) and
-    (platform.name in ('linux2', 'linux-i386'))):
+    (platform.name in ('linux2', 'linux-i386')) or 
+     (id == 'sunos-5.10-i386-studio11')):
           project.sys_libraries.append('Xv')
 


From idefix at helixcommunity.org  Tue Jan  8 22:45:31 2008
From: idefix at helixcommunity.org (idefix@helixcommunity.org)
Date: Tue Jan  8 22:05:51 2008
Subject: [Video-cvs] site unix.pcf,1.4.6.2,1.4.6.3
Message-ID: 

Update of /cvsroot/video/site
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv21794

Modified Files:
      Tag: hxclient_1_5_0_cayenne
	unix.pcf 
Log Message:
Modified by: chris.wang@sun.com

Date: 01:07:2008
Project: Porting solaris
Overview:
In my previous patch, I added (id == 'sunos-5.10-i386-studio11')):
          project.sys_libraries.append('Xv')
to add Xv support to Solaris X86 platform. the id is not a correct expression, this should be written as sysinfo.id.



Files Modified:

Files Added:
video/site/unix.pcf

Platforms and Profiles Affected:
Solaris

Distribution Libraries Affected:
plugins/vidsite.so

Distribution library impact and planned action:
no

Platforms and Profiles Build Verified:
Have verified on solaris 11 x86 , with
SYSTEM_ID=sunos-5.10-i386-studio10, profile as player-all


BIF : reaplayer_gtk_current
Profile: helix_client_all_defines
Branch :  hxclient_1_5_0_cayenne
Copyright assignment:
1. My company (sun.com) submits this code under the terms
of a commercial contribution agreement with RealNetworks,
and I am authorized to contribute this code under said agreement.





Index: unix.pcf
===================================================================
RCS file: /cvsroot/video/site/unix.pcf,v
retrieving revision 1.4.6.2
retrieving revision 1.4.6.3
diff -u -d -r1.4.6.2 -r1.4.6.3
--- unix.pcf	4 Jan 2008 08:33:25 -0000	1.4.6.2
+++ unix.pcf	9 Jan 2008 06:45:26 -0000	1.4.6.3
@@ -62,6 +62,6 @@
 # site. Right now I have only turned on XVideo for linux.
 if( ('HELIX_FEATURE_MINI_SITE' not in project.defines) and
     (platform.name in ('linux2', 'linux-i386')) or 
-     (id == 'sunos-5.10-i386-studio11')):
+     (sysinfo.id == 'sunos-5.10-i386-studio11')):
           project.sys_libraries.append('Xv')
 


From jerrytansun at helixcommunity.org  Thu Jan 10 01:56:36 2008
From: jerrytansun at helixcommunity.org (jerrytansun@helixcommunity.org)
Date: Thu Jan 10 01:16:40 2008
Subject: [Video-cvs] site unix.pcf,1.3.10.1.6.3,1.3.10.1.6.4
Message-ID: 

Update of /cvsroot/video/site
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv4619/site

Modified Files:
      Tag: hxclient_1_4_4_neptunex
	unix.pcf 
Log Message:
turn on xvideo support on solaris sparc also


Index: unix.pcf
===================================================================
RCS file: /cvsroot/video/site/unix.pcf,v
retrieving revision 1.3.10.1.6.3
retrieving revision 1.3.10.1.6.4
diff -u -d -r1.3.10.1.6.3 -r1.3.10.1.6.4
--- unix.pcf	11 Jul 2006 06:10:59 -0000	1.3.10.1.6.3
+++ unix.pcf	10 Jan 2008 09:56:29 -0000	1.3.10.1.6.4
@@ -62,6 +62,7 @@
 # site. Right now I have only turned on XVideo for linux.
 if( ('HELIX_FEATURE_MINI_SITE' not in project.defines) and
     (platform.name in ('linux2', 'linux-i386')) or 
-     (sysinfo.id == 'sunos-5.10-i386-studio11')):
+     (sysinfo.id == 'sunos-5.10-i386-studio11') or
+     (sysinfo.id == 'sunos-5.10-sparc-studio11')):
           project.sys_libraries.append('Xv')
 


From kliu at helixcommunity.org  Thu Jan 24 12:10:42 2008
From: kliu at helixcommunity.org (kliu@helixcommunity.org)
Date: Thu Jan 24 11:27:12 2008
Subject: [Video-cvs] CVSROOT avail,1.152,1.153
Message-ID: 

Update of /cvsroot/video/CVSROOT
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv26284/CVSROOT

Modified Files:
	avail 
Log Message:
granting weian zbt write access for the video project

Index: avail
===================================================================
RCS file: /cvsroot/video/CVSROOT/avail,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- avail	14 Dec 2007 21:49:45 -0000	1.152
+++ avail	24 Jan 2008 20:10:39 -0000	1.153
@@ -1,4 +1,6 @@
 unavail
+avail|zbt
+avail|weian
 avail|andrew_kv
 avail|jeyarengasamy
 avail|sachinkundu


From ehyche at helixcommunity.org  Tue Jan 29 09:09:07 2008
From: ehyche at helixcommunity.org (ehyche@helixcommunity.org)
Date: Tue Jan 29 08:24:22 2008
Subject: [Video-cvs] site win.pcf,1.8,1.8.2.1
Message-ID: 

Update of /cvsroot/video/site
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv6859

Modified Files:
      Tag: hxclient_3_1_0_atlas
	win.pcf 
Log Message:
Fix Win32 build busters on 310Atlas

Index: win.pcf
===================================================================
RCS file: /cvsroot/video/site/win.pcf,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- win.pcf	6 Jul 2007 20:53:55 -0000	1.8
+++ win.pcf	29 Jan 2008 17:09:04 -0000	1.8.2.1
@@ -63,8 +63,8 @@
                            "gdi32.lib")
 
 if 'wince' not in sysinfo.family_list:
-	project.AddSystemPaths(os.path.join(GetSDKPath("dxsdk"), "lib", "x86"))
-	project.AddSystemPaths(os.path.join(GetSDKPath("dxsdk"), "lib"))
+	project.addLibpaths(os.path.join(GetSDKPath("dxsdk"), "lib", "x86"))
+	project.addLibpaths(os.path.join(GetSDKPath("dxsdk"), "lib"))
 	project.AddSystemLibraries("ddraw.lib")
 	project.AddIncludes(GetSDKPath("dxsdk") + '/include')
 


From kliu at helixcommunity.org  Wed Jan 30 10:21:04 2008
From: kliu at helixcommunity.org (kliu@helixcommunity.org)
Date: Wed Jan 30 09:36:05 2008
Subject: [Video-cvs] CVSROOT avail,1.153,1.154
Message-ID: 

Update of /cvsroot/video/CVSROOT
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv14291/CVSROOT

Modified Files:
	avail 
Log Message:
granting anuj_dhamija write access for the video project

Index: avail
===================================================================
RCS file: /cvsroot/video/CVSROOT/avail,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- avail	24 Jan 2008 20:10:39 -0000	1.153
+++ avail	30 Jan 2008 18:21:02 -0000	1.154
@@ -1,4 +1,5 @@
 unavail
+avail|anuj_dhamija
 avail|zbt
 avail|weian
 avail|andrew_kv


From ehyche at helixcommunity.org  Wed Jan 30 14:46:16 2008
From: ehyche at helixcommunity.org (ehyche@helixcommunity.org)
Date: Wed Jan 30 14:01:22 2008
Subject: [Video-cvs] site win.pcf,1.8,1.9
Message-ID: 

Update of /cvsroot/video/site
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv25150

Modified Files:
	win.pcf 
Log Message:
Fix build buster on Win32 when DirectX SDK path has spaces

Index: win.pcf
===================================================================
RCS file: /cvsroot/video/site/win.pcf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- win.pcf	6 Jul 2007 20:53:55 -0000	1.8
+++ win.pcf	30 Jan 2008 22:46:13 -0000	1.9
@@ -63,8 +63,8 @@
                            "gdi32.lib")
 
 if 'wince' not in sysinfo.family_list:
-	project.AddSystemPaths(os.path.join(GetSDKPath("dxsdk"), "lib", "x86"))
-	project.AddSystemPaths(os.path.join(GetSDKPath("dxsdk"), "lib"))
+	project.addLibpaths(os.path.join(GetSDKPath("dxsdk"), "lib", "x86"))
+	project.addLibpaths(os.path.join(GetSDKPath("dxsdk"), "lib"))
 	project.AddSystemLibraries("ddraw.lib")
 	project.AddIncludes(GetSDKPath("dxsdk") + '/include')
 


