[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-player-dev
Subject: Re: [Player-dev] CR: Porting RealPlayer to Atlas Linux
From: Daniel Yek <dyek () real ! com>
Date: 2008-05-30 16:29:30
Message-ID: 48402B6A.40708 () real ! com
[Download RAW message or body]
Hi Sushant,
Is this how it was agreed? If so, that is good.
I have a few more comment.
(Not really targeting the question to you alone.)
Should the following be bin directory instead? I don't know. I know that
there was a underused Bin directory before, but on the other hand, Linux
systems don't typically use a directory name with a capital letter. So,
I wonder if anybody cares if that is one way or the other or can come up
with good reasons for it?
player/installer/archive/make_tempdir:
@@ -125,8 +123,8 @@
if project.IsDefined('HELIX_FEATURE_REAL_BRANDING'):
inst.CopyModuleExes(
- ("player/app/gtk", "realplay" + bin_extension, "realplay" +
bin_extension),
- ("player/app/gtk", "realplay", "realplay"))
+ ("player/app/gtk", "realplay" + bin_extension, "Bin/realplay" +
bin_extension),
+ ("player/app/gtk", "realplay", "Bin/realplay"))
inst.CopyMultiFiles(
"../../../player/installer/common/postinst/profile.d",
"postinst/profile.d",
"realplay.sh",
Since you are not merging all from player HEAD branch, but updated the
BIF file with raac_dll change, could you merge this change from HEAD?
player/installer/archive/make_tempdir:
- # AAC support (XXXNH: only if raac.so built!)
- if os.path.exists(os.path.join(project.src_root_path,
- "datatype/aac/codec/helixaac",
- project.output_dir,
- "raac.so")):
- inst.CopyModuleDlls(
- ("datatype/aac/codec/helixaac", "raac", "Bin/raac"),
- ("datatype/aac/fileformat", "aacff", "Bin/aacff"))
+ # AAC
+ inst.CopySDKPathBuildDll("raac_dll", "codecs/raac")
+ inst.CopyModuleDlls(("datatype/aac/fileformat", "aacff",
"plugins/aacff"))
The rest of the changes and the update look good for 310Atlas.
--
Daniel Yek.
Sushant Garg wrote:
> Please find the comments inline, Marked with Sushant
>
> I have not merged all the changes from Head to 310Atlas because I want
> to minimize the changes to 310Atlas to get the player to work. If all
> the changes under player module to Head be rather merged to 310Atlas,
> I can do that as well.
>
> Thanks & Regards
> Sushant Garg
>
> ----- Original Message ----- From: "Daniel Yek" <dyek@real.com>
> To: "Sushant Garg" <sgarg@real.com>
> Cc: <player-dev@helixcommunity.org>
> Sent: Friday, May 30, 2008 4:20 AM
> Subject: Re: [Player-dev] CR: Porting RealPlayer to Atlas Linux
>
>
>> The biggest problems that I found were source files not merged from
>> HEAD branch.
>>
>> This is not merged from HEAD:
>>
>> hxclient_3_1_0_atlas.bif:
>> @@ -2492,9 +2909,6 @@
>> </includeplatforms>
>> <sdk name="helixaacsdk_aacplusdec_lib"
>> path="datatype_dist/aac/codec/helixaac[aacplusdec]"/>
>> <sdk name="helixaacsdk_decoder_lib"
>> path="datatype_dist/aac/codec/helixaac[raacdeclib]"/>
>> +
>> + <!-- This raac_dll path is used by player installer to locate
>> the raac.so. -->
>> + <sdk name="raac_dll" path="datatype/aac/codec/helixaac[raac]"/>
>> </module>
>> <!-- DATATYPE/AAC/CODEC/HELIXAAC -->
>>
>> This is needed because there are several ways to build the AAC DSOs
>> and their paths are different.
>>
> [Sushant]: Code is added in 310Atlas. Please find the attached diff.txt.
>> player/common/gtk/hxmetadatareader.cpp
>> @@ -713,7 +709,7 @@
>> hx_metadata_reader_terminate (HXMetadataReader* reader,
>> gboolean succeeded)
>> {
>> - g_signal_emit(G_OBJECT(reader), signals[READ_DONE_SIGNAL], 0,
>> succeeded);
>> + g_signal_emit(G_OBJECT(reader), signals[READ_DONE_SIGNAL],
>> NULL, succeeded);
>> }
>> static void
>>
>>
>> Can you merge this change to 310Atlas too?
> [Sushant]: Sorry it was done mistakenly, I have merged above code in
> 310Atlas, please find the attached diff.txt.
>
>> Files Not Merged From HEAD:
>> player/common/gtk/hxutil.cpp
> [Sushant]: This change is done to fix context issue, not merged from
> HEAD.
>
>> player/app/gtk/hxstatuspositionslider.cpp
> [Sushant]: Merged from HEAD. Merged code to fix build busters only.
>
>> player/app/gtk/superbufhscale.h
> [Sushant]: Merged from HEAD. Merged code to fix build busters only.
>
>> player/app/gtk/superbufhscale.c
> [Sushant]: Merged from HEAD. Merged code to fix build busters only.
>> This file has been renamed to .cpp.
>
>> player/installer/archive/make_tempdir
> [Sushant]: Not merged from HEAD. Changes done to copy all
> so's/batch/exe files to the bin folder.
>
>> player/app/gtk/Umakefil
> [Sushant]: Not merged from HEAD. Add code to fix build buster only.
>>
>> The following files are fine:
>> player/hxclientkit/pub/HXClientCFuncs.h
>> player/hxclientkit/src/HXClientCFuncs.cpp
>> player/hxclientkit/src/CHXClientPlayer.cpp
>>
>>
>> Could you explain how merging was done?
>>
>> Thanks.
>>
>> --
>> Daniel Yek.
>>
>>
>>
>> Daniel Yek wrote:
>>> Hi Sushant,
>>>
>>> It is best to generate the diff. from the source root path:
>>> cvs diff -uw player/hxclientkit/pub/HXClientCFuncs.h
>>> player/installer/archive/make_tempdir, etc.
>>>
>>> Doing this will make it easier to apply the patches from the source
>>> root path, because patch only looks at the OLD, NEW, and INDEX file
>>> names and not considering the RCS path at all.
>>>
>>> (I was guilty of not generating patches from source root path for a
>>> long time too, until I realized that the problem and the solution.)
>>>
>>> One more comment inline (for now)...
>>>
>>> Sushant Garg wrote:
>>>>
>>>> *Synopsis:*
>>>>
>>>> Multiple changes for porting RealPlayer based on Atlas_310 Linux
>>>>
>>>>
>>>> *Overview:*
>>>>
>>>> Two new bif files added.
>>>>
>>>> Document folder added .
>>>>
>>>> Merge player code from HEAD and hxclientkit from Cayenne.
>>>>
>>>
>>> I noticed that after applying the patch for
>>> player/installer/archive/make_tempdir, this file is still missing a
>>> lot of patches from HEAD.
>>>
>>> Did you forget to merge some files from HEAD? Or can you elaborate
>>> how you generated the patch for this file?
>>>
>>> Thanks.
>>>
> Index: hxclient_3_1_0_atlas.bif
> ===================================================================
> RCS file: /cvsroot/client/build/BIF/hxclient_3_1_0_atlas.bif,v
> retrieving revision 1.51
> diff -u -r1.51 hxclient_3_1_0_atlas.bif
> --- hxclient_3_1_0_atlas.bif 26 May 2008 05:44:33 -0000 1.51
> +++ hxclient_3_1_0_atlas.bif 30 May 2008 09:39:20 -0000
> @@ -671,7 +671,8 @@
> common_log_logutil
> common_runtime
> common_lang_xml
> - client_common_container + client_common_container
> + client_common_system
> protocol_common_util
> protocol_http
> protocol_transport_rtp
> @@ -2908,6 +2909,8 @@
> </includeplatforms>
> <sdk name="helixaacsdk_aacplusdec_lib"
> path="datatype_dist/aac/codec/helixaac[aacplusdec]"/>
> <sdk name="helixaacsdk_decoder_lib"
> path="datatype_dist/aac/codec/helixaac[raacdeclib]"/>
> + <!-- This raac_dll path is used by player installer to locate
> the raac.so. -->
> + <sdk name="raac_dll" path="datatype/aac/codec/helixaac[raac]"/>
> </module>
>
> <!-- DATATYPE/AAC/CODEC/HELIXAAC -->
> @@ -7921,6 +7924,7 @@
> datatype_dist_flash_common
> datatype_dist_flash_fileformat
> </dependlist>
> + <sdk name="swfformat_dll"
> path="datatype/flash/fileformat[swfformat]"/>
>
> </module>
>
> @@ -7961,6 +7965,7 @@
> datatype_dist_flash_common
> datatype_dist_flash_renderer
> </dependlist>
> + <sdk name="swfrender_dll"
> path="datatype/flash/renderer[swfrender]"/>
>
> </module>
> @@ -15079,6 +15084,7 @@
> <dependlist>
> common_include client_include
> common_system common_runtime common_container
> + common_fileio
> </dependlist>
> </module>
>
> Index: hxmetadatareader.cpp
> ===================================================================
> RCS file: /cvsroot/player/common/gtk/hxmetadatareader.cpp,v
> retrieving revision 1.10
> diff -u -r1.10 hxmetadatareader.cpp
> --- hxmetadatareader.cpp 6 Jul 2007 20:49:23 -0000 1.10
> +++ hxmetadatareader.cpp 30 May 2008 09:42:05 -0000
> @@ -53,7 +53,8 @@
> #include "hxcom.h"
> #include "hxwintyp.h"
> #include "unkimp.h"
> -#include "hxsmartptr.h"
> +#define HELIX_CONFIG_MACROBASED_SMARTPOINTERS 1
> +#include "hxcomptr.h"
> #include "hxplugn.h"
> #include "hxcore.h"
> #include "ihxpckts.h"
> @@ -68,15 +69,10 @@
> class CHXSourceInputMetadataReader;
>
> /* Declare smart pointers (do we have a template-based smart pointer
> class?) */
> -HX_SMART_POINTER_INLINE(SPIHXPlugin2Handler, IHXPlugin2Handler);
> -HX_SMART_POINTER_INLINE(SPIHXCommonClassFactory, IHXCommonClassFactory);
> HX_SMART_POINTER_INLINE(SPIHXDataTypeDriverResponse,
> IHXDataTypeDriverResponse);
> HX_SMART_POINTER_INLINE(SPIHXSetClientContext, IHXSetClientContext);
> HX_SMART_POINTER_INLINE(SPIHXDataTypeDriver2, IHXDataTypeDriver2);
> HX_SMART_POINTER_INLINE(SPIHXSourceInput, IHXSourceInput);
> -HX_SMART_POINTER_INLINE(SPIHXValues, IHXValues);
> -HX_SMART_POINTER_INLINE(SPIHXBuffer, IHXBuffer);
> -HX_SMART_POINTER_INLINE(SPIHXPlugin, IHXPlugin);
>
> enum {
> READ_DONE_SIGNAL,
_______________________________________________
Player-dev mailing list
Player-dev@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/player-dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic