SOURCES: helixplayer-system-libs.patch - updated for 1.0.5 [please...
paszczus
paszczus at pld-linux.org
Tue Oct 18 00:06:00 CEST 2005
Author: paszczus Date: Mon Oct 17 22:06:00 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.0.5 [please review]
---- Files affected:
SOURCES:
helixplayer-system-libs.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/helixplayer-system-libs.patch
diff -u SOURCES/helixplayer-system-libs.patch:1.3 SOURCES/helixplayer-system-libs.patch:1.4
--- SOURCES/helixplayer-system-libs.patch:1.3 Fri Mar 4 21:52:20 2005
+++ SOURCES/helixplayer-system-libs.patch Tue Oct 18 00:05:54 2005
@@ -1,42 +1,21 @@
---- hxplay-1.0.1/datatype/ogg/fileformat/unix.pcf.orig 2003-09-10 22:21:27.000000000 +0200
-+++ hxplay-1.0.1/datatype/ogg/fileformat/unix.pcf 2004-11-18 01:24:56.178668520 +0100
-@@ -1,3 +1,3 @@
-
--project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libogg.a"))
--project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libvorbis.a"))
-+project.AddSystemLibraries("ogg")
-+project.AddSystemLibraries("vorbis")
---- hxplay-1.0.1/datatype/theora/renderer/linux2.pcf.orig 2004-07-09 20:31:54.000000000 +0200
-+++ hxplay-1.0.1/datatype/theora/renderer/linux2.pcf 2004-11-18 01:27:21.856522120 +0100
-@@ -51,9 +51,6 @@
-
- UmakefileVersion(2,1)
-
--oggLibPath = os.path.join(GetSDKPath("oggvorbissdk"), "lib")
-+project.AddSystemLibraries("ogg", "theora")
-
--project.AddLibraries(os.path.join(oggLibPath, "libogg.a"),
-- os.path.join(oggLibPath, "libtheora.a"))
--
--project.AddSystemLibraries("pthread")
-\ Brak znaku nowej linii na końcu pliku
-+project.AddSystemLibraries("pthread")
---- hxplay-1.0.1/datatype/vorbis/renderer/unix.pcf.orig 2003-09-10 22:20:58.000000000 +0200
-+++ hxplay-1.0.1/datatype/vorbis/renderer/unix.pcf 2004-11-18 01:27:04.108220272 +0100
-@@ -1,3 +1,3 @@
-
--project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libogg.a"))
--project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libvorbis.a"))
-+project.AddSystemLibraries("ogg")
-+project.AddSystemLibraries("vorbis")
---- hxplay-1.0.3/build/build/BIF/build.bif.orig 2005-03-02 22:25:07.000000000 +0100
-+++ hxplay-1.0.3/build/build/BIF/build.bif 2005-03-04 21:17:25.386628136 +0100
+diff -ur hxplay-1.0.5/build/build/BIF/build.bif hxplay-1.0.5.new/build/build/BIF/build.bif
+--- hxplay-1.0.5/build/build/BIF/build.bif 2005-05-14 10:03:22.000000000 +0000
++++ hxplay-1.0.5.new/build/build/BIF/build.bif 2005-10-17 22:02:53.473308744 +0000
+@@ -27,7 +27,7 @@
+ file name with full path to the faad2 library binary.
+ Note that these paths will be platform-specific.
+ See BUILD_ROOT/build/doc/buildrc.html for more
+- information about .buildrc files and SetSDKPath().
++ information about .buildrc files and SetSDKPath().
+ </sdk>
+ <sdk name="faad2_lib" path="c:/faad2/faad2.lib"/>
+
@@ -895,7 +895,7 @@
<dependlist>
common_include common_container common_util common_system common_fileio
- common_netio common_lang_xml common_import_zlib common_auth_authmgr common_auth_rn5auth
-+ common_netio common_lang_xml common_auth_authmgr common_auth_rn5auth
++ common_netio common_lang_xml common_auth_authmgr common_auth_rn5auth
</dependlist>
</module>
@@ -51,7 +30,7 @@
- <!-- COMMON_IMPORT_BZIP2 -->
- <module id="common_import_bzip2" name="common/import/bzip2" group="core">
-- <location file="/home/build/build/bif-cvs/helix/2005%2f03%2f01%2015%253a18%253a21/client/build/BIF/hxclient_1_4_3_neptunex.bif" line="0"/>
+- <location file="/home/build/build/bif-cvs/helix/2005%2f05%2f13%2020%253a58%253a33/client/build/BIF/hxclient_1_4_3_neptunex.bif" line="0"/>
- <cvstag id="hxclient_1_4_3_neptunex" type="branch"/>
-
-
@@ -63,14 +42,14 @@
-
<!-- COMMON_IMPORT_EXPAT -->
<module id="common_import_expat" name="common/import/expat" group="core">
- <location file="/home/build/build/bif-cvs/helix/2005%2f03%2f01%2015%253a18%253a21/client/build/BIF/hxclient_1_4_3_neptunex.bif" line="0"/>
+ <location file="/home/build/build/bif-cvs/helix/2005%2f05%2f13%2020%253a58%253a33/client/build/BIF/hxclient_1_4_3_neptunex.bif" line="0"/>
@@ -1128,18 +1116,6 @@
</module>
- <!-- COMMON_IMPORT_ZLIB -->
- <module id="common_import_zlib" name="common/import/zlib" group="core">
-- <location file="/home/build/build/bif-cvs/helix/2005%2f03%2f01%2015%253a18%253a21/client/build/BIF/hxclient_1_4_3_neptunex.bif" line="0"/>
+- <location file="/home/build/build/bif-cvs/helix/2005%2f05%2f13%2020%253a58%253a33/client/build/BIF/hxclient_1_4_3_neptunex.bif" line="0"/>
- <cvstag id="hxclient_1_4_3_neptunex" type="branch"/>
-
-
@@ -82,25 +61,26 @@
-
<!-- COMMON_INCLUDE -->
<module id="common_include" name="common/include" group="core">
- <location file="/home/build/build/bif-cvs/helix/2005%2f03%2f01%2015%253a18%253a21/client/build/BIF/hxclient_1_4_3_neptunex.bif" line="0"/>
+ <location file="/home/build/build/bif-cvs/helix/2005%2f05%2f13%2020%253a58%253a33/client/build/BIF/hxclient_1_4_3_neptunex.bif" line="0"/>
@@ -2331,7 +2307,7 @@
<dependlist>
common_runtime common_dbgtool common_util common_system common_container
- common_fileio common_netio common_import_zlib protocol_http protocol_common_util
-+ common_fileio common_netio protocol_http protocol_common_util
++ common_fileio common_netio protocol_http protocol_common_util
datatype_rm_common datatype_common_util datatype_image_common datatype_image_jpg_import_jpeg-6b datatype_dist_flash_common
datatype_dist_flash_renderer
</dependlist>
-@@ -2378,9 +2354,9 @@
+@@ -2377,10 +2353,10 @@
+ </excludeprofiles>
<dependlist>
- common_runtime common_util common_container common_dbgtool common_system
-- common_lang_xml common_import_zlib datatype_common_baserend datatype_common_util datatype_image_common
-+ common_lang_xml datatype_common_baserend datatype_common_util datatype_image_common
+- common_runtime common_util common_container common_dbgtool common_system
++ common_lang_xml datatype_common_baserend datatype_common_util datatype_image_common
+ common_lang_xml common_import_zlib datatype_common_baserend datatype_common_util datatype_image_common
datatype_image_jpg_import_jpeg-6b datatype_image_jpg_common datatype_image_jpg_fileformat datatype_image_jpg_renderer datatype_image_gif_common
- datatype_image_gif_fileformat datatype_image_gif_renderer datatype_image_png_import_libpng datatype_image_png_common datatype_image_png_fileformat
-+ datatype_image_gif_fileformat datatype_image_gif_renderer datatype_image_png_common datatype_image_png_fileformat
++ datatype_image_gif_fileformat datatype_image_gif_renderer datatype_image_png_common datatype_image_png_fileformat
datatype_image_png_renderer datatype_image_realpix_codec_jpg datatype_image_realpix_codec_gif datatype_image_realpix_codec_png datatype_image_realpix_fileformat
datatype_image_realpix_renderer datatype_image_wbmp_common datatype_image_wbmp_fileformat datatype_image_wbmp_renderer
</dependlist>
@@ -109,7 +89,7 @@
<source_dependlist>
common_include common_container common_dbgtool common_util common_runtime
- common_import_zlib common_lang_xml client_include client_resource datatype_common_util
-+ common_lang_xml client_include client_resource datatype_common_util
++ common_lang_xml client_include client_resource datatype_common_util
</source_dependlist>
</module>
@@ -118,7 +98,7 @@
<dependlist>
common_runtime common_util common_dbgtool common_container common_system
- common_import_zlib datatype_common_util datatype_image_common datatype_image_gif_common
-+ datatype_common_util datatype_image_common datatype_image_gif_common
++ datatype_common_util datatype_image_common datatype_image_gif_common
</dependlist>
<source_dependlist>
common_include client_include
@@ -127,7 +107,7 @@
<dependlist>
- datatype_image_png_import_libpng datatype_image_png_common datatype_image_png_fileformat datatype_image_png_renderer
-+ datatype_image_png_common datatype_image_png_fileformat datatype_image_png_renderer
++ datatype_image_png_common datatype_image_png_fileformat datatype_image_png_renderer
</dependlist>
</module>
@@ -137,7 +117,7 @@
<source_dependlist>
- common_include common_util common_dbgtool client_include common_import_zlib
- datatype_image_png_import_libpng
-+ common_include common_util common_dbgtool client_include
++ common_include common_util common_dbgtool client_include
</source_dependlist>
</module>
@@ -146,7 +126,7 @@
<dependlist>
common_runtime common_system common_util common_container common_dbgtool
- common_import_zlib datatype_image_common datatype_image_png_common datatype_image_png_import_libpng
-+ datatype_image_common datatype_image_png_common
++ datatype_image_common datatype_image_png_common
</dependlist>
<source_dependlist>
common_include client_resource
@@ -155,7 +135,7 @@
- <!-- DATATYPE_IMAGE_PNG_IMPORT_LIBPNG -->
- <module id="datatype_image_png_import_libpng" name="datatype/image/png/import/libpng" group="core">
-- <location file="/home/build/build/bif-cvs/helix/2005%2f03%2f01%2015%253a18%253a21/client/build/BIF/hxclient_1_4_3_neptunex.bif" line="0"/>
+- <location file="/home/build/build/bif-cvs/helix/2005%2f05%2f13%2020%253a58%253a33/client/build/BIF/hxclient_1_4_3_neptunex.bif" line="0"/>
- <cvstag id="hxclient_1_4_3_neptunex" type="branch"/>
-
-
@@ -170,52 +150,86 @@
-
<!-- DATATYPE_IMAGE_PNG_RENDERER -->
<module id="datatype_image_png_renderer" name="datatype/image/png/renderer" group="core">
- <location file="/home/build/build/bif-cvs/helix/2005%2f03%2f01%2015%253a18%253a21/client/build/BIF/hxclient_1_4_3_neptunex.bif" line="0"/>
-@@ -2818,8 +2778,8 @@
+ <location file="/home/build/build/bif-cvs/helix/2005%2f05%2f13%2020%253a58%253a33/client/build/BIF/hxclient_1_4_3_neptunex.bif" line="0"/>
+@@ -2818,8 +2778,7 @@
</excludeprofiles>
<dependlist>
- common_runtime common_util common_container common_dbgtool common_import_zlib
- datatype_common_util datatype_common_baserend datatype_image_common datatype_image_png_common datatype_image_png_import_libpng
-+ common_runtime common_util common_container common_dbgtool
-+ datatype_common_util datatype_common_baserend datatype_image_common datatype_image_png_common
++ common_dbgtool datatype_common_util datatype_image_common datatype_image_png_common
</dependlist>
<source_dependlist>
common_include client_include common_system
-@@ -2921,8 +2881,7 @@
+@@ -4934,7 +4893,7 @@
+ developers should have the following line in their .buildrc file:
+ SetSDKPath("dxsdk", "/path/to/DirectXSDK")
+ See BUILD_ROOT/build/doc/buildrc.html for more
+- information about .buildrc files and SetSDKPath().
++ information about .buildrc files and SetSDKPath().
+ </sdk>
- <dependlist>
- common_runtime common_system common_system common_util common_container
-- common_dbgtool common_import_zlib datatype_common_util datatype_image_common datatype_image_png_common
-- datatype_image_png_import_libpng
-+ common_dbgtool datatype_common_util datatype_image_common datatype_image_png_common
- </dependlist>
- <source_dependlist>
- common_include client_include
+ <attribute id="no_build"/>
@@ -4989,7 +4948,7 @@
<dependlist>
common_container common_util common_system common_runtime common_dbgtool
- common_fileio common_import_zlib protocol_http protocol_common_util filesystem_data
-+ common_fileio protocol_http protocol_common_util filesystem_data
++ common_fileio protocol_http protocol_common_util filesystem_data
</dependlist>
<source_dependlist>
common_include
+@@ -5072,7 +5031,7 @@
+ developers should have the following line in their .buildrc file:
+ SetSDKPath("gapi", "/path/to/GAPISDK")
+ See BUILD_ROOT/build/doc/buildrc.html for more
+- information about .buildrc files and SetSDKPath().
++ information about .buildrc files and SetSDKPath().
+ </sdk>
+
+ <attribute id="no_build"/>
+@@ -5095,7 +5054,7 @@
+ developers should have the following line in their .buildrc file:
+ SetSDKPath("gtk2sdk", "/path/to/gtk2sdk")
+ See BUILD_ROOT/build/doc/buildrc.html for more
+- information about .buildrc files and SetSDKPath().
++ information about .buildrc files and SetSDKPath().
+ </sdk>
+
+ <attribute id="no_build"/>
@@ -5162,7 +5121,7 @@
<dependlist>
- installer_common_util common_import_bzip2
-+ installer_common_util
++ installer_common_util
</dependlist>
<source_dependlist>
common_runtime common_system common_container common_dbgtool common_util
+@@ -5209,7 +5168,7 @@
+ SetSDKPath("mspsdk_81_include", "/path/to/ms_81_sdk/include")
+ SetSDKPath("mspsdk_81_lib", "/path/to/ms_81_sdk/lib")
+ See BUILD_ROOT/build/doc/buildrc.html for more
+- information about .buildrc files and SetSDKPath().
++ information about .buildrc files and SetSDKPath().
+ </sdk>
+
+ <attribute id="no_build"/>
+@@ -5244,7 +5203,7 @@
+ developers should have the following line in their .buildrc file:
+ SetSDKPath("oggvorbissdk", "/path/to/oggvorbisSDK")
+ See BUILD_ROOT/build/doc/buildrc.html for more
+- information about .buildrc files and SetSDKPath().
++ information about .buildrc files and SetSDKPath().
+ </sdk>
+
+ <attribute id="no_build"/>
@@ -6062,7 +6021,7 @@
</dependlist>
<source_dependlist>
common_include common_runtime common_util common_netio common_import_stlport
- common_import_zlib client_core client_common_container client_common_system client_common_netio
-+ client_core client_common_container client_common_system client_common_netio
++ client_core client_common_container client_common_system client_common_netio
client_netwksvc client_common_netio server_include server_protocol_sap server_engine_context
server_common_util server_common_netio protocol_sdp
</source_dependlist>
@@ -224,16 +238,25 @@
<dependlist>
common_dbgtool common_container common_system common_util common_netio
- common_import_zlib common_runtime client_common_container client_common_system client_netwksvc
-+ common_runtime client_common_container client_common_system client_netwksvc
++ common_runtime client_common_container client_common_system client_netwksvc
client_common_netio protocol_common_util protocol_http producersdk_common_util producersdk_common_logutil
producersdk_common_system producersdk_plugins_util producersdk_common_context
</dependlist>
+@@ -7588,7 +7547,7 @@
+ SetSDKPath("qt5sdk_include", "/path/to/QuickTime5SDK/CIncludes")
+ SetSDKPath("qt5sdk_lib", "/path/to/QuickTime5SDK/Libraries")
+ See BUILD_ROOT/build/doc/buildrc.html for more
+- information about .buildrc files and SetSDKPath().
++ information about .buildrc files and SetSDKPath().
+ </sdk>
+
+ <attribute id="no_build"/>
@@ -8056,7 +8015,7 @@
server_common_util server_common_netio server_common_struct server_protocol_http server_qos_core
server_qos_session server_qos_transport server_capex protocol_http protocol_rtsp
protocol_sdp protocol_transport_common_system protocol_transport_rtp protocol_common_util common_lang_xml
- common_dbgtool common_fileio common_import_zlib common_netio common_system
-+ common_dbgtool common_fileio common_netio common_system
++ common_dbgtool common_fileio common_netio common_system
common_container common_util common_runtime
</dependlist>
<source_dependlist>
@@ -242,7 +265,7 @@
server_qos_transport server_capex protocol_http protocol_rtsp protocol_sdp
protocol_transport_common_system protocol_transport_rtp protocol_common_util common_lang_xml common_dbgtool
- common_fileio common_import_zlib common_netio common_system common_container
-+ common_fileio common_netio common_system common_container
++ common_fileio common_netio common_system common_container
common_util common_runtime
</dependlist>
<source_dependlist>
@@ -251,7 +274,7 @@
server_common_struct server_protocol_http server_qos_core server_qos_transport server_qos_session
protocol_http protocol_rtsp protocol_sdp protocol_transport_common_system protocol_transport_rtp
- protocol_common_util common_lang_xml common_dbgtool common_fileio common_import_zlib
-+ protocol_common_util common_lang_xml common_dbgtool common_fileio
++ protocol_common_util common_lang_xml common_dbgtool common_fileio
common_netio common_system common_container common_util common_runtime
</dependlist>
<source_dependlist>
@@ -260,7 +283,7 @@
<source_dependlist>
common_include common_system common_util common_container common_dbgtool
- common_runtime common_import_bzip2 server_installer_common_hxarchive
-+ common_runtime server_installer_common_hxarchive
++ common_runtime server_installer_common_hxarchive
</source_dependlist>
</module>
@@ -269,7 +292,7 @@
<source_dependlist>
common_include common_runtime common_container common_util common_netio
- common_dbgtool common_import_zlib common_system protocol_sdp server_common_struct
-+ common_dbgtool common_system protocol_sdp server_common_struct
++ common_dbgtool common_system protocol_sdp server_common_struct
server_common_util server_common_netio server_include
</source_dependlist>
</module>
@@ -278,48 +301,65 @@
<dependlist>
server_installer_common_util server_installer_common_hxarchive server_installer_common_uninstall server_installer_common common_runtime
- common_dbgtool common_container common_system common_util common_import_bzip2
-+ common_dbgtool common_container common_system common_util
++ common_dbgtool common_container common_system common_util
</dependlist>
</module>
---- hxplay-1.0.1/datatype/image/png/renderer/umakedll.orig 2004-07-09 03:52:28.000000000 +0200
-+++ hxplay-1.0.1/datatype/image/png/renderer/umakedll 2004-11-21 00:43:28.853527360 +0100
-@@ -58,15 +58,15 @@
- "common/util[utillib]",
- "common/container[contlib]",
- "common/dbgtool[debuglib]",
-- "common/import/zlib[zlib]",
- "common/system[syslib]",
- "datatype/common/baserend[baserend]",
- "datatype/common/util[dtutillib]",
- "datatype/image/common[imgcomlib]",
- "datatype/image/png/common[pngcomlib]",
-- "datatype/image/png/import/libpng[libpng]",
- "datatype/image/png/renderer[pngrlib]")
+@@ -9560,7 +9519,7 @@
+ developers should have the following line in their .buildrc file:
+ SetSDKPath("wtlce", "/path/to/wtlcesdk")
+ See BUILD_ROOT/build/doc/buildrc.html for more
+- information about .buildrc files and SetSDKPath().
++ information about .buildrc files and SetSDKPath().
+ </sdk>
+
+ <attribute id="no_build"/>
+diff -ur hxplay-1.0.5/datatype/image/png/common/pxpngdec.cpp hxplay-1.0.5.new/datatype/image/png/common/pxpngdec.cpp
+--- hxplay-1.0.5/datatype/image/png/common/pxpngdec.cpp 2004-07-09 01:52:12.000000000 +0000
++++ hxplay-1.0.5.new/datatype/image/png/common/pxpngdec.cpp 2005-10-17 22:04:35.592784224 +0000
+@@ -63,6 +63,8 @@
+ // pxcomlib
-+project.AddSystemLibraries("png", "z")
-+
- project.AddSources("pngrdll.cpp")
+ // libpng
++// INTERNAL needed for PNG_INVERT_ALPHA
++#define PNG_INTERNAL
+ #include "png.h"
- project.ExportFunction("RMACreateInstance",
---- hxplay-1.0.1/datatype/image/png/renderer/umakelib.orig 2004-07-09 03:52:28.000000000 +0200
-+++ hxplay-1.0.1/datatype/image/png/renderer/umakelib 2004-11-21 00:43:51.108144144 +0100
-@@ -58,12 +58,10 @@
- "common/dbgtool/pub",
- "common/util/pub",
+ // pxpnglib
+@@ -77,6 +79,15 @@
+ #include "errdbg.h"
+ #include "hxperf.h"
+
++/* from hacked libpng 1.2.5 included in Helix sources */
++/* extern PNG_EXPORT(void,png_clear_invert_alpha) PNGARG((png_structp png_ptr)); */
++static void PNGAPI
++png_clear_invert_alpha(png_structp png_ptr)
++{
++ png_debug(1, "in png_clear_invert_alpha\n");
++ png_ptr->transformations &= ~PNG_INVERT_ALPHA;
++}
++
+ PXPNGDecode::PXPNGDecode()
+ {
+ m_lRefCount = 0;
+diff -ur hxplay-1.0.5/datatype/image/png/common/Umakefil hxplay-1.0.5.new/datatype/image/png/common/Umakefil
+--- hxplay-1.0.5/datatype/image/png/common/Umakefil 2004-07-09 01:52:11.000000000 +0000
++++ hxplay-1.0.5.new/datatype/image/png/common/Umakefil 2005-10-17 22:04:35.590784528 +0000
+@@ -57,10 +57,7 @@
+ "common/container/pub",
+ "common/runtime/pub",
"common/system/pub",
-- "common/import/zlib/pub",
- "datatype/common/util/pub",
- "datatype/common/baserend/pub",
- "datatype/image/common/pub",
-- "datatype/image/png/common/pub",
-- "datatype/image/png/import/libpng")
-+ "datatype/image/png/common/pub")
+- "client/include",
+- "common/import/zlib/pub")
+-
+-project.AddIncludes("../import/libpng")
++ "client/include")
- project.AddSources("pxpngrnd.cpp")
+ project.AddSources("pxpngdec.cpp")
---- hxplay-1.0.1/datatype/image/png/fileformat/umakedll.orig 2004-07-09 03:52:41.000000000 +0200
-+++ hxplay-1.0.1/datatype/image/png/fileformat/umakedll 2004-11-21 00:41:16.849595008 +0100
+diff -ur hxplay-1.0.5/datatype/image/png/fileformat/umakedll hxplay-1.0.5.new/datatype/image/png/fileformat/umakedll
+--- hxplay-1.0.5/datatype/image/png/fileformat/umakedll 2004-07-09 01:52:41.000000000 +0000
++++ hxplay-1.0.5.new/datatype/image/png/fileformat/umakedll 2005-10-17 22:04:35.589784680 +0000
@@ -55,14 +55,14 @@
project.AddModuleLibraries("datatype/image/png/fileformat[pngflib]",
@@ -338,8 +378,9 @@
project.AddSources("pngfdll.cpp")
---- hxplay-1.0.1/datatype/image/png/fileformat/umakelib.orig 2004-07-09 03:52:41.000000000 +0200
-+++ hxplay-1.0.1/datatype/image/png/fileformat/umakelib 2004-11-21 00:41:46.779045040 +0100
+diff -ur hxplay-1.0.5/datatype/image/png/fileformat/umakelib hxplay-1.0.5.new/datatype/image/png/fileformat/umakelib
+--- hxplay-1.0.5/datatype/image/png/fileformat/umakelib 2004-07-09 01:52:41.000000000 +0000
++++ hxplay-1.0.5.new/datatype/image/png/fileformat/umakelib 2005-10-17 22:04:35.590784528 +0000
@@ -57,12 +57,10 @@
"common/dbgtool/pub",
"common/util/pub",
@@ -354,49 +395,47 @@
project.AddSources("pxpngff.cpp")
---- hxplay-1.0.1/datatype/image/png/common/Umakefil.orig 2004-07-09 03:52:11.000000000 +0200
-+++ hxplay-1.0.1/datatype/image/png/common/Umakefil 2004-11-21 00:05:20.788366136 +0100
-@@ -57,10 +57,7 @@
- "common/container/pub",
- "common/runtime/pub",
- "common/system/pub",
-- "client/include",
-- "common/import/zlib/pub")
--
--project.AddIncludes("../import/libpng")
-+ "client/include")
-
- project.AddSources("pxpngdec.cpp")
+diff -ur hxplay-1.0.5/datatype/image/png/renderer/umakedll hxplay-1.0.5.new/datatype/image/png/renderer/umakedll
+--- hxplay-1.0.5/datatype/image/png/renderer/umakedll 2004-07-09 01:52:28.000000000 +0000
++++ hxplay-1.0.5.new/datatype/image/png/renderer/umakedll 2005-10-17 22:04:35.587784984 +0000
+@@ -58,15 +58,15 @@
+ "common/util[utillib]",
+ "common/container[contlib]",
+ "common/dbgtool[debuglib]",
+- "common/import/zlib[zlib]",
+ "common/system[syslib]",
+ "datatype/common/baserend[baserend]",
+ "datatype/common/util[dtutillib]",
+ "datatype/image/common[imgcomlib]",
+ "datatype/image/png/common[pngcomlib]",
+- "datatype/image/png/import/libpng[libpng]",
+ "datatype/image/png/renderer[pngrlib]")
---- hxplay-1.0.1/datatype/image/png/common/pxpngdec.cpp.orig 2004-07-09 03:52:12.000000000 +0200
-+++ hxplay-1.0.1/datatype/image/png/common/pxpngdec.cpp 2004-11-21 00:38:28.662163384 +0100
-@@ -63,6 +63,8 @@
- // pxcomlib
++project.AddSystemLibraries("png", "z")
++
+ project.AddSources("pngrdll.cpp")
- // libpng
-+// INTERNAL needed for PNG_INVERT_ALPHA
-+#define PNG_INTERNAL
- #include "png.h"
+ project.ExportFunction("RMACreateInstance",
+diff -ur hxplay-1.0.5/datatype/image/png/renderer/umakelib hxplay-1.0.5.new/datatype/image/png/renderer/umakelib
+--- hxplay-1.0.5/datatype/image/png/renderer/umakelib 2004-07-09 01:52:28.000000000 +0000
++++ hxplay-1.0.5.new/datatype/image/png/renderer/umakelib 2005-10-17 22:04:35.588784832 +0000
+@@ -58,12 +58,10 @@
+ "common/dbgtool/pub",
+ "common/util/pub",
+ "common/system/pub",
+- "common/import/zlib/pub",
+ "datatype/common/util/pub",
+ "datatype/common/baserend/pub",
+ "datatype/image/common/pub",
+- "datatype/image/png/common/pub",
+- "datatype/image/png/import/libpng")
++ "datatype/image/png/common/pub")
- // pxpnglib
-@@ -77,6 +79,15 @@
- #include "errdbg.h"
- #include "hxperf.h"
+ project.AddSources("pxpngrnd.cpp")
-+/* from hacked libpng 1.2.5 included in Helix sources */
-+/* extern PNG_EXPORT(void,png_clear_invert_alpha) PNGARG((png_structp png_ptr)); */
-+static void PNGAPI
-+png_clear_invert_alpha(png_structp png_ptr)
-+{
-+ png_debug(1, "in png_clear_invert_alpha\n");
-+ png_ptr->transformations &= ~PNG_INVERT_ALPHA;
-+}
-+
- PXPNGDecode::PXPNGDecode()
- {
- m_lRefCount = 0;
---- hxplay-1.0.1/datatype/image/realpix/codec/png/umakedll.orig 2004-07-09 03:51:04.000000000 +0200
-+++ hxplay-1.0.1/datatype/image/realpix/codec/png/umakedll 2004-11-21 00:50:03.516529464 +0100
+diff -ur hxplay-1.0.5/datatype/image/realpix/codec/png/umakedll hxplay-1.0.5.new/datatype/image/realpix/codec/png/umakedll
+--- hxplay-1.0.5/datatype/image/realpix/codec/png/umakedll 2004-07-09 01:51:04.000000000 +0000
++++ hxplay-1.0.5.new/datatype/image/realpix/codec/png/umakedll 2005-10-17 22:04:35.593784072 +0000
@@ -55,15 +55,15 @@
project.AddModuleLibraries("datatype/image/realpix/codec/png[rppnglib]",
@@ -416,8 +455,9 @@
project.AddSources("pxcpngfa.cpp")
---- hxplay-1.0.1/datatype/image/realpix/codec/png/umakelib.orig 2004-07-09 03:51:04.000000000 +0200
-+++ hxplay-1.0.1/datatype/image/realpix/codec/png/umakelib 2004-11-21 00:50:26.226077088 +0100
+diff -ur hxplay-1.0.5/datatype/image/realpix/codec/png/umakelib hxplay-1.0.5.new/datatype/image/realpix/codec/png/umakelib
+--- hxplay-1.0.5/datatype/image/realpix/codec/png/umakelib 2004-07-09 01:51:04.000000000 +0000
++++ hxplay-1.0.5.new/datatype/image/realpix/codec/png/umakelib 2005-10-17 22:04:35.594783920 +0000
@@ -57,12 +57,10 @@
"common/container/pub",
"common/dbgtool/pub",
@@ -433,8 +473,43 @@
project.AddSources("pxcpngff.cpp",
"pxcpngrn.cpp")
---- hxplay-1.0.1/filesystem/http/Umakefil.orig 2004-07-09 04:04:03.000000000 +0200
-+++ hxplay-1.0.1/filesystem/http/Umakefil 2004-11-21 00:52:44.600041048 +0100
+diff -ur hxplay-1.0.5/datatype/ogg/fileformat/unix.pcf hxplay-1.0.5.new/datatype/ogg/fileformat/unix.pcf
+--- hxplay-1.0.5/datatype/ogg/fileformat/unix.pcf 2003-09-10 20:21:27.000000000 +0000
++++ hxplay-1.0.5.new/datatype/ogg/fileformat/unix.pcf 2005-10-17 22:04:35.585785288 +0000
+@@ -1,3 +1,3 @@
+
+-project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libogg.a"))
+-project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libvorbis.a"))
++project.AddSystemLibraries("ogg")
++project.AddSystemLibraries("vorbis")
+diff -ur hxplay-1.0.5/datatype/theora/renderer/linux2.pcf hxplay-1.0.5.new/datatype/theora/renderer/linux2.pcf
+--- hxplay-1.0.5/datatype/theora/renderer/linux2.pcf 2004-07-09 18:31:54.000000000 +0000
++++ hxplay-1.0.5.new/datatype/theora/renderer/linux2.pcf 2005-10-17 22:04:35.586785136 +0000
+@@ -51,9 +51,6 @@
+
+ UmakefileVersion(2,1)
+
+-oggLibPath = os.path.join(GetSDKPath("oggvorbissdk"), "lib")
++project.AddSystemLibraries("ogg", "theora")
+
+-project.AddLibraries(os.path.join(oggLibPath, "libogg.a"),
+- os.path.join(oggLibPath, "libtheora.a"))
+-
+-project.AddSystemLibraries("pthread")
+\ Brak znaku nowej linii na końcu pliku
++project.AddSystemLibraries("pthread")
+diff -ur hxplay-1.0.5/datatype/vorbis/renderer/unix.pcf hxplay-1.0.5.new/datatype/vorbis/renderer/unix.pcf
+--- hxplay-1.0.5/datatype/vorbis/renderer/unix.pcf 2003-09-10 20:20:58.000000000 +0000
++++ hxplay-1.0.5.new/datatype/vorbis/renderer/unix.pcf 2005-10-17 22:04:35.586785136 +0000
+@@ -1,3 +1,3 @@
+
+-project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libogg.a"))
+-project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libvorbis.a"))
++project.AddSystemLibraries("ogg")
++project.AddSystemLibraries("vorbis")
+diff -ur hxplay-1.0.5/filesystem/http/Umakefil hxplay-1.0.5.new/filesystem/http/Umakefil
+--- hxplay-1.0.5/filesystem/http/Umakefil 2004-07-09 02:04:03.000000000 +0000
++++ hxplay-1.0.5.new/filesystem/http/Umakefil 2005-10-17 22:04:35.595783768 +0000
@@ -76,7 +76,7 @@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/helixplayer-system-libs.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list