Attachment #99581 for bug #146485

View | Details | Raw Unified | Return to bug 146485
Collapse All | Expand All




AC_ARG_WITH(xmms,[  --with-xmms             compile XMMS-1 plugin],
	     WITHXMMS=$withval, WITHXMMS=no)

AC_ARG_WITH(bmp,[  --with-bmp              compile beep media player plugin],
	     [WITHBMP=$withval;WITHXMMS=$withval], [WITHBMP=no])

AC_ARG_WITH(drm,[  --with-drm              compile libfaad with DRM support],
	     WITHDRM=$withval, WITHDRM=no)


 AM_CONDITIONAL(HAVE_XMMS, false)
fi

if test x$WITHBMP = xyes; then
  AC_DEFINE([HAVE_BMP], 1, [User wants beep media player plugin built])
  AM_CONDITIONAL([HAVE_XMMS], true)
  AM_CONDITIONAL([HAVE_BMP], true)
fi

if test x$WITHDRM = xyes; then
  AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)])
  AC_DEFINE(DRM_PS, 1, [Define if you want support for Digital Radio Mondiale (DRM) parametric stereo])

Lines 7-17 Link Here

(-)faad2/plugins/Makefile.am (-6 lines)
7	else	7	else
8	if HAVE_XMMS	8	if HAVE_XMMS
9	SUBDIRS = xmms	9	SUBDIRS = xmms
10	else
11	if HAVE_BMP
12	SUBDIRS = bmp
13	else
14	SUBDIRS =
15	endif #HAVE_BMP
16	endif #HAVE_XMMS	10	endif #HAVE_XMMS
17	endif #HAVE_MPEG4IP_PLUG	11	endif #HAVE_MPEG4IP_PLUG




if HAVE_BMP
libdir=$(shell pkg-config --variable=input-plugin-dir bmp)
local_CFLAGS=$(shell pkg-config --cflags bmp)
local_LDFLAGS=$(shell pkg-config --libs bmp)
else
local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall
local_LDFLAGS=`$(XMMS_CONFIG) --libs`
libdir = `$(XMMS_CONFIG) --input-plugin-dir`
endif #HAVE_BMP
lib_LTLIBRARIES = libmp4.la

libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \

Lines 11-16 Link Here

(-)faad2/plugins/xmms/src/libmp4.c (+2 lines)
11	#include <stdio.h>	11	#include <stdio.h>
12	#include <string.h>	12	#include <string.h>
13		13
		14	#if 0
14	#if defined(HAVE_BMP)	15	#if defined(HAVE_BMP)
15	#include <bmp/plugin.h>	16	#include <bmp/plugin.h>
16	#include <bmp/util.h>	17	#include <bmp/util.h>
Lines 22-27 Link Here
22	#include <xmms/configfile.h>	23	#include <xmms/configfile.h>
23	#include <xmms/titlestring.h>	24	#include <xmms/titlestring.h>
24	#endif /HAVE_BMP/	25	#endif /HAVE_BMP/
		26	#endif
25		27
26	#include "neaacdec.h"	28	#include "neaacdec.h"
27	#include "mp4ff.h"	29	#include "mp4ff.h"

Return to bug 146485

Lines 29-37 Link Here

(-)faad2/configure.in (-9 lines)
29	AC_ARG_WITH(xmms,[ --with-xmms compile XMMS-1 plugin],	29	AC_ARG_WITH(xmms,[ --with-xmms compile XMMS-1 plugin],
30	WITHXMMS=$withval, WITHXMMS=no)	30	WITHXMMS=$withval, WITHXMMS=no)
31		31
32	AC_ARG_WITH(bmp,[ --with-bmp compile beep media player plugin],
33	[WITHBMP=$withval;WITHXMMS=$withval], [WITHBMP=no])
34
35	AC_ARG_WITH(drm,[ --with-drm compile libfaad with DRM support],	32	AC_ARG_WITH(drm,[ --with-drm compile libfaad with DRM support],
36	WITHDRM=$withval, WITHDRM=no)	33	WITHDRM=$withval, WITHDRM=no)
37		34
Lines 114-125 Link Here
114	AM_CONDITIONAL(HAVE_XMMS, false)	111	AM_CONDITIONAL(HAVE_XMMS, false)
115	fi	112	fi
116		113
117	if test x$WITHBMP = xyes; then
118	AC_DEFINE([HAVE_BMP], 1, [User wants beep media player plugin built])
119	AM_CONDITIONAL([HAVE_XMMS], true)
120	AM_CONDITIONAL([HAVE_BMP], true)
121	fi
122
123	if test x$WITHDRM = xyes; then	114	if test x$WITHDRM = xyes; then
124	AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)])	115	AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)])
125	AC_DEFINE(DRM_PS, 1, [Define if you want support for Digital Radio Mondiale (DRM) parametric stereo])	116	AC_DEFINE(DRM_PS, 1, [Define if you want support for Digital Radio Mondiale (DRM) parametric stereo])

Lines 1-12 Link Here

(-)faad2/plugins/xmms/src/Makefile.am (-6 lines)
1	if HAVE_BMP
2	libdir=$(shell pkg-config --variable=input-plugin-dir bmp)
3	local_CFLAGS=$(shell pkg-config --cflags bmp)
4	local_LDFLAGS=$(shell pkg-config --libs bmp)
5	else
6	local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall	1	local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall
7	local_LDFLAGS=`$(XMMS_CONFIG) --libs`	2	local_LDFLAGS=`$(XMMS_CONFIG) --libs`
8	libdir = `$(XMMS_CONFIG) --input-plugin-dir`	3	libdir = `$(XMMS_CONFIG) --input-plugin-dir`
9	endif #HAVE_BMP
10	lib_LTLIBRARIES = libmp4.la	4	lib_LTLIBRARIES = libmp4.la
11		5
12	libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \	6	libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \