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

[koen commit]

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

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 913ae7f0b3bc89c8381cfe284d5e1012ce8e8278
ViewMTN: http://monotone.openembedded.org/revision/info/913ae7f0b3bc89c8381cfe284d5e1012ce8e8278
Files:
1
packages/ffmpeg/ffmpeg_git.bb
Diffs:

#
# mt diff -r6da9c24a1aa1d725d11e49afc21499e8004735a3 -r913ae7f0b3bc89c8381cfe284d5e1012ce8e8278
#
#
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
#  from [837a41171d7bc2826dbcf02c9c62aa91c7e8f655]
#    to [2444e0335de6facacd9f9a2e3622fd5d31f23e4d]
#
============================================================
--- packages/ffmpeg/ffmpeg_git.bb	837a41171d7bc2826dbcf02c9c62aa91c7e8f655
+++ packages/ffmpeg/ffmpeg_git.bb	2444e0335de6facacd9f9a2e3622fd5d31f23e4d
@@ -3,7 +3,7 @@ PV = "0.4.9+${PR}+gitr${SRCREV}" 
 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