shaka-packager: 3.2.0 -> 3.2.1

From 4c7743f4fd231648d7bd1513c9db71a651ef7553 Mon Sep 17 00:00:00 2001

From a412a1cbce2b8f28e831aabe0c8d31832eb3f840 Mon Sep 17 00:00:00 2001

From: Niklas Korz <niklas@niklaskorz.de>

Date: Wed, 4 Sep 2024 14:52:23 +0200

Date: Thu, 24 Oct 2024 22:05:50 +0200

Subject: [PATCH 2/3] Unvendor dependencies

---

 CMakeLists.txt                     | 24 ++++++++++++++++++++++++

 packager/CMakeLists.txt            |  1 -

 2 files changed, 24 insertions(+), 1 deletion(-)

 packager/tools/pssh/CMakeLists.txt |  5 -----

 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt

index 5b96a2429e..181df0bf2d 100644

 add_subdirectory(tools)

 add_subdirectory(utils)

 add_subdirectory(version)

diff --git a/packager/tools/pssh/CMakeLists.txt b/packager/tools/pssh/CMakeLists.txt

index 9ec3a39d26..0b981cec29 100644

--- a/packager/tools/pssh/CMakeLists.txt

+++ b/packager/tools/pssh/CMakeLists.txt

@@ -14,7 +14,6 @@ set(PSSH_BOX_OUTPUTS

 add_custom_command(

     DEPENDS

-        protobuf_py

         widevine_protos

         pssh-box.py

     OUTPUT ${PSSH_BOX_OUTPUTS}

@@ -26,10 +25,6 @@ add_custom_command(

         ${CMAKE_BINARY_DIR}/packager/media/base/widevine_common_encryption_pb2.py

         ${CMAKE_BINARY_DIR}/packager/media/base/widevine_pssh_data_pb2.py

         ${CMAKE_BINARY_DIR}/packager/pssh-box-protos/

-    COMMAND

-        ${CMAKE_COMMAND} -E copy_directory

-        ${CMAKE_BINARY_DIR}/packager/third_party/protobuf/py/google

-        ${CMAKE_BINARY_DIR}/packager/pssh-box-protos/google

     COMMAND

         ${CMAKE_COMMAND} -E copy

         ${CMAKE_CURRENT_SOURCE_DIR}/pssh-box.py

-- 

2.46.0

stdenv.mkDerivation (finalAttrs: {

  pname = "shaka-packager";

  version = "3.2.0";

  version = "3.2.1";

  src = fetchFromGitHub {

    owner = "shaka-project";

    repo = "shaka-packager";

    rev = "refs/tags/v${finalAttrs.version}";

    hash = "sha256-L10IMsc4dTMa5zwYq612F4J+uKOmEEChY8k/m09wuNE=";

    hash = "sha256-9oGoWDGKnAVqVDa/lz0Y3qiE1y0OD9ZobJ44gxdB+2A=";

  };

  patches = [

  ];

  buildInputs = [

    python3

    (python3.withPackages (ps: [

      # As we remove the vendored protobuf in our patch,

      # we must re-add it to the python package used for

      # pssh_box.py.

      ps.protobuf

    ]))

    abseil-cpp

    curl

    gtest