summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerich@mine.nu <erich@mine.nu>2004-03-28 01:02:19 +0000
committererich@mine.nu <erich@mine.nu>2004-03-28 01:02:19 +0000
commit4b23e25f0c8bf3a40be9c1beb1f110a3d15e505a (patch)
treeb155aa5061f31d546e6a2d781ff29f44efa55127
parent9b750c09fc921a6616ff5248f8ff3c60051e6b16 (diff)
includedir.patch:
remove /usr/include/ncurses from the list of include directories (was breaking build on FC1 since it tried to use native ncurses.h) BKrev: 4066241b2SH0BpEG2UqvtwiesvflRg
-rw-r--r--mp3blaster/mp3blaster-3.2.0/includedir.patch58
1 files changed, 58 insertions, 0 deletions
diff --git a/mp3blaster/mp3blaster-3.2.0/includedir.patch b/mp3blaster/mp3blaster-3.2.0/includedir.patch
index e69de29bb2..8ae45e2f48 100644
--- a/mp3blaster/mp3blaster-3.2.0/includedir.patch
+++ b/mp3blaster/mp3blaster-3.2.0/includedir.patch
@@ -0,0 +1,58 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- mp3blaster-3.2.0/src/Makefile.am~includedir 2003-09-08 17:48:56.000000000 -0400
++++ mp3blaster-3.2.0/src/Makefile.am 2004-03-20 22:51:26.000000000 -0500
+@@ -36,7 +36,7 @@
+ mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
+ mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@
+ mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
+-INCLUDES = -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir)
++INCLUDES = -I$(top_srcdir)/mpegsound -I$(top_srcdir)/nmixer
+ mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@
+ EXTRA_DIST = FILES
+ CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\"
+--- mp3blaster-3.2.0/mpegsound/Makefile.am~includedir 2002-09-20 16:38:16.000000000 -0400
++++ mp3blaster-3.2.0/mpegsound/Makefile.am 2004-03-20 22:50:29.000000000 -0500
+@@ -11,5 +11,5 @@
+
+ noinst_HEADERS = mpegsound.h mpegsound_locals.h
+
+-INCLUDES = -I$(srcdir) -I$(includedir)
++INCLUDES = -I$(srcdir)
+ CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@
+--- mp3blaster-3.2.0/nmixer/Makefile.am~includedir 2002-10-20 10:08:20.000000000 -0400
++++ mp3blaster-3.2.0/nmixer/Makefile.am 2004-03-20 22:50:29.000000000 -0500
+@@ -2,7 +2,7 @@
+ nmixer_SOURCES = main.cc
+ nmixer_DEPENDENCIES = @LIBNMIXER@
+ LDADD = @LIBNMIXER@ @NCURSES_LIBS@
+-INCLUDES = -I/usr/include/ncurses -I$(srcdir) -I$(includedir)
++INCLUDES = -I$(srcdir)
+ noinst_LIBRARIES = libnmixer.a
+ libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h \
+ getopt.c getopt1.c getopt.h
+--- mp3blaster-3.2.0/src/Makefile.in~includedir 2004-03-20 22:49:26.000000000 -0500
++++ mp3blaster-3.2.0/src/Makefile.in 2004-03-20 22:51:32.000000000 -0500
+@@ -217,7 +217,7 @@
+ mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
+ mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@
+ mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
+-INCLUDES = -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir)
++INCLUDES = -I$(top_srcdir)/mpegsound -I$(top_srcdir)/nmixer
+ mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@
+ EXTRA_DIST = FILES
+ all: all-am
+--- mp3blaster-3.2.0/nmixer/Makefile.in~includedir 2004-03-20 22:49:26.000000000 -0500
++++ mp3blaster-3.2.0/nmixer/Makefile.in 2004-03-20 22:50:29.000000000 -0500
+@@ -181,7 +181,7 @@
+ nmixer_SOURCES = main.cc
+ nmixer_DEPENDENCIES = @LIBNMIXER@
+ LDADD = @LIBNMIXER@ @NCURSES_LIBS@
+-INCLUDES = -I/usr/include/ncurses -I$(srcdir) -I$(includedir)
++INCLUDES = -I$(srcdir)
+ noinst_LIBRARIES = libnmixer.a
+ libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h \
+ getopt.c getopt1.c getopt.h