summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO16
-rw-r--r--0001-fix-lib32-makefile.patch (renamed from fix-lib32-makefile.patch)0
-rw-r--r--0002-fix-lib32-makefile.patch11
-rw-r--r--PKGBUILD25
-rw-r--r--alsaequal-asneeded.patch16
5 files changed, 53 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5f85a11e2599..435387c56f49 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,13 +12,17 @@ pkgbase = lib32-alsaequal
source = https://launchpad.net/ubuntu/+archive/primary/+files/alsaequal_0.6.orig.tar.bz2
source = false_error.patch
source = alsaequal.patch
- source = fix-lib32-makefile.patch
+ source = 0001-fix-lib32-makefile.patch
+ source = 0002-fix-lib32-makefile.patch
source = lib32-alsaequal_caps_9.x.patch
- md5sums = d2edc7710c72cbf3ab297c414e35ebda
- md5sums = 15bbaaa51bf3e01fdc1af1cd3b0b53e3
- md5sums = 40911a2eedc8fdb85b68bb81ccea65eb
- md5sums = 9b58c23a264e59b672eccbf3f8c0663b
- md5sums = 212e7c8bf7cb2f83b476894dde58812b
+ source = alsaequal-asneeded.patch
+ sha256sums = 916e7d152added24617efc350142438a46099efe062bd8781d36dbf10b4e6ff0
+ sha256sums = c1a02bfed6be6385e8ab4ebe7c9c3844e9c0937fbafe0f8d948842c2b7c9f7f0
+ sha256sums = 2f3d928b0c0665c39ace25fd727bd12b6e81b2406811bd0744c09f804b6d25bd
+ sha256sums = d8b2f37f39a29de73feed8aedfb917fb621338dfeb8096ed0f01faf5e873c0b4
+ sha256sums = 53a067babe50333138c39549db937aa0746aad39f849f70a5196fa05d2d18867
+ sha256sums = d8d12c72176e1f7aba9443007f72a7ab7bb8f8d677757db24630dc593eaf978c
+ sha256sums = 24718bedfa184b9a59127020f09105cc831b5f188be4b05f21b530bf13155a52
pkgname = lib32-alsaequal
diff --git a/fix-lib32-makefile.patch b/0001-fix-lib32-makefile.patch
index 40b978febe70..40b978febe70 100644
--- a/fix-lib32-makefile.patch
+++ b/0001-fix-lib32-makefile.patch
diff --git a/0002-fix-lib32-makefile.patch b/0002-fix-lib32-makefile.patch
new file mode 100644
index 000000000000..ac7ee43dfafe
--- /dev/null
+++ b/0002-fix-lib32-makefile.patch
@@ -0,0 +1,11 @@
+--- 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 8d6a649c816d..bec41f55e636 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,22 +14,29 @@ install='alsaequal.install'
source=("https://launchpad.net/ubuntu/+archive/primary/+files/alsaequal_${pkgver}.orig.tar.bz2"
'false_error.patch'
- 'alsaequal.patch'
- 'fix-lib32-makefile.patch'
- 'lib32-alsaequal_caps_9.x.patch')
+ 'alsaequal.patch'
+ '0001-fix-lib32-makefile.patch'
+ '0002-fix-lib32-makefile.patch'
+ 'lib32-alsaequal_caps_9.x.patch'
+ 'alsaequal-asneeded.patch')
+
+sha256sums=('916e7d152added24617efc350142438a46099efe062bd8781d36dbf10b4e6ff0'
+ 'c1a02bfed6be6385e8ab4ebe7c9c3844e9c0937fbafe0f8d948842c2b7c9f7f0'
+ '2f3d928b0c0665c39ace25fd727bd12b6e81b2406811bd0744c09f804b6d25bd'
+ 'd8b2f37f39a29de73feed8aedfb917fb621338dfeb8096ed0f01faf5e873c0b4'
+ '53a067babe50333138c39549db937aa0746aad39f849f70a5196fa05d2d18867'
+ 'd8d12c72176e1f7aba9443007f72a7ab7bb8f8d677757db24630dc593eaf978c'
+ '24718bedfa184b9a59127020f09105cc831b5f188be4b05f21b530bf13155a52')
-md5sums=('d2edc7710c72cbf3ab297c414e35ebda'
- '15bbaaa51bf3e01fdc1af1cd3b0b53e3'
- '40911a2eedc8fdb85b68bb81ccea65eb'
- '9b58c23a264e59b672eccbf3f8c0663b'
- '212e7c8bf7cb2f83b476894dde58812b')
prepare() {
cd "$srcdir/${_srcname}"
patch -Np0 -i ../false_error.patch
patch -Np0 -i ../alsaequal.patch
- patch -Np1 -i ../fix-lib32-makefile.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
make clean
}
diff --git a/alsaequal-asneeded.patch b/alsaequal-asneeded.patch
new file mode 100644
index 000000000000..50a95e6a5c95
--- /dev/null
+++ b/alsaequal-asneeded.patch
@@ -0,0 +1,16 @@
+--- 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 $<