Unverified Commit a35398ff authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

shaka-packager: 3.2.0 -> 3.3.0 (#351014)

parents f00f17fe 6effeaf8

pkgs/by-name/sh/shaka-packager/0001-Allow-external-declaration-of-packager-version.patch

+0 −11
Original line number Diff line number Diff line 
From e243cc17f48c5e1b8db29cab85ca98b033d972fb Mon Sep 17 00:00:00 2001

From: Niklas Korz <niklas@niklaskorz.de>

Date: Wed, 4 Sep 2024 14:51:30 +0200

Subject: [PATCH 1/3] Allow external declaration of packager version



---

 packager/version/CMakeLists.txt | 2 ++

 1 file changed, 2 insertions(+)



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

index fba4fb8282..ad56e0a23b 100644

--- a/packager/version/CMakeLists.txt
@@ -27,6 +18,4 @@ index fba4fb8282..ad56e0a23b 100644 
 

 add_library(version STATIC version.cc)

 target_compile_definitions(version PRIVATE

-- 

2.46.0

pkgs/by-name/sh/shaka-packager/0002-Unvendor-dependencies.patch

+23 −12
Original line number Diff line number Diff line 
From 4c7743f4fd231648d7bd1513c9db71a651ef7553 Mon Sep 17 00:00:00 2001

From: Niklas Korz <niklas@niklaskorz.de>

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

Subject: [PATCH 2/3] Unvendor dependencies



---

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

 packager/CMakeLists.txt |  1 -

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



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

index 5b96a2429e..181df0bf2d 100644

--- a/CMakeLists.txt
@@ -62,6 +52,27 @@ index 7238d243bb..722217bbc4 100644 
 add_subdirectory(tools)

 add_subdirectory(utils)

 add_subdirectory(version)

-- 

2.46.0

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

pkgs/by-name/sh/shaka-packager/0003-Fix-curl-deprecations.patch

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
From c8b0b467a140d8a67157f5cee26a8510444706be Mon Sep 17 00:00:00 2001

From: Niklas Korz <niklas@niklaskorz.de>

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

Subject: [PATCH 3/3] Fix curl deprecations



---

 packager/file/http_file.cc | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/packager/file/http_file.cc b/packager/file/http_file.cc

index b50fef6f07..dca43e26ca 100644

--- a/packager/file/http_file.cc

+++ b/packager/file/http_file.cc

@@ -311,7 +311,7 @@ void HttpFile::SetupRequest() {

       curl_easy_setopt(curl, CURLOPT_POST, 1L);

       break;

     case HttpMethod::kPut:

-      curl_easy_setopt(curl, CURLOPT_PUT, 1L);

+      curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);

       break;

   }

 

-- 

2.46.0

pkgs/by-name/sh/shaka-packager/package.nix

+12 −11
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "shaka-packager";

  version = "3.2.0";

  version = "3.3.0";



  src = fetchFromGitHub {

    owner = "shaka-project";

    repo = "shaka-packager";

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

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

    hash = "sha256-5TDfIbguBipYciXusn0rDS0ZQl0+fDFfHYbrnYjxSdE=";

  };



  patches = [
@@ -46,10 +46,6 @@ stdenv.mkDerivation (finalAttrs: { 
    # The last step is necessary to keep the patch size to a minimum, otherwise we'd have

    # to add the namespace identifiers everywhere a dependency is used.

    ./0002-Unvendor-dependencies.patch

    # As nixpkgs ships with a newer version of libcurl than the one vendored in shaka-packager,

    # we have to fix one deprecation.

    # See https://curl.se/libcurl/c/CURLOPT_PUT.html for further information.

    ./0003-Fix-curl-deprecations.patch

  ];



  nativeBuildInputs = [
@@ -58,7 +54,12 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  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
@@ -95,13 +96,13 @@ stdenv.mkDerivation (finalAttrs: { 
    };

  };



  meta = with lib; {

  meta = {

    description = "Media packaging framework for VOD and Live DASH and HLS applications";

    homepage = "https://shaka-project.github.io/shaka-packager/html/";

    changelog = "https://github.com/shaka-project/shaka-packager/releases/tag/v${finalAttrs.version}";

    license = licenses.bsd3;

    license = lib.licenses.bsd3;

    mainProgram = "packager";

    maintainers = with maintainers; [ niklaskorz ];

    platforms = platforms.all;

    maintainers = with lib.maintainers; [ niklaskorz ];

    platforms = lib.platforms.all;

  };

})