Request 5282 (accepted)

makemkv.changes Changed

makemkv.spec Changed

makemkv-bin-1.15.3.tar.xz/bin/amd64/makemkvcon -> makemkv-bin-1.15.4.tar.gz/bin/amd64/makemkvcon Changed

makemkv-bin-1.15.3.tar.xz/bin/i386/makemkvcon -> makemkv-bin-1.15.4.tar.gz/bin/i386/makemkvcon Changed

makemkv-bin-1.15.3.tar.xz/src/share/appdata.tar -> makemkv-bin-1.15.4.tar.gz/src/share/appdata.tar Changed

makemkv-bin-1.15.3.tar.xz/src/share/blues.jar -> makemkv-bin-1.15.4.tar.gz/src/share/blues.jar Changed

makemkv-oss-1.15.3.tar.xz/configure -> makemkv-oss-1.15.4.tar.gz/configure Changed

@@ -643,6 +643,7 @@
 PKG_CONFIG_PATH
 PKG_CONFIG
 NO_EC_DEF
+HAVE_CXX11
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
@@ -751,7 +752,6 @@
 enable_gui
 enable_qt5
 enable_noec
-enable_allcodecs
 enable_debug
 '
       ac_precious_vars='build_alias
@@ -1410,8 +1410,6 @@
   --disable-qt5           do not use Qt5
   --enable-noec           use private ECDSA code (default - use openssl ECDSA
                           if available)
-  --enable-allcodecs      enable all codecs from ffmpeg library (default - use
-                          only necessary subset)
   --enable-debug          keep debug symbols in binarfies (default - strip
                           debug symbols)
 
@@ -11708,14 +11706,6 @@
 fi
 
 
-# Check whether --enable-allcodecs was given.
-if test "${enable_allcodecs+set}" = set; then :
-  enableval=$enable_allcodecs;
-else
-  enable_allcodecs=no
-fi
-
-
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug;
@@ -11726,10 +11716,6 @@
 ENABLE_DEBUG=$enable_debug
 
 
