Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/25 21:55:23+01:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2004/12/25 21:55:12+01:00 dyndns.org!reenoo
ffmpeg: fix libavcodec and libavformat sonames; package libs separately.

BKrev: 41cdde36QSWfCBQI9lrcbig3QIAZCA

diff --git a/packages/ffmpeg/ffmpeg-0.4.9-pre1/soname.patch b/packages/ffmpeg/ffmpeg-0.4.9-pre1/soname.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
index fd69398..6770703 100644 (file)
--- a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
+++ b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
@@ -4,6 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "zlib libvorbis faad2 faac liba52 lame mplayer"
 LICENSE = "LGPL"
+PR = "r1"
 
 
 inherit autotools
@@ -11,6 +12,7 @@ inherit autotools
 SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \
        file://configure.patch;patch=0 \
        file://common.patch;patch=1 \
+       file://soname.patch;patch=1 \
        "
 
 TARGET_LDFLAGS_append = " -lm -la52 "
@@ -46,9 +48,17 @@ EXTRA_OECONF=" \
        --extra-libs=\$(TARGET_LDFLAGS) \
        \
        --cpu=${PACKAGE_ARCH} \
-       --prefix=${D}/usr \
+       --prefix=${D}/${prefix} \
 "
 
+PACKAGES += "libavcodec libavcodec-dev libavformat libavformat-dev"
+FILES_${PN} = "${bindir}"
+FILES_${PN}-dev = "${includedir}"
+FILES_libavcodec = "${libdir}/libavcodec*.so.*"
+FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/libavcodec*.la ${libdir}/libavcodec*.a"
+FILES_libavformat = "${libdir}/libavformat*.so.*"
+FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/libavformat*.la ${libdir}/libavformat*.a"
+
 # We do this because the install program is called with -s which causes it to call "strip" and it then mangles cross compiled stuff..
 PATH_prepend=${CROSS_DIR}/${TARGET_SYS}/bin:
 
@@ -58,19 +68,6 @@ do_configure_prepend() {
        export CC="${CC}"
 }
 
-do_install_append() {
-       # Need to fix up the shared libraries
-       cd ${D}/usr/lib
-       
-       mv libavcodec-${PV}.so libavcodec.so.0.0.0
-       ln -s libavcodec.so.0.0.0 libavcodec-${PV}.so
-       ln -s libavcodec.so.0.0.0 libavcodec.so.0
-
-       mv libavformat-${PV}.so libavformat.so.0.0.0
-       ln -s libavformat.so.0.0.0 libavformat-${PV}.so
-       ln -s libavformat.so.0.0.0 libavformat.so.0
-}
-
 do_stage() {
        oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR}
        oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR}