Unverified Commit d20b8f87 authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

freedv: 2.1.0 -> 2.2.1 (#488656)

parents edab2963 6f43842f

pkgs/by-name/fr/freedv/no-framework.patch

+3 −3
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ index 38b3b262..3be9bfee 100644 
         TARGET FreeDV

         POST_BUILD

         COMMAND rm -rf dist_tmp FreeDV.dmg || true

-        COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${Python3_ROOT_DIR}:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src -s ${Python3_ROOT_DIR} -s `dirname ${CLANG_SANITIZER_FILE}`

+        COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src -s `dirname ${CLANG_SANITIZER_FILE}`

-        COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${Python3_ROOT_DIR}/../..:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src -s ${Python3_ROOT_DIR}/../.. -s `dirname ${CLANG_SANITIZER_FILE}` -ns

+        COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src -s `dirname ${CLANG_SANITIZER_FILE}` -ns

         COMMAND cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/freedv.icns FreeDV.app/Contents/Resources

         COMMAND rm ARGS -rf FreeDV.app/Contents/Frameworks

         COMMAND mkdir ARGS FreeDV.app/Contents/Frameworks
@@ -21,7 +21,7 @@ index 38b3b262..3be9bfee 100644 
-        COMMAND cd FreeDV.app/Contents/Resources && ../Frameworks/Python.framework/Versions/Current/bin/python3 -c "import radae_txe\; import radae_rxe\;" && cd ../../..

-        

         # Codesign binary so that it can execute

-        COMMAND codesign --force --options runtime --timestamp --entitlements ${CMAKE_CURRENT_SOURCE_DIR}/entitlements.plist --sign ${MACOS_CODESIGN_IDENTITY} ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app -name '*.so' -o -name '*.dylib'` `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.12/bin -name 'Python' -o -name 'python3.12*'` `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/ -name 'Python'` ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/MacOS/FreeDV ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.12/lib/python3.12/site-packages/torch/bin/* ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.12/Python

-        COMMAND codesign --force --options runtime --timestamp --entitlements ${CMAKE_CURRENT_SOURCE_DIR}/entitlements.plist --sign ${MACOS_CODESIGN_IDENTITY} ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app -name '*.so' -o -name '*.dylib'` `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/Current/bin -name 'Python' -o -name 'python3.*'` `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/ -name 'Python'` ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/MacOS/FreeDV ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/Current/lib/python3.*/site-packages/torch/bin/* ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.*/Frameworks/Tcl.framework/Versions/*/*.a ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.*/Frameworks/Tk.framework/Versions/*/*.a ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.*/Frameworks/Tk.framework/Versions/*/Tk ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.*/Frameworks/Tcl.framework/Versions/*/Tcl ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/*/Python

+        COMMAND codesign --force --options runtime --timestamp --entitlements ${CMAKE_CURRENT_SOURCE_DIR}/entitlements.plist --sign ${MACOS_CODESIGN_IDENTITY} ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app -name '*.so' -o -name '*.dylib'`

     )

pkgs/by-name/fr/freedv/package.nix

+18 −15
Original line number Diff line number Diff line
@@ -34,12 +34,6 @@ let 
    rev = "v1.2.6";

    hash = "sha256-UKO2k+kKH/dwt2xfaYMrH/GXjEkIrnxh1kGG/3P5d3Y=";

  };

  mimallocSrc = fetchFromGitHub {

    owner = "microsoft";

    repo = "mimalloc";

    tag = "v2.2.4";

    hash = "sha256-+8xZT+mVEqlqabQc+1buVH/X6FZxvCd0rWMyjPu9i4o=";

  };

  opusSrc = fetchFromGitHub {

    owner = "xiph";

    repo = "opus";
@@ -57,19 +51,27 @@ let 
  radaeSrc = fetchFromGitHub {

    owner = "drowe67";

    repo = "radae";

    rev = "0f26661b26d02e6963353dce7ad1bbe3f4791ab2";

    hash = "sha256-0pCH+oyVChWdOL5o6Uhb9DDSw4AqCfcsEKw2SZs3K4w=";

    rev = "5d640a028ab2b8e4ff23ed7136caee396cdcb844";

    # upstream repository archive fetching is broken

    forceFetchGit = true;

    hash = "sha256-+Sd+FWycEJabT3RN/zyKXS2Xzr060/ekYdzg6s1gQcM=";

  };

  radeInteg = fetchFromGitHub {

    owner = "drowe67";

    repo = "radae";

    rev = "7bd3ae2401fcba58e314755576a2940085835312";

    hash = "sha256-WVYKvttiNh6uEzw0b27winyDfzzGkEEhYq7DIwfZW74=";

  };

in

stdenv.mkDerivation (finalAttrs: {

  pname = "freedv";

  version = "2.1.0";

  version = "2.2.1";



  src = fetchFromGitHub {

    owner = "drowe67";

    repo = "freedv-gui";

    tag = "v${finalAttrs.version}";

    hash = "sha256-3nLO0UHoIjPN5liz3XJ7r9/Qo+a64ewqvzWPZuFG2SY=";

    hash = "sha256-7SOGz2+MzAkXd5JDKasSJcKVXcnuYk+C0S9N/NPRfOM=";

  };



  patches = [
@@ -78,19 +80,20 @@ stdenv.mkDerivation (finalAttrs: { 


  postPatch = ''

    cp -R ${ebur128Src} ebur128

    cp -R ${mimallocSrc} mimalloc

    cp -R ${radaeSrc} radae

    chmod -R u+w ebur128 mimalloc radae

    cp -R ${radeInteg} rade_integ

    chmod -R u+w ebur128 radae rade_integ

    substituteInPlace cmake/BuildEbur128.cmake \

      --replace-fail "GIT_REPOSITORY https://github.com/jiixyj/libebur128.git" "URL $(realpath ebur128)" \

      --replace-fail 'GIT_TAG "v''${EBUR128_VERSION}"' "" \

      --replace-fail "git apply" "patch -p1 <"

    substituteInPlace cmake/BuildMimalloc.cmake \

      --replace-fail "GIT_REPOSITORY https://github.com/microsoft/mimalloc.git" "URL $(realpath mimalloc)" \

      --replace-fail "GIT_TAG        v2.2.4" ""

    substituteInPlace cmake/BuildRADE.cmake \

      --replace-fail "https://github.com/xiph/opus/archive/940d4e5af64351ca8ba8390df3f555484c567fbb.zip" "${opusSrc}" \

      --replace-fail "GIT_REPOSITORY https://github.com/drowe67/radae.git" "URL $(realpath radae)" \

      --replace-fail "GIT_TAG main" ""

    substituteInPlace cmake/BuildRADEForIntegrations.cmake \

      --replace-fail "https://github.com/xiph/opus/archive/940d4e5af64351ca8ba8390df3f555484c567fbb.zip" "${opusSrc}" \

      --replace-fail "GIT_REPOSITORY https://github.com/drowe67/radae.git" "URL $(realpath rade_integ)" \

      --replace-fail "GIT_TAG ms-disable-python-gc" ""

    patchShebangs test/test_*.sh

    substituteInPlace cmake/CheckGit.cmake \