summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/flac/flac-1.2.1
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:14:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:29:45 +0100
commit29d6678fd546377459ef75cf54abeef5b969b5cf (patch)
tree8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-multimedia/flac/flac-1.2.1
parentda49de6885ee1bc424e70bc02f21f6ab920efb55 (diff)
downloadpoky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-multimedia/flac/flac-1.2.1')
-rw-r--r--meta/recipes-multimedia/flac/flac-1.2.1/disable-xmms-plugin.patch24
-rw-r--r--meta/recipes-multimedia/flac/flac-1.2.1/flac-gcc43-fixes.patch14
-rw-r--r--meta/recipes-multimedia/flac/flac-1.2.1/xmms.m4149
3 files changed, 187 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/flac/flac-1.2.1/disable-xmms-plugin.patch b/meta/recipes-multimedia/flac/flac-1.2.1/disable-xmms-plugin.patch
new file mode 100644
index 0000000000..e2f4fa1360
--- /dev/null
+++ b/meta/recipes-multimedia/flac/flac-1.2.1/disable-xmms-plugin.patch
@@ -0,0 +1,24 @@
1# Acquired from OpenEmbedded
2
3diff -ruN flac-1.2.1-orig/src/Makefile.am flac-1.2.1-new/src/Makefile.am
4--- flac-1.2.1-orig/src/Makefile.am 2010-06-23 15:06:29.167865355 +0800
5+++ flac-1.2.1-new/src/Makefile.am 2010-06-25 16:23:05.555202728 +0800
6@@ -15,10 +15,6 @@
7 # restrictive of those mentioned above. See the file COPYING.Xiph in this
8 # distribution.
9
10-if FLaC__HAS_XMMS
11-XMMS_DIRS = plugin_common plugin_xmms
12-endif
13-
14 if FLaC__WITH_CPPLIBS
15 CPPLIBS_DIRS = libFLAC++ test_libFLAC++
16 endif
17@@ -29,7 +25,6 @@
18 flac \
19 metaflac \
20 monkeys_audio_utilities \
21- $(XMMS_DIRS) \
22 plugin_winamp2 \
23 test_grabbag \
24 test_libs_common \
diff --git a/meta/recipes-multimedia/flac/flac-1.2.1/flac-gcc43-fixes.patch b/meta/recipes-multimedia/flac/flac-1.2.1/flac-gcc43-fixes.patch
new file mode 100644
index 0000000000..fdb6f1337e
--- /dev/null
+++ b/meta/recipes-multimedia/flac/flac-1.2.1/flac-gcc43-fixes.patch
@@ -0,0 +1,14 @@
1# Acquired from OpenEmbedded
2# Fix no declaration of memcmp()
3
4diff -urN flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp
5--- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp 2010-06-23 15:06:29.159481339 +0800
6+++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2010-06-23 15:06:46.233384883 +0800
7@@ -30,6 +30,7 @@
8
9 #include <stdio.h>
10 #include <stdlib.h>
11+#include <string.h>
12 #include "FLAC++/metadata.h"
13 #include "FLAC++/encoder.h"
14
diff --git a/meta/recipes-multimedia/flac/flac-1.2.1/xmms.m4 b/meta/recipes-multimedia/flac/flac-1.2.1/xmms.m4
new file mode 100644
index 0000000000..5e250cdd38
--- /dev/null
+++ b/meta/recipes-multimedia/flac/flac-1.2.1/xmms.m4
@@ -0,0 +1,149 @@
1# CFLAGS and library paths for XMMS
2# written 15 December 1999 by Ben Gertzfield <che@debian.org>
3# Acquired from OpenEmbedded
4
5dnl Usage:
6dnl AM_PATH_XMMS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
7dnl
8dnl Example:
9dnl AM_PATH_XMMS(0.9.5.1, , AC_MSG_ERROR([*** XMMS >= 0.9.5.1 not installed - please install first ***]))
10dnl
11dnl Defines XMMS_CFLAGS, XMMS_LIBS, XMMS_DATA_DIR, XMMS_PLUGIN_DIR,
12dnl XMMS_VISUALIZATION_PLUGIN_DIR, XMMS_INPUT_PLUGIN_DIR,
13dnl XMMS_OUTPUT_PLUGIN_DIR, XMMS_GENERAL_PLUGIN_DIR, XMMS_EFFECT_PLUGIN_DIR,
14dnl and XMMS_VERSION for your plugin pleasure.
15dnl
16
17dnl XMMS_TEST_VERSION(AVAILABLE-VERSION, NEEDED-VERSION [, ACTION-IF-OKAY [, ACTION-IF-NOT-OKAY]])
18AC_DEFUN(XMMS_TEST_VERSION, [
19
20# Determine which version number is greater. Prints 2 to stdout if
21# the second number is greater, 1 if the first number is greater,
22# 0 if the numbers are equal.
23
24# Written 15 December 1999 by Ben Gertzfield <che@debian.org>
25# Revised 15 December 1999 by Jim Monty <monty@primenet.com>
26
27 AC_PROG_AWK
28 xmms_got_version=[` $AWK ' \
29BEGIN { \
30 print vercmp(ARGV[1], ARGV[2]); \
31} \
32 \
33function vercmp(ver1, ver2, ver1arr, ver2arr, \
34 ver1len, ver2len, \
35 ver1int, ver2int, len, i, p) { \
36 \
37 ver1len = split(ver1, ver1arr, /\./); \
38 ver2len = split(ver2, ver2arr, /\./); \
39 \
40 len = ver1len > ver2len ? ver1len : ver2len; \
41 \
42 for (i = 1; i <= len; i++) { \
43 p = 1000 ^ (len - i); \
44 ver1int += ver1arr[i] * p; \
45 ver2int += ver2arr[i] * p; \
46 } \
47 \
48 if (ver1int < ver2int) \
49 return 2; \
50 else if (ver1int > ver2int) \
51 return 1; \
52 else \
53 return 0; \
54}' $1 $2`]
55
56 if test $xmms_got_version -eq 2; then # failure
57 ifelse([$4], , :, $4)
58 else # success!
59 ifelse([$3], , :, $3)
60 fi
61])
62
63AC_DEFUN(AM_PATH_XMMS,
64[
65AC_ARG_WITH(xmms-prefix,[ --with-xmms-prefix=PFX Prefix where XMMS is installed (optional)],
66 xmms_config_prefix="$withval", xmms_config_prefix="")
67AC_ARG_WITH(xmms-exec-prefix,[ --with-xmms-exec-prefix=PFX Exec prefix where XMMS is installed (optional)],
68 xmms_config_exec_prefix="$withval", xmms_config_exec_prefix="")
69
70if test x$xmms_config_exec_prefix != x; then
71 xmms_config_args="$xmms_config_args --exec-prefix=$xmms_config_exec_prefix"
72 if test x${XMMS_CONFIG+set} != xset; then
73 XMMS_CONFIG=$xmms_config_exec_prefix/bin/xmms-config
74 fi
75fi
76
77if test x$xmms_config_prefix != x; then
78 xmms_config_args="$xmms_config_args --prefix=$xmms_config_prefix"
79 if test x${XMMS_CONFIG+set} != xset; then
80 XMMS_CONFIG=$xmms_config_prefix/bin/xmms-config
81 fi
82fi
83
84AC_PATH_PROG(XMMS_CONFIG, xmms-config, no)
85min_xmms_version=ifelse([$1], ,0.9.5.1, $1)
86
87if test "$XMMS_CONFIG" = "no"; then
88 no_xmms=yes
89else
90 XMMS_CFLAGS=`$XMMS_CONFIG $xmms_config_args --cflags`
91 XMMS_LIBS=`$XMMS_CONFIG $xmms_config_args --libs`
92 XMMS_VERSION=`$XMMS_CONFIG $xmms_config_args --version`
93 XMMS_DATA_DIR=`$XMMS_CONFIG $xmms_config_args --data-dir`
94 XMMS_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --plugin-dir`
95 XMMS_VISUALIZATION_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args \
96 --visualization-plugin-dir`
97 XMMS_INPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --input-plugin-dir`
98 XMMS_OUTPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --output-plugin-dir`
99 XMMS_EFFECT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --effect-plugin-dir`
100 XMMS_GENERAL_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --general-plugin-dir`
101
102 XMMS_TEST_VERSION($XMMS_VERSION, $min_xmms_version, ,no_xmms=version)
103fi
104
105AC_MSG_CHECKING(for XMMS - version >= $min_xmms_version)
106
107if test "x$no_xmms" = x; then
108 AC_MSG_RESULT(yes)
109 ifelse([$2], , :, [$2])
110else
111 AC_MSG_RESULT(no)
112
113 if test "$XMMS_CONFIG" = "no" ; then
114 echo "*** The xmms-config script installed by XMMS could not be found."
115 echo "*** If XMMS was installed in PREFIX, make sure PREFIX/bin is in"
116 echo "*** your path, or set the XMMS_CONFIG environment variable to the"
117 echo "*** full path to xmms-config."
118 else
119 if test "$no_xmms" = "version"; then
120 echo "*** An old version of XMMS, $XMMS_VERSION, was found."
121 echo "*** You need a version of XMMS newer than $min_xmms_version."
122 echo "*** The latest version of XMMS is always available from"
123 echo "*** http://www.xmms.org/"
124 echo "***"
125
126 echo "*** If you have already installed a sufficiently new version, this error"
127 echo "*** probably means that the wrong copy of the xmms-config shell script is"
128 echo "*** being found. The easiest way to fix this is to remove the old version"
129 echo "*** of XMMS, but you can also set the XMMS_CONFIG environment to point to the"
130 echo "*** correct copy of xmms-config. (In this case, you will have to"
131 echo "*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf"
132 echo "*** so that the correct libraries are found at run-time)"
133 fi
134 fi
135 XMMS_CFLAGS=""
136 XMMS_LIBS=""
137 ifelse([$3], , :, [$3])
138fi
139AC_SUBST(XMMS_CFLAGS)
140AC_SUBST(XMMS_LIBS)
141AC_SUBST(XMMS_VERSION)
142AC_SUBST(XMMS_DATA_DIR)
143AC_SUBST(XMMS_PLUGIN_DIR)
144AC_SUBST(XMMS_VISUALIZATION_PLUGIN_DIR)
145AC_SUBST(XMMS_INPUT_PLUGIN_DIR)
146AC_SUBST(XMMS_OUTPUT_PLUGIN_DIR)
147AC_SUBST(XMMS_GENERAL_PLUGIN_DIR)
148AC_SUBST(XMMS_EFFECT_PLUGIN_DIR)
149])