Commit 04883e8f authored by Niklas Korz's avatar Niklas Korz
Browse files

shaka-packager: 3.2.1 -> 3.3.0

parent 667692b3

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

+0 −13
Original line number Diff line number Diff line 
From a412a1cbce2b8f28e831aabe0c8d31832eb3f840 Mon Sep 17 00:00:00 2001

From: Niklas Korz <niklas@niklaskorz.de>

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

Subject: [PATCH 2/3] Unvendor dependencies



---

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

 packager/CMakeLists.txt            |  1 -

 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

--- a/CMakeLists.txt
@@ -86,6 +75,4 @@ index 9ec3a39d26..0b981cec29 100644 
     COMMAND

         ${CMAKE_COMMAND} -E copy

         ${CMAKE_CURRENT_SOURCE_DIR}/pssh-box.py

-- 

2.46.0

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

+2 −6
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "shaka-packager";

  version = "3.2.1";

  version = "3.3.0";



  src = fetchFromGitHub {

    owner = "shaka-project";

    repo = "shaka-packager";

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

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

    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 = [