diff options
Diffstat (limited to 'meta/packages/flac')
-rw-r--r-- | meta/packages/flac/flac-1.2.1/disable-xmms-plugin.patch | 24 | ||||
-rw-r--r-- | meta/packages/flac/flac-1.2.1/flac-gcc43-fixes.patch | 14 | ||||
-rw-r--r-- | meta/packages/flac/flac-1.2.1/xmms.m4 | 149 | ||||
-rw-r--r-- | meta/packages/flac/flac_1.2.1.bb | 49 |
4 files changed, 0 insertions, 236 deletions
diff --git a/meta/packages/flac/flac-1.2.1/disable-xmms-plugin.patch b/meta/packages/flac/flac-1.2.1/disable-xmms-plugin.patch deleted file mode 100644 index e2f4fa136..000000000 --- a/meta/packages/flac/flac-1.2.1/disable-xmms-plugin.patch +++ /dev/null @@ -1,24 +0,0 @@ -# Acquired from OpenEmbedded - -diff -ruN flac-1.2.1-orig/src/Makefile.am flac-1.2.1-new/src/Makefile.am ---- flac-1.2.1-orig/src/Makefile.am 2010-06-23 15:06:29.167865355 +0800 -+++ flac-1.2.1-new/src/Makefile.am 2010-06-25 16:23:05.555202728 +0800 -@@ -15,10 +15,6 @@ - # restrictive of those mentioned above. See the file COPYING.Xiph in this - # distribution. - --if FLaC__HAS_XMMS --XMMS_DIRS = plugin_common plugin_xmms --endif -- - if FLaC__WITH_CPPLIBS - CPPLIBS_DIRS = libFLAC++ test_libFLAC++ - endif -@@ -29,7 +25,6 @@ - flac \ - metaflac \ - monkeys_audio_utilities \ -- $(XMMS_DIRS) \ - plugin_winamp2 \ - test_grabbag \ - test_libs_common \ diff --git a/meta/packages/flac/flac-1.2.1/flac-gcc43-fixes.patch b/meta/packages/flac/flac-1.2.1/flac-gcc43-fixes.patch deleted file mode 100644 index fdb6f1337..000000000 --- a/meta/packages/flac/flac-1.2.1/flac-gcc43-fixes.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Acquired from OpenEmbedded -# Fix no declaration of memcmp() - -diff -urN flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp ---- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp 2010-06-23 15:06:29.159481339 +0800 -+++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2010-06-23 15:06:46.233384883 +0800 -@@ -30,6 +30,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - #include "FLAC++/metadata.h" - #include "FLAC++/encoder.h" - diff --git a/meta/packages/flac/flac-1.2.1/xmms.m4 b/meta/packages/flac/flac-1.2.1/xmms.m4 deleted file mode 100644 index 5e250cdd3..000000000 --- a/meta/packages/flac/flac-1.2.1/xmms.m4 +++ /dev/null @@ -1,149 +0,0 @@ -# CFLAGS and library paths for XMMS -# written 15 December 1999 by Ben Gertzfield <che@debian.org> -# Acquired from OpenEmbedded - -dnl Usage: -dnl AM_PATH_XMMS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl -dnl Example: -dnl AM_PATH_XMMS(0.9.5.1, , AC_MSG_ERROR([*** XMMS >= 0.9.5.1 not installed - please install first ***])) -dnl -dnl Defines XMMS_CFLAGS, XMMS_LIBS, XMMS_DATA_DIR, XMMS_PLUGIN_DIR, -dnl XMMS_VISUALIZATION_PLUGIN_DIR, XMMS_INPUT_PLUGIN_DIR, -dnl XMMS_OUTPUT_PLUGIN_DIR, XMMS_GENERAL_PLUGIN_DIR, XMMS_EFFECT_PLUGIN_DIR, -dnl and XMMS_VERSION for your plugin pleasure. -dnl - -dnl XMMS_TEST_VERSION(AVAILABLE-VERSION, NEEDED-VERSION [, ACTION-IF-OKAY [, ACTION-IF-NOT-OKAY]]) -AC_DEFUN(XMMS_TEST_VERSION, [ - -# Determine which version number is greater. Prints 2 to stdout if -# the second number is greater, 1 if the first number is greater, -# 0 if the numbers are equal. - -# Written 15 December 1999 by Ben Gertzfield <che@debian.org> -# Revised 15 December 1999 by Jim Monty <monty@primenet.com> - - AC_PROG_AWK - xmms_got_version=[` $AWK ' \ -BEGIN { \ - print vercmp(ARGV[1], ARGV[2]); \ -} \ - \ -function vercmp(ver1, ver2, ver1arr, ver2arr, \ - ver1len, ver2len, \ - ver1int, ver2int, len, i, p) { \ - \ - ver1len = split(ver1, ver1arr, /\./); \ - ver2len = split(ver2, ver2arr, /\./); \ - \ - len = ver1len > ver2len ? ver1len : ver2len; \ - \ - for (i = 1; i <= len; i++) { \ - p = 1000 ^ (len - i); \ - ver1int += ver1arr[i] * p; \ - ver2int += ver2arr[i] * p; \ - } \ - \ - if (ver1int < ver2int) \ - return 2; \ - else if (ver1int > ver2int) \ - return 1; \ - else \ - return 0; \ -}' $1 $2`] - - if test $xmms_got_version -eq 2; then # failure - ifelse([$4], , :, $4) - else # success! - ifelse([$3], , :, $3) - fi -]) - -AC_DEFUN(AM_PATH_XMMS, -[ -AC_ARG_WITH(xmms-prefix,[ --with-xmms-prefix=PFX Prefix where XMMS is installed (optional)], - xmms_config_prefix="$withval", xmms_config_prefix="") -AC_ARG_WITH(xmms-exec-prefix,[ --with-xmms-exec-prefix=PFX Exec prefix where XMMS is installed (optional)], - xmms_config_exec_prefix="$withval", xmms_config_exec_prefix="") - -if test x$xmms_config_exec_prefix != x; then - xmms_config_args="$xmms_config_args --exec-prefix=$xmms_config_exec_prefix" - if test x${XMMS_CONFIG+set} != xset; then - XMMS_CONFIG=$xmms_config_exec_prefix/bin/xmms-config - fi -fi - -if test x$xmms_config_prefix != x; then - xmms_config_args="$xmms_config_args --prefix=$xmms_config_prefix" - if test x${XMMS_CONFIG+set} != xset; then - XMMS_CONFIG=$xmms_config_prefix/bin/xmms-config - fi -fi - -AC_PATH_PROG(XMMS_CONFIG, xmms-config, no) -min_xmms_version=ifelse([$1], ,0.9.5.1, $1) - -if test "$XMMS_CONFIG" = "no"; then - no_xmms=yes -else - XMMS_CFLAGS=`$XMMS_CONFIG $xmms_config_args --cflags` - XMMS_LIBS=`$XMMS_CONFIG $xmms_config_args --libs` - XMMS_VERSION=`$XMMS_CONFIG $xmms_config_args --version` - XMMS_DATA_DIR=`$XMMS_CONFIG $xmms_config_args --data-dir` - XMMS_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --plugin-dir` - XMMS_VISUALIZATION_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args \ - --visualization-plugin-dir` - XMMS_INPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --input-plugin-dir` - XMMS_OUTPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --output-plugin-dir` - XMMS_EFFECT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --effect-plugin-dir` - XMMS_GENERAL_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --general-plugin-dir` - - XMMS_TEST_VERSION($XMMS_VERSION, $min_xmms_version, ,no_xmms=version) -fi - -AC_MSG_CHECKING(for XMMS - version >= $min_xmms_version) - -if test "x$no_xmms" = x; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) -else - AC_MSG_RESULT(no) - - if test "$XMMS_CONFIG" = "no" ; then - echo "*** The xmms-config script installed by XMMS could not be found." - echo "*** If XMMS was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the XMMS_CONFIG environment variable to the" - echo "*** full path to xmms-config." - else - if test "$no_xmms" = "version"; then - echo "*** An old version of XMMS, $XMMS_VERSION, was found." - echo "*** You need a version of XMMS newer than $min_xmms_version." - echo "*** The latest version of XMMS is always available from" - echo "*** http://www.xmms.org/" - echo "***" - - echo "*** If you have already installed a sufficiently new version, this error" - echo "*** probably means that the wrong copy of the xmms-config shell script is" - echo "*** being found. The easiest way to fix this is to remove the old version" - echo "*** of XMMS, but you can also set the XMMS_CONFIG environment to point to the" - echo "*** correct copy of xmms-config. (In this case, you will have to" - echo "*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf" - echo "*** so that the correct libraries are found at run-time)" - fi - fi - XMMS_CFLAGS="" - XMMS_LIBS="" - ifelse([$3], , :, [$3]) -fi -AC_SUBST(XMMS_CFLAGS) -AC_SUBST(XMMS_LIBS) -AC_SUBST(XMMS_VERSION) -AC_SUBST(XMMS_DATA_DIR) -AC_SUBST(XMMS_PLUGIN_DIR) -AC_SUBST(XMMS_VISUALIZATION_PLUGIN_DIR) -AC_SUBST(XMMS_INPUT_PLUGIN_DIR) -AC_SUBST(XMMS_OUTPUT_PLUGIN_DIR) -AC_SUBST(XMMS_GENERAL_PLUGIN_DIR) -AC_SUBST(XMMS_EFFECT_PLUGIN_DIR) -]) diff --git a/meta/packages/flac/flac_1.2.1.bb b/meta/packages/flac/flac_1.2.1.bb deleted file mode 100644 index 30a8cfb93..000000000 --- a/meta/packages/flac/flac_1.2.1.bb +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION = "FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but lossless." -HOMEPAGE = "http://flac.sourceforge.net/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=13478&atid=113478" -SECTION = "libs" -LICENSE = "FDLv1.2 & GPLv2+ & LGPLv2.1+ & BSD" -LIC_FILES_CHKSUM = "file://COPYING.FDL;md5=ad1419ecc56e060eccf8184a87c4285f \ - file://src/Makefile.am;beginline=1;endline=16;md5=8dee151a56a3122f064a9dce771db37d \ - file://COPYING.GPL;md5=079b27cd65c86dbc1b6997ffde902735 \ - file://src/flac/main.c;beginline=1;endline=17;md5=756c4234516e4266ea45ee7bbbd798cf \ - file://COPYING.LGPL;md5=fbc093901857fcd118f065f900982c24 \ - file://src/plugin_common/all.h;beginline=1;endline=17;md5=b2e7960da6b43e4eccabf999bcf7f3a9 \ - file://COPYING.Xiph;md5=df8975c0225f83ed7b567587ed953b83 \ - file://include/FLAC/all.h;beginline=64;endline=69;md5=64474f2b22e9e77b28d8b8b25c983a48" -DEPENDS = "libogg" - -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \ - file://disable-xmms-plugin.patch;patch=1 \ - file://flac-gcc43-fixes.patch;patch=1 \ - file://xmms.m4" - -S = "${WORKDIR}/flac-${PV}" - -inherit autotools - -EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \ - --with-ogg-libraries=${STAGING_LIBDIR} \ - --with-ogg-includes=${STAGING_INCDIR} \ - --without-xmms-prefix \ - --without-xmms-exec-prefix \ - --without-libiconv-prefix \ - --without-id3lib" - -PACKAGES += "libflac libflac++ liboggflac liboggflac++" -FILES_${PN} = "${bindir}/*" -FILES_libflac = "${libdir}/libFLAC.so.*" -FILES_libflac++ = "${libdir}/libFLAC++.so.*" -FILES_liboggflac = "${libdir}/libOggFLAC.so.*" -FILES_liboggflac++ = "${libdir}/libOggFLAC++.so.*" - -do_configure () { - install -d ${S}/m4 - install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/ - autotools_do_configure - # removes '-read-only-relocs' which is enabled for PowerPC builds. - # It makes the build fail, other archs are not affected. Fixes #1775. - sed -i 's/-Wl,-read_only_relocs,warning//g' src/libFLAC/Makefile -} |