Maintenance. Just to make it compilable.

contrib/CMakeLists.txt

@@ -163,9 +163,9 @@ IF(COMPILE_TIFF)
     ENDIF()
     EXTERNALPROJECT_ADD(
         08_TIFF
-        URL ${URL}tiff-4.0.0.tar.gz
+        URL ${URL}tiff-4.0.9.tar.gz
         BUILD_IN_SOURCE 1
-        PATCH_COMMAND patch -d <SOURCE_DIR> -p0 -t -N < ${PROJECT_SOURCE_DIR}/contrib/libtiff-4.0.0.patch
+        PATCH_COMMAND patch -d <SOURCE_DIR> -p0 -t -N < ${PROJECT_SOURCE_DIR}/contrib/libtiff-4.0.9.patch
         CONFIGURE_COMMAND ${CONFIGURE} ${PREFIX_ARG} ${AUTO_CFLAGS} ${AUTO_CXXFLAGS} ${AUTO_LDFLAGS}
                           --disable-dependency-tracking --enable-static=yes --enable-shared=no
                           --enable-jpeg=no

gui/resources/naming.xml

@@ -95,8 +95,6 @@ YUE    CHINESE - CANTONESE
 </language>
 
 <territory>
-INT-TD    International Texted
-INT-TL    International Textless
 AE    UNITED ARAB EMIRATES
 AL    ALBANIA
 AN    CURACAO
@@ -215,7 +213,6 @@ ZA    SOUTH AFRICA
 </territory>
 
 <rating>
-NR    NOT RATED
 G     General Admission
 PG    Parental Guidance
 13    PG-13
@@ -309,11 +306,12 @@ Y7    YELLOW CIRCLE 7
 </rating>
 
 <audio>
-MOS   No Audio (Silent)
+NS    No Sound
 51    5.1
+61    6.1
 71    7.1
-10    1.0 (Center Channel Mono)
-20    2.0 (LoRo Stereo)
+10    Center Channel Mono
+20    LtRt Stereo
 </audio>
 
 <resolution>

libasdcp/AS_DCP.h

@@ -25,7 +25,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 /*! \file    AS_DCP.h
-    \version $Id: AS_DCP.h,v 1.54 2016/11/22 17:58:18 jhurst Exp $
+    \version $Id: AS_DCP.h,v 1.52 2015/04/21 03:55:31 jhurst Exp $
     \brief   AS-DCP library, public interface
 
 The asdcplib library is a set of file access objects that offer simplified
@@ -222,7 +222,6 @@ namespace ASDCP {
     ESS_AS02_PCM_24b_96k,     // the file contains one or more PCM audio pairs, clip wrapped
     ESS_AS02_TIMED_TEXT,      // the file contains a TTML document and zero or more resources
 
-    ESS_ACES,                 // the file contains one ACES codestream
     ESS_MAX
   };
 
@@ -302,9 +301,6 @@ namespace ASDCP {
   const Rational EditRate_96 = Rational(96,1);
   const Rational EditRate_100 = Rational(100,1);
   const Rational EditRate_120 = Rational(120,1);
-  const Rational EditRate_192 = Rational(192,1);
-  const Rational EditRate_200 = Rational(200,1);
-  const Rational EditRate_240 = Rational(240,1);
 
   // Archival frame rates, see ST 428-21
   // These rates are new and not supported by all systems. Do not assume that
@@ -950,8 +946,6 @@ namespace ASDCP {
 	  // Reads the next sequential frame in the input file and places it in the
 	  // frame buffer. Fails if the buffer is too small or the stream is empty.
 	  Result_t ReadFrame(FrameBuffer&) const;
-
-	  Result_t Seek(ui32_t frame_number) const;
 	};
 
 

libasdcp/AS_DCP_AES.cpp

@@ -39,10 +39,9 @@ using Kumu::DefaultLogSink;
 using namespace ASDCP;
 const int KEY_SIZE_BITS = 128;
 
-#include <openssl/aes.h>
-#include <openssl/sha.h>
-#include <openssl/bn.h>
-#include <openssl/err.h>
+#include <libcrypto/aes.h>
+#include <libcrypto/err.h>
+#include <libcrypto/sha1.h>
 
 
 void
@@ -177,7 +176,7 @@ ASDCP::AESDecContext::InitKey(const byte_t* key)
   KM_TEST_NULL_L(key);
 
   if ( m_Context )
-    return  RESULT_INIT;
+    return RESULT_INIT;
 
   m_Context = new h__AESContext;
   m_Context->m_KeyBuf.Set(key);