Commit 35c32dcd authored by Doron Behar's avatar Doron Behar
Browse files

lpcnetfreedv: remove

parent a156b87e
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@
  fetchFromGitHub,
  cmake,
  freedvSupport ? false,
  lpcnetfreedv,
  LPCNet,
}:

stdenv.mkDerivation (finalAttrs: {
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  buildInputs = lib.optionals freedvSupport [
    lpcnetfreedv
    LPCNet
  ];

  # we need to unset these variables from stdenv here and then set their equivalents in the cmake flags
+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@
  libpulseaudio,
  libsamplerate,
  libsndfile,
  lpcnetfreedv,
  LPCNet,
  portaudio,
  speexdsp,
  hamlib_4,
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
    codec2
    libsamplerate
    libsndfile
    lpcnetfreedv
    LPCNet
    speexdsp
    hamlib_4
    wxGTK32
+0 −13
Original line number Diff line number Diff line
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1600871..1536c55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,7 +158,7 @@ elseif(${SSE} AND (${SSE_PRESENT} OR ${SSE_PRESENT} GREATER 0))
 # AVX and AVX2 machines will also match on SSE
     message(STATUS "sse processor flags found or enabled.")
     set(LPCNET_C_PROC_FLAGS -msse4.1)
-elseif(${NEON} AND (${NEON_PRESENT} OR ${NEON_PRESENT} GREATER 0))
+elseif(${NEON} AND (${NEON_PRESENT} OR ${NEON_PRESENT} GREATER 0) AND NOT APPLE)
     # RPi / ARM 32bit
     message(STATUS "neon processor flags found or enabled.")
     set(LPCNET_C_PROC_FLAGS -mfpu=neon -march=armv8-a -mtune=cortex-a53)
+0 −51
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  fetchFromGitHub,
  fetchurl,
  cmake,
  nix-update-script,
}:

let
  dataVersion = "191005_v1.0";
  data = fetchurl {
    url = "http://rowetel.com/downloads/deep/lpcnet_${dataVersion}.tgz";
    sha256 = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg=";
  };
in
stdenv.mkDerivation {
  pname = "lpcnetfreedv";
  version = "0.5-unstable-2025-01-19";

  src = fetchFromGitHub {
    owner = "drowe67";
    repo = "LPCNet";
    rev = "c8e51ac5e2fe674849cb53e7da44689b572cc246";
    sha256 = "sha256-0Knoym+deTuFAyJrrD55MijVh6DlhJp3lss66BJUHiA=";
  };

  nativeBuildInputs = [ cmake ];

  patches = [
    # extracted from https://github.com/drowe67/LPCNet/pull/59
    ./darwin.patch
  ];

  postPatch = ''
    mkdir build
    ln -s ${data} build/lpcnet_${dataVersion}.tgz
  '';

  passthru.updateScript = nix-update-script {
    extraArgs = [ "--version=branch" ];
  };

  meta = {
    homepage = "https://freedv.org/";
    description = "Experimental Neural Net speech coding for FreeDV";
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ mvs ];
    platforms = lib.platforms.all;
  };
}
+1 −0
Original line number Diff line number Diff line
@@ -1808,6 +1808,7 @@ mapAliases {
  libtransmission = lib.warnOnInstantiate (transmission3Warning {
    prefix = "lib";
  }) libtransmission_3; # Added 2024-06-10
  lpcnetfreedv = throw "lpcnetfreedv was removed in favor of LPCNet"; # Added 2025-05-05
  tracker = lib.warnOnInstantiate "tracker has been renamed to tinysparql" tinysparql; # Added 2024-09-30
  tracker-miners = lib.warnOnInstantiate "tracker-miners has been renamed to localsearch" localsearch; # Added 2024-09-30
  transcode = throw "transcode has been removed as it is unmaintained"; # Added 2024-12-11