-if test -z $CXXFLAGS; then
-    CXXFLAGS='-std=c++11'
-fi
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -16120,6 +16106,672 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
+  ax_cxx_compile_alternatives="11 0x"    ax_cxx_compile_cxx11_required=true
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+  ac_success=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features by default" >&5
+$as_echo_n "checking whether $CXX supports C++11 features by default... " >&6; }
+if ${ax_cv_cxx_compile_cxx11+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+// If the compiler admits that it is not ready for C++11, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201103L
+
+#error "This is not a C++11 compiler"
+
+#else
+
+namespace cxx11
+{
+
+  namespace test_static_assert
+  {
+
+    template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+  }
+
+  namespace test_final_override
+  {
+
+    struct Base
+    {
+      virtual void f() {}
+    };
+
+    struct Derived : public Base
+    {
+      virtual void f() override {}
+    };
+
+  }
+
+  namespace test_double_right_angle_brackets
+  {
+
+    template < typename T >
+    struct check {};
+
+    typedef check<void> single_type;
+    typedef check<check<void>> double_type;
+    typedef check<check<check<void>>> triple_type;
+    typedef check<check<check<check<void>>>> quadruple_type;
+
+  }
+
+  namespace test_decltype
+  {
+
+    int
+    f()
+    {
+      int a = 1;
+      decltype(a) b = 2;
+      return a + b;
+    }
+
+  }
+
+  namespace test_type_deduction
+  {
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static const bool value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static const bool value = true;
+    };
+
+    template < typename T1, typename T2 >
+    auto
+    add(T1 a1, T2 a2) -> decltype(a1 + a2)
+    {
+      return a1 + a2;
+    }
+
+    int
+    test(const int c, volatile int v)
+    {
+      static_assert(is_same<int, decltype(0)>::value == true, "");
+      static_assert(is_same<int, decltype(c)>::value == false, "");
+      static_assert(is_same<int, decltype(v)>::value == false, "");
+      auto ac = c;
+      auto av = v;
+      auto sumi = ac + av + 'x';
+      auto sumf = ac + av + 1.0;
+      static_assert(is_same<int, decltype(ac)>::value == true, "");
+      static_assert(is_same<int, decltype(av)>::value == true, "");
+      static_assert(is_same<int, decltype(sumi)>::value == true, "");
+      static_assert(is_same<int, decltype(sumf)>::value == false, "");
+      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
+      return (sumf > 0.0) ? sumi : add(c, v);
+    }
+
+  }
+
+  namespace test_noexcept
+  {
+
+    int f() { return 0; }
+    int g() noexcept { return 0; }
+
+    static_assert(noexcept(f()) == false, "");
+    static_assert(noexcept(g()) == true, "");
+
+  }
+
+  namespace test_constexpr
+  {
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
+    {
+      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
+    }
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c(const CharT *const s) noexcept
+    {
+      return strlen_c_r(s, 0UL);
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("1") == 1UL, "");
+    static_assert(strlen_c("example") == 7UL, "");
+    static_assert(strlen_c("another\0example") == 7UL, "");
+
+  }
+
+  namespace test_rvalue_references
+  {
+
+    template < int N >
+    struct answer
+    {
+      static constexpr int value = N;
+    };
+
+    answer<1> f(int&)       { return answer<1>(); }
+    answer<2> f(const int&) { return answer<2>(); }
+    answer<3> f(int&&)      { return answer<3>(); }
+
+    void
+    test()
+    {
+      int i = 0;
+      const int c = 0;
+      static_assert(decltype(f(i))::value == 1, "");
+      static_assert(decltype(f(c))::value == 2, "");
+      static_assert(decltype(f(0))::value == 3, "");
+    }
+
+  }
+
+  namespace test_uniform_initialization
+  {
+
+    struct test
+    {
+      static const int zero {};
+      static const int one {1};
+    };
+
+    static_assert(test::zero == 0, "");
+    static_assert(test::one == 1, "");
+
+  }
+
+  namespace test_lambdas
+  {
+
+    void
+    test1()
+    {
+      auto lambda1 = [](){};
+      auto lambda2 = lambda1;
+      lambda1();
+      lambda2();
+    }
+
+    int
+    test2()
+    {
+      auto a = [](int i, int j){ return i + j; }(1, 2);
+      auto b = []() -> int { return '0'; }();
+      auto c = [=](){ return a + b; }();
+      auto d = [&](){ return c; }();
+      auto e = [a, &b](int x) mutable {
+        const auto identity = [](int y){ return y; };
+        for (auto i = 0; i < a; ++i)
+          a += b--;
+        return x + identity(a + b);
+      }(0);
+      return a + b + c + d + e;
+    }
+
+    int
+    test3()
+    {
+      const auto nullary = [](){ return 0; };
+      const auto unary = [](int x){ return x; };
+      using nullary_t = decltype(nullary);
+      using unary_t = decltype(unary);
+      const auto higher1st = [](nullary_t f){ return f(); };
+      const auto higher2nd = [unary](nullary_t f1){
+        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
+      };
+      return higher1st(nullary) + higher2nd(nullary)(unary);
+    }
+
+  }
+
+  namespace test_variadic_templates
+  {
+
+    template <int...>
+    struct sum;
+
+    template <int N0, int... N1toN>
+    struct sum<N0, N1toN...>
+    {
+      static constexpr auto value = N0 + sum<N1toN...>::value;
+    };
+
+    template <>
+    struct sum<>
+    {
+      static constexpr auto value = 0;
+    };
+
+    static_assert(sum<>::value == 0, "");
+    static_assert(sum<1>::value == 1, "");
+    static_assert(sum<23>::value == 23, "");
+    static_assert(sum<1, 2>::value == 3, "");
+    static_assert(sum<5, 5, 11>::value == 21, "");
+    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
+
+  }
+
+  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
+  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
+  // because of this.
+  namespace test_template_alias_sfinae
+  {
+
+    struct foo {};
+
+    template<typename T>
+    using member = typename T::member_type;
+
+    template<typename T>
+    void func(...) {}
+
+    template<typename T>
+    void func(member<T>*) {}
+
+    void test();
+
+    void test() { func<foo>(0); }
+
+  }
+
+}  // namespace cxx11
+
+#endif  // __cplusplus >= 201103L
+
+
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ax_cv_cxx_compile_cxx11=yes
+else
+  ax_cv_cxx_compile_cxx11=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx11" >&5
+$as_echo "$ax_cv_cxx_compile_cxx11" >&6; }
+  if test x$ax_cv_cxx_compile_cxx11 = xyes; then
+    ac_success=yes
+  fi
+
+
+
+    if test x$ac_success = xno; then
+                for alternative in ${ax_cxx_compile_alternatives}; do
+      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
+        cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh`
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5
+$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; }
+if eval \${$cachevar+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_CXX="$CXX"
+           CXX="$CXX $switch"
+           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+// If the compiler admits that it is not ready for C++11, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201103L
+
+#error "This is not a C++11 compiler"
+
+#else
+
+namespace cxx11
+{
+
+  namespace test_static_assert
+  {
+
+    template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+  }
+
+  namespace test_final_override
+  {
+
+    struct Base
+    {
+      virtual void f() {}
+    };
+
+    struct Derived : public Base
+    {
+      virtual void f() override {}
+    };
+
+  }
+
+  namespace test_double_right_angle_brackets
+  {
+
+    template < typename T >
+    struct check {};
+
+    typedef check<void> single_type;
+    typedef check<check<void>> double_type;
+    typedef check<check<check<void>>> triple_type;
+    typedef check<check<check<check<void>>>> quadruple_type;
+
+  }
+
+  namespace test_decltype
+  {
+
+    int
+    f()
+    {
+      int a = 1;
+      decltype(a) b = 2;
+      return a + b;
+    }
+
+  }
+
+  namespace test_type_deduction
+  {
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static const bool value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static const bool value = true;
+    };
+
+    template < typename T1, typename T2 >
+    auto
+    add(T1 a1, T2 a2) -> decltype(a1 + a2)
+    {
+      return a1 + a2;
+    }
+
+    int
+    test(const int c, volatile int v)
+    {
+      static_assert(is_same<int, decltype(0)>::value == true, "");
+      static_assert(is_same<int, decltype(c)>::value == false, "");
+      static_assert(is_same<int, decltype(v)>::value == false, "");
+      auto ac = c;
+      auto av = v;
+      auto sumi = ac + av + 'x';
+      auto sumf = ac + av + 1.0;
+      static_assert(is_same<int, decltype(ac)>::value == true, "");
+      static_assert(is_same<int, decltype(av)>::value == true, "");
+      static_assert(is_same<int, decltype(sumi)>::value == true, "");
+      static_assert(is_same<int, decltype(sumf)>::value == false, "");
+      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
+      return (sumf > 0.0) ? sumi : add(c, v);
+    }
+
+  }
+
+  namespace test_noexcept
+  {
+
+    int f() { return 0; }
+    int g() noexcept { return 0; }
+
+    static_assert(noexcept(f()) == false, "");
+    static_assert(noexcept(g()) == true, "");
+
+  }
+
+  namespace test_constexpr
+  {
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
+    {
+      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
+    }
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c(const CharT *const s) noexcept
+    {
+      return strlen_c_r(s, 0UL);
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("1") == 1UL, "");
+    static_assert(strlen_c("example") == 7UL, "");
+    static_assert(strlen_c("another\0example") == 7UL, "");
+
+  }
+
+  namespace test_rvalue_references
+  {
+
+    template < int N >
+    struct answer
+    {
+      static constexpr int value = N;
+    };
+
+    answer<1> f(int&)       { return answer<1>(); }
+    answer<2> f(const int&) { return answer<2>(); }
+    answer<3> f(int&&)      { return answer<3>(); }
+
+    void
+    test()
+    {
+      int i = 0;
+      const int c = 0;
+      static_assert(decltype(f(i))::value == 1, "");
+      static_assert(decltype(f(c))::value == 2, "");
+      static_assert(decltype(f(0))::value == 3, "");
+    }
+
+  }
+
+  namespace test_uniform_initialization
+  {
+
+    struct test
+    {
+      static const int zero {};
+      static const int one {1};
+    };
+
+    static_assert(test::zero == 0, "");
+    static_assert(test::one == 1, "");
+
+  }
+
+  namespace test_lambdas
+  {
+
+    void
+    test1()
+    {
+      auto lambda1 = [](){};
+      auto lambda2 = lambda1;
+      lambda1();
+      lambda2();
+    }
+
+    int
+    test2()
+    {
+      auto a = [](int i, int j){ return i + j; }(1, 2);
+      auto b = []() -> int { return '0'; }();
+      auto c = [=](){ return a + b; }();
+      auto d = [&](){ return c; }();
+      auto e = [a, &b](int x) mutable {
+        const auto identity = [](int y){ return y; };
+        for (auto i = 0; i < a; ++i)
+          a += b--;
+        return x + identity(a + b);
+      }(0);
+      return a + b + c + d + e;
+    }
+
+    int
+    test3()
+    {
+      const auto nullary = [](){ return 0; };
+      const auto unary = [](int x){ return x; };
+      using nullary_t = decltype(nullary);
+      using unary_t = decltype(unary);
+      const auto higher1st = [](nullary_t f){ return f(); };
+      const auto higher2nd = [unary](nullary_t f1){
+        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
+      };
+      return higher1st(nullary) + higher2nd(nullary)(unary);
+    }
+
+  }
+
+  namespace test_variadic_templates
+  {
+
+    template <int...>
+    struct sum;
+
+    template <int N0, int... N1toN>
+    struct sum<N0, N1toN...>
+    {
+      static constexpr auto value = N0 + sum<N1toN...>::value;
+    };
+
+    template <>
+    struct sum<>
+    {
+      static constexpr auto value = 0;
+    };
+
+    static_assert(sum<>::value == 0, "");
+    static_assert(sum<1>::value == 1, "");
+    static_assert(sum<23>::value == 23, "");
+    static_assert(sum<1, 2>::value == 3, "");
+    static_assert(sum<5, 5, 11>::value == 21, "");
+    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
+
+  }
+
+  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
+  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
+  // because of this.
+  namespace test_template_alias_sfinae
+  {
+
+    struct foo {};
+
+    template<typename T>
+    using member = typename T::member_type;
+
+    template<typename T>
+    void func(...) {}
+
+    template<typename T>
+    void func(member<T>*) {}
+
+    void test();
+
+    void test() { func<foo>(0); }
+
+  }
+
+}  // namespace cxx11
+
+#endif  // __cplusplus >= 201103L
+
+
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  eval $cachevar=yes
+else
+  eval $cachevar=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+           CXX="$ac_save_CXX"
+fi
+eval ac_res=\$$cachevar
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+        if eval test x\$$cachevar = xyes; then
+          CXX="$CXX $switch"
+          if test -n "$CXXCPP" ; then
+            CXXCPP="$CXXCPP $switch"
+          fi
+          ac_success=yes
+          break
+        fi
+      done
+      if test x$ac_success = xyes; then
+        break
+      fi
+    done
+  fi
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  if test x$ax_cxx_compile_cxx11_required = xtrue; then
+    if test x$ac_success = xno; then
+      as_fn_error $? "*** A compiler with support for C++11 language features is required." "$LINENO" 5
+    fi
+  fi
+  if test x$ac_success = xno; then
+    HAVE_CXX11=0
+    { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5
+$as_echo "$as_me: No compiler with C++11 support was found" >&6;}
+  else
+    HAVE_CXX11=1
+
+$as_echo "#define HAVE_CXX11 1" >>confdefs.h
+
+  fi
+
+
+
+
 if test "x$enable_noec" != "xno"; then :
 
   NO_EC_DEF=-DFORCE_OPENSSL_NO_EC=1
@@ -16784,176 +17436,16 @@
 fi
 
 
-if test "x$enable_allcodecs" != "xno"; then :
-
-
-$as_echo "#define FFABI_HAVE_ALL_CODECS 1" >>confdefs.h
-
-
-fi
-
-ac_fn_c_check_func "$LINENO" "ff_ac3_decoder" "ac_cv_func_ff_ac3_decoder"
-if test "x$ac_cv_func_ff_ac3_decoder" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_DECODER_AC3 1" >>confdefs.h
-
-
-  ac_fn_c_check_func "$LINENO" "ff_eac3_decoder" "ac_cv_func_ff_eac3_decoder"
-if test "x$ac_cv_func_ff_eac3_decoder" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_DECODER_EAC3 1" >>confdefs.h
-
-
-fi
-
-
-  ac_fn_c_check_func "$LINENO" "ff_aac_latm_decoder" "ac_cv_func_ff_aac_latm_decoder"
-if test "x$ac_cv_func_ff_aac_latm_decoder" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_DECODER_AAC_LATM 1" >>confdefs.h
-
-
-fi
-
-
-  ac_fn_c_check_func "$LINENO" "ff_aac_fixed_decoder" "ac_cv_func_ff_aac_fixed_decoder"
-if test "x$ac_cv_func_ff_aac_fixed_decoder" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_DECODER_AAC_FIXED 1" >>confdefs.h
-
-
-fi
-
-
-  ac_fn_c_check_func "$LINENO" "ff_dca_decoder" "ac_cv_func_ff_dca_decoder"
-if test "x$ac_cv_func_ff_dca_decoder" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_DECODER_DCA 1" >>confdefs.h
-
-
-fi
-
-
-  ac_fn_c_check_func "$LINENO" "ff_mlp_decoder" "ac_cv_func_ff_mlp_decoder"
-if test "x$ac_cv_func_ff_mlp_decoder" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_DECODER_MLP 1" >>confdefs.h
-
-
-fi
-
-
-  ac_fn_c_check_func "$LINENO" "ff_truehd_decoder" "ac_cv_func_ff_truehd_decoder"
-if test "x$ac_cv_func_ff_truehd_decoder" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_DECODER_TRUEHD 1" >>confdefs.h
-
-
-fi
-
-
-  ac_fn_c_check_func "$LINENO" "ff_mp1_decoder" "ac_cv_func_ff_mp1_decoder"
-if test "x$ac_cv_func_ff_mp1_decoder" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_DECODER_MP1 1" >>confdefs.h
-
-
-fi
-
-
-  ac_fn_c_check_func "$LINENO" "ff_mp2_decoder" "ac_cv_func_ff_mp2_decoder"
-if test "x$ac_cv_func_ff_mp2_decoder" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_DECODER_MP2 1" >>confdefs.h
-
-
-fi
-
-
-  ac_fn_c_check_func "$LINENO" "ff_mp3_decoder" "ac_cv_func_ff_mp3_decoder"
-if test "x$ac_cv_func_ff_mp3_decoder" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_DECODER_MP3 1" >>confdefs.h
-
-
-fi
-
-
-  ac_fn_c_check_func "$LINENO" "ff_flac_decoder" "ac_cv_func_ff_flac_decoder"
-if test "x$ac_cv_func_ff_flac_decoder" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_DECODER_FLAC 1" >>confdefs.h
-
-
-fi
-
-
-  ac_fn_c_check_func "$LINENO" "ff_ac3_encoder" "ac_cv_func_ff_ac3_encoder"
-if test "x$ac_cv_func_ff_ac3_encoder" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_ENCODER_AC3 1" >>confdefs.h
-
-
-fi
-
-
-  ac_fn_c_check_func "$LINENO" "ff_ac3_fixed_encoder" "ac_cv_func_ff_ac3_fixed_encoder"
-if test "x$ac_cv_func_ff_ac3_fixed_encoder" = xyes; then :
+ac_fn_c_check_func "$LINENO" "av_codec_iterate" "ac_cv_func_av_codec_iterate"
+if test "x$ac_cv_func_av_codec_iterate" = xyes; then :
 
 
-$as_echo "#define FFABI_HAVE_ENCODER_AC3_FIXED 1" >>confdefs.h
+$as_echo "#define FFABI_HAVE_AV_CODEC_ITERATE 1" >>confdefs.h
 
 
 fi
 
 
-  ac_fn_c_check_func "$LINENO" "ff_aac_encoder" "ac_cv_func_ff_aac_encoder"
-if test "x$ac_cv_func_ff_aac_encoder" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_ENCODER_AAC 1" >>confdefs.h
-
-
-fi
-
-
-  ac_fn_c_check_func "$LINENO" "ff_libfdk_aac_encoder" "ac_cv_func_ff_libfdk_aac_encoder"
-if test "x$ac_cv_func_ff_libfdk_aac_encoder" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_ENCODER_LIBFDK_AAC 1" >>confdefs.h
-
-
-fi
-
-
-  ac_fn_c_check_func "$LINENO" "ff_flac_encoder" "ac_cv_func_ff_flac_encoder"
-if test "x$ac_cv_func_ff_flac_encoder" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_ENCODER_FLAC 1" >>confdefs.h
-
-
-fi
-
-
-
-fi
-
-
-
 CPPFLAGS="$OLD_CPPFLAGS"
 LIBS="$OLD_LIBS"

makemkv-oss-1.15.3.tar.xz/libdriveio/inc/driveio/driveio.h -> makemkv-oss-1.15.4.tar.gz/libdriveio/inc/driveio/driveio.h Changed

@@ -169,10 +169,12 @@
 DIO_INFOLIST    DIO_CDECL   DriveInfoList_Create();
 void            DIO_CDECL   DriveInfoList_Destroy(DIO_INFOLIST List);
 size_t          DIO_CDECL   DriveInfoList_GetCount(DIO_INFOLIST List);
-void            DIO_CDECL   DriveInfoList_GetItem(DIO_INFOLIST List,size_t Index,DriveInfoItem *Item);
+int             DIO_CDECL   DriveInfoList_GetItem(DIO_INFOLIST List,size_t Index,DriveInfoItem *Item);
 int             DIO_CDECL   DriveInfoList_GetItemById(DIO_INFOLIST List,DriveInfoId Id,DriveInfoItem *Item);
 int             DIO_CDECL   DriveInfoList_AddItem(DIO_INFOLIST List,DriveInfoId Id,const void* Data,size_t Size);
 int             DIO_CDECL   DriveInfoList_AddOrUpdateItem(DIO_INFOLIST List, DriveInfoId Id, const void* Data, size_t Size);
+int             DIO_CDECL   DriveInfoList_RemoveItem(DIO_INFOLIST List, size_t Index);
+int             DIO_CDECL   DriveInfoList_RemoveItemById(DIO_INFOLIST List, DriveInfoId Id);
 int             DIO_CDECL   DriveInfoList_CopyAllItemsFrom(DIO_INFOLIST List, const DIO_INFOLIST Src);
 int             DIO_CDECL   DriveInfoList_MoveAllItemsFrom(DIO_INFOLIST List, DIO_INFOLIST Src);
 size_t          DIO_CDECL   DriveInfoList_Serialize(DIO_INFOLIST List, void* Buffer, size_t BufferSize);

makemkv-oss-1.15.3.tar.xz/libdriveio/inc/driveio/error.h -> makemkv-oss-1.15.4.tar.gz/libdriveio/inc/driveio/error.h Changed

makemkv-oss-1.15.3.tar.xz/libdriveio/src/infolist.cpp -> makemkv-oss-1.15.4.tar.gz/libdriveio/src/infolist.cpp Changed

@@ -78,8 +78,10 @@
     bool CopyAllItemsFrom(const CDriveInfoList* Src);
     void MoveAllItemsFrom(CDriveInfoList* Src);
     size_t GetCount();
-    void GetItem(size_t Index,DriveInfoItem *Item);
+    CDriveInfoItem* GetItem(size_t Index);
     bool GetItemById(DriveInfoId Id,DriveInfoItem *Item);
+    bool RemoveItem(size_t Index);
+    bool RemoveItemById(DriveInfoId Id);
     size_t Serialize(void* Buffer,size_t BufferSize);
     bool Deserialize(const void* Buffer,size_t BufferSize);
     void* operator new(size_t,CDriveInfoList* p)
@@ -154,9 +156,9 @@
     return m_count;
 }
 
-void CDriveInfoList::GetItem(size_t Index,DriveInfoItem *Item)
+CDriveInfoItem* CDriveInfoList::GetItem(size_t Index)
 {
-    if (Index>=m_count) return;
+    if (Index>=m_count) return NULL;
 
     CDriveInfoItem* pitem;
 
@@ -175,7 +177,61 @@
         }
     }
 
-    *Item = pitem->m_item;
+    return pitem;
+}
+
+bool CDriveInfoList::RemoveItem(size_t Index)
+{
+    if (Index >= m_count) return false;
+
+    if (m_count == 1)
+    {
+        CDriveInfoItem::Destroy(m_first);
+        m_first = m_last = NULL;
+        m_count = 0;
+        return true;
+    }
+
+    CDriveInfoItem* p_item = NULL;
+    if (Index == 0)
+    {
+        p_item = m_first;
+        m_first = p_item->m_next;
+        CDriveInfoItem::Destroy(p_item);
+        m_count--;
+        return true;
+    }
+
+    CDriveInfoItem* p_prev = m_first;
+    for (unsigned int i = 1; i < Index; i++)
+    {
+        p_prev = p_prev->m_next;
+    }
+    p_item = p_prev->m_next;
+
+    p_prev->m_next = p_item->m_next;
+    if (Index == (m_count - 1))
+    {
+        m_last = p_prev;
+    }
+
+    CDriveInfoItem::Destroy(p_item);
+    m_count--;
+    return true;
+}
+
+bool CDriveInfoList::RemoveItemById(DriveInfoId Id)
+{
+    size_t ndx = 0;
+    for (CDriveInfoItem* pitem = m_first; pitem != NULL; pitem = pitem->m_next)
+    {
+        if (pitem->m_item.Id == Id)
+        {
+            return RemoveItem(ndx);
+        }
+        ndx++;
+    }
+    return false;
 }
 
 bool CDriveInfoList::GetItemById(DriveInfoId Id,DriveInfoItem *Item)
@@ -365,6 +421,7 @@
 extern "C" int DIO_CDECL DriveInfoList_AddItem(DIO_INFOLIST List,DriveInfoId Id,const void* Data,size_t Size)
 {
     LibDriveIo::CDriveInfoList* plist = (LibDriveIo::CDriveInfoList*) List;
+    if (plist == NULL) return DRIVEIO_ERROR_INVALID_ARG;
 
     return plist->AddItem(Id,Data,Size) ? 0 : DRIVEIO_ERR_NO_MEMORY;
 }
@@ -372,6 +429,7 @@
 extern "C" int DIO_CDECL DriveInfoList_AddOrUpdateItem(DIO_INFOLIST List, DriveInfoId Id, const void* Data, size_t Size)
 {
     LibDriveIo::CDriveInfoList* plist = (LibDriveIo::CDriveInfoList*) List;
+    if (plist == NULL) return DRIVEIO_ERROR_INVALID_ARG;
 
     return plist->AddOrUpdateItem(Id, Data, Size) ? 0 : DRIVEIO_ERR_NO_MEMORY;
 }
@@ -379,23 +437,46 @@
 extern "C" size_t DIO_CDECL DriveInfoList_GetCount(DIO_INFOLIST List)
 {
     LibDriveIo::CDriveInfoList* plist = (LibDriveIo::CDriveInfoList*) List;
+    if (plist == NULL) return 0;
 
     return plist->GetCount();
 }
 
-extern "C" void DIO_CDECL DriveInfoList_GetItem(DIO_INFOLIST List,size_t Index,DriveInfoItem *Item)
+extern "C" int DIO_CDECL DriveInfoList_GetItem(DIO_INFOLIST List,size_t Index,DriveInfoItem *Item)
 {
     LibDriveIo::CDriveInfoList* plist = (LibDriveIo::CDriveInfoList*) List;
+    if (plist == NULL) return DRIVEIO_ERROR_INVALID_ARG;
+
+    CDriveInfoItem* pitem = plist->GetItem(Index);
+    if (NULL==pitem) return DRIVEIO_ERROR_INVALID_ARG;
 
-    plist->GetItem(Index,Item);
+    *Item = pitem->m_item;
+
+    return 0;
 }
 
 extern "C" int DIO_CDECL DriveInfoList_GetItemById(DIO_INFOLIST List,DriveInfoId Id,DriveInfoItem *Item)
 {
     LibDriveIo::CDriveInfoList* plist = (LibDriveIo::CDriveInfoList*) List;
 
-    if (List==NULL) return -1;
-    return plist->GetItemById(Id,Item) ? 0 : -1;
+    if (List==NULL) return DRIVEIO_ERROR_INVALID_ARG;
+    return plist->GetItemById(Id,Item) ? 0 : DRIVEIO_ERR_NOT_FOUND;
+}
+
+extern "C" int DIO_CDECL DriveInfoList_RemoveItem(DIO_INFOLIST List, size_t Index)
+{
+    LibDriveIo::CDriveInfoList* plist = (LibDriveIo::CDriveInfoList*) List;
+
+    if (List == NULL) return DRIVEIO_ERROR_INVALID_ARG;
+    return plist->RemoveItem(Index) ? 0 : DRIVEIO_ERROR_INVALID_ARG;
+}
+
+extern "C" int DIO_CDECL DriveInfoList_RemoveItemById(DIO_INFOLIST List, DriveInfoId Id)
+{
+    LibDriveIo::CDriveInfoList* plist = (LibDriveIo::CDriveInfoList*) List;
+
+    if (List == NULL) return DRIVEIO_ERROR_INVALID_ARG;
+    return plist->RemoveItemById(Id) ? 0 : DRIVEIO_ERR_NOT_FOUND;
 }
 
 extern "C" int DIO_CDECL DriveInfoList_CopyAllItemsFrom(DIO_INFOLIST List, const DIO_INFOLIST Src)

makemkv-oss-1.15.3.tar.xz/libdriveio/src/libdriveio.def -> makemkv-oss-1.15.4.tar.gz/libdriveio/src/libdriveio.def Changed

makemkv-oss-1.15.3.tar.xz/libdriveio/src/libdriveio.vers -> makemkv-oss-1.15.4.tar.gz/libdriveio/src/libdriveio.vers Changed

makemkv-oss-1.15.3.tar.xz/libdriveio/src/stdquery.cpp -> makemkv-oss-1.15.4.tar.gz/libdriveio/src/stdquery.cpp Changed

makemkv-oss-1.15.3.tar.xz/libffabi/src/ffabi.c -> makemkv-oss-1.15.4.tar.gz/libffabi/src/ffabi.c Changed

@@ -74,69 +74,6 @@
     }
 }
 
-#if !defined(FFABI_HAVE_ALL_CODECS) && defined(FFABI_HAVE_DECODER_AC3) && (LIBAVCODEC_VERSION_MAJOR < 58)
-#define FFABI_REGISTER_ALL
-extern AVCodec ff_ac3_decoder,ff_eac3_decoder,ff_aac_latm_decoder,ff_aac_fixed_decoder;
-extern AVCodec ff_dca_decoder,ff_mlp_decoder,ff_truehd_decoder;
-extern AVCodec ff_mp1_decoder,ff_mp2_decoder,ff_mp3_decoder;
-extern AVCodec ff_flac_decoder;
-extern AVCodec ff_ac3_encoder,ff_ac3_fixed_encoder,ff_aac_encoder,ff_libfdk_aac_encoder,ff_flac_encoder;
-extern AVCodecParser ff_mlp_parser;
-
-static void ffabi_register_all(void)
-{
-    avcodec_register(&ff_ac3_decoder);
-#ifdef FFABI_HAVE_DECODER_EAC3
-    avcodec_register(&ff_eac3_decoder);
-#endif
-#ifdef FFABI_HAVE_DECODER_AAC_LATM
-    avcodec_register(&ff_aac_latm_decoder);
-#endif
-#ifdef FFABI_HAVE_DECODER_AAC_FIXED
-    avcodec_register(&ff_aac_fixed_decoder);
-#endif
-#ifdef FFABI_HAVE_DECODER_DCA
-    avcodec_register(&ff_dca_decoder);
-#endif
-#ifdef FFABI_HAVE_DECODER_MLP
-    avcodec_register(&ff_mlp_decoder);
-#endif
-#ifdef FFABI_HAVE_DECODER_TRUEHD
-    avcodec_register(&ff_truehd_decoder);
-#endif
-#ifdef FFABI_HAVE_DECODER_MP1
-    avcodec_register(&ff_mp1_decoder);
-#endif
-#ifdef FFABI_HAVE_DECODER_MP2
-    avcodec_register(&ff_mp2_decoder);
-#endif
-#ifdef FFABI_HAVE_DECODER_MP3
-    avcodec_register(&ff_mp3_decoder);
-#endif
-#ifdef FFABI_HAVE_DECODER_FLAC
-    avcodec_register(&ff_flac_decoder);
-#endif
-
-#ifdef FFABI_HAVE_ENCODER_AC3
-    avcodec_register(&ff_ac3_encoder);
-#endif
-#ifdef FFABI_HAVE_ENCODER_AC3_FIXED
-    avcodec_register(&ff_ac3_fixed_encoder);
-#endif
-#ifdef FFABI_HAVE_ENCODER_AAC
-    avcodec_register(&ff_aac_encoder);
-#endif
-#ifdef FFABI_HAVE_ENCODER_LIBFDK_AAC
-    avcodec_register(&ff_libfdk_aac_encoder);
-#endif
-#ifdef FFABI_HAVE_ENCODER_FLAC
-    avcodec_register(&ff_flac_encoder);
-#endif
-
-    av_register_codec_parser(&ff_mlp_parser);
-}
-#endif
-
 int __cdecl ffm_init(ffm_log_callback_t log_proc,void* log_ctx,ffm_memalign_t memalign_proc,ffm_realloc_t realloc_proc,ffm_free_t free_proc)
 {
     log_context = log_ctx;
@@ -147,9 +84,7 @@
 
     av_log_set_callback(static_log_callback);
 
-#ifdef FFABI_REGISTER_ALL
-    ffabi_register_all();
-#else
+#ifndef FFABI_HAVE_AV_CODEC_ITERATE
     avcodec_register_all();
 #endif

makemkv-oss-1.15.3.tar.xz/libffabi/src/ffabicfg.h.in -> makemkv-oss-1.15.4.tar.gz/libffabi/src/ffabicfg.h.in Changed

makemkv-oss-1.15.3.tar.xz/libffabi/src/mpegaudiodecheader.h -> makemkv-oss-1.15.4.tar.gz/libffabi/src/mpegaudiodecheader.h Changed

makemkv-oss-1.15.3.tar.xz/libmakemkv/inc/lgpl/cassert -> makemkv-oss-1.15.4.tar.gz/libmakemkv/inc/lgpl/cassert Changed

makemkv-oss-1.15.3.tar.xz/libmakemkv/inc/lgpl/world.h -> makemkv-oss-1.15.4.tar.gz/libmakemkv/inc/lgpl/world.h Changed

makemkv-oss-1.15.3.tar.xz/libmakemkv/inc/libmkv/libmkv.h -> makemkv-oss-1.15.4.tar.gz/libmakemkv/inc/libmkv/libmkv.h Changed

makemkv-oss-1.15.3.tar.xz/makemkvgui/inc/lgpl/aproxy.h -> makemkv-oss-1.15.4.tar.gz/makemkvgui/inc/lgpl/aproxy.h Changed

makemkv-oss-1.15.3.tar.xz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.15.4.tar.gz/makemkvgui/inc/ver_num.h Changed

makemkv-oss-1.15.3.tar.xz/makemkvgui/src/main.cpp -> makemkv-oss-1.15.4.tar.gz/makemkvgui/src/main.cpp Changed

makemkv-oss-1.15.3.tar.xz/makemkvgui/src/scsiinfo.cpp -> makemkv-oss-1.15.4.tar.gz/makemkvgui/src/scsiinfo.cpp Changed

Overview

Request 5282 (accepted)

Request History