summaryrefslogtreecommitdiffstats
path: root/audio-drivers
diff options
context:
space:
mode:
authorIsmael Luceno2019-09-20 00:36:05 +0200
committerIsmael Luceno2019-09-20 00:36:37 +0200
commit915b68cdacf6e5401be5bc1746e9d6cca823a4f4 (patch)
tree30e81a13d117bed2abf2d05e6b434f5b09a4c742 /audio-drivers
parentbbb52ce1fa88fa5cb455e4419a4e82f37602bef8 (diff)
portaudio: conflicts with portaudio19
Diffstat (limited to 'audio-drivers')
-rwxr-xr-xaudio-drivers/portaudio/CONFLICTS3
-rw-r--r--audio-drivers/portaudio/HISTORY3
2 files changed, 5 insertions, 1 deletions
diff --git a/audio-drivers/portaudio/CONFLICTS b/audio-drivers/portaudio/CONFLICTS
index 6a1a5b3bd3..52950f6edb 100755
--- a/audio-drivers/portaudio/CONFLICTS
+++ b/audio-drivers/portaudio/CONFLICTS
@@ -1 +1,2 @@
-conflicts portaudio-cvs
+conflicts portaudio-cvs y &&
+conflicts portaudio19 y
diff --git a/audio-drivers/portaudio/HISTORY b/audio-drivers/portaudio/HISTORY
index ed9d9cf923..782164a428 100644
--- a/audio-drivers/portaudio/HISTORY
+++ b/audio-drivers/portaudio/HISTORY
@@ -1,3 +1,6 @@
+2019-09-19 Ismael Luceno <ismael@sourcemage.org>
+ * CONFLICTS: conflicts with portaudio19
+
2019-08-07 Ismael Luceno <ismael@sourcemage.org>
* PRE_BUILD: fixed install when there is no ldconfig