summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsudokamikaze2018-01-14 21:39:56 +0200
committersudokamikaze2018-01-14 21:40:04 +0200
commit3cf912201b5583ebacd5feeafe8499b4c7b97d31 (patch)
treebfdcd9cc3d47e17a12edaf89c00f8acbe9e21677
parentaa08d0eaf18ba1640b4cea772ac7971f1af790d4 (diff)
downloadaur-3cf912201b5583ebacd5feeafe8499b4c7b97d31.tar.gz
Cleaned a bit, also updated mail
Splited few patches into one Signed-off-by: sudokamikaze <sudokamikaze@protonmail.com>
-rw-r--r--.SRCINFO14
-rw-r--r--0002-fix-lib32-makefile.patch11
-rw-r--r--PKGBUILD26
-rw-r--r--alsaequal-asneeded.patch16
-rw-r--r--alsaequal.patch13
-rw-r--r--lib32_ctr.patch (renamed from 0001-fix-lib32-makefile.patch)29
-rw-r--r--lib32_makefile.patch48
7 files changed, 63 insertions, 94 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bbaf2c3d3c9..d9fe31e7bf8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = lib32-alsaequal
pkgdesc = A real-time adjustable equalizer plugin for ALSA sound server.
pkgver = 0.6
- pkgrel = 16
+ pkgrel = 17
url = http://www.thedigitalmachine.net/alsaequal.html
install = alsaequal.install
arch = x86_64
@@ -11,20 +11,16 @@ pkgbase = lib32-alsaequal
optdepends = lib32-swh-plugins: to use the mbeq equalizer (15-band)
source = https://launchpad.net/ubuntu/+archive/primary/+files/alsaequal_0.6.orig.tar.bz2
source = false_error.patch
- source = alsaequal.patch
- source = 0001-fix-lib32-makefile.patch
- source = 0002-fix-lib32-makefile.patch
+ source = lib32_ctr.patch
+ source = lib32_makefile.patch
source = lib32-alsaequal_caps_9.x.patch
- source = alsaequal-asneeded.patch
source = ladspa_multilib.patch
source = 0003-use-alsaequal_bin.patch
sha256sums = 916e7d152added24617efc350142438a46099efe062bd8781d36dbf10b4e6ff0
sha256sums = c1a02bfed6be6385e8ab4ebe7c9c3844e9c0937fbafe0f8d948842c2b7c9f7f0
- sha256sums = 2f3d928b0c0665c39ace25fd727bd12b6e81b2406811bd0744c09f804b6d25bd
- sha256sums = d8b2f37f39a29de73feed8aedfb917fb621338dfeb8096ed0f01faf5e873c0b4
- sha256sums = 53a067babe50333138c39549db937aa0746aad39f849f70a5196fa05d2d18867
+ sha256sums = 61e7c03cb0d0281912e9d85267becedd30745fc39025d98d1fb252f7f8fb5c48
+ sha256sums = 2e3c0cdd2d887562d98f8914af8894271b6135a6faeb7eca4f6fa3b59a590286
sha256sums = d8d12c72176e1f7aba9443007f72a7ab7bb8f8d677757db24630dc593eaf978c
- sha256sums = 24718bedfa184b9a59127020f09105cc831b5f188be4b05f21b530bf13155a52
sha256sums = 3c420dabd2aac2e80c04de10686c4bd50c2ffdd46f7b81c030f27ca9be53ada0
sha256sums = f6ce1cc258aeac4f4f60e21556463d2c2458c559ed0c08dc0823e0971737af5e
diff --git a/0002-fix-lib32-makefile.patch b/0002-fix-lib32-makefile.patch
deleted file mode 100644
index ac7ee43dfaf..00000000000
--- a/0002-fix-lib32-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/alsaequal/Makefile 2017-01-03 22:58:43.880200186 +0200
-+++ src/Makefile 2017-01-03 23:01:46.050201757 +0200
-@@ -50,6 +50,5 @@
-
- uninstall:
- @echo Un-installing...
-- $(Q)rm ${DESTDIR}/usr/lib/alsa-lib/$(SND_PCM_BIN)
-- $(Q)rm ${DESTDIR}/usr/lib/alsa-lib/$(SND_CTL_BIN)
--
-+ $(Q)rm ${DESTDIR}/usr/lib32/alsa-lib/$(SND_PCM_BIN)
-+ $(Q)rm ${DESTDIR}/usr/lib32/alsa-lib/$(SND_CTL_BIN)
diff --git a/PKGBUILD b/PKGBUILD
index 7e2e9958603..dc11f28b2dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer: Pulshen Sudokamikaze <pulshencode@outlook.com>
+# Maintainer: Sudokamikaze <sudokamikaze@protonmail.com>
pkgname=lib32-alsaequal
_srcname=alsaequal
pkgver=0.6
-pkgrel=16
+pkgrel=17
pkgdesc="A real-time adjustable equalizer plugin for ALSA sound server."
arch=('x86_64')
url="http://www.thedigitalmachine.net/alsaequal.html"
@@ -14,34 +14,28 @@ install='alsaequal.install'
source=("https://launchpad.net/ubuntu/+archive/primary/+files/alsaequal_${pkgver}.orig.tar.bz2"
'false_error.patch'
- 'alsaequal.patch'
- '0001-fix-lib32-makefile.patch'
- '0002-fix-lib32-makefile.patch'
+ 'lib32_ctr.patch'
+ 'lib32_makefile.patch'
'lib32-alsaequal_caps_9.x.patch'
- 'alsaequal-asneeded.patch'
'ladspa_multilib.patch'
'0003-use-alsaequal_bin.patch')
sha256sums=('916e7d152added24617efc350142438a46099efe062bd8781d36dbf10b4e6ff0'
'c1a02bfed6be6385e8ab4ebe7c9c3844e9c0937fbafe0f8d948842c2b7c9f7f0'
- '2f3d928b0c0665c39ace25fd727bd12b6e81b2406811bd0744c09f804b6d25bd'
- 'd8b2f37f39a29de73feed8aedfb917fb621338dfeb8096ed0f01faf5e873c0b4'
- '53a067babe50333138c39549db937aa0746aad39f849f70a5196fa05d2d18867'
+ '61e7c03cb0d0281912e9d85267becedd30745fc39025d98d1fb252f7f8fb5c48'
+ '2e3c0cdd2d887562d98f8914af8894271b6135a6faeb7eca4f6fa3b59a590286'
'd8d12c72176e1f7aba9443007f72a7ab7bb8f8d677757db24630dc593eaf978c'
- '24718bedfa184b9a59127020f09105cc831b5f188be4b05f21b530bf13155a52'
'3c420dabd2aac2e80c04de10686c4bd50c2ffdd46f7b81c030f27ca9be53ada0'
'f6ce1cc258aeac4f4f60e21556463d2c2458c559ed0c08dc0823e0971737af5e')
prepare() {
cd "$srcdir/${_srcname}"
- patch -Np0 -i ../false_error.patch
- patch -Np0 -i ../alsaequal.patch
- patch -Np1 -i ../0001-fix-lib32-makefile.patch
- patch -Np1 -i ../0002-fix-lib32-makefile.patch
- patch -Np0 -i ../lib32-alsaequal_caps_9.x.patch
- patch -Np0 -i ../alsaequal-asneeded.patch
+ patch -Np0 -i ../false_error.patch
+ patch -Np1 -i ../lib32_makefile.patch
+ patch -Np1 -i ../lib32_ctr.patch
patch -Np1 -i ../ladspa_multilib.patch
+ patch -Np0 -i ../lib32-alsaequal_caps_9.x.patch
patch -Np1 -i ../0003-use-alsaequal_bin.patch
make clean
}
diff --git a/alsaequal-asneeded.patch b/alsaequal-asneeded.patch
deleted file mode 100644
index 50a95e6a5c9..00000000000
--- a/alsaequal-asneeded.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -29,11 +29,11 @@
-
- $(SND_PCM_BIN): $(SND_PCM_OBJECTS)
- @echo LD $@
-- $(Q)$(LD) $(LDFLAGS) $(SND_PCM_LIBS) $(SND_PCM_OBJECTS) -o $(SND_PCM_BIN)
-+ $(Q)$(LD) $(LDFLAGS) $(SND_PCM_OBJECTS) -o $(SND_PCM_BIN) $(SND_PCM_LIBS)
-
- $(SND_CTL_BIN): $(SND_CTL_OBJECTS)
- @echo LD $@
-- $(Q)$(LD) $(LDFLAGS) $(SND_CTL_LIBS) $(SND_CTL_OBJECTS) -o $(SND_CTL_BIN)
-+ $(Q)$(LD) $(LDFLAGS) $(SND_CTL_OBJECTS) -o $(SND_CTL_BIN) $(SND_CTL_LIBS)
-
- %.o: %.c
- @echo GCC $<
diff --git a/alsaequal.patch b/alsaequal.patch
deleted file mode 100644
index bf735b27add..00000000000
--- a/alsaequal.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile 2009-08-27 18:09:24.000000000 -0400
-+++ Makefile 2009-08-27 18:09:49.000000000 -0400
-@@ -45,8 +45,8 @@
-
- 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}/usr/lib/alsa-lib/
-+ $(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/usr/lib/alsa-lib/
-
- uninstall:
- @echo Un-installing...
diff --git a/0001-fix-lib32-makefile.patch b/lib32_ctr.patch
index 40b978febe7..bf46c2c95ad 100644
--- a/0001-fix-lib32-makefile.patch
+++ b/lib32_ctr.patch
@@ -1,32 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 57fe2fa..b6a0242 100644
---- a/Makefile
-+++ b/Makefile
-@@ -4,10 +4,10 @@ Q ?= @
- #Q ?=
-
- # Build Tools
--CC := gcc
-+CC := gcc -m32
- CFLAGS := -I. -O2 -Wall -funroll-loops -ffast-math -fPIC -DPIC
--LD := gcc
--LDFLAGS := -O2 -Wall -shared -lasound
-+LD := gcc -m32
-+LDFLAGS := -O2 -Wall -shared -lasound -L/usr/lib32
-
- SND_PCM_OBJECTS = pcm_equal.o ladspa_utils.o
- SND_PCM_LIBS =
-@@ -45,8 +45,8 @@ clean:
-
- install: all
- @echo Installing...
-- $(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/usr/lib/alsa-lib/
-- $(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/usr/lib/alsa-lib/
-+ $(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/usr/lib32/alsa-lib/
-+ $(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/usr/lib32/alsa-lib/
-
- uninstall:
- @echo Un-installing...
diff --git a/ctl_equal.c b/ctl_equal.c
index 40747d4..e0f1e15 100644
--- a/ctl_equal.c
diff --git a/lib32_makefile.patch b/lib32_makefile.patch
new file mode 100644
index 00000000000..4627669a670
--- /dev/null
+++ b/lib32_makefile.patch
@@ -0,0 +1,48 @@
+diff --git a/Makefile b/Makefile
+index 3b2aa7d..6c0531c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,10 +4,10 @@ Q ?= @
+ #Q ?=
+
+ # Build Tools
+-CC := gcc
++CC := gcc -m32
+ CFLAGS := -I. -O2 -Wall -funroll-loops -ffast-math -fPIC -DPIC
+-LD := gcc
+-LDFLAGS := -O2 -Wall -shared -lasound
++LD := gcc -m32
++LDFLAGS := -O2 -Wall -shared -lasound -L/usr/lib32
+
+ SND_PCM_OBJECTS = pcm_equal.o ladspa_utils.o
+ SND_PCM_LIBS =
+@@ -29,11 +29,11 @@ dep:
+
+ $(SND_PCM_BIN): $(SND_PCM_OBJECTS)
+ @echo LD $@
+- $(Q)$(LD) $(LDFLAGS) $(SND_PCM_LIBS) $(SND_PCM_OBJECTS) -o $(SND_PCM_BIN)
++ $(Q)$(LD) $(LDFLAGS) $(SND_PCM_OBJECTS) -o $(SND_PCM_BIN) $(SND_PCM_LIBS)
+
+ $(SND_CTL_BIN): $(SND_CTL_OBJECTS)
+ @echo LD $@
+- $(Q)$(LD) $(LDFLAGS) $(SND_CTL_LIBS) $(SND_CTL_OBJECTS) -o $(SND_CTL_BIN)
++ $(Q)$(LD) $(LDFLAGS) $(SND_CTL_OBJECTS) -o $(SND_CTL_BIN) $(SND_CTL_LIBS)
+
+ %.o: %.c
+ @echo GCC $<
+@@ -45,11 +45,10 @@ clean:
+
+ 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}/usr/lib32/alsa-lib/
++ $(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/usr/lib32/alsa-lib/
+
+ uninstall:
+ @echo Un-installing...
+- $(Q)rm ${DESTDIR}/usr/lib/alsa-lib/$(SND_PCM_BIN)
+- $(Q)rm ${DESTDIR}/usr/lib/alsa-lib/$(SND_CTL_BIN)
+-
++ $(Q)rm ${DESTDIR}/usr/lib32/alsa-lib/$(SND_PCM_BIN)
++ $(Q)rm ${DESTDIR}/usr/lib32/alsa-lib/$(SND_CTL_BIN)