[librtmp] Update to 2.4

ports/librtmp/CMakeLists.txt

@@ -36,7 +36,6 @@ set(SRCS librtmp/amf.c
          librtmp/log.c
          librtmp/parseurl.c
          librtmp/rtmp.c
-         librtmp/librtmp.def
 )
 
 if(MSVC)
@@ -54,4 +53,4 @@ install(TARGETS librtmp
         LIBRARY DESTINATION lib
         ARCHIVE DESTINATION lib)
 
-install(FILES librtmp/rtmp.h librtmp/amf.h DESTINATION include/librtmp)
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/librtmp DESTINATION include FILES_MATCHING PATTERN "*.h")

ports/librtmp/CONTROL

@@ -1,4 +1,4 @@
 Source: librtmp
-Version: 2.3
+Version: 2.4
 Build-Depends: zlib, openssl
 Description: RTMPDump Real-Time Messaging Protocol API

ports/librtmp/fix_strncasecmp.patch

@@ -1,16 +1,20 @@
 diff --git a/librtmp/rtmp_sys.h b/librtmp/rtmp_sys.h
-index 0874cbe..b43d587 100644
+index 6a3f215..1b5ac2a 100644
 --- a/librtmp/rtmp_sys.h
 +++ b/librtmp/rtmp_sys.h
-@@ -37,6 +37,11 @@
+@@ -28,11 +28,13 @@
  #include <ws2tcpip.h>
- #endif
  
-+#ifdef _MSC_VER
-+#define strncasecmp _strnicmp
+ #ifdef _MSC_VER	/* MSVC */
++#if _MSC_VER < 1900
+ #define snprintf _snprintf
+-#define strcasecmp stricmp
+-#define strncasecmp strnicmp
+ #define vsnprintf _vsnprintf
+ #endif
 +#define strcasecmp _stricmp
++#define strncasecmp _strnicmp
 +#endif
-+
+ 
  #define GetSockError()	WSAGetLastError()
  #define SetSockError(e)	WSASetLastError(e)
- #define setsockopt(a,b,c,d,e)	(setsockopt)(a,b,c,(const char *)d,(int)e)

ports/librtmp/hide_netstackdump.patch

@@ -1,8 +1,8 @@
 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
-index f152648..0bf3f7d 100644
+index 5ef3ae9..e559c6e 100644
 --- a/librtmp/rtmp.c
 +++ b/librtmp/rtmp.c
-@@ -1316,7 +1316,7 @@ ReadN(RTMP *r, char *buffer, int n)
+@@ -1333,7 +1333,7 @@ ReadN(RTMP *r, char *buffer, int n)
  	    SendBytesReceived(r);
  	}
        /*RTMP_Log(RTMP_LOGDEBUG, "%s: %d bytes\n", __FUNCTION__, nBytes); */
@@ -11,7 +11,7 @@ index f152648..0bf3f7d 100644
        fwrite(ptr, 1, nBytes, netstackdump_read);
  #endif
  
-@@ -3527,7 +3527,7 @@ RTMPSockBuf_Send(RTMPSockBuf *sb, const char *buf, int len)
+@@ -3553,7 +3553,7 @@ RTMPSockBuf_Send(RTMPSockBuf *sb, const char *buf, int len)
  {
    int rc;
  

ports/librtmp/librtmp.def

@@ -1,4 +1,11 @@
 EXPORTS
+	AMF3_Decode
+	AMF3CD_AddProp
+	AMF3CD_GetProp
+	AMF3Prop_Decode
+	AMF3ReadInteger
+	AMF3ReadString
+
 	AMF_AddProp
 	AMF_CountProp
 	AMF_Decode
@@ -24,13 +31,6 @@ EXPORTS
 	AMF_GetProp
 	AMF_Reset
 
-	AMF3_Decode
-	AMF3CD_AddProp
-	AMF3CD_GetProp
-	AMF3Prop_Decode
-	AMF3ReadInteger
-	AMF3ReadString
-
 	AMFProp_Decode
 	AMFProp_Dump
 	AMFProp_Encode
@@ -51,9 +51,7 @@ EXPORTS
 	RTMP_Connect0
 	RTMP_Connect1
 	RTMP_ConnectStream
-	RTMP_ctrlC
 	RTMP_debuglevel
-	RTMP_DefaultFlashVer
 	RTMP_DeleteStream
 	RTMP_DropRequest
 	RTMP_EnableWrite
@@ -97,9 +95,15 @@ EXPORTS
 	RTMP_SetupStream
 	RTMP_SetupURL
 	RTMP_Socket
-	RTMP_TLS_ctx
 	RTMP_TLS_Init
 	RTMP_ToggleStream
 	RTMP_UpdateBufferMS
 	RTMP_UserInterrupt
 	RTMP_Write
+	RTMPPacket_Alloc
+	RTMPPacket_Dump
+	RTMPPacket_Free
+	RTMPPacket_Reset
+	RTMPSockBuf_Close
+	RTMPSockBuf_Fill
+	RTMPSockBuf_Send

ports/librtmp/portfile.cmake

@@ -1,13 +1,13 @@
 include(vcpkg_common_functions)
 
-set(RTMPDUMP_VERSION 2.3)
-set(RTMPDUMP_FILENAME rtmpdump-${RTMPDUMP_VERSION}.tgz)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/rtmpdump-${RTMPDUMP_VERSION})
+set(RTMPDUMP_VERSION 2.4)
+set(RTMPDUMP_FILENAME rtmpdump-${RTMPDUMP_VERSION}.tar.gz)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/rtmpdump)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "http://rtmpdump.mplayerhq.hu/download/${RTMPDUMP_FILENAME}"
     FILENAME "${RTMPDUMP_FILENAME}"
-    SHA512 d8240ba372a704231286b81bbf75716d8b76874840538c4e1527f7f8b6ca66eeaba6b03167fe6fab06bf80f20f07d89ecb84cc428b3196234174a43f3328ec2a
+    SHA512 a6253af95492739366dce620a2a6cc6f4f18d7f12f9ef2c747240259066ca135beeb02091d0f3dd8380c0c294a30d3f702ad3fad1dee1db4e70473078fb81609
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
@@ -23,6 +23,7 @@ vcpkg_apply_patches(
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
 )
 
 vcpkg_install_cmake()