[50620] trunk/dports/www/rtmpdump

[raimue at macports.org]

Revision: 50620
          http://trac.macports.org/changeset/50620
Author:   raimue at macports.org
Date:     2009-05-05 01:03:19 -0700 (Tue, 05 May 2009)
Log Message:
-----------
www/rtmpdump:
Fix build for Tiger, closes #19386

Modified Paths:
--------------
    trunk/dports/www/rtmpdump/Portfile
    trunk/dports/www/rtmpdump/files/patch-bytes.h.diff

Added Paths:
-----------
    trunk/dports/www/rtmpdump/files/patch-bytes.cpp.diff

Modified: trunk/dports/www/rtmpdump/Portfile
===================================================================
--- trunk/dports/www/rtmpdump/Portfile	2009-05-05 05:52:54 UTC (rev 50619)
+++ trunk/dports/www/rtmpdump/Portfile	2009-05-05 08:03:19 UTC (rev 50620)
@@ -4,6 +4,7 @@
 
 name                rtmpdump
 version             1.4
+revision            1
 categories          www net
 platforms           darwin
 maintainers         gmail.com:captsolo openmaintainer
@@ -21,7 +22,7 @@
 
 checksums           md5 09fef2e674f7579088d966aac5d08736
 
-patchfiles          patch-bytes.h.diff
+patchfiles          patch-bytes.h.diff patch-bytes.cpp.diff
 post-patch {
     reinplace "s|CC=.*\$|CC=${configure.cc}|" ${worksrcpath}/Makefile
     reinplace "s|CXX=.*\$|CXX=${configure.cxx}|" ${worksrcpath}/Makefile

Added: trunk/dports/www/rtmpdump/files/patch-bytes.cpp.diff
===================================================================
--- trunk/dports/www/rtmpdump/files/patch-bytes.cpp.diff	                        (rev 0)
+++ trunk/dports/www/rtmpdump/files/patch-bytes.cpp.diff	2009-05-05 08:03:19 UTC (rev 50620)
@@ -0,0 +1,11 @@
+--- bytes.cpp.orig	2009-04-30 05:38:51.000000000 +0200
++++ bytes.cpp	2009-04-30 05:39:07.000000000 +0200
+@@ -31,7 +31,7 @@
+ 
+ #if __FLOAT_WORD_ORDER == __BYTE_ORDER
+ #if __BYTE_ORDER == __BIG_ENDIAN
+-	res = dVal;
++	res = *(uint64_t*)&dVal;
+ #elif __BYTE_ORDER == __LITTLE_ENDIAN
+         uint64_t in  = *((uint64_t*)&dVal);
+         res = __bswap_64(in);

Modified: trunk/dports/www/rtmpdump/files/patch-bytes.h.diff
===================================================================
--- trunk/dports/www/rtmpdump/files/patch-bytes.h.diff	2009-05-05 05:52:54 UTC (rev 50619)
+++ trunk/dports/www/rtmpdump/files/patch-bytes.h.diff	2009-05-05 08:03:19 UTC (rev 50620)
@@ -1,26 +1,32 @@
---- bytes.h.orig	2009-04-06 00:10:27.000000000 +0100
-+++ bytes.h	2009-04-06 00:09:15.000000000 +0100
-@@ -34,12 +34,23 @@
+--- bytes.h.orig	2009-04-30 05:52:02.000000000 +0200
++++ bytes.h	2009-04-30 06:00:47.000000000 +0200
+@@ -34,6 +34,20 @@
        | (((x) & 0x00000000000000ffull) << 56))
  
  #else
-+#ifdef __APPLE__ 
-+#include <machine/endian.h> 
-+#include <libkern/_OSByteOrder.h> 
-+#define __BYTE_ORDER BYTE_ORDER 
-+#define __FLOAT_WORD_ORDER BYTE_ORDER 
-+#define __BIG_ENDIAN BIG_ENDIAN 
-+#define __LITTLE_ENDIAN LITTLE_ENDIAN 
-+#define __bswap_32 __DARWIN_OSSwapConstInt32 
-+#define __bswap_64 __DARWIN_OSSwapConstInt64 
-+#else 
++
++#ifdef __APPLE__
++#include <machine/endian.h>
++#define __BIG_ENDIAN		BIG_ENDIAN
++#define __LITTLE_ENDIAN		LITTLE_ENDIAN
++
++#include <libkern/OSByteOrder.h>
++#define __BYTE_ORDER		BYTE_ORDER
++#define __FLOAT_WORD_ORDER	BYTE_ORDER
++
++#define __bswap_32			OSSwapConstInt32
++#define __bswap_64			OSSwapConstInt64
++
++#else
  #include <endian.h>
  #include <byteswap.h>
  
- typedef __uint64_t uint64_t;
+@@ -41,6 +55,8 @@
  typedef __uint32_t uint32_t;
  #endif
-+#endif 
  
++#endif
++
  #if !defined(__BYTE_ORDER) || !defined(__FLOAT_WORD_ORDER)
  #error "Undefined byte and float word order!"
+ #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090505/e9ae5ebb/attachment-0001.html>