diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-16 22:54:14 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-16 22:54:14 +0000 |
commit | 3ba6fce06afb1d4c1b3cafd88faa193a655cdac1 (patch) | |
tree | a9ccae38b8f2872bef86b1c0fe28e266450f9758 /meta/packages/libmad/files | |
parent | 7edbe8118188fcfcca81d9e9f18eac9d441ee04a (diff) | |
download | openembedded-core-3ba6fce06afb1d4c1b3cafd88faa193a655cdac1.tar.gz openembedded-core-3ba6fce06afb1d4c1b3cafd88faa193a655cdac1.tar.bz2 openembedded-core-3ba6fce06afb1d4c1b3cafd88faa193a655cdac1.tar.xz openembedded-core-3ba6fce06afb1d4c1b3cafd88faa193a655cdac1.zip |
libmad: Drop custom staging function
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/libmad/files')
-rw-r--r-- | meta/packages/libmad/files/add-pkgconfig.patch | 68 | ||||
-rw-r--r-- | meta/packages/libmad/files/no-force-mem.patch | 16 |
2 files changed, 0 insertions, 84 deletions
diff --git a/meta/packages/libmad/files/add-pkgconfig.patch b/meta/packages/libmad/files/add-pkgconfig.patch deleted file mode 100644 index 636b27a92..000000000 --- a/meta/packages/libmad/files/add-pkgconfig.patch +++ /dev/null @@ -1,68 +0,0 @@ -Here is a patch for adding pkg-config support to libmad. -It would make life a bit easier for distro maintainers if this was applied. -In case you didn't know, pkg-config is a tool for providing LDFLAGS and -CFLAGS for packages using shared libraries. It's on freedesktop.org. -Debian has already been distributing the pkg-config file mad.pc with -libmad for some time, and people developing on debian (notably xmms2 -developers) have started relying on this support being present, causing -some confusion for people installing from source and on some BSDs which -do not provide mad.pc (google: pkgconfig libmad). - -EMH - ---h31gzZEtNLTqOjlF -Content-Type: text/plain; charset=us-ascii -Content-Disposition: attachment; filename="libmad-0.15.1b-pkgconfig.patch" - -diff -Naur libmad-0.15.1b.old/configure.ac libmad-0.15.1b/configure.ac ---- libmad-0.15.1b.old/configure.ac 2004-01-23 10:41:32.000000000 +0100 -+++ libmad-0.15.1b/configure.ac 2004-08-07 02:25:24.633462168 +0200 -@@ -429,5 +429,5 @@ - dnl AC_SUBST(LTLIBOBJS) - - AC_CONFIG_FILES([Makefile msvc++/Makefile \ -- libmad.list]) -+ libmad.list mad.pc]) - AC_OUTPUT -diff -Naur libmad-0.15.1b.old/mad.pc.in libmad-0.15.1b/mad.pc.in ---- libmad-0.15.1b.old/mad.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ libmad-0.15.1b/mad.pc.in 2004-08-07 02:04:59.617692872 +0200 -@@ -0,0 +1,14 @@ -+# libmad pkg-config source file -+ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: mad -+Description: MPEG Audio Decoder -+Version: @VERSION@ -+Requires: -+Conflicts: -+Libs: -L${libdir} -lmad -lm -+Cflags: -I${includedir} -diff -Naur libmad-0.15.1b.old/Makefile.am libmad-0.15.1b/Makefile.am ---- libmad-0.15.1b.old/Makefile.am 2004-02-17 03:02:03.000000000 +0100 -+++ libmad-0.15.1b/Makefile.am 2004-08-07 02:03:19.859858368 +0200 -@@ -24,6 +24,9 @@ - SUBDIRS = - DIST_SUBDIRS = msvc++ - -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = mad.pc -+ - lib_LTLIBRARIES = libmad.la - include_HEADERS = mad.h - -@@ -34,7 +37,8 @@ - minimad_LDADD = libmad.la - - EXTRA_DIST = mad.h.sed \ -- CHANGES COPYRIGHT CREDITS README TODO VERSION -+ CHANGES COPYRIGHT CREDITS README TODO VERSION \ -+ mad.pc.in - - exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \ - synth.h decoder.h - diff --git a/meta/packages/libmad/files/no-force-mem.patch b/meta/packages/libmad/files/no-force-mem.patch deleted file mode 100644 index d4dab7556..000000000 --- a/meta/packages/libmad/files/no-force-mem.patch +++ /dev/null @@ -1,16 +0,0 @@ -This option no longer exists in gcc 3.4.1 - -RP - 18/07/2008 - -Index: libmad-0.15.1b/configure.ac -=================================================================== ---- libmad-0.15.1b.orig/configure.ac 2008-07-18 15:45:30.000000000 +0100 -+++ libmad-0.15.1b/configure.ac 2008-07-18 15:45:37.000000000 +0100 -@@ -140,7 +140,6 @@ - case "$optimize" in - -O|"-O "*) - optimize="-O" -- optimize="$optimize -fforce-mem" - optimize="$optimize -fforce-addr" - : #x optimize="$optimize -finline-functions" - : #- optimize="$optimize -fstrength-reduce" |