diff options
Diffstat (limited to 'multimedia')
25 files changed, 1625 insertions, 23 deletions
diff --git a/multimedia/helixplayer/Makefile b/multimedia/helixplayer/Makefile index a9f76a17def9..58d25b70b01c 100644 --- a/multimedia/helixplayer/Makefile +++ b/multimedia/helixplayer/Makefile @@ -14,26 +14,35 @@ MAINTAINER= shaun@FreeBSD.org COMMENT= The Helix Community's open source media player LIB_DEPENDS= theora.[1-9]:${PORTSDIR}/multimedia/libtheora \ - esd.2:${PORTSDIR}/audio/esound + esd.2:${PORTSDIR}/audio/esound \ + png:${PORTSDIR}/graphics/png \ + jpeg:${PORTSDIR}/graphics/jpeg USE_BZIP2= yes +USE_OPENSSL= yes USE_PYTHON= yes USE_GETTEXT= yes USE_GNOME= gtk20 +USE_DOS2UNIX= player/app/plugin/unix.pcf INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/HelixPlayer/lib -PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message CF2FIX= gcc.cf freebsd.cf freebsd-5.0-i586.cf freebsd-4.0-i386.cf \ freebsd-4.0-i586.cf freebsd-6.0-i586.cf freebsd-7.0-i586.cf +EXCLUDE= common/import datatype/image/jpg/import \ + common/util/getopt.c common/util/md5* \ + datatype/image/png/import \ + build/BIF/build.bif +EXTRACT_AFTER_ARGS=| ${TAR} -xf - ${EXCLUDE:S,^,--exclude ${DISTNAME}/,} + pre-patch: - ${CP} ${WRKSRC}/build/umakecf/freebsd-6.0-i586.cf \ + ${LN} ${WRKSRC}/build/umakecf/freebsd-6.0-i586.cf \ ${WRKSRC}/build/umakecf/freebsd-7.0-i586.cf # Add support for AudioOutLinux - ${CP} ${WRKSRC}/audio/device/linux2.pcf \ + ${LN} ${WRKSRC}/audio/device/linux2.pcf \ ${WRKSRC}/audio/device/freebsd.pcf pre-configure: @@ -58,15 +67,20 @@ pre-configure: ${WRKSRC}/player/app/gtk/hxplay post-build: - @${ECHO_MSG} - @${ECHO_MSG} "If anything failed, please examine or report the file" - @${ECHO_MSG} "${WRKSRC}/build.out" - @${ECHO_MSG} + @if ! ${TAIL} "${WRKSRC}/build.out" | ${GREP} -qF ', 0 of' ; \ + then \ + ${ECHO_MSG} ==================================================; \ + ${ECHO_MSG} Something failed, please examine the log file; \ + ${ECHO_MSG} ${WRKSRC}/build.out; \ + ${ECHO_MSG} ==================================================; \ + ${FALSE}; \ + fi do-install: ${MKDIR} ${PREFIX}/HelixPlayer - (cd ${PREFIX}/HelixPlayer && \ - ${TAR} -xjf ${WRKSRC}/player/installer/archive/install.bz2) + ${RM} -rf ${WRKSRC}/player/installer/archive/temp/Bin + ${CP} -Rp ${WRKSRC}/player/installer/archive/temp/* \ + ${PREFIX}/HelixPlayer/ ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/HelixPlayer .if !defined(WITH_DEBUG) @${STRIP_CMD} ${PREFIX}/HelixPlayer/hxplay.bin diff --git a/multimedia/helixplayer/files/patch-amd64 b/multimedia/helixplayer/files/patch-amd64 new file mode 100644 index 000000000000..8aba4e08ecca --- /dev/null +++ b/multimedia/helixplayer/files/patch-amd64 @@ -0,0 +1,9 @@ +--- audio/fixptutil/pub/math64.h Fri Sep 17 14:22:38 2004 ++++ audio/fixptutil/pub/math64.h Fri Jul 8 00:24:56 2005 +@@ -125,5 +125,5 @@ + /////////////////////////////////////////////////////////////////////////////////////// + +-#if defined(__GNUC__) && defined(__i386__) && !defined(_NO_GNU_AS) ++#if defined(__GNUC__) && (defined(__i386__) || defined(__amd64__)) && !defined(_NO_GNU_AS) + + #define HAVE_PLATFORM_MACROS diff --git a/multimedia/helixplayer/files/patch-build.bif b/multimedia/helixplayer/files/patch-build.bif new file mode 100644 index 000000000000..e2075cc02028 --- /dev/null +++ b/multimedia/helixplayer/files/patch-build.bif @@ -0,0 +1,422 @@ +--- build/build/BIF/build.bif Wed Apr 12 16:27:44 2006 ++++ build/build/BIF/build.bif Wed Jul 5 23:26:24 2006 +@@ -896,5 +896,5 @@ + <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 + </dependlist> + </module> +@@ -1073,7 +1073,4 @@ + <attribute id="no_build"/> + +- <dependlist> +- common_import_expat common_import_stlport common_import_zlib common_import_bzip2 +- </dependlist> + </module> + +@@ -1117,5 +1114,5 @@ + + <!-- COMMON_IMPORT_STLPORT --> +- <module id="common_import_stlport" name="common/import/stlport" group="core"> ++ <module id="" name="common/import/stlport" group="core"> + <location file="/home/build/build/bif-cvs/helix/2006%2f04%2f12%2012%253a50%253a16/client/build/BIF/hxclient_1_4_3_neptunex.bif" line="0"/> + <cvstag id="hxclient_1_4_3_neptunex" type="branch"/> +@@ -1166,5 +1163,5 @@ + </dependlist> + <source_dependlist> +- common_include common_fileio common_import_expat ++ common_include common_fileio + </source_dependlist> + </module> +@@ -1413,5 +1410,5 @@ + </dependlist> + <source_dependlist> +- common_import_stlport common_include datatype_common_container protocol_sdp protocol_transport_common_system ++ common_include datatype_common_container protocol_sdp protocol_transport_common_system + </source_dependlist> + </module> +@@ -2331,6 +2328,6 @@ + <dependlist> + common_runtime common_dbgtool common_util common_system common_container +- common_fileio common_netio common_import_zlib protocol_http protocol_common_util +- datatype_rm_common datatype_common_util datatype_image_common datatype_image_jpg_import_jpeg-6b datatype_dist_flash_common ++ common_fileio common_netio protocol_http protocol_common_util ++ datatype_rm_common datatype_common_util datatype_image_common datatype_dist_flash_common + datatype_dist_flash_renderer + </dependlist> +@@ -2378,7 +2375,7 @@ + <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 +- 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 ++ common_lang_xml datatype_common_baserend datatype_common_util datatype_image_common ++ 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_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 +@@ -2516,5 +2513,5 @@ + <dependlist> + datatype_rm_common datatype_dist_rm_video_common datatype_dist_rm_video_payload datatype_common_util datatype_common_vidrend +- common_import_stlport client_videosvc client_include common_include common_runtime ++ client_videosvc client_include common_include common_runtime + common_dbgtool common_util common_system common_container video_vidutil + </dependlist> +@@ -2549,5 +2546,5 @@ + <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 + </source_dependlist> + </module> +@@ -2626,5 +2623,5 @@ + <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 + </dependlist> + <source_dependlist> +@@ -2644,5 +2641,5 @@ + + <dependlist> +- datatype_image_jpg_import_jpeg-6b datatype_image_jpg_common datatype_image_jpg_fileformat datatype_image_jpg_renderer ++ datatype_image_jpg_common datatype_image_jpg_fileformat datatype_image_jpg_renderer + </dependlist> + </module> +@@ -2660,5 +2657,5 @@ + <source_dependlist> + common_include common_util common_container common_dbgtool common_runtime +- datatype_common_util datatype_image_common datatype_image_jpg_import_jpeg-6b ++ datatype_common_util datatype_image_common + </source_dependlist> + </module> +@@ -2725,5 +2722,5 @@ + <dependlist> + common_runtime common_container common_dbgtool common_util datatype_common_baserend +- datatype_common_util datatype_image_common datatype_image_jpg_common datatype_image_jpg_import_jpeg-6b ++ datatype_common_util datatype_image_common datatype_image_jpg_common + </dependlist> + <source_dependlist> +@@ -2743,5 +2740,5 @@ + + <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 + </dependlist> + </module> +@@ -2758,6 +2755,5 @@ + + <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 + </source_dependlist> + </module> +@@ -2780,5 +2776,5 @@ + <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 + </dependlist> + <source_dependlist> +@@ -2797,7 +2793,4 @@ + </includeplatforms> + +- <source_dependlist> +- common_import_zlib +- </source_dependlist> + </module> + +@@ -2818,6 +2811,6 @@ + + <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 + </dependlist> + <source_dependlist> +@@ -2897,5 +2890,5 @@ + <dependlist> + common_runtime common_system common_util common_container common_dbgtool +- datatype_common_util datatype_image_common datatype_image_jpg_common datatype_image_jpg_import_jpeg-6b ++ datatype_common_util datatype_image_common datatype_image_jpg_common + </dependlist> + <source_dependlist> +@@ -2921,6 +2914,5 @@ + <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> +@@ -4990,5 +4982,5 @@ + <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 + </dependlist> + <source_dependlist> +@@ -5163,5 +5155,5 @@ + + <dependlist> +- installer_common_util common_import_bzip2 ++ installer_common_util + </dependlist> + <source_dependlist> +@@ -5430,5 +5422,5 @@ + + <dependlist> +- player_installer_archive player_installer_stage1 ++ player_installer_archive + </dependlist> + </module> +@@ -5668,5 +5660,5 @@ + </dependlist> + <source_dependlist> +- client_include player_widget common_import_gecko ++ client_include player_widget + </source_dependlist> + </module> +@@ -6032,5 +6024,5 @@ + </dependlist> + <source_dependlist> +- common_include common_import_stlport common_runtime producersdk_include producersdk_common_util ++ common_include common_runtime producersdk_include producersdk_common_util + producersdk_common_include + </source_dependlist> +@@ -6051,6 +6043,6 @@ + </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 ++ common_include common_runtime common_util 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 +@@ -6069,5 +6061,5 @@ + + <source_dependlist> +- common_container common_dbgtool common_import_stlport common_include common_runtime ++ common_container common_dbgtool common_include common_runtime + common_system common_util datatype_rm_common datatype_rm_include producersdk_include + producersdk_common_container producersdk_common_graphmanager producersdk_common_system producersdk_common_util +@@ -6086,5 +6078,5 @@ + + <source_dependlist> +- common_container common_dbgtool common_import_stlport common_include common_runtime ++ common_container common_dbgtool common_include common_runtime + producersdk_common_container producersdk_common_graphcore producersdk_common_log producersdk_common_logutil producersdk_common_system + producersdk_common_util producersdk_include +@@ -6120,5 +6112,5 @@ + </dependlist> + <source_dependlist> +- common_include common_import_stlport common_runtime producersdk_include producersdk_common_container ++ common_include common_runtime producersdk_include producersdk_common_container + </source_dependlist> + </module> +@@ -6139,5 +6131,5 @@ + </dependlist> + <source_dependlist> +- common_include common_import_stlport common_runtime producersdk_common producersdk_common_container ++ common_include common_runtime producersdk_common producersdk_common_container + producersdk_include + </source_dependlist> +@@ -6158,5 +6150,5 @@ + </dependlist> + <source_dependlist> +- common_import_stlport common_include common_runtime producersdk_include producersdk_common_include ++ common_include common_runtime producersdk_include producersdk_common_include + </source_dependlist> + </module> +@@ -6211,5 +6203,5 @@ + </dependlist> + <source_dependlist> +- common_include common_import_stlport common_runtime producersdk_include producersdk_common_container ++ common_include common_runtime producersdk_include producersdk_common_container + producersdk_common_include + </source_dependlist> +@@ -6230,5 +6222,5 @@ + </dependlist> + <source_dependlist> +- common_import_expat common_import_stlport common_include common_runtime producersdk_include ++ common_include common_runtime producersdk_include + producersdk_common_include producersdk_common_container + </source_dependlist> +@@ -6278,5 +6270,5 @@ + + <source_dependlist> +- common_container common_dbgtool common_import_stlport common_include common_runtime ++ common_container common_dbgtool common_include common_runtime + common_system common_util datatype_rm_include producersdk_common_container producersdk_common_graphcore + producersdk_common_graphmanager producersdk_common_logutil producersdk_common_system producersdk_common_util producersdk_engine_include +@@ -6306,5 +6298,5 @@ + </dependlist> + <source_dependlist> +- common_import_stlport common_include common_runtime datatype_rm_include producersdk_common_logobserver ++ common_include common_runtime datatype_rm_include producersdk_common_logobserver + producersdk_engine_include producersdk_include producersdk_plugins_include producersdk_plugins_input_mediasink producersdk_plugins_util + producersdk_plugins_headergenerators_headergenerator +@@ -6336,5 +6328,5 @@ + + <source_dependlist> +- common_container common_dbgtool common_import_stlport common_include common_runtime ++ common_container common_dbgtool common_include common_runtime + common_system common_util datatype_rm_include producersdk_common_logutil producersdk_common_system + producersdk_common_util producersdk_include producersdk_plugins_headergenerators_headergenerator +@@ -6584,5 +6576,5 @@ + </dependlist> + <source_dependlist> +- common_fileio common_import_stlport common_include common_runtime producersdk_common_log ++ common_fileio common_include common_runtime producersdk_common_log + </source_dependlist> + </module> +@@ -6642,5 +6634,5 @@ + </dependlist> + <source_dependlist> +- common_import_stlport common_include producersdk_common_container producersdk_common_include producersdk_common_util ++ common_include producersdk_common_container producersdk_common_include producersdk_common_util + producersdk_include producersdk_plugins_util + </source_dependlist> +@@ -6677,5 +6669,5 @@ + </dependlist> + <source_dependlist> +- common_import_stlport common_include common_runtime datatype_rm_include protocol_rtsp ++ common_include common_runtime datatype_rm_include protocol_rtsp + producersdk_include producersdk_common_log + </source_dependlist> +@@ -6735,5 +6727,5 @@ + </dependlist> + <source_dependlist> +- common_import_stlport common_include common_runtime producersdk_include ++ common_include common_runtime producersdk_include + </source_dependlist> + </module> +@@ -6751,5 +6743,5 @@ + <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 + client_common_netio protocol_common_util protocol_http producersdk_common_util producersdk_common_logutil + producersdk_common_system producersdk_plugins_util producersdk_common_context +@@ -6815,5 +6807,5 @@ + </dependlist> + <source_dependlist> +- common_import_stlport common_include common_runtime producersdk_include producersdk_plugins_include ++ common_include common_runtime producersdk_include producersdk_plugins_include + </source_dependlist> + </module> +@@ -6834,5 +6826,5 @@ + </dependlist> + <source_dependlist> +- common_import_stlport common_include common_runtime datatype_rm_include datatype_rm_video ++ common_include common_runtime datatype_rm_include datatype_rm_video + producersdk_include producersdk_common_graphcore + </source_dependlist> +@@ -6893,5 +6885,5 @@ + </dependlist> + <source_dependlist> +- common_import_stlport common_include producersdk_include producersdk_common_include ++ common_include producersdk_include producersdk_common_include + </source_dependlist> + </module> +@@ -6990,5 +6982,5 @@ + </dependlist> + <source_dependlist> +- common_import_stlport common_include common_runtime producersdk_include producersdk_plugins_include ++ common_include common_runtime producersdk_include producersdk_plugins_include + </source_dependlist> + </module> +@@ -7030,5 +7022,5 @@ + </dependlist> + <source_dependlist> +- common_import_stlport common_include common_runtime producersdk_include producersdk_plugins_util ++ common_include common_runtime producersdk_include producersdk_plugins_util + </source_dependlist> + </module> +@@ -7049,5 +7041,5 @@ + </dependlist> + <source_dependlist> +- common_import_stlport common_include common_runtime producersdk_common_container producersdk_include ++ common_include common_runtime producersdk_common_container producersdk_include + producersdk_plugins_util + </source_dependlist> +@@ -7069,5 +7061,5 @@ + </dependlist> + <source_dependlist> +- common_import_stlport common_include common_runtime producersdk_include producersdk_plugins_include ++ common_include common_runtime producersdk_include producersdk_plugins_include + </source_dependlist> + </module> +@@ -7202,5 +7194,5 @@ + </dependlist> + <source_dependlist> +- common_include common_import_stlport common_runtime datatype_rm_include producersdk_include ++ common_include common_runtime datatype_rm_include producersdk_include + producersdk_common_util producersdk_common_container + </source_dependlist> +@@ -7251,5 +7243,5 @@ + + <source_dependlist> +- common_import_stlport common_include producersdk_include producersdk_common_include ++ common_include producersdk_include producersdk_common_include + </source_dependlist> + </module> +@@ -7266,5 +7258,5 @@ + + <source_dependlist> +- common_import_stlport common_include producersdk_include producersdk_common_include ++ common_include producersdk_include producersdk_common_include + </source_dependlist> + </module> +@@ -7281,5 +7273,5 @@ + + <source_dependlist> +- common_import_stlport common_include producersdk_include producersdk_common_include ++ common_include producersdk_include producersdk_common_include + </source_dependlist> + </module> +@@ -8046,5 +8038,5 @@ + 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_container common_util common_runtime + </dependlist> +@@ -8073,5 +8065,5 @@ + 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_util common_runtime + </dependlist> +@@ -8136,5 +8128,5 @@ + 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 + common_netio common_system common_container common_util common_runtime + </dependlist> +@@ -8404,5 +8396,5 @@ + <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 + </source_dependlist> + </module> +@@ -8632,5 +8624,5 @@ + <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 + server_common_util server_common_netio server_include + </source_dependlist> +@@ -9223,5 +9215,5 @@ + <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 + </dependlist> + </module> diff --git a/multimedia/helixplayer/files/patch-build_umakecf_freebsd.cf b/multimedia/helixplayer/files/patch-build_umakecf_freebsd.cf index b59cc831377c..e515d5215523 100644 --- a/multimedia/helixplayer/files/patch-build_umakecf_freebsd.cf +++ b/multimedia/helixplayer/files/patch-build_umakecf_freebsd.cf @@ -114,7 +114,7 @@ undefinedSymbols="" - cmd = "g++ -shared %s -o %s %s %s %s %s %s -lgcc" % ( -+ cmd = "%%CXX%% -shared %s -o %s %s %s %s %s %s -lgcc" % ( ++ cmd = "%%CXX%% -shared %s -o %s %s %s %s %s %s" % ( lspath, target_path, undefinedSymbols, objects, libpath, diff --git a/multimedia/helixplayer/files/patch-common_netio_pub_platform_unix_sockio.h b/multimedia/helixplayer/files/patch-common_netio_pub_platform_unix_sockio.h index dc0546b230b8..da14ce7bfe10 100644 --- a/multimedia/helixplayer/files/patch-common_netio_pub_platform_unix_sockio.h +++ b/multimedia/helixplayer/files/patch-common_netio_pub_platform_unix_sockio.h @@ -1,11 +1,19 @@ ---- ./common/netio/pub/platform/unix/sockio.h.orig Fri Jul 9 03:46:54 2004 -+++ ./common/netio/pub/platform/unix/sockio.h Fri Sep 10 21:59:06 2004 -@@ -92,7 +92,7 @@ - +--- common/netio/pub/platform/unix/sockio.h Thu Jul 8 21:46:54 2004 ++++ common/netio/pub/platform/unix/sockio.h Sat Jul 1 14:30:54 2006 +@@ -93,7 +93,8 @@ #if defined (_AIX42) #define HX_SOCKLEN_T size_t -#elif defined(_AIX43) || defined(_FREEBSD5) || defined(_FREEBSD4) || defined(_OPENBSD) ||defined(_NETBSD) || defined(_LINUX) || (defined (__GNUC__) && defined(_SOLARIS)) -+#elif defined(_AIX43) || defined(_FREEBSD7) || defined(_FREEBSD6) || defined(_FREEBSD5) || defined(_FREEBSD4) || defined(_OPENBSD) ||defined(_NETBSD) || defined(_LINUX) || (defined (__GNUC__) && defined(_SOLARIS)) ++#elif defined(_AIX43) || defined(__FreeBSD__) || defined(_OPENBSD) ||defined(_NETBSD) || defined(_LINUX) || (defined (__GNUC__) && defined(_SOLARIS)) #define HX_SOCKLEN_T socklen_t #else ++#error "socklen_t misdefined" #define HX_SOCKLEN_T int + #endif +@@ -306,5 +307,5 @@ + + HX_SOCKLEN_T temp_addr = *addr_len; +- int ret = ::getsockname(sock, (HX_SOCKADDR_T*)addr, (HX_SOCKLEN_T *)&temp_addr); ++ int ret = ::getsockname(sock, (HX_SOCKADDR_T*)addr, &temp_addr); + *addr_len = temp_addr; + #ifdef _LINUX diff --git a/multimedia/helixplayer/files/patch-digestauth b/multimedia/helixplayer/files/patch-digestauth new file mode 100644 index 000000000000..d0987f1d09e1 --- /dev/null +++ b/multimedia/helixplayer/files/patch-digestauth @@ -0,0 +1,25 @@ +--- common/auth/rn5auth/digestauth.h Tue Jul 27 03:41:40 2004 ++++ common/auth/rn5auth/digestauth.h Sun Jul 10 00:54:04 2005 +@@ -50,5 +50,5 @@ + #define CDIGESTAUTH_H_ + +-enum digest_algo {MD5, MD5_SESS, ALGO_UNKNOWN}; ++enum digest_algo {ALGO_MD5, MD5_SESS, ALGO_UNKNOWN}; + + class CDigestAuthenticator: public CHashAuthenticatorBase, +--- common/auth/rn5auth/digestauth.cpp Tue Jul 27 03:41:02 2004 ++++ common/auth/rn5auth/digestauth.cpp Sun Jul 10 00:55:35 2005 +@@ -479,5 +479,5 @@ + m_algorithm = MD5_SESS; + else +- m_algorithm = MD5; ++ m_algorithm = ALGO_MD5; + HX_RELEASE(pbufHdr); + } +@@ -502,5 +502,5 @@ + switch (m_algorithm) + { +- case MD5: ++ case ALGO_MD5: + pbufA1 = pbufPassword; + pbufA1->AddRef(); diff --git a/multimedia/helixplayer/files/patch-expat b/multimedia/helixplayer/files/patch-expat new file mode 100644 index 000000000000..7950f0c73df6 --- /dev/null +++ b/multimedia/helixplayer/files/patch-expat @@ -0,0 +1,46 @@ +This patch allows to use the modern version of expat instead of what +many vendors continue to bundle with their releases. + +--- common/lang/xml/xmlccf.cpp Mon Jul 19 17:04:07 2004 ++++ common/lang/xml/xmlccf.cpp Thu Jul 7 23:36:23 2005 +@@ -75,5 +75,5 @@ + #endif + +-#include "xmlparse.h" ++#include <expat.h> + #include "expatprs.h" + #include "xmlccf.h" +--- common/lang/xml/hxexpat/expatapi.cpp Mon Jul 19 17:04:07 2004 ++++ common/lang/xml/hxexpat/expatapi.cpp Thu Jul 7 23:39:08 2005 +@@ -55,5 +55,5 @@ + #include "hxplugn.h" + +-#include "xmlparse.h" ++#include <expat.h> + #include "expatapi.h" + #include "expatprs.h" +--- common/lang/xml/hxexpat/expatprs.cpp Mon Jul 19 17:04:07 2004 ++++ common/lang/xml/hxexpat/expatprs.cpp Thu Jul 7 23:39:08 2005 +@@ -67,5 +67,5 @@ + + #include "hxxml.ver" +-#include "xmlparse.h" ++#include <expat.h> + #include "expatprs.h" + #include "expatapi.h" +@@ -371,4 +371,9 @@ + case XML_ERROR_NOT_STANDALONE: + return HXR_XML_NOT_STANDALONE; ++#if 0 /* { */ ++ /* ++ * modern expat does not have the below errors, but has ++ * others. Fall back to the generic error message for now ++ */ + case XML_ERROR_INVALID_NAME: + return HXR_XML_INVALID_NAME; +@@ -408,4 +413,5 @@ + case XML_ERROR_INVALID_COMMENT: + return HXR_XML_INVALID_COMMENT; ++#endif /* } */ + default: + return HXR_XML_GENERALERROR; diff --git a/multimedia/helixplayer/files/patch-getopt b/multimedia/helixplayer/files/patch-getopt new file mode 100644 index 000000000000..ee75f74e292d --- /dev/null +++ b/multimedia/helixplayer/files/patch-getopt @@ -0,0 +1,9 @@ +--- common/runtime/pub/hlxclib/getopt.h Wed Dec 22 15:00:41 2004 ++++ common/runtime/pub/hlxclib/getopt.h Mon Mar 21 08:09:01 2005 +@@ -53,4 +53,6 @@ + #if defined(_SOLARIS) || defined(_HPUX) + #include <stdlib.h> ++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ++#include <unistd.h> + #else + #include <getopt.h> diff --git a/multimedia/helixplayer/files/patch-hxbuffer.h b/multimedia/helixplayer/files/patch-hxbuffer.h new file mode 100644 index 000000000000..b313bf1c2d2a --- /dev/null +++ b/multimedia/helixplayer/files/patch-hxbuffer.h @@ -0,0 +1,9 @@ +--- common/container/pub/hxbuffer.h Thu Jul 8 21:45:51 2004 ++++ common/container/pub/hxbuffer.h Thu Jul 6 08:44:51 2006 +@@ -61,5 +61,5 @@ + #define PnBufferShort + #ifdef PnBufferShort +-const int MaxPnbufShortDataLen = 15; ++static const int MaxPnbufShortDataLen = 23; + #endif + diff --git a/multimedia/helixplayer/files/patch-i386 b/multimedia/helixplayer/files/patch-i386 new file mode 100644 index 000000000000..e7f81502ed41 --- /dev/null +++ b/multimedia/helixplayer/files/patch-i386 @@ -0,0 +1,10 @@ +--- common/include/atomicbase.h Wed Dec 22 15:00:41 2004 ++++ common/include/atomicbase.h Sat Jul 8 12:58:06 2006 +@@ -547,6 +547,7 @@ + #elif defined(__GNUC__) && !defined(_OPENBSD) && \ + (__GNUC__>2 || (__GNUC__==2 && __GNUC_MINOR__>=95)) && \ + ( defined (__i486__) || defined (__i586__) || defined (__i686__) || \ ++ defined (__i386__) /* For FreeBSD/i386, maybe others */ || \ + defined (__pentium__) || defined (__pentiumpro__)) + + /* Increment by 1 */ diff --git a/multimedia/helixplayer/files/patch-noimport b/multimedia/helixplayer/files/patch-noimport new file mode 100644 index 000000000000..0fc613e219bf --- /dev/null +++ b/multimedia/helixplayer/files/patch-noimport @@ -0,0 +1,188 @@ +--- datatype/image/png/common/Umakefil Thu Jul 8 21:52:11 2004 ++++ datatype/image/png/common/Umakefil Fri Jul 8 02:11:45 2005 +@@ -58,8 +58,8 @@ + "common/runtime/pub", + "common/system/pub", +- "client/include", +- "common/import/zlib/pub") ++ "client/include") + +-project.AddIncludes("../import/libpng") ++project.AddSystemPaths('-L/usr/local/lib') ++project.AddDynamicLibraries("-lpng", "-lz") + + project.AddSources("pxpngdec.cpp") +--- datatype/image/jpg/common/Umakefil Thu Jul 8 21:53:22 2004 ++++ datatype/image/jpg/common/Umakefil Fri Jul 8 02:15:02 2005 +@@ -59,6 +59,8 @@ + "common/system/pub", + "datatype/common/util/pub", +- "datatype/image/common/pub", +- "datatype/image/jpg/import/jpeg-6b") ++ "datatype/image/common/pub") ++ ++project.AddSystemPaths('-L/usr/local/lib') ++project.AddDynamicLibraries("-ljpeg") + + project.AddSources("jbuffdst.c", +--- datatype/image/common/Umakefil Thu Jul 8 21:54:47 2004 ++++ datatype/image/common/Umakefil Fri Jul 8 02:15:38 2005 +@@ -58,5 +58,4 @@ + "common/runtime/pub", + "common/system/pub", +- "common/import/zlib/pub", + "common/lang/xml/pub", + "client/include", +--- datatype/image/common/mkstatic/Umakefil Thu Jul 8 21:54:32 2004 ++++ datatype/image/common/mkstatic/Umakefil Fri Jul 8 02:16:06 2005 +@@ -54,5 +54,5 @@ + project.AddModuleIncludes("common/include") + +-project.AddModuleLibraries("common/import/zlib[zlib]") ++project.AddDynamicLibraries("-lz") + + project.AddSources("mkstatic.cpp") +--- datatype/image/common/test/Umakefil Thu Jul 8 21:54:43 2004 ++++ datatype/image/common/test/Umakefil Fri Jul 8 02:16:35 2005 +@@ -60,7 +60,7 @@ + "common/system[syslib]", + "common/util[utillib]", +- "common/runtime[runtlib]", +- "common/import/zlib[zlib]") ++ "common/runtime[runtlib]") + ++project.AddDynamicLibraries("-lz") + project.AddSources("testbomb.cpp") + +--- client/resource/Umakefil Mon Jul 19 17:03:59 2004 ++++ client/resource/Umakefil Fri Jul 8 02:18:10 2005 +@@ -52,6 +52,5 @@ + UmakefileVersion(2,2) + +-project.AddModuleIncludes("common/include", +- "common/import/stlport") ++project.AddModuleIncludes("common/include") + + project.AddIncludes("../include", +--- filesystem/http/Umakefil Thu Jul 8 22:04:03 2004 ++++ filesystem/http/Umakefil Fri Jul 8 02:18:37 2005 +@@ -77,5 +77,5 @@ + if project.IsDefined("HELIX_FEATURE_HTTP_GZIP"): + project.AddSources("decoder.cpp") +- project.AddModuleLibraries("common/import/zlib[zlib]") ++ project.AddDynamicLibraries("-lz") + + project.ExportFunction("RMACreateInstance", +--- datatype/image/realpix/codec/png/umakedll Thu Jul 8 21:51:04 2004 ++++ datatype/image/realpix/codec/png/umakedll Fri Jul 8 21:30:57 2005 +@@ -56,5 +56,4 @@ + project.AddModuleLibraries("datatype/image/realpix/codec/png[rppnglib]", + "datatype/image/png/common[pngcomlib]", +- "datatype/image/png/import/libpng[libpng]", + "datatype/image/common[imgcomlib]", + "datatype/common/util[dtutillib]", +@@ -63,8 +62,9 @@ + "common/util[utillib]", + "common/container[contlib]", +- "common/runtime[runtlib]", +- "common/import/zlib[zlib]") ++ "common/runtime[runtlib]") + + project.AddSources("pxcpngfa.cpp") ++project.AddSystemPaths('-L/usr/local/lib') ++project.AddDynamicLibraries("-lpng", "-lz") + + project.ExportFunction("RMACreateInstance", +--- datatype/image/realpix/codec/jpg/umakedll Thu Jul 8 21:51:18 2004 ++++ datatype/image/realpix/codec/jpg/umakedll Fri Jul 8 21:31:34 2005 +@@ -52,10 +52,8 @@ + UmakefileVersion(2,2) + +-project.AddModuleIncludes("common/include", +- "datatype/image/jpg/import/jpeg-6b") ++project.AddModuleIncludes("common/include") + + project.AddModuleLibraries("datatype/image/realpix/codec/jpg[rpjpglib]", + "datatype/image/jpg/common[hxijglib]", +- "datatype/image/jpg/import/jpeg-6b[jpeglib]", + "datatype/image/common[imgcomlib]", + "datatype/common/util[dtutillib]", +@@ -67,4 +65,6 @@ + + project.AddSources("pxcjpgfa.cpp") ++project.AddSystemPaths('-L/usr/local/lib') ++project.AddDynamicLibraries("-ljpeg") + + project.ExportFunction("RMACreateInstance", +--- datatype/image/png/renderer/umakedll Thu Jul 8 21:52:28 2004 ++++ datatype/image/png/renderer/umakedll Fri Jul 8 21:32:07 2005 +@@ -59,5 +59,4 @@ + "common/container[contlib]", + "common/dbgtool[debuglib]", +- "common/import/zlib[zlib]", + "common/system[syslib]", + "datatype/common/baserend[baserend]", +@@ -65,8 +64,9 @@ + "datatype/image/common[imgcomlib]", + "datatype/image/png/common[pngcomlib]", +- "datatype/image/png/import/libpng[libpng]", + "datatype/image/png/renderer[pngrlib]") + + project.AddSources("pngrdll.cpp") ++project.AddSystemPaths('-L/usr/local/lib') ++project.AddDynamicLibraries("-lpng", "-lz") + + project.ExportFunction("RMACreateInstance", +--- datatype/image/png/fileformat/umakedll Thu Jul 8 21:52:41 2004 ++++ datatype/image/png/fileformat/umakedll Fri Jul 8 21:32:36 2005 +@@ -56,5 +56,4 @@ + project.AddModuleLibraries("datatype/image/png/fileformat[pngflib]", + "datatype/image/png/common[pngcomlib]", +- "datatype/image/png/import/libpng[libpng]", + "datatype/image/common[imgcomlib]", + "common/util[utillib]", +@@ -62,8 +61,9 @@ + "common/dbgtool[debuglib]", + "common/system[syslib]", +- "common/runtime[runtlib]", +- "common/import/zlib[zlib]") ++ "common/runtime[runtlib]") + + project.AddSources("pngfdll.cpp") ++project.AddSystemPaths('-L/usr/local/lib') ++project.AddDynamicLibraries("-lpng", "-lz") + + project.ExportFunction("RMACreateInstance", +--- datatype/image/jpg/renderer/umakedll Thu Jul 8 21:53:52 2004 ++++ datatype/image/jpg/renderer/umakedll Fri Jul 8 21:33:05 2005 +@@ -53,6 +53,5 @@ + + project.AddModuleIncludes("common/include", +- "client/include", +- "datatype/image/jpg/import/jpeg-6b") ++ "client/include") + + project.AddModuleLibraries("common/runtime[runtlib]", +@@ -64,9 +63,11 @@ + "datatype/image/common[imgcomlib]", + "datatype/image/jpg/common[hxijglib]", +- "datatype/image/jpg/import/jpeg-6b[jpeglib]", + "datatype/image/jpg/renderer[jpgrlib]", + "common/system[syslib]") + + project.AddSources("jpgrdll.cpp") ++project.AddSystemPaths('-L/usr/local/lib') ++project.AddDynamicLibraries("-ljpeg") ++project.AddSystemPaths('-L/usr/X11R6/lib') + + project.ExportFunction("RMACreateInstance", +--- datatype/image/gif/renderer/umakedll Thu Jul 8 21:54:06 2004 ++++ datatype/image/gif/renderer/umakedll Fri Jul 8 21:35:18 2005 +@@ -70,5 +70,6 @@ + + if project.IsDefined("HELIX_FEATURE_GIF_BROKENIMAGE"): +- project.AddModuleLibraries("common/import/zlib[zlib]") ++ project.AddDynamicLibraries("-lz") + ++project.AddSystemPaths('-L/usr/X11R6/lib') + project.AddSources("gifrdll.cpp") diff --git a/multimedia/helixplayer/files/patch-noinstaller b/multimedia/helixplayer/files/patch-noinstaller new file mode 100644 index 000000000000..7f8ccf72a0f7 --- /dev/null +++ b/multimedia/helixplayer/files/patch-noinstaller @@ -0,0 +1,9 @@ +--- player/installer/archive/Umakefil Tue Nov 16 16:11:24 2004 ++++ player/installer/archive/Umakefil Wed Jul 5 23:07:43 2006 +@@ -57,5 +57,5 @@ + UseCommonObjects() + +-MultiTargetMake("make_tempdir", "make_symbols", "make_archive") ++MultiTargetMake("make_tempdir") + + diff --git a/multimedia/helixplayer/files/patch-player_app_gtk_embeddedapp.cpp b/multimedia/helixplayer/files/patch-player_app_gtk_embeddedapp.cpp index 3da1e5d27b22..357b1f8c8ab9 100644 --- a/multimedia/helixplayer/files/patch-player_app_gtk_embeddedapp.cpp +++ b/multimedia/helixplayer/files/patch-player_app_gtk_embeddedapp.cpp @@ -1,7 +1,6 @@ ---- player/app/gtk/embeddedapp.cpp.orig Mon May 17 23:04:00 2004 -+++ player/app/gtk/embeddedapp.cpp Sat May 22 22:44:45 2004 -@@ -56,6 +56,9 @@ - #include <unistd.h> +--- player/app/gtk/embeddedapp.cpp Tue Dec 7 16:17:19 2004 ++++ player/app/gtk/embeddedapp.cpp Sun Jul 2 02:55:03 2006 +@@ -80,4 +80,7 @@ #include <glib.h> +#if GLIB_CHECK_VERSION (2, 4, 0) @@ -9,4 +8,31 @@ +#endif /* This file contains functions with several different prefixes. - * They include: +@@ -276,5 +279,5 @@ + typedef struct + { +- guint stream_id; ++ uintptr_t stream_id; + HXDataStream* stream; + gchar* url; +@@ -3108,5 +3111,5 @@ + + HXEmbeddedWindow* +-hxembedded_window_get_from_id(guint window_id) ++hxembedded_window_get_from_id(uintptr_t window_id) + { + GList* consoles_iter; +@@ -3165,5 +3168,5 @@ + void + hxembedded_window_new_stream(HXEmbeddedWindow* window, +- guint stream_id, ++ uintptr_t stream_id, + const gchar* url, + const gchar* mime_type, +@@ -3296,5 +3299,5 @@ + void + hxembedded_window_stream_done(HXEmbeddedWindow* window, +- guint stream_id) ++ uintptr_t stream_id) + { + GList* iter; diff --git a/multimedia/helixplayer/files/patch-plugin b/multimedia/helixplayer/files/patch-plugin new file mode 100644 index 000000000000..5d4d7d185f73 --- /dev/null +++ b/multimedia/helixplayer/files/patch-plugin @@ -0,0 +1,290 @@ +This set of patches change the plugin to compile against the installed +NSPR and Firefox' APIs (instead of the gecko-sdk bundled by Real) and to +pass pointers between processes using %p or %td format instead of %d. +The latter is not safe on 64-bit systems... + + -mi + +--- player/app/plugin/unix.pcf Thu Jul 8 21:48:45 2004 ++++ player/app/plugin/unix.pcf Sun Jul 2 00:43:31 2006 +@@ -52,13 +52,13 @@ + +-project.AddModuleIncludes( +- "common/import/gecko-sdk", +- "common/import/gecko-sdk/nspr/include", +- "common/import/gecko-sdk/java/include", +- "common/import/gecko-sdk/xpcom/include", +- "common/import/gecko-sdk/plugin/include", +- "common/import/gecko-sdk/windowwatcher/include", +- "common/import/gecko-sdk/string/include", +- "common/import/gecko-sdk/uconv/include", +- "common/import/gecko-sdk/dom/include" +-) ++project.includes.append( ++ "/usr/local/include/nspr", ++ "/usr/local/include/firefox", ++ "/usr/local/include/firefox/java", ++ "/usr/local/include/firefox/xpcom", ++ "/usr/local/include/firefox/plugin", ++ "/usr/local/include/firefox/windowwatcher", ++ "/usr/local/include/firefox/string", ++ "/usr/local/include/firefox/uconv", ++ "/usr/local/include/firefox/dom" ++) + +--- player/app/plugin/hxbackend.h Mon Nov 22 19:24:25 2004 ++++ player/app/plugin/hxbackend.h Sun Jul 2 01:13:09 2006 +@@ -62,9 +62,4 @@ + #include "nsIObserver.h" + +-/* Mozilla 1.0-1.2 had nsIScriptableTimer.h and a different nsITimer.h. We +- use the nsIScriptableTimer version to avoid conflicts with the newer +- nsITimer. */ +-#include "nsIScriptableTimer.h" +- + /* Mozilla 1.3+ have the modern nsITimer */ + #include "nsITimer.h" +@@ -106,5 +101,5 @@ + nsresult ReadGenericResponse(PRBool *retval); + +- PRBool AreCallbacksSupported(void) { return m_pTimer || m_pObsoleteTimer; } ++ PRBool AreCallbacksSupported(void) { return m_pTimer != NULL; } + + private: +@@ -129,5 +124,4 @@ + + nsITimer *m_pTimer; +- nsIScriptableTimer *m_pObsoleteTimer; // Only found in old mozilla's + nsIScriptableUnicodeConverter *m_pUConv; + nsIPromptService *m_pPromptService; +--- player/app/plugin/nsHXPlayer.cpp Mon Nov 22 19:24:25 2004 ++++ player/app/plugin/nsHXPlayer.cpp Sun Jul 2 01:47:25 2006 +@@ -560,8 +560,8 @@ + XFlush(ws_info->display); + +- nLen = asprintf(&pMsg, "%s %d %d %d %d %d %d %d %d %d %d %d\n", ++ nLen = asprintf(&pMsg, "%s %td %d %d %d %d %d %d %d %d %d %d\n", + szCommand, + m_iPlayerID, +- (int)aWindow->window, ++ (intptr_t)aWindow->window, + aWindow->x, + aWindow->y, +@@ -602,5 +602,4 @@ + PRBool retval; + unsigned int nStreamLength; +- int nStreamId = 0; + + nStreamLength = ( stream->end > 0 ) ? stream->end : 0; +@@ -617,16 +616,7 @@ + *stype = NP_NORMAL; + +- if(m_bIsFirstNewStream) +- { +- nStreamId = 0; +- } +- else +- { +- nStreamId = (int)stream; +- } +- +- nLen = asprintf(&pMsg, "NewStream %d %d %s %s %d\n", ++ nLen = asprintf(&pMsg, "NewStream %d %td %s %s %d\n", + m_iPlayerID, +- nStreamId, ++ (intptr_t)(m_bIsFirstNewStream ? 0 : stream), + stream->url, + type, +@@ -671,5 +661,5 @@ + (void)offset; + +- nLen = asprintf(&pMsg, "StreamData %d %d %d\n", m_iPlayerID, (int)streamID, nDataLen); ++ nLen = asprintf(&pMsg, "StreamData %d %td %d\n", m_iPlayerID, (intptr_t)streamID, nDataLen); + result = m_pBackend->SendMessage(pMsg, nLen); + free(pMsg); +@@ -704,5 +694,5 @@ + const void *streamID = (void*)stream; + +- nLen = asprintf(&pMsg, "StreamDone %d %d\n", m_iPlayerID, (int)streamID); ++ nLen = asprintf(&pMsg, "StreamDone %d %td\n", m_iPlayerID, (intptr_t)streamID); + result = m_pBackend->SendMessage(pMsg, nLen); + free(pMsg); +--- player/app/gtk/playeripc.cpp Mon Nov 22 19:24:25 2004 ++++ player/app/gtk/playeripc.cpp Sun Jul 2 01:52:39 2006 +@@ -1005,8 +1005,8 @@ + gchar* mime_type; + gchar* url; +- guint stream_id; ++ uintptr_t stream_id; + guint stream_length; + +- result = sscanf(argv[2], "%d", &stream_id); ++ result = sscanf(argv[2], "%p", &stream_id); + url = argv[3]; + mime_type = argv[4]; +@@ -1068,7 +1068,7 @@ + else if (strcmp("StreamDone", argv[0]) == 0 && argc == 3) + { +- guint stream_id; ++ uintptr_t stream_id; + +- result = sscanf(argv[2], "%d", &stream_id); ++ result = sscanf(argv[2], "%p", &stream_id); + + hxembedded_window_stream_done(window, stream_id); +@@ -1168,8 +1168,8 @@ + { + /* Get the window id from argv[1] */ +- guint window_id; ++ uintptr_t window_id; + HXEmbeddedWindow* window; + +- if(sscanf(argv[1], "%d", &window_id)) ++ if(sscanf(argv[1], "%p", &window_id)) + { + window = hxembedded_window_get_from_id(window_id); +--- player/app/gtk/embeddedapp.h Mon Nov 22 19:24:25 2004 ++++ player/app/gtk/embeddedapp.h Sun Jul 2 02:19:00 2006 +@@ -189,5 +189,5 @@ + const gchar* url); + void hxembedded_window_new_stream (HXEmbeddedWindow* window, +- guint stream_id, ++ uintptr_t stream_id, + const gchar* url, + const gchar* mime_type, +@@ -198,5 +198,5 @@ + guint len); + void hxembedded_window_stream_done(HXEmbeddedWindow* window, +- guint stream_id); ++ uintptr_t stream_id); + + void hxembedded_window_set_browser_info(HXEmbeddedWindow* window, +@@ -205,5 +205,5 @@ + gboolean has_xembed); + +-HXEmbeddedWindow* hxembedded_window_get_from_id(guint window_id); ++HXEmbeddedWindow* hxembedded_window_get_from_id(uintptr_t window_id); + guint hxembedded_window_get_id (HXEmbeddedWindow* window); + +--- player/app/plugin/hxbackend.cpp Mon Nov 22 19:24:25 2004 ++++ player/app/plugin/hxbackend.cpp Sun Jul 2 02:37:29 2006 +@@ -153,5 +153,4 @@ + m_nCallbackBufPos(0), + m_pTimer(NULL), +- m_pObsoleteTimer(NULL), + m_pUConv(NULL), + m_pPromptService(NULL), +@@ -424,13 +423,5 @@ + (void**)&m_pTimer); + +- if(!m_pTimer) +- { +- /* Try to get an old-style mozilla 1.0-1.2 timer */ +- pComponentManager->CreateInstanceByContractID(NS_TIMER_CONTRACTID, +- NULL, +- NS_GET_IID(nsIScriptableTimer), +- (void**)&m_pObsoleteTimer); +- } +- ++ + NS_RELEASE(pComponentManager); + } +@@ -545,5 +536,5 @@ + sprintf(cbSd, "%d", cbsockets[1]); + +- if (m_pTimer || m_pObsoleteTimer) ++ if (m_pTimer) + { + /* We have a timer callback, include --callbacks flag */ +@@ -678,16 +669,7 @@ + if(instance) + { +- PRUnichar *pUnicodeTitle = NULL; +- PRUnichar *pUnicodeMessage = NULL; +- + NPN_GetValue(instance, NPNVDOMWindow, &pDomWindow); + +- if(m_pPromptService && m_pUConv && m_pMemory && pDomWindow) +- { +- m_pUConv->ConvertToUnicode("Helix DNA Plugin Error", &pUnicodeTitle); +- m_pUConv->ConvertToUnicode(szError, &pUnicodeMessage); +- } +- +- if(pUnicodeTitle && pUnicodeMessage && m_pPromptService && m_pMemory && pDomWindow) ++ if(m_pPromptService && m_pMemory && pDomWindow) + { + /* Cancel the callback timer while the alert dialog is up to +@@ -698,5 +680,6 @@ + StopCallbackTimer(); + +- m_pPromptService->Alert(pDomWindow, pUnicodeTitle, pUnicodeMessage); ++ m_pPromptService->Alert(pDomWindow, ++ (const PRUnichar *)"Helix DNA Plugin Error", (const PRUnichar *)szError); + + if(bRestartCallbackTimer) +@@ -716,13 +699,4 @@ + free(szJavaScriptAlert); + } +- +- if(pUnicodeTitle) +- { +- m_pMemory->Free(pUnicodeTitle); +- } +- if(pUnicodeMessage) +- { +- m_pMemory->Free(pUnicodeMessage); +- } + } + +@@ -894,5 +868,5 @@ + m_pTimer->Init(pTimerFob, + 500, +- nsIScriptableTimer::TYPE_REPEATING_SLACK); ++ nsITimer::TYPE_REPEATING_SLACK); + m_pTimer->Cancel(); + +@@ -901,20 +875,4 @@ + } + +- if(m_pObsoleteTimer) +- { +- m_pObsoleteTimer->Cancel(); +- +- /* Re-initing causes the timer to unref this and switch its ref +- to pTimerFob instead */ +- m_pObsoleteTimer->Init(pTimerFob, +- 500, +- nsIScriptableTimer::PRIORITY_NORMAL, +- nsIScriptableTimer::TYPE_REPEATING_SLACK); +- m_pObsoleteTimer->Cancel(); +- +- NS_RELEASE(m_pObsoleteTimer); +- m_pObsoleteTimer = NULL; +- } +- + NS_RELEASE(pTimerFob); + +@@ -1187,12 +1145,4 @@ + nsITimer::TYPE_REPEATING_SLACK); + } +- else if(m_pObsoleteTimer) +- { +- m_bCallbackTimerRunning = PR_TRUE; +- m_pObsoleteTimer->Init(this, +- 500, +- nsIScriptableTimer::PRIORITY_NORMAL, +- nsIScriptableTimer::TYPE_REPEATING_SLACK); +- } + } + +@@ -1205,10 +1155,3 @@ + m_pTimer->Cancel(); + } +- if(m_pObsoleteTimer) +- { +- m_bCallbackTimerRunning = PR_FALSE; +- m_pObsoleteTimer->Cancel(); +- } + } +- +- diff --git a/multimedia/helixplayer/files/patch-pxpngdec b/multimedia/helixplayer/files/patch-pxpngdec new file mode 100644 index 000000000000..6e3ac470e045 --- /dev/null +++ b/multimedia/helixplayer/files/patch-pxpngdec @@ -0,0 +1,14 @@ +--- datatype/image/png/common/pxpngdec.cpp Thu Jul 8 21:52:12 2004 ++++ datatype/image/png/common/pxpngdec.cpp Fri Jul 8 02:25:42 2005 +@@ -400,4 +400,5 @@ + SetReadTransforms(m_pPNGStruct, m_pPNGInfo); + } ++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR == 2 && PNG_LIBPNG_VER_RELEASE == 5 + // libpng by default assumes that 0 is fully transparent and 255 is + // fully opaque. PXPNGDecode by default outputs alpha in the opposite +@@ -409,4 +410,5 @@ + png_clear_invert_alpha(m_pPNGStruct); + } ++#endif + // Save a copy of the output buffer + HX_RELEASE(m_pOutputBuffer); diff --git a/multimedia/helixplayer/files/patch-sysinfo b/multimedia/helixplayer/files/patch-sysinfo new file mode 100644 index 000000000000..17b16751aec2 --- /dev/null +++ b/multimedia/helixplayer/files/patch-sysinfo @@ -0,0 +1,43 @@ +--- build/lib/sysinfo.py Fri Jan 21 17:46:56 2005 ++++ build/lib/sysinfo.py Sun Mar 20 22:49:35 2005 +@@ -143,23 +143,9 @@ + + AddPlatform(Platform( +- id = 'freebsd-4.0-i386', +- platform = 'freebsd4', +- arch = 'i386', +- distribution_id = 'freebsd-4.0-i386', +- family_list = ['unix', 'freebsd', 'freebsd4', 'freebsd-4.0'] )) +- +-AddPlatform(Platform( +- id = 'freebsd-4.0-i586', +- platform = 'freebsd4', +- arch = 'i386', +- distribution_id = 'freebsd-4.0-i386', +- family_list = ['unix', 'freebsd', 'freebsd4', 'freebsd-4.0', 'freebsd-4.0-i586'] )) +- +-AddPlatform(Platform( +- id = 'freebsd-5.0-i586', +- platform = 'freebsd5', +- arch = 'i386', +- distribution_id = 'freebsd-5.0-i586', +- family_list = ['unix', 'freebsd', 'freebsd5', 'freebsd-5.0', 'freebsd-5.0-i586'] )) ++ id = 'freebsd', ++ platform = 'freebsd', ++ arch = 'all', ++ distribution_id = 'freebsd', ++ family_list = ['unix', 'freebsd', 'freebsd', 'freebsd', 'freebsd'] )) + + AddPlatform(Platform( +@@ -1103,9 +1089,6 @@ + set_platform('freebsd-3.0-i386') + +- elif sys.platform == 'freebsd4': +- set_platform('freebsd-4.0-i386') +- +- elif sys.platform == 'freebsd5': +- set_platform('freebsd-5.0-i586') ++ elif sys.platform[0:7] == 'freebsd': ++ set_platform('freebsd') + + elif sys.platform == 'hp-uxB': diff --git a/multimedia/helixplayer/files/patch-sysjpeg b/multimedia/helixplayer/files/patch-sysjpeg new file mode 100644 index 000000000000..bf439a7465ef --- /dev/null +++ b/multimedia/helixplayer/files/patch-sysjpeg @@ -0,0 +1,54 @@ +--- datatype/image/jpg/common/ijglwrap.cpp Thu Jul 8 21:53:22 2004 ++++ datatype/image/jpg/common/ijglwrap.cpp Sat Jul 8 01:38:05 2006 +@@ -367,4 +367,37 @@ + } + ++/* ++ * When compiled against ordinary JPEG, which uses RGB order and 3 bytes ++ * per pixel, we need the below function to rearrange things. ++ */ ++#if RGB_RED == 0 ++static void ++RGBtoBGRx(void *pBuf, size_t uWidth) ++{ ++ struct RGB { ++ BYTE R, G, B; ++ } *pRGB = (struct RGB *)pBuf; ++ struct BGRx { ++ BYTE B, G, R, x; ++ } *pBGRx = (struct BGRx *)pBuf; ++ ++ HX_ASSERT(sizeof(*pRGB) == 3); ++ HX_ASSERT(sizeof(*pBGRx) == 4); ++ ++ pRGB += uWidth - 1; ++ pBGRx += uWidth - 1; ++ ++ while (uWidth--) ++ { ++ pBGRx->B = pRGB->B; ++ pBGRx->R = pRGB->R; ++ pBGRx->G = pRGB->G; ++ pBGRx->x = 0; ++ pBGRx--; ++ pRGB--; ++ } ++} ++#endif ++ + HX_RESULT CIJGLibraryWrapper::Decompress() + { +@@ -438,4 +469,7 @@ + else + { ++#if RGB_RED == 0 ++ RGBtoBGRx(pRowBuf, m_cDecompress.output_width); ++#endif + if (m_bBigEndian) + { +@@ -572,5 +606,4 @@ + + /* Save the current public source manager state variables */ +- UINT32 ulOldBytesInBuffer = pMgr->m_cPubSrcMgr.bytes_in_buffer; + BYTE *pOldNextInputByte = (BYTE *) pMgr->m_cPubSrcMgr.next_input_byte; + diff --git a/multimedia/helixplayer/files/patch-sysmd5 b/multimedia/helixplayer/files/patch-sysmd5 new file mode 100644 index 000000000000..9b522e3b05d0 --- /dev/null +++ b/multimedia/helixplayer/files/patch-sysmd5 @@ -0,0 +1,193 @@ +--- player/installer/postinst/platform/unix/postinst.cpp Thu Jul 8 21:49:20 2004 ++++ player/installer/postinst/platform/unix/postinst.cpp Fri Jul 8 22:32:13 2005 +@@ -84,3 +84,2 @@ + +-#include "md5.h" + +--- common/util/chxuuid.cpp Thu Jul 8 21:48:15 2004 ++++ common/util/chxuuid.cpp Fri Jul 8 22:32:13 2005 +@@ -93,3 +93,3 @@ + #include "netbyte.h" +-#include "md5.h" ++#include <openssl/md5.h> + +@@ -955,13 +955,12 @@ + if (SUCCEEDED(res)) + { +- md5_state_t ctx; +- md5_init(&ctx); +- UCHAR aHashBuffer[20]; +- memset(aHashBuffer, 0, 20); ++ MD5_CTX ctx; ++ MD5_Init(&ctx); ++ UCHAR aHashBuffer[MD5_DIGEST_LENGTH]; + + // MD5-hash the namespace ID with the name buffer +- md5_append(&ctx, (const UCHAR*)pUuid, sizeof(uuid_tt)); +- md5_append(&ctx, (const UCHAR*)pBuffer, ulBufferSize); +- md5_finish(aHashBuffer, &ctx); ++ MD5_Update(&ctx, pUuid, sizeof(uuid_tt)); ++ MD5_Update(&ctx, pBuffer, ulBufferSize); ++ MD5_Final(aHashBuffer, &ctx); + + // Copy the 128-bit hash result into the UUID. Memcpy one var at a time +--- common/util/cookies.cpp Thu Jul 8 21:48:15 2004 ++++ common/util/cookies.cpp Fri Jul 8 22:32:13 2005 +@@ -104,3 +104,2 @@ + #include "cookies.h" +-#include "md5.h" + #include "filespecutils.h" +--- common/util/random32.c Thu Jul 8 21:48:16 2004 ++++ common/util/random32.c Fri Jul 8 22:32:13 2005 +@@ -52,3 +52,3 @@ + #include "hxtick.h" +-#include "md5.h" ++#include <openssl/md5.h> + #include "random32.h" +@@ -57,5 +57,4 @@ + static ULONG32 md_32(const unsigned char *string, int length) + { +- md5_state_t context; + + union { +@@ -66,7 +65,5 @@ + int i; + +- md5_init (&context); +- md5_append (&context, string, length); +- md5_finish ((unsigned char *)&digest, &context); ++ MD5(string, length, &digest); + r = 0; + for (i = 0; i < 3; i++) { +--- client/common/container/basehand.cpp Thu Jul 8 22:07:27 2004 ++++ client/common/container/basehand.cpp Fri Jul 8 22:32:13 2005 +@@ -114,3 +114,2 @@ + #include "chxuuid.h" +-#include "md5.h" + +--- client/common/container/hxresmg.cpp Thu Jul 8 22:07:27 2004 ++++ client/common/container/hxresmg.cpp Fri Jul 8 22:32:13 2005 +@@ -74,3 +74,3 @@ + #include "chxpckts.h" +-#include "md5.h" ++#include <openssl/md5.h> + #include "findfile.h" +@@ -431,15 +431,15 @@ + { + struct stat stat_struct; +- md5_state_t MD5_data; ++ MD5_CTX MD5_data; + UCHAR tempbuf[16]; + +- md5_init(&MD5_data); ++ MD5_Init(&MD5_data); + if (HXR_OK != Stat(pPath, &stat_struct)) + { +- md5_finish(tempbuf, &MD5_data); ++ MD5_Final(tempbuf, &MD5_data); + return NULL; + } +- md5_append(&MD5_data,(UCHAR*)&(stat_struct),sizeof(stat_struct)); +- md5_finish(tempbuf, &MD5_data); ++ MD5_Update(&MD5_data, &(stat_struct), sizeof(stat_struct)); ++ MD5_Final(tempbuf, &MD5_data); + return ConvertToAsciiString((char*)tempbuf, sizeof(tempbuf)); + } +--- client/common/container/plghand2.cpp Thu Jul 8 22:07:28 2004 ++++ client/common/container/plghand2.cpp Fri Jul 8 22:32:13 2005 +@@ -153,3 +153,3 @@ + #include "chxuuid.h" +-#include "md5.h" ++#include <openssl/md5.h> + +@@ -6515,5 +6515,5 @@ + SafeStrCat(pszFileNameWithPath, pszFileName, (1<<10)); + +- UCHAR tempbuf[16] = ""; ++ UCHAR tempbuf[16]; + struct stat stat_stuct; + Errors statError = PLUGIN_NOT_FOUND; +@@ -6551,8 +6551,5 @@ + return NULL; + } +- md5_state_t MD5_data; +- md5_init(&MD5_data); +- md5_append(&MD5_data,(UCHAR*)&(stat_stuct),sizeof(stat_stuct)); +- md5_finish(tempbuf, &MD5_data); ++ MD5((UCHAR*)&(stat_stuct), sizeof(stat_stuct), tempbuf); + return ConvertToAsciiString((char*)tempbuf, sizeof(tempbuf)); + } +--- installer/common/util/consoleui.cpp Thu Jul 8 22:03:17 2004 ++++ installer/common/util/consoleui.cpp Fri Jul 8 22:32:13 2005 +@@ -100,3 +100,2 @@ + //hxmisc +-#include "md5.h" + #ifdef _WIN32 +--- installer/common/prodinstlib.cpp Thu Jul 8 22:03:21 2004 ++++ installer/common/prodinstlib.cpp Fri Jul 8 22:32:13 2005 +@@ -98,3 +98,2 @@ + +-#include "md5.h" + +--- installer/common/util/passwdtool.cpp Thu Jul 8 22:03:17 2004 ++++ installer/common/util/passwdtool.cpp Sat Jul 1 14:27:13 2006 +@@ -95,5 +95,5 @@ + + //hxmisc +-#include "md5.h" ++#include <openssl/md5.h> + #ifdef _WIN32 + #include "hxstrutl.h" //strcasecmp +@@ -127,11 +127,23 @@ + char* szMD5Buf) + { +- char szBuf[4096]; +- //char szMD5buf[64]; ++ MD5_CTX ctx; ++ char c; + +- sprintf(szBuf, "%s:%s:%s", szUsername, szRealm, szPassword); +- MD5Data((char*)szMD5Buf, (const unsigned char*)szBuf, +- (unsigned int)strlen(szBuf)); +- //printf("%s:%s\n", szUsername, szMD5Buf); ++ MD5_Init(&ctx); ++ MD5_Update(&ctx, szUsername, strlen(szUsername)); ++ MD5_Update(&ctx, ":", 1); ++ MD5_Update(&ctx, szRealm, strlen(szRealm)); ++ MD5_Update(&ctx, ":", 1); ++ MD5_Update(&ctx, szPassword, strlen(szPassword)); ++ MD5_Final((unsigned char *)szMD5Buf, &ctx); ++ for (int i = 15; i >= 0; i--) { ++ c = szMD5Buf[i] & 0x0f; ++ c += c > 9 ? 'a' - 0xa : '0'; ++ szMD5Buf[i*2 + 1] = c; ++ c = szMD5Buf[i] & 0xf0; ++ c += c > 9 ? 'a' - 0xa : '0'; ++ szMD5Buf[i*2] = c; ++ } ++ fprintf(stderr, "%s:%s\n", szUsername, szMD5Buf); + } + +--- client/core/clntcoredll_unix.pcf Thu Jul 8 22:05:57 2004 ++++ client/core/clntcoredll_unix.pcf Thu Jul 6 00:20:36 2006 +@@ -58 +58,7 @@ + ++# Link with the OpenSSL's crypto -- the provider of fast MD5 functionality ++if os.environ.has_key('OPENSSLBASE') and os.environ['OPENSSLBASE'] != '/usr': ++ project.includes.append(os.environ['OPENSSLBASE'] + '/include') ++ project.AddSystemPaths('-L' + os.environ['OPENSSLBASE'] + '/lib') ++ ++project.AddDynamicLibraries('-lcrypto') +--- player/installer/postinst/unix.pcf Thu Jul 8 21:49:23 2004 ++++ player/installer/postinst/unix.pcf Thu Jul 6 00:38:16 2006 +@@ -48,4 +48,10 @@ + # ***** END LICENSE BLOCK ***** + ++# Link with the OpenSSL's crypto -- the provider of fast MD5 functionality ++if os.environ.has_key('OPENSSLBASE') and os.environ['OPENSSLBASE'] != '/usr': ++ project.includes.append(os.environ['OPENSSLBASE'] + '/include') ++ project.AddSystemPaths('-L' + os.environ['OPENSSLBASE'] + '/lib') ++project.AddDynamicLibraries('-lcrypto') ++ + project.AddModuleIncludes("installer/common/pub/platform/unix") + diff --git a/multimedia/helixplayer/files/patch-timeval b/multimedia/helixplayer/files/patch-timeval new file mode 100644 index 000000000000..7f82a656c65b --- /dev/null +++ b/multimedia/helixplayer/files/patch-timeval @@ -0,0 +1,16 @@ +--- common/util/pub/timeval.h Thu Jul 8 21:48:01 2004 ++++ common/util/pub/timeval.h Sat Jul 8 13:09:00 2006 +@@ -74,5 +74,5 @@ + #endif + +-#if !(defined _UNIX && (defined _LONG_IS_64 || defined _VXWORKS)) ++#if 0 + Timeval(int sec, int usec); + Timeval(int usec); +@@ -124,5 +124,5 @@ + } + +-#if !(defined _UNIX && (defined _LONG_IS_64 || defined _VXWORKS)) ++#if 0 + + inline Timeval::Timeval(int s, int us) { diff --git a/multimedia/helixplayer/files/patch-types b/multimedia/helixplayer/files/patch-types new file mode 100644 index 000000000000..a60bb1d58891 --- /dev/null +++ b/multimedia/helixplayer/files/patch-types @@ -0,0 +1,118 @@ +--- common/include/hxtypes.h Fri Jul 23 02:41:37 2004 ++++ common/include/hxtypes.h Fri Jul 7 01:45:23 2006 +@@ -97,4 +97,23 @@ + typedef TUint32 UINT; /* Its unclear, but UINT is suppose to be 32 bits. */ + typedef TBool BOOL; ++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++/* Most other platforms should use these C99 types too */ ++#include <sys/types.h> ++#include <sys/limits.h> ++# if INT_MAX != LONG_MAX /* XXX Imperfect guess.. */ ++# define _LONG_IS_64 ++# endif ++typedef int8_t INT8; ++typedef uint8_t UINT8; ++typedef int16_t INT16; ++typedef uint16_t UINT16; ++typedef int32_t INT32; ++typedef uint32_t UINT32; ++/* ++typedef int64_t INT64; ++typedef uint64_t UINT64; ++*/ ++typedef int BOOL; ++typedef unsigned int UINT; + #else + # ifndef _VXWORKS +@@ -762,4 +781,7 @@ + #endif + ++ ++/* This works-around similar type-bugs in JPEG's <jmorecfg.h> */ ++#define XMD_H + + #endif /* _HXTYPES_H_ */ +--- player/hxclientkit/pub/HXClientTypes.h Thu Jul 8 21:49:29 2004 ++++ player/hxclientkit/pub/HXClientTypes.h Fri Jul 7 02:01:08 2006 +@@ -64,4 +64,8 @@ + typedef int SInt32; + typedef unsigned int UInt32; ++# elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++# include <sys/types.h> ++ typedef int32_t SInt32; ++ typedef uint32_t UInt32; + # else + typedef long int SInt32; +--- datatype/wav/fileformat/wvffplin.cpp Fri Feb 11 04:06:09 2005 ++++ datatype/wav/fileformat/wvffplin.cpp Fri Jul 7 02:16:57 2006 +@@ -1314,5 +1314,5 @@ + } + +- m_pszTitle = new CHAR[len+1]; ++ m_pszTitle = new char[len+1]; + if (m_pszTitle) + { +@@ -1334,5 +1334,5 @@ + } + +- m_pszAuthor = new CHAR[len+1]; ++ m_pszAuthor = new char[len+1]; + if (m_pszAuthor) + { +@@ -1354,5 +1354,5 @@ + } + +- m_pszCopyright = new CHAR[len+1]; ++ m_pszCopyright = new char[len+1]; + if (m_pszCopyright) + { +--- filesystem/http/httpfsys.cpp Fri Sep 16 16:59:04 2005 ++++ filesystem/http/httpfsys.cpp Fri Jul 7 02:21:19 2006 +@@ -521,5 +521,5 @@ + #endif + +- INT8* pFilename = ::strrchr(szModule, OS_SEPARATOR_CHAR); ++ char* pFilename = ::strrchr(szModule, OS_SEPARATOR_CHAR); + + if (pFilename == NULL) +@@ -5636,5 +5636,5 @@ + #endif + // Find the separator character before the file name +- INT8* pFilename = ::strrchr(szModule, OS_SEPARATOR_CHAR); ++ char* pFilename = ::strrchr(szModule, OS_SEPARATOR_CHAR); + + // Perhaps they are using the '/' separator +--- client/core/hxprotocol.cpp Thu Jul 8 22:05:58 2004 ++++ client/core/hxprotocol.cpp Fri Jul 7 02:22:47 2006 +@@ -444,5 +444,5 @@ + } + +- pszStats = new CHAR[ulStatsLength]; ++ pszStats = new char[ulStatsLength]; + memset(pszStats, 0, ulStatsLength); + +@@ -531,5 +531,5 @@ + if (!pszStats) + { +- pszStats = new CHAR[ulStatsLength]; ++ pszStats = new char[ulStatsLength]; + memset(pszStats, 0, ulStatsLength); + } +--- filesystem/http/cache.h Thu Jul 8 22:04:03 2004 ++++ filesystem/http/cache.h Fri Jul 7 02:37:36 2006 +@@ -84,5 +84,5 @@ + #define CACHE_MIRRORED_SERVERS 2 + UINT32 m_ulHttpHeaderSize; // Number of bytes in HTTP Header +- CHAR m_szMimeType[64]; ++ char m_szMimeType[64]; + } CacheHeader, *PCacheHeader; + +--- client/core/rtspprotocol.cpp Tue Jul 13 13:12:04 2004 ++++ client/core/rtspprotocol.cpp Fri Jul 7 02:39:12 2006 +@@ -2922,5 +2922,5 @@ + STREAM_STATS* pStats = NULL; + IHXBuffer* pParentName = NULL; +- CHAR RegKeyName[MAX_DISPLAY_NAME] = {0}; ++ char RegKeyName[MAX_DISPLAY_NAME] = {0}; + + if (!m_pRegistry) diff --git a/multimedia/helixplayer/files/patch-unix.pcf b/multimedia/helixplayer/files/patch-unix.pcf new file mode 100644 index 000000000000..4b7bd86bdee5 --- /dev/null +++ b/multimedia/helixplayer/files/patch-unix.pcf @@ -0,0 +1,54 @@ +--- datatype/ram/renderer/unix.pcf Thu Jul 8 21:55:54 2004 ++++ datatype/ram/renderer/unix.pcf Fri Jul 8 01:55:24 2005 +@@ -55,4 +55,5 @@ + + if (not project.IsDefined("QWS")): ++ project.AddSystemPaths('-L' + platform.x_root_dir + '/lib'); + project.AddSystemLibraries("X11") + +--- video/site/unix.pcf Thu Jul 8 21:59:40 2004 ++++ video/site/unix.pcf Fri Jul 8 01:50:56 2005 +@@ -51,4 +51,5 @@ + + if not project.IsDefined("QWS"): ++ project.AddSystemPaths('-L' + platform.x_root_dir + '/lib'); + project.AddSystemLibraries( 'm', 'X11', 'Xext' ); + +--- datatype/smil/renderer/unix.pcf Thu Jul 8 21:58:10 2004 ++++ datatype/smil/renderer/unix.pcf Fri Jul 8 02:02:28 2005 +@@ -51,4 +51,5 @@ + + project.AddIncludes(platform.x_root_dir + "/include") ++project.AddSystemPaths('-L' + platform.x_root_dir + '/lib') + + project.AddSystemLibraries("m", "X11") +--- datatype/image/wbmp/renderer/umakedll_unix.pcf Thu Jul 8 21:52:55 2004 ++++ datatype/image/wbmp/renderer/umakedll_unix.pcf Fri Jul 8 21:38:36 2005 +@@ -50,3 +50,4 @@ + # + ++project.AddSystemPaths('-L' + platform.x_root_dir + '/lib') + project.AddSystemLibraries("X11") +--- datatype/image/realpix/renderer/umakedll_unix.pcf Thu Jul 8 21:52:55 2004 ++++ datatype/image/realpix/renderer/umakedll_unix.pcf Fri Jul 8 21:38:36 2005 +@@ -50,3 +50,4 @@ + # + ++project.AddSystemPaths('-L' + platform.x_root_dir + '/lib') + project.AddSystemLibraries("X11") +--- datatype/ogg/fileformat/unix.pcf Wed Sep 10 16:21:27 2003 ++++ datatype/ogg/fileformat/unix.pcf Fri Jul 8 21:49:23 2005 +@@ -1,3 +1,2 @@ +- +-project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libogg.a")) +-project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libvorbis.a")) ++project.AddSystemPaths('-L' + os.path.join(GetSDKPath("oggvorbissdk"), "lib")) ++project.AddSystemLibraries("ogg", "vorbis") +--- datatype/vorbis/renderer/unix.pcf Wed Sep 10 16:21:27 2003 ++++ datatype/vorbis/renderer/unix.pcf Fri Jul 8 21:49:23 2005 +@@ -1,3 +1,2 @@ +- +-project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libogg.a")) +-project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libvorbis.a")) ++project.AddSystemPaths('-L' + os.path.join(GetSDKPath("oggvorbissdk"), "lib")) ++project.AddSystemLibraries("ogg", "vorbis") diff --git a/multimedia/helixplayer/files/patch-util b/multimedia/helixplayer/files/patch-util new file mode 100644 index 000000000000..fe2e6eb64824 --- /dev/null +++ b/multimedia/helixplayer/files/patch-util @@ -0,0 +1,17 @@ +--- common/util/Umakefil Thu Jul 8 21:48:15 2004 ++++ common/util/Umakefil Mon Mar 21 08:53:52 2005 +@@ -74,6 +74,4 @@ + "db_dict.cpp", + "key.cpp", +- "md5.c", +- "md5hl.c", + "mimechk.cpp", + "miscsp.cpp", +@@ -125,7 +123,4 @@ + "hxcbobj.cpp", + "clone_values.cpp") +- +-if not project.IsDefined("HELIX_CONFIG_NOSTATICS"): +- project.AddSources("getopt.c") + + project.AddSources("tconverter/fxpoint/tconverter_fxp.cpp") diff --git a/multimedia/helixplayer/files/patch-vdecopcl.c b/multimedia/helixplayer/files/patch-vdecopcl.c new file mode 100644 index 000000000000..9c03a6aa18d3 --- /dev/null +++ b/multimedia/helixplayer/files/patch-vdecopcl.c @@ -0,0 +1,9 @@ +--- datatype/h263/codec/video/vdecopcl.c Thu Jul 8 21:56:22 2004 ++++ datatype/h263/codec/video/vdecopcl.c Fri Jul 8 01:58:47 2005 +@@ -52,5 +52,5 @@ + //#include <stddef.h> + #include "machine.h" +-#ifdef FOR_MAC ++#if defined(FOR_MAC) || defined(__FreeBSD__) || defined(_FREEBSD) + #include <stdlib.h> + #else diff --git a/multimedia/helixplayer/files/patch-xmldll b/multimedia/helixplayer/files/patch-xmldll new file mode 100644 index 000000000000..0455689bac89 --- /dev/null +++ b/multimedia/helixplayer/files/patch-xmldll @@ -0,0 +1,21 @@ +--- common/lang/xml/xmldll Mon Jul 19 17:04:07 2004 ++++ common/lang/xml/xmldll Thu Jul 7 23:26:10 2005 +@@ -58,7 +58,5 @@ + "common/runtime/pub", + "common/dbgtool/pub", +- "common/system/pub", +- "common/import/expat/xmlparse", +- "common/import/expat/xmltok") ++ "common/system/pub") + + project.AddModuleLibraries("common/util[utillib]", +@@ -70,8 +68,5 @@ + project.AddSources("xmlccf.cpp", + "hxexpat/expatprs.cpp", +- "hxexpat/expatapi.cpp", +- "../../import/expat/xmlparse/xmlparse.c", +- "../../import/expat/xmltok/xmltok.c", +- "../../import/expat/xmltok/xmlrole.c") ++ "hxexpat/expatapi.cpp") + + project.AddDefines("XML_DTD", diff --git a/multimedia/helixplayer/pkg-plist b/multimedia/helixplayer/pkg-plist index 4aded4a39631..5f7802bc9b49 100644 --- a/multimedia/helixplayer/pkg-plist +++ b/multimedia/helixplayer/pkg-plist @@ -1,4 +1,3 @@ -HelixPlayer/Bin/setup HelixPlayer/LICENSE HelixPlayer/README HelixPlayer/codecs/colorcvt.so @@ -190,6 +189,5 @@ share/applications/hxplay.desktop @dirrm HelixPlayer/doc @dirrm HelixPlayer/common @dirrm HelixPlayer/codecs -@dirrm HelixPlayer/Bin @dirrm HelixPlayer @dirrmtry share/applications |