18eec0ea7e
decided to leave this marked IGNORE/BROKEN for the moment until I can
figure out if/when/why the build is failing; but also, I have a few more
changes to make before I bring it back to life.
This is courtesy of Mikhail Teterin, with some input from Thierry
Thomas.
1) Allow port to build and execute on amd64.
2) Do not build the bundled png, jpg, zlib, bzip2, getopt, md5: do not
even extract them -- use the ports and the OS versions (OpenSSL in
case of md5 -- it may be assembler-optimized on some arches even)
3) Do not build the giant install.bz2, which the do-install target
would then untar in ${PREFIX}/HelixPlayer -- leave that whole part
alone and simply copy the stuff under PREFIX.
4) Check for build failures (parsing the end of build.out) and fail in
post-built, of any modules failed.
5) Fix JPEG image display.
46 lines
1.3 KiB
Text
46 lines
1.3 KiB
Text
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;
|