Project

General

Profile

audacious-plugins-oggvorbis-2.patch

Michael Schwendt, May 17, 2012 22:57

View differences:

configure.ac
904 904
)
905 905

  
906 906
if test "x$enable_filewriter_vorbis" = "xyes"; then
907
   PKG_CHECK_MODULES(OGG_VORBIS, [ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0],
907
   PKG_CHECK_MODULES(OGG_VORBISENC, [ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0],
908 908
   [have_vorbisenc=yes], [have_vorbisenc=no])
909 909
   if test "x$have_vorbisenc" = "xyes"; then
910 910
      AC_DEFINE(FILEWRITER_VORBIS, 1, [Define if Vorbis output part should be built])
911
      FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS  `pkg-config --cflags vorbisenc`"
912
      FILEWRITER_LIBS="$FILEWRITER_LIBS  `pkg-config --libs vorbisenc`"
911
      FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $OGG_VORBISENC_CFLAGS"
912
      FILEWRITER_LIBS="$FILEWRITER_LIBS $OGG_VORBISENC_LIBS"
913 913
   fi
914 914
fi
915 915

  
extra.mk.in
81 81
NOTIFY_LIBS ?= @NOTIFY_LIBS@
82 82
OGG_VORBIS_CFLAGS ?= @OGG_VORBIS_CFLAGS@
83 83
OGG_VORBIS_LIBS ?= @OGG_VORBIS_LIBS@
84
OGG_VORBISENC_CFLAGS ?= @OGG_VORBISENC_CFLAGS@
85
OGG_VORBISENC_LIBS ?= @OGG_VORBISENC_LIBS@
84 86
OPENAL_CFLAGS ?= @OPENAL_CFLAGS@
85 87
OPENAL_LIBS ?= @OPENAL_LIBS@
86 88
OSS_CFLAGS ?= @OSS_CFLAGS@
src/filewriter/Makefile
13 13
plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
14 14

  
15 15
CFLAGS += ${PLUGIN_CFLAGS}
16
CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} ${GTK_CFLAGS}   ${FILEWRITER_CFLAGS} ${OGG_VORBIS_CFLAGS} -I../..
16
CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} ${GTK_CFLAGS} ${FILEWRITER_CFLAGS} -I../..
17 17
LIBS += ${GTK_LIBS} ${FILEWRITER_LIBS}