[oe-commits] org.oe.dev merge of '4ced2a6d71f9eeefb5a83f0584348d666b56065a'
oe commit
oe at amethyst.openembedded.net
Wed Jul 9 19:37:21 UTC 2008
merge of '4ced2a6d71f9eeefb5a83f0584348d666b56065a'
and '9a6c7bec4be483b56e6305d978adce9e49f1e29c'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 6431187c3e895379ef9f32bcc4a81bf581afbf05
ViewMTN: http://monotone.openembedded.org/revision/info/6431187c3e895379ef9f32bcc4a81bf581afbf05
Files:
1
packages/python/python-cython-native_0.9.6.9.bb
packages/python/python-cython-native_0.9.8.bb
packages/python/python-cython_0.9.6.9.bb
packages/python/python-cython_0.9.8.bb
packages/python/python-pyrex-native_0.9.5.1a.bb
packages/python/python-pyrex-native_0.9.8.4.bb
packages/python/python-pyrex_0.9.5.1a.bb
packages/python/python-pyrex_0.9.8.4.bb
packages/webkit/files/update-webkit.sh
packages/webkit/webkit-gtk/update-webkit.sh
packages/neuros-pkggen
packages/neuros-pkggen/files
packages/python/python-opendir
packages/qt4/qt-embedded-4.4.0
packages/u-boot/files/neuros-osd2
conf/machine/include/neuros.inc
packages/ffmpeg/ffmpeg_git.bb
packages/freesmartphone/mickeydbus_git.bb
packages/images/dsplink-test-image.bb
packages/linux/linux-omap2-git/omap3evm/soc.patch
packages/linux/linux-omap2-git/omap3evm/timer-suppression.patch
packages/linux/linux-omap2-git/omap3evm/touchscreen.patch
packages/meta/meta-toolchain-neuros.bb
packages/neuros-pkggen/files/Makefile
packages/neuros-pkggen/files/Makefile.rules
packages/neuros-pkggen/files/config
packages/neuros-pkggen/files/crc32.c
packages/neuros-pkggen/files/package.c
packages/neuros-pkggen/files/package.h
packages/neuros-pkggen/files/readme
packages/neuros-pkggen/files/zlib.h
packages/neuros-pkggen/neuros-pkggen-native.bb
packages/python/python-cython-native_0.9.6.14.bb
packages/python/python-cython_0.9.6.14.bb
packages/python/python-opendir/opendir.pyx
packages/python/python-opendir/setup.py
packages/python/python-opendir_1.0.bb
packages/qt4/qt-embedded-4.4.0/0001-cross-compile.patch
packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch
packages/qt4/qt-embedded-4.4.0/0004-no-qmake.patch
packages/qt4/qt-embedded-4.4.0/0005-fix-mkspecs.patch
packages/qt4/qt-embedded-4.4.0/0006-freetype-host-includes.patch
packages/qt4/qt-embedded-4.4.0/0007-openssl-host-includes.patch
packages/qt4/qt-embedded-4.4.0/allow-configure-plugins.patch
packages/qt4/qt-embedded-4.4.0/build-tools.patch
packages/qt4/qt-embedded-4.4.0/linux-oe-qmake.conf
packages/qt4/qt-embedded-4.4.0/qconfig-oe.h
packages/qt4/qt-embedded_4.4.0.bb
packages/qt4/qtopia-core_4.4.0.bb
packages/tar/tar_1.20.bb
packages/tasks/task-sdk-bare.bb
packages/u-boot/files/Makefile-fix.patch
packages/u-boot/files/neuros-osd2/default-env.ascr
packages/u-boot/u-boot-env.bb
packages/uicmoc/uicmoc4-native_4.4.0.bb
conf/distro/include/fso-autorev.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/neuros-osd2.conf
packages/dsplink/codec-engine_2.10.bb
packages/dsplink/dsplink.inc
packages/dsplink/dsplink_1.50.bb
packages/dsplink/dsplink_1.51.00.08.bb
packages/ffmpeg/ffmpeg_svn.bb
packages/gtk-doc/gtk-doc.bb
packages/images/fso-image.bb
packages/images/neuros-osd-base-image.bb
packages/linux/linux-neuros/neuros-osd2/defconfig
packages/linux/linux-neuros_git.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2-git/omap3evm/defconfig
packages/linux/linux-omap2_git.bb
packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
packages/qt4/qt_packaging.inc
packages/qt4/qt_staging.inc
packages/tasks/task-python-everything.bb
packages/u-boot/u-boot_git.bb
packages/webkit/webkit-gtk/GNUmakefile.am
packages/webkit/webkit-gtk/Makefile
packages/webkit/webkit-gtk/configure.ac
packages/webkit/webkit-gtk_svn.bb
packages/fastcgi/files
packages/fastcgi/files/link-against-math.patch
packages/fastcgi/fastcgi_2.4.0.bb
Diffs:
#
# mt diff -r4ced2a6d71f9eeefb5a83f0584348d666b56065a -r6431187c3e895379ef9f32bcc4a81bf581afbf05
#
#
#
# rename "packages/python/python-cython-native_0.9.6.9.bb"
# to "packages/python/python-cython-native_0.9.8.bb"
#
# rename "packages/python/python-cython_0.9.6.9.bb"
# to "packages/python/python-cython_0.9.8.bb"
#
# rename "packages/python/python-pyrex-native_0.9.5.1a.bb"
# to "packages/python/python-pyrex-native_0.9.8.4.bb"
#
# rename "packages/python/python-pyrex_0.9.5.1a.bb"
# to "packages/python/python-pyrex_0.9.8.4.bb"
#
# rename "packages/webkit/files/update-webkit.sh"
# to "packages/webkit/webkit-gtk/update-webkit.sh"
#
# add_dir "packages/neuros-pkggen"
#
# add_dir "packages/neuros-pkggen/files"
#
# add_dir "packages/python/python-opendir"
#
# add_dir "packages/qt4/qt-embedded-4.4.0"
#
# add_dir "packages/u-boot/files/neuros-osd2"
#
# add_file "conf/machine/include/neuros.inc"
# content [98be0da0f0970c6e0823e91ff927912ba72f5309]
#
# add_file "packages/ffmpeg/ffmpeg_git.bb"
# content [64b784ccdafe69b684df27bf1e7040588a54b936]
#
# add_file "packages/freesmartphone/mickeydbus_git.bb"
# content [3fe06dd9c96a8f02c6b8aef310e26d8ec2ef2197]
#
# add_file "packages/images/dsplink-test-image.bb"
# content [a39b6f82b2a378ac3310ddafaf5e8e8032fe09af]
#
# add_file "packages/linux/linux-omap2-git/omap3evm/soc.patch"
# content [3c9184ebe013aa4d82f973de0ba1de1e33c85988]
#
# add_file "packages/linux/linux-omap2-git/omap3evm/timer-suppression.patch"
# content [f804af7d04bcc598a9d1e5245cf3a4a30f9e9b34]
#
# add_file "packages/linux/linux-omap2-git/omap3evm/touchscreen.patch"
# content [1f789de7949218132176e34fc3d33dcb0ae5e587]
#
# add_file "packages/meta/meta-toolchain-neuros.bb"
# content [975bc80b05a6d5c8ee34c730b23a41c8d922ad55]
#
# add_file "packages/neuros-pkggen/files/Makefile"
# content [c957515e8e596a944c6a466d16084b0dfe71bcea]
#
# add_file "packages/neuros-pkggen/files/Makefile.rules"
# content [937d101e33dd936cedcd992a4f537d890f358bc3]
#
# add_file "packages/neuros-pkggen/files/config"
# content [4ff9d4eb3944713db73a0ab93774eb758fcd3a55]
#
# add_file "packages/neuros-pkggen/files/crc32.c"
# content [367b74813d906f5ceedc08aa1a00a4c91bfa304c]
#
# add_file "packages/neuros-pkggen/files/package.c"
# content [d5ca5a63df4cd233db04df33a50fc5150b0d9cc2]
#
# add_file "packages/neuros-pkggen/files/package.h"
# content [55379d6e10495f88c7745fa5723cdb7bf6a36c15]
#
# add_file "packages/neuros-pkggen/files/readme"
# content [0367528a3bcdf39a471d235cf4b3d1c2d2869927]
#
# add_file "packages/neuros-pkggen/files/zlib.h"
# content [0b52ee19f7582a0e6e35cf0432af4480e6491b23]
#
# add_file "packages/neuros-pkggen/neuros-pkggen-native.bb"
# content [fbece6a9f1b6839cbb4d1d7847f64a9f5b810583]
#
# add_file "packages/python/python-cython-native_0.9.6.14.bb"
# content [e1421a5e31559ec41144bbdc77a4c448d493e717]
#
# add_file "packages/python/python-cython_0.9.6.14.bb"
# content [abc04d3b0fcddee4e58f667b31f4126a7976fe57]
#
# add_file "packages/python/python-opendir/opendir.pyx"
# content [89cb23b087cadb1a837bef7f0ad7f55a266e6629]
#
# add_file "packages/python/python-opendir/setup.py"
# content [d91df36c9dfa36dd3aa85dd6c1cb3ff6fa24271d]
#
# add_file "packages/python/python-opendir_1.0.bb"
# content [64e7b00b25584e19a34c8e58454de70a8fd0706b]
#
# add_file "packages/qt4/qt-embedded-4.4.0/0001-cross-compile.patch"
# content [2efe9cfa1a60cd53e732b11c53b902203fd7049c]
#
# add_file "packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch"
# content [36b5d42de52855e6a1ad8b8858043fbef8ec9963]
#
# add_file "packages/qt4/qt-embedded-4.4.0/0004-no-qmake.patch"
# content [3161380072937eb18db9e2b0e7ab732d8a1ad0e8]
#
# add_file "packages/qt4/qt-embedded-4.4.0/0005-fix-mkspecs.patch"
# content [e0202ec32ac08327d4432d53f000d1500072e47a]
#
# add_file "packages/qt4/qt-embedded-4.4.0/0006-freetype-host-includes.patch"
# content [3570223a649acdeb59d0a0d14207bea417a9c8b5]
#
# add_file "packages/qt4/qt-embedded-4.4.0/0007-openssl-host-includes.patch"
# content [a1b4e6415d9a946ffd9c11915b871187c76f8245]
#
# add_file "packages/qt4/qt-embedded-4.4.0/allow-configure-plugins.patch"
# content [c3b316fee55e5f2f5eecd54f37cdc88af92b9956]
#
# add_file "packages/qt4/qt-embedded-4.4.0/build-tools.patch"
# content [6612f0ee0a17e0dbc12ea3bed6fa66232e887240]
#
# add_file "packages/qt4/qt-embedded-4.4.0/linux-oe-qmake.conf"
# content [40e5550b5f9b6f0041674c58f49f96eb79c0076a]
#
# add_file "packages/qt4/qt-embedded-4.4.0/qconfig-oe.h"
# content [b03c0cf1186234b787173c4ebb4d6ee12103b1b6]
#
# add_file "packages/qt4/qt-embedded_4.4.0.bb"
# content [b18569128b0fbec67fb005585e346a2e604cf533]
#
# add_file "packages/qt4/qtopia-core_4.4.0.bb"
# content [1bd65f7336a5b9896b56d4d721d8dec8bcf8129a]
#
# add_file "packages/tar/tar_1.20.bb"
# content [fdb536c98631133f166b631d1c6a2be653c4ac34]
#
# add_file "packages/tasks/task-sdk-bare.bb"
# content [0b3da4f6e59030596fa9512444acba601928db9d]
#
# add_file "packages/u-boot/files/Makefile-fix.patch"
# content [e6aceb208841e83769b780b7923eaf573d898c54]
#
# add_file "packages/u-boot/files/neuros-osd2/default-env.ascr"
# content [8989e41178f588246d71e06134d1cab9837c0de0]
#
# add_file "packages/u-boot/u-boot-env.bb"
# content [7f7ddc4378a241d2ad4d73243dbbbda71d9fb612]
#
# add_file "packages/uicmoc/uicmoc4-native_4.4.0.bb"
# content [301657a33a03471124a9ed314c128a1d49dd97f9]
#
# patch "conf/distro/include/fso-autorev.inc"
# from [d5c69660919c5a3424379a0705eeaa21c0220e0e]
# to [a237638d389c64b3de893a3d3c8811cec9602c62]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [50cf71bcebe08dea933ab20470606445ce693ae6]
# to [c24a6b6487621a87f028138310d8af27665e8ab3]
#
# patch "conf/machine/neuros-osd2.conf"
# from [5d3d5445dcd1af59e2891676c7738060a43c6fbe]
# to [fee48b7231afdc08a0a60696b81a0c4c00b25ade]
#
# patch "packages/dsplink/codec-engine_2.10.bb"
# from [cf2642c470b980999a1aabc46677b458b065132e]
# to [811c730621069ed158a4cbe9dfb3d042da4161d2]
#
# patch "packages/dsplink/dsplink.inc"
# from [d492fe354f65326c479a4c150bb2067756c5f296]
# to [fca62e36a4305180437de4c7fb99f38394bd283d]
#
# patch "packages/dsplink/dsplink_1.50.bb"
# from [35e4aa8c6509ff24d50d3658625e7252d51e0893]
# to [a9e3ba59a084ded0b9f0ed96b0a405931edaa01c]
#
# patch "packages/dsplink/dsplink_1.51.00.08.bb"
# from [02cc53a05188213058b69eda10abb1e4a6848c7d]
# to [0321486a05d21dda79c6ad70e4520b4f7d71c58d]
#
# patch "packages/ffmpeg/ffmpeg_svn.bb"
# from [d2d47408e07ad06f91f35a6b7f6b2233209c0414]
# to [1afc1dfbc37b23cec6af00e75b7e10c8d82709e1]
#
# patch "packages/gtk-doc/gtk-doc.bb"
# from [67b6c2ef4ebc159a3f8987b2bda9967bde992e9d]
# to [64f93dc7f8ebf7f55577f45d5f48394ab8c06fa9]
#
# patch "packages/images/fso-image.bb"
# from [dce081cba6576f35793e776422e81e47ea57d62b]
# to [ed48a221328cfc4e99587341b1139811a37425d9]
#
# patch "packages/images/neuros-osd-base-image.bb"
# from [c917176930daa9aa78c1264ea7bc13edf825a943]
# to [55e02451a61b84f5d6c47acfeab218b9afea1c42]
#
# patch "packages/linux/linux-neuros/neuros-osd2/defconfig"
# from [01904f3357f46a93c12b2301c94ddd9bb6276011]
# to [b437ee0b18fc27f9716c12f286fe71a31d157702]
#
# patch "packages/linux/linux-neuros_git.bb"
# from [d2e46023ffdd2a94c8a64a85a822d65cfa6ab270]
# to [34b3e338dd002f3fd5c5bc899e3ee6665bd2928f]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [57c2c0d28ca9963ed016ec055d47e1d2c288dbb4]
# to [61306895c6b0bae840d63008e1d83ad6488255cb]
#
# patch "packages/linux/linux-omap2-git/omap3evm/defconfig"
# from [f47bbb6cd4b40524fe13d11da2f0ec4179f502bc]
# to [724e10b25852d19bebc02358e1b8300447945040]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [2f55f24c8b5a337a34a74ae3b7f07fdbeb56fecd]
# to [e6f17b9cec8b3cfa0d93d2fd47b21c197a3b7d7a]
#
# patch "packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb"
# from [d90b9e48b2570a1906b72dcb19d0a8764fe6c23b]
# to [d3d20223ed445fd02466944d48f546fc905d8b5c]
#
# patch "packages/python/python-cython_0.9.8.bb"
# from [0a9a75ec77d6190dc80054f14140c6d397f4f97c]
# to [f0a7654128e29538d467b1773c4e33222f730cc0]
#
# patch "packages/qt4/qt_packaging.inc"
# from [39f09b583e2e9f61e01f5d75bf57e75690501ed4]
# to [2b3af606a7b62ab9d091ec36472d4e09ccb973ed]
#
# patch "packages/qt4/qt_staging.inc"
# from [311fad49c6f57f9d909e3aa12a9f4635e194da20]
# to [47a145dc6e238d6fffdbd1cfa27edaa0e623d3ef]
#
# patch "packages/tasks/task-python-everything.bb"
# from [459ea3b6154cfd34d4b68901888518f858cfd22d]
# to [5c95c7ef9b80d1e01edfc398f561b98df36dd908]
#
# patch "packages/u-boot/u-boot_git.bb"
# from [32b1019dfdf87033174dc1ae1adb1d36f6a8b300]
# to [9ded7fb06cb65f1ee44e4355f91dbf7c6e105862]
#
# patch "packages/webkit/webkit-gtk/GNUmakefile.am"
# from [3fa55447d194f071e732102b5c13bc3d1d73e8ea]
# to [cd85767a047ac2d58ffd39cb9068ef1ab226d847]
#
# patch "packages/webkit/webkit-gtk/Makefile"
# from [45c43d087d496c1ad06572aa5f3a45d0d522bf49]
# to [96e3a86699284d8960c453ccad155734cf90d3a7]
#
# patch "packages/webkit/webkit-gtk/configure.ac"
# from [026e427444b23ac308a2c3f79cd91a90efe7b2b3]
# to [a0b6b788b46f20b4bdcf3b5a8338e7f7353fde1e]
#
# patch "packages/webkit/webkit-gtk_svn.bb"
# from [3e3f5f342f551b081cd56fab1fc74145a0b6b8cb]
# to [b60a055223bb87126729c5ef9b5837d928b3a8a7]
#
============================================================
--- conf/machine/include/neuros.inc 98be0da0f0970c6e0823e91ff927912ba72f5309
+++ conf/machine/include/neuros.inc 98be0da0f0970c6e0823e91ff927912ba72f5309
@@ -0,0 +1,29 @@
+MACHINE_POSTPROCESS_COMMAND = "neuros_make_installkit"
+EXTRA_IMAGECMD_yaffs2 = "0"
+
+EXTRA_IMAGEDEPENDS += "u-boot u-boot-env virtual/kernel neuros-pkggen-native"
+
+neuros_make_installkit () {
+ cd ${DEPLOY_DIR_IMAGE}
+ rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+ mkdir -p ${IMAGE_NAME}-installkit/temp
+
+ # Get the latest kernel and u-boot using the foo-<machine>.bin symlinks
+ cp uImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/temp/uImage
+ [ -f u-boot-${MACHINE}.bin ] && cp u-boot-${MACHINE}.bin ${IMAGE_NAME}-installkit/u-boot.bin
+ [ -f default_env.img ] && cp default_env.img ${IMAGE_NAME}-installkit/
+
+ cp ${IMAGE_NAME}.rootfs.yaffs2 ${IMAGE_NAME}-installkit/rootfs.yaffs2
+
+ cd ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+ mkfs.jffs2 -d ./temp -o uImage.jffs2 -e 0x20000 -s 0x800 -n
+ echo "${MACHINE}" > rootfs.version
+ echo "${MACHINE}" > u-boot.version
+ echo "${MACHINE}" > uImage.version
+ packet_osd2 osd20.pkg '${DISTRO} Developer UPK' default_env.img u-boot.bin uImage.jffs2 rootfs.yaffs2
+ cd ${DEPLOY_DIR_IMAGE}
+
+ cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/osd20.pkg ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-osd20.pkg
+ rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+}
+
============================================================
--- packages/ffmpeg/ffmpeg_git.bb 64b784ccdafe69b684df27bf1e7040588a54b936
+++ packages/ffmpeg/ffmpeg_git.bb 64b784ccdafe69b684df27bf1e7040588a54b936
@@ -0,0 +1,132 @@
+require ffmpeg.inc
+
+DEPENDS += "libgsm"
+
+PV = "0.4.9+${PR}+gitr${SRCREV}"
+PR = "r9"
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_armv7a = "1"
+
+FFBRANCH_arm = "arm-neon"
+FFBRANCH ?= "master"
+
+SRCREV = "1e8300e71f79963eacdad6b180d9a12c4f56318d"
+SRCREV_arm = "4cc48b756abd09baa7b31909ebbc0c09be2c8e5a"
+SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
+"
+
+S = "${WORKDIR}/git"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -ftree-vectorize -fomit-frame-pointer -O4 -ffast-math"
+BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
+
+EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
+EXTRA_FFCONF ?= ""
+
+EXTRA_OECONF = " \
+ --enable-shared \
+ --enable-pthreads \
+ --disable-stripping \
+ --enable-gpl \
+ --enable-nonfree \
+ --enable-postproc \
+ \
+ --cross-prefix=${TARGET_PREFIX} \
+ --prefix=${prefix} \
+ \
+ --enable-x11grab \
+ --enable-libfaac \
+ --enable-libfaad \
+ --enable-libfaadbin \
+ --enable-libgsm \
+ --enable-libmp3lame \
+ --enable-swscale \
+ --arch=${TARGET_ARCH} \
+ --enable-cross-compile \
+ --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
+ --extra-ldflags="${TARGET_LDFLAGS}" \
+ --enable-hardcoded-tables \
+ ${EXTRA_FFCONF} \
+"
+
+do_configure() {
+ cd ${S} ; git clone git://git.mplayerhq.hu/libswscale || true
+ mkdir -p ${B}
+ cd ${B}
+ ${S}/configure ${EXTRA_OECONF}
+ sed -i -e s:Os:O4:g ${B}/config.h
+}
+
+do_stage() {
+ for lib in libavcodec libavdevice libavformat \
+ libavutil libpostproc libswscale
+ do
+ oe_libinstall -a -so -C $lib $lib ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/$lib
+ done
+
+ install -d ${STAGING_INCDIR}/ffmpeg
+
+ install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h
+ install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/ffmpeg/opt.h
+ install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/libavcodec/avcodec.h
+ install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/libavcodec/opt.h
+
+ install -m 0644 ${S}/libavdevice/avdevice.h ${STAGING_INCDIR}/ffmpeg/avdevice.h
+
+ for h in avformat.h avio.h rtp.h rtsp.h rtspcodes.h
+ do
+ install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/ffmpeg/$h
+ done
+
+ for h in adler32.h avstring.h avutil.h base64.h bswap.h \
+ common.h crc.h fifo.h integer.h intfloat_readwrite.h \
+ log.h lzo.h mathematics.h md5.h mem.h random.h \
+ rational.h sha1.h
+ do
+ install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/ffmpeg/$h
+ 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}/libpostproc
+ install -d ${STAGING_INCDIR}/postproc
+ install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/libpostproc/postprocess.h
+ install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/postproc/postprocess.h
+}
+
+PACKAGES += "libavcodec libavcodec-dev libavcodec-dbg \
+ libavdevice libavdevice-dev libavdevice-dbg \
+ libavformat libavformat-dev libavformat-dbg \
+ libavutil libavutil-dev libavutil-dbg \
+ libpostproc libpostproc-dev libpostproc-dbg \
+ libswscale libswscale-dev libswscale-dbg"
+
+FILES_${PN}-dev = "${includedir}"
+FILES_libavcodec = "${libdir}/libavcodec*.so.*"
+FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/pkgconfig/libavcodec.pc ${libdir}/libavcodec*.a"
+FILES_libavcodec-dbg += "${libdir}/.debug/libavcodec*"
+
+FILES_libavdevice = "${libdir}/libavdevice*.so.*"
+FILES_libavdevice-dev = "${libdir}/libavdevice*.so ${libdir}/pkgconfig/libavdevice.pc ${libdir}/libavdevice*.a"
+FILES_libavdevice-dbg += "${libdir}/.debug/libavdevice*"
+
+FILES_libavformat = "${libdir}/libavformat*.so.*"
+FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/pkgconfig/libavformat.pc ${libdir}/libavformat*.a"
+FILES_libavformat-dbg += "${libdir}/.debug/libavformat*"
+
+FILES_libavutil = "${libdir}/libavutil*.so.*"
+FILES_libavutil-dev = "${libdir}/libavutil*.so ${libdir}/pkgconfig/libavutil.pc ${libdir}/libavutil*.a"
+FILES_libavutil-dbg += "${libdir}/.debug/libavutil*"
+
+FILES_libpostproc = "${libdir}/libpostproc*.so.*"
+FILES_libpostproc-dev = "${libdir}/libpostproc*.so ${libdir}/pkgconfig/libpostproc.pc ${libdir}/libpostproc*.a ${includedir}/postproc"
+FILES_libpostproc-dbg += "${libdir}/.debug/libpostproc*"
+
+FILES_libswscale = "${libdir}/libswscale*.so.*"
+FILES_libswscale-dev = "${libdir}/libswscale*.so ${libdir}/pkgconfig/libswscale.pc ${libdir}/libswscale*.a"
+FILES_libswscale-dbg += "${libdir}/.debug/libswscale*"
============================================================
--- packages/freesmartphone/mickeydbus_git.bb 3fe06dd9c96a8f02c6b8aef310e26d8ec2ef2%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r9a6c7bec4be483b56e6305d978adce9e49f1e29c -r6431187c3e895379ef9f32bcc4a81bf581afbf05
#
#
#
# add_dir "packages/fastcgi/files"
#
# add_file "packages/fastcgi/files/link-against-math.patch"
# content [072e1afbda9f530c7274d0a7966543d862e4c5f3]
#
# patch "packages/fastcgi/fastcgi_2.4.0.bb"
# from [865f9d310ddf05e89de798145b06cce3ece5b683]
# to [2801e4594a4cb85ac3d88807719e4447918dc14d]
#
============================================================
--- packages/fastcgi/files/link-against-math.patch 072e1afbda9f530c7274d0a7966543d862e4c5f3
+++ packages/fastcgi/files/link-against-math.patch 072e1afbda9f530c7274d0a7966543d862e4c5f3
@@ -0,0 +1,26 @@
+Need to link against the C math library (-lm) at least for uclibc.
+
+Index: fcgi-2.4.0/cgi-fcgi/Makefile.am
+===================================================================
+--- fcgi-2.4.0.orig/cgi-fcgi/Makefile.am 2008-07-09 20:54:56.000000000 +0200
++++ fcgi-2.4.0/cgi-fcgi/Makefile.am 2008-07-09 20:55:12.000000000 +0200
+@@ -11,5 +11,5 @@
+ LIBDIR = ../libfcgi
+ LIBFCGI = $(LIBDIR)/libfcgi.la
+
+-LDADD = $(LIBFCGI)
++LDADD = $(LIBFCGI) -lm
+ cgi_fcgi_SOURCES = $(INCLUDE_FILES) cgi-fcgi.c
+Index: fcgi-2.4.0/examples/Makefile.am
+===================================================================
+--- fcgi-2.4.0.orig/examples/Makefile.am 2008-07-09 20:54:56.000000000 +0200
++++ fcgi-2.4.0/examples/Makefile.am 2008-07-09 20:55:11.000000000 +0200
+@@ -21,7 +21,7 @@
+ LIBDIR = ../libfcgi
+ LIBFCGI = $(LIBDIR)/libfcgi.la
+
+-LDADD = $(LIBFCGI)
++LDADD = $(LIBFCGI) -lm
+
+ echo_SOURCES = $(INCLUDE_FILES) echo.c
+ echo_x_SOURCES = $(INCLUDE_FILES) echo-x.c
============================================================
--- packages/fastcgi/fastcgi_2.4.0.bb 865f9d310ddf05e89de798145b06cce3ece5b683
+++ packages/fastcgi/fastcgi_2.4.0.bb 2801e4594a4cb85ac3d88807719e4447918dc14d
@@ -1,8 +1,9 @@ DESCRIPTION = "Fast CGI backend (web ser
LICENSE = "Open Market"
DESCRIPTION = "Fast CGI backend (web server to CGI handler) library"
-PR = "r1"
+PR = "r2"
-SRC_URI = "http://www.fastcgi.com/dist/fcgi-${PV}.tar.gz"
+SRC_URI = "http://www.fastcgi.com/dist/fcgi-${PV}.tar.gz \
+file://link-against-math.patch;patch=1"
S=${WORKDIR}/fcgi-${PV}
@@ -16,6 +17,3 @@ do_stage() {
autotools_stage_all
}
-do_compile() {
-}
-
More information about the Openembedded-commits
mailing list