[oe-commits] org.oe.dev flac: consolidate and unify. preparing closure of bug 4386.
Laibsch commit
oe at amethyst.openembedded.net
Mon Sep 1 17:48:56 UTC 2008
flac: consolidate and unify. preparing closure of bug 4386.
Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: ccb7f1f9255a881fe31045e96a80be35d59827a8
ViewMTN: http://monotone.openembedded.org/revision/info/ccb7f1f9255a881fe31045e96a80be35d59827a8
Files:
1
packages/flac/flac-1.1.0
packages/flac/flac-1.1.0/disable-xmms-plugin.patch
packages/flac/flac-1.1.0/xmms.m4
packages/flac/flac-1.1.2
packages/flac/files
packages/flac/flac_1.1.2.bb
packages/flac/flac.inc
packages/flac/flac_1.1.0.bb
Diffs:
#
# mt diff -ref96b95bd9637cbe10bcca0129b560159fdedafb -rccb7f1f9255a881fe31045e96a80be35d59827a8
#
#
#
# delete "packages/flac/flac-1.1.0"
#
# delete "packages/flac/flac-1.1.0/disable-xmms-plugin.patch"
#
# delete "packages/flac/flac-1.1.0/xmms.m4"
#
# rename "packages/flac/flac-1.1.2"
# to "packages/flac/files"
#
# rename "packages/flac/flac_1.1.2.bb"
# to "packages/flac/flac.inc"
#
# add_file "packages/flac/flac_1.1.2.bb"
# content [245d992e59fe51ef048af8a26f63b8a3697553a9]
#
# patch "packages/flac/flac.inc"
# from [96f2861b917ed2fbcaa9526091bbe8c89b7a7a80]
# to [3debbf0cbf93e4c1cd7d9cf2fced5a6b7ed588a4]
#
# patch "packages/flac/flac_1.1.0.bb"
# from [71e75385e9a1c43fb8889177f8f7eee410a1ce49]
# to [06994a9dfe206b7f2228ed1848818e4da01eb833]
#
============================================================
--- packages/flac/flac_1.1.2.bb 245d992e59fe51ef048af8a26f63b8a3697553a9
+++ packages/flac/flac_1.1.2.bb 245d992e59fe51ef048af8a26f63b8a3697553a9
@@ -0,0 +1,13 @@
+require flac.inc
+
+PR = "r6"
+
+do_configure_append () {
+ # 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
+}
+
+do_stage_append () {
+ install -m 0644 ${S}/include/FLAC/callback.h ${STAGING_INCDIR}/FLAC/callback.h
+}
============================================================
--- packages/flac/flac_1.1.2.bb 96f2861b917ed2fbcaa9526091bbe8c89b7a7a80
+++ packages/flac/flac.inc 3debbf0cbf93e4c1cd7d9cf2fced5a6b7ed588a4
@@ -2,14 +2,11 @@ DEPENDS = "libogg"
LICENSE = "BSD GPL"
SECTION = "libs"
DEPENDS = "libogg"
-PR = "r5"
SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
file://disable-xmms-plugin.patch;patch=1 \
file://xmms.m4"
-S = "${WORKDIR}/flac-${PV}"
-
inherit autotools
EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \
@@ -20,13 +17,6 @@ EXTRA_OECONF = "--disable-oggtest --disa
--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/
@@ -82,3 +72,10 @@ do_stage () {
install -m 0644 ${S}/include/OggFLAC++/decoder.h ${STAGING_INCDIR}/OggFLAC++/decoder.h
install -m 0644 ${S}/src/libOggFLAC++/libOggFLAC++.m4 ${STAGING_DATADIR}/aclocal/
}
+
+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.*"
============================================================
--- packages/flac/flac_1.1.0.bb 71e75385e9a1c43fb8889177f8f7eee410a1ce49
+++ packages/flac/flac_1.1.0.bb 06994a9dfe206b7f2228ed1848818e4da01eb833
@@ -1,78 +1,3 @@
-DESCRIPTION = "FLAC is a Free Lossless Audio Codec."
-LICENSE = "BSD GPL"
-SECTION = "libs"
-DEPENDS = "libogg"
-PR = "r5"
+require flac.inc
+PR = "r6"
-SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
- file://disable-xmms-plugin.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
-}
-
-do_stage () {
- install -d ${STAGING_DATADIR}/aclocal
-
- oe_libinstall -a -so -C src/libOggFLAC libOggFLAC ${STAGING_LIBDIR}/
- install -d ${STAGING_INCDIR}/OggFLAC
- install -m 0644 ${S}/include/OggFLAC/export.h ${STAGING_INCDIR}/OggFLAC/export.h
- install -m 0644 ${S}/include/OggFLAC/all.h ${STAGING_INCDIR}/OggFLAC/all.h
- install -m 0644 ${S}/include/OggFLAC/stream_encoder.h ${STAGING_INCDIR}/OggFLAC/stream_encoder.h
- install -m 0644 ${S}/include/OggFLAC/stream_decoder.h ${STAGING_INCDIR}/OggFLAC/stream_decoder.h
- install -m 0644 ${S}/src/libOggFLAC/libOggFLAC.m4 ${STAGING_DATADIR}/aclocal/
-
- oe_libinstall -a -so -C src/libFLAC libFLAC ${STAGING_LIBDIR}/
- install -d ${STAGING_INCDIR}/FLAC
- install -m 0644 ${S}/include/FLAC/export.h ${STAGING_INCDIR}/FLAC/export.h
- install -m 0644 ${S}/include/FLAC/metadata.h ${STAGING_INCDIR}/FLAC/metadata.h
- install -m 0644 ${S}/include/FLAC/all.h ${STAGING_INCDIR}/FLAC/all.h
- install -m 0644 ${S}/include/FLAC/format.h ${STAGING_INCDIR}/FLAC/format.h
- install -m 0644 ${S}/include/FLAC/stream_encoder.h ${STAGING_INCDIR}/FLAC/stream_encoder.h
- install -m 0644 ${S}/include/FLAC/stream_decoder.h ${STAGING_INCDIR}/FLAC/stream_decoder.h
- install -m 0644 ${S}/include/FLAC/ordinals.h ${STAGING_INCDIR}/FLAC/ordinals.h
- install -m 0644 ${S}/include/FLAC/seekable_stream_encoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_encoder.h
- install -m 0644 ${S}/include/FLAC/file_encoder.h ${STAGING_INCDIR}/FLAC/file_encoder.h
- install -m 0644 ${S}/include/FLAC/seekable_stream_decoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_decoder.h
- install -m 0644 ${S}/include/FLAC/file_decoder.h ${STAGING_INCDIR}/FLAC/file_decoder.h
- install -m 0644 ${S}/include/FLAC/assert.h ${STAGING_INCDIR}/FLAC/assert.h
- install -m 0644 ${S}/src/libFLAC/libFLAC.m4 ${STAGING_DATADIR}/aclocal/
-
- oe_libinstall -a -so -C src/libFLAC++ libFLAC++ ${STAGING_LIBDIR}/
- install -d ${STAGING_INCDIR}/FLAC++
- install -m 0644 ${S}/include/FLAC++/export.h ${STAGING_INCDIR}/FLAC++/export.h
- install -m 0644 ${S}/include/FLAC++/metadata.h ${STAGING_INCDIR}/FLAC++/metadata.h
- install -m 0644 ${S}/include/FLAC++/all.h ${STAGING_INCDIR}/FLAC++/all.h
- install -m 0644 ${S}/include/FLAC++/encoder.h ${STAGING_INCDIR}/FLAC++/encoder.h
- install -m 0644 ${S}/include/FLAC++/decoder.h ${STAGING_INCDIR}/FLAC++/decoder.h
- install -m 0644 ${S}/src/libFLAC++/libFLAC++.m4 ${STAGING_DATADIR}/aclocal/
-
- oe_libinstall -a -so -C src/libOggFLAC++ libOggFLAC++ ${STAGING_LIBDIR}/
- install -d ${STAGING_INCDIR}/OggFLAC++
- install -m 0644 ${S}/include/OggFLAC++/export.h ${STAGING_INCDIR}/OggFLAC++/export.h
- install -m 0644 ${S}/include/OggFLAC++/all.h ${STAGING_INCDIR}/OggFLAC++/all.h
- install -m 0644 ${S}/include/OggFLAC++/encoder.h ${STAGING_INCDIR}/OggFLAC++/encoder.h
- install -m 0644 ${S}/include/OggFLAC++/decoder.h ${STAGING_INCDIR}/OggFLAC++/decoder.h
- install -m 0644 ${S}/src/libOggFLAC++/libOggFLAC++.m4 ${STAGING_DATADIR}/aclocal/
-}
More information about the Openembedded-commits
mailing list