[SCM] crtmpserver/master: Complete patches
jet-guest at users.alioth.debian.org
jet-guest at users.alioth.debian.org
Mon Jun 6 16:51:58 UTC 2011
The following commit has been merged in the master branch:
commit bba5b3b632c622796d63fb97a8bb2700748fae2c
Author: Andriy Beregovenko <jet at jet.kiev.ua>
Date: Mon Jun 6 19:40:22 2011 +0300
Complete patches
diff --git a/debian/patches/10_disable_tests_vmtests.diff b/debian/patches/10_disable_tests_vmtests.diff
index ee2cbf2..f888c9a 100644
--- a/debian/patches/10_disable_tests_vmtests.diff
+++ b/debian/patches/10_disable_tests_vmtests.diff
@@ -2,7 +2,7 @@ Description: disable tests and vmtests.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -184,7 +184,7 @@
+@@ -188,7 +188,7 @@
ADD_SUBDIRECTORY(vm vm)
ADD_SUBDIRECTORY(applications applications)
ADD_SUBDIRECTORY(crtmpserver crtmpserver)
diff --git a/debian/patches/10_disable_vm_tests_vmtests.diff b/debian/patches/10_disable_vm_tests_vmtests.diff
deleted file mode 100644
index 5dc9584..0000000
--- a/debian/patches/10_disable_vm_tests_vmtests.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: disable vm, tests and vmtests.
- This applications is not present in package, so disable it in
- cmake build rules.
-Author: Andriy Beregovenko <jet at jet.kiev.ua>
-Last-Update: 2011-03-25
-
----
- CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- crtmpserver.orig/CMakeLists.txt
-+++ crtmpserver/CMakeLists.txt
-@@ -167,7 +167,7 @@ ADD_SUBDIRECTORY(applications applicatio
- #ADD_SUBDIRECTORY(androidapplestreaming androidapplestreaming)
-
- ADD_DEFINITIONS(-DVM_LUA)
--ADD_SUBDIRECTORY(vm vm)
--ADD_SUBDIRECTORY(vmtests vmtests)
--ADD_SUBDIRECTORY(tests)
-+#ADD_SUBDIRECTORY(vm vm)
-+#ADD_SUBDIRECTORY(vmtests vmtests)
-+#ADD_SUBDIRECTORY(tests)
-
diff --git a/debian/patches/16_fix_rvalue_access.diff b/debian/patches/16_fix_rvalue_access.diff
deleted file mode 100644
index 9900a6a..0000000
--- a/debian/patches/16_fix_rvalue_access.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: fix rvalue/lvalue issue
- Fix problem with rvalue is accessed before lvalue
-Author: Andriy Beregovenko <jet at jet.kiev.ua>
-Last-Update: 2011-04-06
-
---- crtmpserver.orig/crtmpserver/src/crtmpserver.cpp
-+++ crtmpserver/crtmpserver/src/crtmpserver.cpp
-@@ -303,10 +303,14 @@
- void NormalizeCommandLine(string configFile) {
- gRs.commandLine["arguments"]["configFile"] = configFile;
- gRs.commandLine["arguments"].RemoveKey(configFile);
-- gRs.commandLine["arguments"]["--help"] = (bool)gRs.commandLine["arguments"].HasKey("--help");
-- gRs.commandLine["arguments"]["--version"] = (bool)gRs.commandLine["arguments"].HasKey("--version");
-- gRs.commandLine["arguments"]["--use-implicit-console-appender"] = (bool)gRs.commandLine["arguments"].HasKey("--use-implicit-console-appender");
-- gRs.commandLine["arguments"]["--daemon"] = (bool)gRs.commandLine["arguments"].HasKey("--daemon");
-+ bool tmp = (gRs.commandLine["--help"] != V_NULL);
-+ gRs.commandLine["--help"] = (bool)tmp;
-+ tmp = (gRs.commandLine["--version"] != V_NULL);
-+ gRs.commandLine["--version"] = (bool)tmp;
-+ tmp = (gRs.commandLine["arguments"]["--use-implicit-console-appender"] != V_NULL);
-+ gRs.commandLine["arguments"]["--use-implicit-console-appender"] = (bool)tmp;
-+ tmp = (gRs.commandLine["arguments"]["--daemon"] != V_NULL);
-+ gRs.commandLine["arguments"]["--daemon"] = (bool)tmp;
- if (gRs.commandLine["arguments"].HasKey("--uid")) {
- gRs.commandLine["arguments"]["--uid"] = (uint32_t) atoi(STR(gRs.commandLine["arguments"]["--uid"]));
- } else {
diff --git a/debian/patches/17_fix_bigendian_defines.diff b/debian/patches/17_fix_bigendian_defines.diff
deleted file mode 100644
index 1b4eb9f..0000000
--- a/debian/patches/17_fix_bigendian_defines.diff
+++ /dev/null
@@ -1,82 +0,0 @@
-Description: Fix endianess implementation for big endian platform
- Reimplement endianess for big-endian architectures
-Author: Andriy Beregovenko <jet at jet.kiev.ua>
-Last-Update: 2011-04-06
-
---- crtmpserver.orig/common/include/platform/endianess/big_endian_byte_aligned.h
-+++ crtmpserver/common/include/platform/endianess/big_endian_byte_aligned.h
-@@ -17,27 +17,58 @@
- * along with crtmpserver. If not, see <http://www.gnu.org/licenses/>.
- */
-
--
- #ifndef _BIG_ENDIAN_BYTE_ALIGNED_H
- #define _BIG_ENDIAN_BYTE_ALIGNED_H
-
--#define htonll(x) (x)
--#define ntohll(x) (x)
-+//64 bit
-+#ifndef DONT_DEFINE_HTONLL
-+#define htonll(x) (x)
-+#define ntohll(x) (x)
-+#endif /* DONT_DEFINE_HTONLL */
-
--//adobe shit. Sometimes, Adobe's reprezentation of 0x0a0b0c0d
--//in "network-order" is like this: 0b 0c 0d 0a
--#define htona(x) (((x)<<8)|((x)>>24))
--#define ntoha(x) (((x)>>8)|((x)<<24))
-+//64 bit
-+#define EHTONLL(x) htonll(x)
-+#define ENTOHLL(x) ntohll(x)
-
--#define ntohsp(x) ntohs(*((uint16_t *)(x)))
--#define ntohlp(x) ntohl(*((uint32_t *)(x)))
--#define ntohap(x) ntoha(*((uint32_t *)(x)))
--#define ntohllp(x) ntohll(*((uint64_t *)(x)))
-+//double
-+#define EHTOND(hostDoubleVal,networkUI64Val) networkUI64Val=EHTONLL((*((uint64_t *)(&(hostDoubleVal)))))
-+#define ENTOHD(networkUI64Val,hostDoubleVal) \
-+do {\
-+ uint64_t ___tempHostENTOHD=ENTOHLL(networkUI64Val); \
-+ hostDoubleVal=(double)(*((double *)&___tempHostENTOHD)); \
-+} while(0)
-
--#define put_htons(x,v) (*((uint16_t*)(x)) = htons(v))
--#define put_htonl(x,v) (*((uint32_t*)(x)) = htonl(v))
--#define put_htonll(x,v) (*((uint64_t*)(x)) = htonll(v))
--/* TODO: Do we need put_value methods for aligned access when not swapping bytes */
--/* TODO: Do we need put_htonll() or put_htona() */
-+//32 bit
-+#define EHTONL(x) htonl(x)
-+#define ENTOHL(x) ntohl(x)
-
-+//16 bit
-+#define EHTONS(x) htons(x)
-+#define ENTOHS(x) ntohs(x)
-+
-+//adobe
-+#define EHTONA(x) (((x)<<8)|((x)>>24))
-+#define ENTOHA(x) (((x)>>8)|((x)<<24))
-+
-+//64 bit pointer
-+#define EHTONLLP(pNetworkPointer,hostLongLongValue) (*((uint64_t*)(pNetworkPointer)) = EHTONLL(hostLongLongValue))
-+#define ENTOHLLP(pNetworkPointer) ENTOHLL(*((uint64_t *)(pNetworkPointer)))
-+
-+//double pointer
-+#define EHTONDP(hostDoubleVal,pNetworkPointer) EHTOND(hostDoubleVal,(*((uint64_t *)(pNetworkPointer))))
-+#define ENTOHDP(pNetworkPointer,hostDoubleVal) ENTOHD((*((uint64_t *)(pNetworkPointer))),hostDoubleVal)
-+
-+//32 bit pointer
-+#define EHTONLP(pNetworkPointer,hostLongValue) (*((uint32_t*)(pNetworkPointer)) = EHTONL(hostLongValue))
-+#define ENTOHLP(pNetworkPointer) ENTOHL(*((uint32_t *)(pNetworkPointer)))
-+
-+//16 bit pointer
-+#define EHTONSP(pNetworkPointer,hostShortValue) (*((uint16_t*)(pNetworkPointer)) = EHTONS(hostShortValue))
-+#define ENTOHSP(pNetworkPointer) ENTOHS(*((uint16_t *)(pNetworkPointer)))
-+
-+//adobe pointer
-+#define EHTONAP(pNetworkPointer,hostAdobeValue) (*((uint32_t*)(pNetworkPointer)) = EHTONA(hostAdobeValue))
-+#define ENTOHAP(pNetworkPointer) ENTOHA(*((uint32_t *)(pNetworkPointer)))
-+
- #endif /* _BIG_ENDIAN_BYTE_ALIGNED_H */
-+
--
crtmpserver packaging
More information about the pkg-multimedia-commits
mailing list