Mercurial > audlegacy-plugins

changeset 6:7cac35581bd0 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - only check for -lossaudio if have_oss is true (otherwise libESD is broken on many platforms) - make ESD build
author nenolod
date Mon, 18 Sep 2006 02:28:00 -0700
parents 54f9e753b511
children 248c90003c84
files ChangeLog configure.ac src/Output/esd/about.c src/Output/esd/audio.c src/Output/esd/configure.c src/Output/esd/init.c
diffstat 6 files changed, 25 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Sep 18 02:22:03 2006 -0700
+++ b/ChangeLog	Mon Sep 18 02:28:00 2006 -0700
@@ -1,3 +1,23 @@
+2006-09-18 09:22:03 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [10]
+  - SDK pathchange fixes
+  - enforce use of SDK
+  - always link against libaudacious
+  
+
+  Changes:        Modified:
+  +2 -16          trunk/configure.ac  
+  +1 -1           trunk/src/Input/aac/src/xmms-id3.h  
+  +1 -1           trunk/src/Input/cue/cuesheet.c  
+  +1 -1           trunk/src/Input/mpg123/http.c  
+  +1 -1           trunk/src/Input/mpg123/mpg123.h  
+  +1 -1           trunk/src/Input/mpg123/rtsp.c  
+  +0 -367         trunk/src/Input/mpg123/xmms-id3.h  
+  +1 -1           trunk/src/Input/vorbis/vcedit.c  
+  +1 -1           trunk/src/Input/vorbis/vcedit.h  
+  +1 -1           trunk/src/Input/wav/wav.h  
+
+
 2006-09-18 09:02:50 +0000  William Pitcock <nenolod@nenolod.net>
   revision [8]
   - the first pass missed some libaudacious references, this fixes them
--- a/configure.ac	Mon Sep 18 02:22:03 2006 -0700
+++ b/configure.ac	Mon Sep 18 02:28:00 2006 -0700
@@ -606,6 +606,7 @@
         have_oss=yes
     fi
 
+    if test "${have_oss}" = "yes"; then
 	AC_MSG_CHECKING(whether we need -lossaudio)
         AC_TRY_LINK([
 		#include <sys/ioctl.h>
@@ -621,6 +622,7 @@
 		OSS_LIBS="-lossaudio"
 		AC_MSG_RESULT(yes)
         ])
+   fi
 fi
 
 if test "$have_oss" = "yes"; then
--- a/src/Output/esd/about.c	Mon Sep 18 02:22:03 2006 -0700
+++ b/src/Output/esd/about.c	Mon Sep 18 02:28:00 2006 -0700
@@ -20,7 +20,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <libaudacious/util.h>
+#include <audacious/util.h>
 
 
 void
--- a/src/Output/esd/audio.c	Mon Sep 18 02:22:03 2006 -0700
+++ b/src/Output/esd/audio.c	Mon Sep 18 02:28:00 2006 -0700
@@ -26,8 +26,6 @@
 
 #include <unistd.h>
 
-#include <libaudacious/util.h>
-
 #include "esdout.h"
 
 
--- a/src/Output/esd/configure.c	Mon Sep 18 02:22:03 2006 -0700
+++ b/src/Output/esd/configure.c	Mon Sep 18 02:28:00 2006 -0700
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 
-#include <libaudacious/configdb.h>
+#include <audacious/configdb.h>
 
 
 static GtkWidget *configure_win;
--- a/src/Output/esd/init.c	Mon Sep 18 02:22:03 2006 -0700
+++ b/src/Output/esd/init.c	Mon Sep 18 02:28:00 2006 -0700
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <esd.h>
 
-#include <libaudacious/configdb.h>
+#include <audacious/configdb.h>
 
 #include "esdout.h"