1 --- faad2/libfaad/Makefile.am.orig 2004-11-08 09:06:09.000000000 +0100
2 +++ faad2/libfaad/Makefile.am 2006-08-23 23:39:14.753322500 +0200
4 include_HEADERS = $(top_srcdir)/include/faad.h \
\r
5 $(top_srcdir)/include/neaacdec.h
\r
7 -libfaad_la_LDFLAGS = -lm
\r
8 +libfaad_la_LIBADD = -lm
\r
10 libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \
\r
11 drm_dec.c error.c filtbank.c \
\r
12 --- faad2/plugins/Makefile.am.orig 2006-08-07 20:47:45.000000000 +0200
13 +++ faad2/plugins/Makefile.am 2006-08-24 00:00:04.739441750 +0200
24 endif #HAVE_MPEG4IP_PLUG
\r
25 --- faad2/plugins/xmms/src/Makefile.am.orig 2006-08-07 20:47:45.000000000 +0200
26 +++ faad2/plugins/xmms/src/Makefile.am 2006-08-24 00:01:12.775693750 +0200
29 -libdir=$(shell pkg-config --variable=input-plugin-dir bmp)
\r
30 +plugindir=$(shell pkg-config --variable=input-plugin-dir bmp)
\r
31 local_CFLAGS=$(shell pkg-config --cflags bmp)
\r
32 local_LDFLAGS=$(shell pkg-config --libs bmp)
\r
34 local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall
\r
35 local_LDFLAGS=`$(XMMS_CONFIG) --libs`
\r
36 -libdir = `$(XMMS_CONFIG) --input-plugin-dir`
\r
37 +plugindir = `$(XMMS_CONFIG) --input-plugin-dir`
\r
39 -lib_LTLIBRARIES = libmp4.la
\r
40 +plugin_LTLIBRARIES = libmp4.la
\r
42 libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
\r
43 -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
\r
44 --- faad2/configure.in.orig 2006-08-13 16:13:31.000000000 +0200
45 +++ faad2/configure.in 2006-08-24 00:04:16.259160750 +0200
47 AC_DEFINE([HAVE_BMP], 1, [User wants beep media player plugin built])
\r
48 AM_CONDITIONAL([HAVE_XMMS], true)
\r
49 AM_CONDITIONAL([HAVE_BMP], true)
\r
51 + AM_CONDITIONAL([HAVE_BMP], false)
\r
54 if test x$WITHDRM = xyes; then
\r