Unverified Commit 6531b95e authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

alsaequal: 0.6 -> 0.7.1 (#349355)

parents 6745c254 ad9cfe30

pkgs/tools/audio/alsaequal/caps_9.x.patch

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
--- ./ctl_equal.c

+++ ./ctl_equal.c

@@ -167,7 +167,7 @@

 	snd_ctl_equal_t *equal;

 	const char *controls = ".alsaequal.bin";

 	const char *library = "/usr/lib/ladspa/caps.so";

-	const char *module = "Eq";

+	const char *module = "Eq10";

 	long channels = 2;

 	const char *sufix = " Playback Volume";

 	int err, i, index;

--- ./pcm_equal.c

+++ ./pcm_equal.c

@@ -151,7 +151,7 @@

 	snd_config_t *sconf = NULL;

 	const char *controls = ".alsaequal.bin";

 	const char *library = "/usr/lib/ladspa/caps.so";

-	const char *module = "Eq";

+	const char *module = "Eq10";

 	long channels = 2;

 	int err;

pkgs/tools/audio/alsaequal/default.nix

+14 −12
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl

, alsa-lib, caps

{ lib, stdenv, fetchFromGitHub

, alsa-lib, caps,

  ladspaH

}:



stdenv.mkDerivation rec {

  pname = "alsaequal";

  version = "0.6";

  version = "0.7.1";



  src = fetchurl {

    url = "https://thedigitalmachine.net/tools/alsaequal-${version}.tar.bz2";

    sha256 = "1w3g9q5z3nrn3mwdhaq6zsg0jila8d102dgwgrhj9vfx58apsvli";

  src = fetchFromGitHub {

    owner = "bassdr";

    repo = "alsaequal";

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

    hash = "sha256-jI+w/jCFslQSNeIS7mwb+LZSawU4XjbSNNgpvuShH1g=";

  };



  buildInputs = [ alsa-lib ];

  buildInputs = [

    alsa-lib

    ladspaH

  ];



  makeFlags = [ "DESTDIR=$(out)" ];
@@ -20,10 +26,6 @@ stdenv.mkDerivation rec { 
    # Adds executable permissions to resulting libraries

    # and changes their destination directory from "usr/lib/alsa-lib" to "lib/alsa-lib" to better align with nixpkgs filesystem hierarchy.

    ./makefile.patch

    # Fixes control port check, which resulted in false error.

    ./false_error.patch

    # Fixes name change of an "Eq" to "Eq10" method in version 9 of caps library.

    ./caps_9.x.patch

  ];



  postPatch = ''
@@ -36,7 +38,7 @@ stdenv.mkDerivation rec { 


  meta = with lib; {

    description = "Real-time adjustable equalizer plugin for ALSA";

    homepage = "https://thedigitalmachine.net/alsaequal.html";

    homepage = "https://github.com/bassdr/alsaequal";

    license = licenses.gpl2Plus;

    maintainers = with maintainers; [ ymeister ];

  };

pkgs/tools/audio/alsaequal/false_error.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
--- ./ctl_equal.c

+++ ./ctl_equal.c

@@ -263,8 +263,8 @@

 	for(i = 0; i < equal->num_input_controls; i++) {

 		if(equal->control_data->control[i].type == LADSPA_CNTRL_INPUT) {

 			index = equal->control_data->control[i].index;

-			if(equal->klass->PortDescriptors[index] !=

-					(LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL)) {

+			if(equal->klass->PortDescriptors[index] &

+					(LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL) == 0) {

 				SNDERR("Problem with control file %s, %d.", controls, index);

 				return -1;

 			}

pkgs/tools/audio/alsaequal/makefile.patch

+6 −4
Original line number Diff line number Diff line
@@ -4,10 +4,12 @@ 


 install: all

 	@echo Installing...

-	$(Q)install -m 644 $(SND_PCM_BIN) ${DESTDIR}/usr/lib/alsa-lib/

-	$(Q)install -m 644 $(SND_CTL_BIN) ${DESTDIR}/usr/lib/alsa-lib/

+	$(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/lib/alsa-lib/

+	$(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/lib/alsa-lib/

-	$(Q)mkdir -p ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/

-	$(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/

-	$(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/

+	$(Q)mkdir -p ${DESTDIR}/$(LIBDIR)/alsa-lib/

+	$(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/$(LIBDIR)/alsa-lib/

+	$(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/$(LIBDIR)/alsa-lib/



 uninstall:

 	@echo Un-installing...