[oe-commits] org.oe.dev merge of '3a5892676598eb5fb52e72f522d90504a9cebf45'

[oe commit]

merge of '3a5892676598eb5fb52e72f522d90504a9cebf45'
     and 'c35290b09c1ca880d544533f46fa7833a9ee72ce'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 5902c8a2faa615298afe02583b6cc1c6fdc96b8c
ViewMTN: http://monotone.openembedded.org/revision/info/5902c8a2faa615298afe02583b6cc1c6fdc96b8c
Files:
1
packages/webcam-server/webcam-server_0.50.bb
packages/binutils/binutils-cross.inc
Diffs:

#
# mt diff -r3a5892676598eb5fb52e72f522d90504a9cebf45 -r5902c8a2faa615298afe02583b6cc1c6fdc96b8c
#
# 
# 
# patch "packages/webcam-server/webcam-server_0.50.bb"
#  from [2f43d2a37af7dd344e2bf4f5f4ca16cfd4b2699f]
#    to [65286686307779c3b7e4d745c2a04e988aedd627]
# 
============================================================
--- packages/webcam-server/webcam-server_0.50.bb	2f43d2a37af7dd344e2bf4f5f4ca16cfd4b2699f
+++ packages/webcam-server/webcam-server_0.50.bb	65286686307779c3b7e4d745c2a04e988aedd627
@@ -11,8 +11,12 @@ LICENSE = "GPL"
 HOMEPAGE = "http://webcamserver.sourceforge.net/"
 LICENSE = "GPL"
 
+PR = "r1"
+
 ######################################################################################
 
+DEPENDS = "jpeg"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/webcamserver/webcam_server-${PV}.tar.gz"
 
 S = "${WORKDIR}/webcam_server-${PV}"


#
# mt diff -rc35290b09c1ca880d544533f46fa7833a9ee72ce -r5902c8a2faa615298afe02583b6cc1c6fdc96b8c
#
# 
# 
# patch "packages/binutils/binutils-cross.inc"
#  from [5220c374da49786833122769e3c53593a8202d99]
#    to [73e088c7ac4cceb6a25ed245c6dd4c2d47c7a624]
# 
============================================================
--- packages/binutils/binutils-cross.inc	5220c374da49786833122769e3c53593a8202d99
+++ packages/binutils/binutils-cross.inc	73e088c7ac4cceb6a25ed245c6dd4c2d47c7a624
@@ -6,7 +6,7 @@ EXTRA_OECONF = "--with-sysroot=${CROSS_D
 EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
 		--program-prefix=${TARGET_PREFIX} \
 		--enable-install-libbfd \
-		"
+                --disable-werror"
 
 do_stage () {
 	oe_runmake install