[patch] patch to remove broken/left-over bmp (beep media player) code from faad2-2.5

faad2-2.5-bmp-bad.patch (text/plain), 2.59 KB, created by Armando Di Cianno on 2006-10-13 12:46:42 UTC

diff -ur faad2/configure.in faad2-patch/configure.in
--- faad2/configure.in	2006-08-13 10:13:31.000000000 -0400
+++ faad2-patch/configure.in	2006-10-13 15:22:05.000000000 -0400
@@ -29,9 +29,6 @@
 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)
 
@@ -114,12 +111,6 @@
  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])
diff -ur faad2/plugins/Makefile.am faad2-patch/plugins/Makefile.am
--- faad2/plugins/Makefile.am	2006-08-07 14:47:45.000000000 -0400
+++ faad2-patch/plugins/Makefile.am	2006-10-13 15:23:05.000000000 -0400
@@ -7,11 +7,5 @@
 else
 if HAVE_XMMS
 SUBDIRS = xmms
-else
-if HAVE_BMP
-SUBDIRS = bmp
-else
-SUBDIRS =
-endif #HAVE_BMP
 endif #HAVE_XMMS
 endif #HAVE_MPEG4IP_PLUG
diff -ur faad2/plugins/xmms/src/Makefile.am faad2-patch/plugins/xmms/src/Makefile.am
--- faad2/plugins/xmms/src/Makefile.am	2006-08-07 14:47:45.000000000 -0400
+++ faad2-patch/plugins/xmms/src/Makefile.am	2006-10-13 15:09:34.000000000 -0400
@@ -1,12 +1,6 @@
-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 \
diff -ur faad2/plugins/xmms/src/libmp4.c faad2-patch/plugins/xmms/src/libmp4.c
--- faad2/plugins/xmms/src/libmp4.c	2006-08-07 14:47:45.000000000 -0400
+++ faad2-patch/plugins/xmms/src/libmp4.c	2006-10-13 15:22:53.000000000 -0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#if 0
 #if defined(HAVE_BMP)
 #include <bmp/plugin.h>
 #include <bmp/util.h>
@@ -22,6 +23,7 @@
 #include <xmms/configfile.h>
 #include <xmms/titlestring.h>
 #endif /*HAVE_BMP*/
+#endif
 
 #include "neaacdec.h"
 #include "mp4ff.h"