[oe-commits] : ffmpeg git: stage swscale headers in both ffmpeg/ and libswcale/, apps can't agree on a standard location

[OE GIT Trial]

Module: OE.dev
Branch: master
Commit: 895eb68e9d8db5c9ce6bda3151793f853a8f61f9
URL:    http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=895eb68e9d8db5c9ce6bda3151793f853a8f61f9

Author:  <koen at openembedded.org>
Date:   Tue Aug  5 15:13:03 2008 +0000

ffmpeg git: stage swscale headers in both ffmpeg/ and libswcale/, apps can't agree on a standard location

---

 packages/ffmpeg/ffmpeg_git.bb |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index 6cc388b..0cbfce2 100644
--- a/packages/ffmpeg/ffmpeg_git.bb
+++ b/packages/ffmpeg/ffmpeg_git.bb
@@ -3,7 +3,7 @@ require ffmpeg.inc
 DEPENDS += "libgsm"
 
 PV = "0.4.9+${PR}+gitr${SRCREV}" 
-PR = "r22"
+PR = "r23"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_armv5te = "1"
@@ -93,8 +93,9 @@ do_stage() {
            install -m 0644 ${S}/libavutil/$h        ${STAGING_INCDIR}/libavutil/$h 
         done
 
-        install -m 0644 ${S}/libswscale/swscale.h ${STAGING_INCDIR}/ffmpeg/swscale.h
-        install -m 0644 ${S}/libswscale/rgb2rgb.h ${STAGING_INCDIR}/ffmpeg/rgb2rgb.h
+        install -d ${STAGING_INCDIR}/libswscale/ 
+        install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/ffmpeg/
+        install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/libswscale/
 
         install -d ${STAGING_INCDIR}/libpostproc
         install -d ${STAGING_INCDIR}/postproc